http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29735 <pre> writerfilter/source/rtftok/rtffly.hxx | 42 ++++++++++++---------------------- 1 file changed, 15 insertions(+), 27 deletions(-) New commits: commit 593b0352d22d775b5646eaf4928863fbb5a40aea Author: David Tardon &lt;dtardon&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 12:38:43 2013 +0200 fix rtf import on big endian (cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6) Change-Id: Ia9f589752176849f7f6700483e933767e509edf3 Signed-off-by: David Tardon &lt;dtardon&lt; at &gt;redhat.com&gt; Reviewed-on: https://gerrit.libreoffice.org/4355 Reviewed-by: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Tested-by: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx index 918f800..f804b00 100644 --- a/writerfilter/source/rtftok/rtffly.hxx +++ b/writerfilter/source/rtftok/rtffly.hxx &lt; at &gt;&lt; at &gt; -36,18 +36,18 &lt; at &gt;&lt; at &gt; namespace writerfilter { { public: RTFVertOrient(sal_uInt16 nValue) + </pre> David Tardon 2013-06-19T13:27:10 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29734 <pre> writerfilter/source/rtftok/rtffly.hxx | 42 ++++++++++++---------------------- 1 file changed, 15 insertions(+), 27 deletions(-) New commits: commit b936dd27904f8688214a2e3ac7e1fd5cdf6a0877 Author: David Tardon &lt;dtardon&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 12:38:43 2013 +0200 fix rtf import on big endian (cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6) Change-Id: Ia9f589752176849f7f6700483e933767e509edf3 Signed-off-by: David Tardon &lt;dtardon&lt; at &gt;redhat.com&gt; Reviewed-on: https://gerrit.libreoffice.org/4354 Reviewed-by: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Tested-by: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx index ab68cfc..d07a8ac 100644 --- a/writerfilter/source/rtftok/rtffly.hxx +++ b/writerfilter/source/rtftok/rtffly.hxx &lt; at &gt;&lt; at &gt; -17,18 +17,18 &lt; at &gt;&lt; at &gt; namespace writerfilter { { public: RTFVertOrient(sal_uInt16 nValue) + </pre> David Tardon 2013-06-19T13:18:02 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29733 <pre> extras/source/glade/libreoffice-catalog.xml.in | 3 sw/UIConfig_swriter.mk | 1 sw/source/ui/chrdlg/drpcps.cxx | 280 ++++++++++---------- sw/source/ui/chrdlg/drpcps.hrc | 45 --- sw/source/ui/chrdlg/drpcps.src | 142 ---------- sw/source/ui/inc/drpcps.hxx | 48 +-- sw/uiconfig/swriter/ui/dropcapspage.ui | 343 +++++++++++++++++++++++++ 7 files changed, 522 insertions(+), 340 deletions(-) New commits: commit d74323815aec2abb25eae026052651ceec7e372a Author: Olivier Hallot &lt;olivier.hallot&lt; at &gt;edx.srv.br&gt; Date: Wed Jun 12 15:47:38 2013 -0300 Convert Drop Caps tab page to UI widgets Conflicts: sw/UIConfig_swriter.mk Conflicts: sw/source/ui/chrdlg/drpcps.cxx Change-Id: Ic66f367d23b84666dd0165108c405b5b625b798b Reviewed-on: https://gerrit.libreoffice.org/4236 Reviewed-by: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Tested-by: Caolán McNamara &lt;caolanm</pre> Olivier Hallot 2013-06-19T13:14:11 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29732 <pre> vcl/coretext/ctlayout.cxx | 2 -- 1 file changed, 2 deletions(-) New commits: commit 97cd0f38a53f97034442de57d48006d30c4a94db Author: Tor Lillqvist &lt;tml&lt; at &gt;iki.fi&gt; Date: Wed Jun 19 16:06:15 2013 +0300 Call CheckContext() on OS X, too Change-Id: I093586b0c979e492ea2a09dca9525b808de3ce70 diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx index 721d770..18330936 100644 --- a/vcl/coretext/ctlayout.cxx +++ b/vcl/coretext/ctlayout.cxx &lt; at &gt;&lt; at &gt; -433,10 +433,8 &lt; at &gt;&lt; at &gt; bool CTLayout::GetBoundRect( SalGraphics&amp; rGraphics, Rectangle&amp; rVCLRect ) const AquaSalGraphics&amp; rAquaGraphics = static_cast&lt;AquaSalGraphics&amp;&gt;(rGraphics); -#ifdef IOS if( !rAquaGraphics.CheckContext() ) return false; -#endif CGContextSaveGState( rAquaGraphics.mrContext ); CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 ); </pre> Tor Lillqvist 2013-06-19T13:12:08 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29731 <pre> bin/striplanguagetags.sh | 74 +++ solenv/bin/_mkout | 28 - solenv/bin/addsym-mingw.sh | 52 -- solenv/bin/chrel.sed | 2 solenv/bin/cleandiff.pl | 36 - solenv/bin/concat-deps.pl | 89 ---- solenv/bin/convertlinks.pl | 138 ------- solenv/bin/gen_userfeedback_VCL_names.pl | 186 --------- solenv/bin/genmap | 1 solenv/bin/getcsym.awk | 25 - solenv/bin/langwrap | 142 ------- solenv/bin/leconvert.pl | 82 ---- solenv/bin/licinserter.pl | 129 ------ solenv/bin/make_ext_update_info.pl | 604 ------------------------------- solenv/bin/makedepn | 30 - solenv/bin/makemani.pl | 95 ---- solenv/bin/mapgen.pl | 196 ---------- solenv/bin/mkdir.pl | 82 ---- solenv/bin/mkout.pl </pre> Matúš Kukan 2013-06-19T13:05:34 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29730 <pre> sw/source/ui/chrdlg/drpcps.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 90f381f02336126e850c657dc62ae0d2cc7b33ca Author: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 13:55:23 2013 +0100 Resolves: fdo#65931 why are we futzing with leading on the preview anyway Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f (cherry picked from commit cb1ec05a72d54d55c8a98778c56ee01197cf45f4) Reviewed-on: https://gerrit.libreoffice.org/4363 Reviewed-by: David Tardon &lt;dtardon&lt; at &gt;redhat.com&gt; Tested-by: David Tardon &lt;dtardon&lt; at &gt;redhat.com&gt; diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 1a11874..afb51f1 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx &lt; at &gt;&lt; at &gt; -71,7 +71,6 &lt; at &gt;&lt; at &gt; class SwDropCapsPict : public Control long mnLineH; long mnTextH; sal_uInt16 mnDistance; - sal_Int32 mnLeading; Printer* mpPrinter; bool</pre> Caolán McNamara 2013-06-19T13:04:10 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29729 <pre> ff/8c8d3c169bb1adf489bca080a91fd5f7bea95f | 1 + 1 file changed, 1 insertion(+) New commits: commit 08da40e1e727af87466b11a38704c0ddcb31890b Author: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 14:02:51 2013 +0100 Notes added by 'git notes add' diff --git a/ff/8c8d3c169bb1adf489bca080a91fd5f7bea95f b/ff/8c8d3c169bb1adf489bca080a91fd5f7bea95f new file mode 100644 index 0000000..8e5c182 --- /dev/null +++ b/ff/8c8d3c169bb1adf489bca080a91fd5f7bea95f &lt; at &gt;&lt; at &gt; -0,0 +1 &lt; at &gt;&lt; at &gt; +ignore: aoo _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits&lt; at &gt;lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits </pre> Caolán McNamara 2013-06-19T13:03:10 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29728 <pre> sw/source/ui/chrdlg/drpcps.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit cb1ec05a72d54d55c8a98778c56ee01197cf45f4 Author: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 13:55:23 2013 +0100 Resolves: fdo#65931 why are we futzing with leading on the preview anyway Change-Id: I0eff88f165a737dfd9a2f348f04b17b6a6212e6f diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 1a11874..afb51f1 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx &lt; at &gt;&lt; at &gt; -71,7 +71,6 &lt; at &gt;&lt; at &gt; class SwDropCapsPict : public Control long mnLineH; long mnTextH; sal_uInt16 mnDistance; - sal_Int32 mnLeading; Printer* mpPrinter; bool mbDelPrinter; /// The _ScriptInfo structure holds information on where we change from one &lt; at &gt;&lt; at &gt; -243,7 +242,6 &lt; at &gt;&lt; at &gt; void SwDropCapsPict::UpdatePaintSettings( void ) // gray lines mnTotLineH = (GetOutputSiz</pre> Caolán McNamara 2013-06-19T12:57:32 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29727 <pre> sal/osl/all/log.cxx | 3 +++ sal/osl/unx/file.cxx | 4 ++-- sal/textenc/tencinfo.cxx | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) New commits: commit a1936e4183240981af0bf616207994e3a2f7929e Author: Tor Lillqvist &lt;tml&lt; at &gt;iki.fi&gt; Date: Wed Jun 19 11:35:00 2013 +0300 Fix warning: Value stored is never read Change-Id: Ic41fe1682f19c39faa0a2afc47c11b8a5bead212 diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 7a991e8..4e646b0 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx &lt; at &gt;&lt; at &gt; -461,7 +461,7 &lt; at &gt;&lt; at &gt; oslFileError FileHandle_Impl::readFileAt ( if (result != osl_File_E_None) return (result); - nBytesRequested -= uDone, *pBytesRead += uDone; + *pBytesRead += uDone; return osl_File_E_None; } &lt; at &gt;&lt; at &gt; -533,7 +533,7 &lt; at &gt;&lt; at &gt; oslFileError FileHandle_Impl::writeFileAt ( if (uDone != nBytesToWrite) ret</pre> Tor Lillqvist 2013-06-19T12:56:54 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29726 <pre> sw/Module_sw.mk | 1 sw/qa/extras/ooxmlexport/data/fdo64238_a.docx |binary sw/qa/extras/ooxmlexport/data/fdo64238_b.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 44 ++++++++++ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 91 ++++++++++++++-------- writerfilter/source/dmapper/DomainMapper_Impl.hxx | 1 6 files changed, 105 insertions(+), 32 deletions(-) New commits: commit 782adba4d436c65cdf85d48f28486321873b15ed Author: Adam Co &lt;rattles2013&lt; at &gt;gmail.com&gt; Date: Wed Jun 12 15:06:42 2013 +0300 fdo#64238: fix for missing footer bug Signed-off-by: Miklos Vajna &lt;vmiklos&lt; at &gt;suse.cz&gt; Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I328547c41bfc1a23f7e6233db57fbfa415e22cb3 Signed-off-by: Miklos Vajna &lt;vmiklos&lt; at &gt;suse.cz&gt; diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index d8ca65e..202c67c 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk &lt; at &gt;&lt; at &gt; -48,6 +48,7 &lt; at &gt;&lt; at &gt; $(eval $(call gb_Module_add</pre> Adam Co 2013-06-19T12:31:59 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29725 <pre> cui/source/tabpages/transfrm.cxx | 2 +- svx/source/svdraw/svdedtv1.cxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 8c1d1b66904cdd95e8eec746a81cf1c57ad0e85a Author: David Tardon &lt;dtardon&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 14:23:44 2013 +0200 fdo#65870 fix changing shape height via dialog Change-Id: I7c61be2c3d368dfd3ea66427c77636f797a7e88a diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 196779b..85ea67d 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx &lt; at &gt;&lt; at &gt; -1522,6 +1522,7 &lt; at &gt;&lt; at &gt; void SdrEditView::SetGeoAttrToMarked(const SfxItemSet&amp; rAttr) if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&amp;pPoolItem)) { nSizY=((const SfxUInt32Item*)pPoolItem)-&gt;GetValue(); bChgSiz=true; + bChgHgt=true; } if (bChgSiz) { eSizePoint=(RECT_POINT)((const SfxAllEnumItem&amp;)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue(); commit 8fbb2ebc2155b03d1436</pre> David Tardon 2013-06-19T12:28:01 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29724 <pre> vcl/coretext/ctlayout.cxx | 5 +++++ 1 file changed, 5 insertions(+) New commits: commit 47dca10811a31cf28e72b9bc034b9d8975327df3 Author: Tor Lillqvist &lt;tml&lt; at &gt;iki.fi&gt; Date: Wed Jun 19 15:25:26 2013 +0300 Add comment Change-Id: Id3ec71e8da07a8bf1c979585eb84cd5a9d6f7a77 diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx index 1e89a39..721d770 100644 --- a/vcl/coretext/ctlayout.cxx +++ b/vcl/coretext/ctlayout.cxx &lt; at &gt;&lt; at &gt; -426,6 +426,11 &lt; at &gt;&lt; at &gt; void CTLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const bool CTLayout::GetBoundRect( SalGraphics&amp; rGraphics, Rectangle&amp; rVCLRect ) const { + // Closely mimic DrawText(), except that instead of calling + // CTLineDraw() to draw the line, we call CTLineGetImageBounds() + // to get its bounds. But all the coordinate system manipulation + // before that is the same =&gt; should be factored out? + AquaSalGraphics&amp; rAquaGraphics = static_cast&lt;AquaSalGraphics&amp;&gt;(rGraphics); #ifdef IOS </pre> Tor Lillqvist 2013-06-19T12:27:15 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29723 <pre> instsetoo_native/util/openoffice.lst | 10 +++++----- solenv/inc/minor.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 99c9338276339572eeed3b00033c03282105ca8e Author: Andras Timar &lt;atimar&lt; at &gt;suse.com&gt; Date: Wed Jun 19 14:16:43 2013 +0200 Bump for 3.6-29 Change-Id: I551bce4ae38687fc7decd96b0466e951808c2768 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 9ad8e63..7dc2cd1 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst &lt; at &gt;&lt; at &gt; -32,13 +32,13 &lt; at &gt;&lt; at &gt; Globals CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 28 + WINDOWSPATCHLEVEL 29 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} STARTCENTER_HIDE_EXTERNAL_LINKS 0 } - } + </pre> Andras Timar 2013-06-19T12:17:21 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29722 <pre> configure.ac | 2 +- vcl/coretext/ctlayout.cxx | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) New commits: commit b9c46f46cebc0ebed5a91f8fbb9d0a01366f1f77 Author: Tor Lillqvist &lt;tml&lt; at &gt;iki.fi&gt; Date: Wed Jun 19 15:12:30 2013 +0300 fdo#63616: Fix GetBoundRect for rotated text in CoreText backend Change-Id: I8c9ee84afd71481c2c6b002265b86e048f369f5c diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx index e2a118b..1e89a39 100644 --- a/vcl/coretext/ctlayout.cxx +++ b/vcl/coretext/ctlayout.cxx &lt; at &gt;&lt; at &gt; -433,18 +433,39 &lt; at &gt;&lt; at &gt; bool CTLayout::GetBoundRect( SalGraphics&amp; rGraphics, Rectangle&amp; rVCLRect ) const return false; #endif + CGContextSaveGState( rAquaGraphics.mrContext ); + CGContextScaleCTM( rAquaGraphics.mrContext, 1.0, -1.0 ); + CGContextSetShouldAntialias( rAquaGraphics.mrContext, !rAquaGraphics.mbNonAntialiasedText ); + + const Point aVclPos = GetDrawPosition( Point(mnBaseAdv,0) ); + CGPoint </pre> Tor Lillqvist 2013-06-19T12:15:53 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29721 <pre> instsetoo_native/util/openoffice.lst | 2 +- sc/source/ui/view/gridwin.cxx | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) New commits: commit 73a9e800ff4f61058750acb6840af780a0505b49 Author: Armin Le Grand &lt;alg&lt; at &gt;apache.org&gt; Date: Wed Jun 19 11:23:41 2013 +0000 i122497 Filter D&amp;D flags for calc D&amp;D diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 108525c..e397dfa 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx &lt; at &gt;&lt; at &gt; -3565,6 +3565,13 &lt; at &gt;&lt; at &gt; sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent&amp; rEvt ) { sal_Int8 nMyAction = rEvt.mnAction; + // clear DND_ACTION_LINK when other actions are set. The usage below cannot handle + // multiple set values + if((nMyAction &amp; DND_ACTION_LINK) &amp;&amp; (nMyAction &amp; (DND_ACTION_COPYMOVE))) + { + nMyAction &amp;= ~DND_ACTION_LINK; + } + if ( !rData.pDrawTransfer || </pre> Armin Le Grand 2013-06-19T12:07:38 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29720 <pre> oox/source/vml/vmlshape.cxx | 11 ++++++-- writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 20 ++++++++++++--- writerfilter/source/dmapper/GraphicImport.cxx | 3 -- writerfilter/source/dmapper/PropertyMap.cxx | 4 +-- writerfilter/source/dmapper/StyleSheetTable.cxx | 3 -- writerfilter/source/dmapper/WrapPolygonHandler.cxx | 8 +++--- writerfilter/source/dmapper/WrapPolygonHandler.hxx | 2 - 7 files changed, 35 insertions(+), 16 deletions(-) New commits: commit ebd25b53f8416340391429921232a8b0fbb1f331 Author: Cédric Bosdonnat &lt;cedric.bosdonnat&lt; at &gt;free.fr&gt; Date: Wed May 22 11:34:01 2013 +0200 n#816593: Floating table width import fix: adjust the frame width (cherry picked from commit 9f4c8a8bca06b4c2a916a51909367b453fc41a8b) Conflicts: sw/qa/extras/ooxmlimport/data/table_width.docx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I8212bc5981418f6cbd514bf5002e</pre> Cédric Bosdonnat 2013-06-19T11:58:48 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29719 <pre> helpcontent2 | 2 +- translations | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8bba0911ccffe72d5db53358afe751f8d2da4251 Author: Fridrich Å trba &lt;fridrich.strba&lt; at &gt;bluewin.ch&gt; Date: Wed Jun 19 13:31:08 2013 +0200 Syncing core with translations Change-Id: I2a1ff066468144086b26eb75854478e244bfdba6 diff --git a/translations b/translations index 9b5110f..46c683c 160000 --- a/translations +++ b/translations &lt; at &gt;&lt; at &gt; -1 +1 &lt; at &gt;&lt; at &gt; -Subproject commit 9b5110fd0c47fb475a83ae33b286bdcff2652784 +Subproject commit 46c683c740acf324164f188a97abea28fe3c1bf9 commit 6ac974ac81bc763838532693e663ca3baea0758f Author: Fridrich Å trba &lt;fridrich.strba&lt; at &gt;bluewin.ch&gt; Date: Wed Jun 19 13:28:40 2013 +0200 Setting helpcontent2 on the branch Change-Id: Ie156fa098887a9a4cf5d9c20e43116f771e79a81 diff --git a/helpcontent2 b/helpcontent2 index e15ec69..81f2a2b 160000 --- a/helpcontent2 +++ b/helpcontent2 &lt; at &gt;&lt; at &gt; -1 +1 &lt; at &gt;&lt; at &gt; -Subproject commit e15ec6915ca8837f68fc1b1133d6380f087f81c0 +Subp</pre> Fridrich Štrba 2013-06-19T11:31:47 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29718 <pre> svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 57 ++++++++++---------- sw/source/core/draw/dcontact.cxx | 20 +++++-- 2 files changed, 48 insertions(+), 29 deletions(-) New commits: commit bc69be88fa43901504126740bc8810f4e31e17a5 Author: Armin Le Grand &lt;alg&lt; at &gt;apache.org&gt; Date: Tue Jun 18 13:10:42 2013 +0000 Resolves: #i121917# Corrected access to text object (cherry picked from commit 2c9c9923fdf042c41cebaf9a15def7caac86032d) Conflicts: sw/source/core/draw/dcontact.cxx Change-Id: Ia214127ca540c4f4036a0006e7c227649fb39134 (cherry picked from commit 6c5c5584eb1adb64fee3aaf76196115ba3812e2c) diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 5854e36..20879f1 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx &lt; at &gt;&lt; at &gt; -150,6 +150,34 &lt; at &gt;&lt; at &gt; void PosSizePropertyPanel::ShowMenu (void) +namespace +{ + </pre> Armin Le Grand 2013-06-19T11:20:45 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29717 <pre> include/vcl/bitmap.hxx | 29 ----- include/vcl/bitmapex.hxx | 32 +++++ svtools/source/control/ctrlbox.cxx | 14 +- svtools/source/control/valueset.cxx | 14 +- sw/source/core/txtnode/txtedt.cxx | 13 ++ sw/source/core/undo/unins.cxx | 13 ++ vcl/source/control/ilstbox.cxx | 32 ++--- vcl/source/gdi/bitmap4.cxx | 194 ------------------------------------ vcl/source/gdi/bitmapex.cxx | 149 +++++++++++++++++++++++++++ vcl/source/gdi/outdev2.cxx | 9 + 10 files changed, 238 insertions(+), 261 deletions(-) New commits: commit 18eba6a69f49c9e8e2902f84e96cb6906ee337f1 Author: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 12:14:52 2013 +0100 bounds can be -1 for not-found Change-Id: I941ef1dae00167460f2f0de39e472ed047539f27 diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 1716010..691da30 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/t</pre> Caolán McNamara 2013-06-19T11:17:40 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29716 <pre> 13/6976efb17b8617a83c7f26601cd04031b51e7f | 1 + 1 file changed, 1 insertion(+) New commits: commit 75317768fffb73f39993ae3d427f7b945338de9e Author: Caolán McNamara &lt;caolanm&lt; at &gt;redhat.com&gt; Date: Wed Jun 19 12:17:33 2013 +0100 Notes added by 'git notes add' diff --git a/13/6976efb17b8617a83c7f26601cd04031b51e7f b/13/6976efb17b8617a83c7f26601cd04031b51e7f new file mode 100644 index 0000000..77400a7 --- /dev/null +++ b/13/6976efb17b8617a83c7f26601cd04031b51e7f &lt; at &gt;&lt; at &gt; -0,0 +1 &lt; at &gt;&lt; at &gt; +merged as: c96802f0e2e553bfbb3bd036df95ea34d2f5741a _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits&lt; at &gt;lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits </pre> Caolán McNamara 2013-06-19T11:17:40 http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.scm/29715 <pre> dictionaries | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6af376566b55c504335ccfae0fd82d6d2a0c75dd Author: Fridrich Å trba &lt;fridrich.strba&lt; at &gt;bluewin.ch&gt; Date: Wed Jun 19 13:09:22 2013 +0200 Update core Change-Id: I724b5ec0a5e8d052c47c56364bd7601bd0c5bff9 diff --git a/dictionaries b/dictionaries index 9ec57a8..dbfffe3 160000 --- a/dictionaries +++ b/dictionaries &lt; at &gt;&lt; at &gt; -1 +1 &lt; at &gt;&lt; at &gt; -Subproject commit 9ec57a8df294f82d2b038ada757e3924406d7719 +Subproject commit dbfffe3512457095ea99f7362ff64b1431b820b1 _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits&lt; at &gt;lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits </pre> Fridrich Štrba 2013-06-19T11:09:59 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.documentfoundation.libreoffice.scm