[PATCH] Remove unneeded #include
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1637 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/1637/1 Remove unneeded #include Change-Id: Ic0c82079aeb586af97c864aebf966f01643ebfd6 --- M sw/source/core/doc/docedt.cxx 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 693e2bf..5aa66f3 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -60,7 +60,6 @@ #include UndoInsert.hxx #include UndoDelete.hxx #include breakit.hxx -#include hhcwrp.hxx #include vcl/msgbox.hxx #include comcore.hrc #include editsh.hxx -- To view, visit https://gerrit.libreoffice.org/1637 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0c82079aeb586af97c864aebf966f01643ebfd6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Use member initializer list in constructor
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1640
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/1640/1
Use member initializer list in constructor
Change-Id: I8d4f8b95909b91917b456f49d7a3ac270703cc96
---
M sw/source/ui/lingu/hhcwrp.cxx
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index f1ec1d5..82e7d3a 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -103,21 +103,21 @@
pTargetFont,
nConvOptions,
bIsInteractive ),
-mrWrtShell( pSwView-GetWrtShell() )
+mpView( pSwView ),
+mpWin( pSwView-GetEditWin() ),
+mrWrtShell( pSwView-GetWrtShell() ),
+mpConvArgs( 0 ),
+mnLastPos( 0 ),
+mnUnitOffset( 0 ),
+mnPageCount( 0 ),
+mnPageStart( 0 ),
+mbIsDrawObj( sal_False ),
+mbIsOtherCntnt( bOther ),
+mbStartChk( bOther ),
+mbIsSelection( bSelection ),
+mbStartDone( bOther || bStart ),
+mbEndDone( sal_False )
{
-mpConvArgs = 0;
-mnLastPos = 0;
-mnUnitOffset= 0;
-
-mpView = pSwView;
-mpWin = pSwView-GetEditWin();
-mbIsDrawObj = sal_False;
-mbIsOtherCntnt = mbStartChk = bOther;
-mbIsSelection = bSelection;
-mbStartDone = bOther || bStart;
-mbEndDone= sal_False;
-//bLastRet= sal_True;
-mnPageCount = mnPageStart = 0;
}
--
To view, visit https://gerrit.libreoffice.org/1640
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d4f8b95909b91917b456f49d7a3ac270703cc96
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused class members
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1638
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/1638/1
Remove unused class members
Change-Id: I44fe6ad3dacc65e28256aca98588b7dfe92d73ae
---
M sw/inc/hhcwrp.hxx
M sw/source/ui/lingu/hhcwrp.cxx
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 0be12b5..0d0c6b1 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -47,12 +47,9 @@
sal_uInt16 nPageStart; /// first checked page
sal_BoolbIsDrawObj;
-sal_BoolbIsStart;
sal_BoolbIsOtherCntnt;
sal_BoolbStartChk;
sal_BoolbIsSelection; /// true if only the selected text should
be converted
-sal_BoolbInfoBox; /// true if message should be displayed
at the end
-sal_BoolbIsConvSpecial; /// true if special regions: header,
footer, ... should be converted
sal_BoolbStartDone;
sal_BoolbEndDone;
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 953fdc7..03bdc7a 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -112,11 +112,8 @@
pView = pSwView;
pWin= pSwView-GetEditWin();
bIsDrawObj = sal_False;
-bIsStart= bStart;
bIsOtherCntnt = bStartChk = bOther;
-bIsConvSpecial = sal_True;
bIsSelection= bSelection;
-bInfoBox= sal_False;
bStartDone = bOther || bStart;
bEndDone= sal_False;
//bLastRet= sal_True;
@@ -662,7 +659,6 @@
if( bIsOtherCntnt bStartDone bEndDone ) // document completely
checked?
{
-bInfoBox = sal_True;
return sal_False;
}
@@ -677,13 +673,11 @@
else if ( bStartDone bEndDone )
{
// body region done, ask about special region
-if( bIsConvSpecial HasOtherCnt_impl() )
+if( HasOtherCnt_impl() )
{
ConvStart_impl( pConvArgs, SVX_SPELL_OTHER );
bIsOtherCntnt = bGoOn = sal_True;
}
-else
-bInfoBox = sal_True;
}
else
{
--
To view, visit https://gerrit.libreoffice.org/1638
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44fe6ad3dacc65e28256aca98588b7dfe92d73ae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Character conversion: do not destroy sequence while iteratin...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1636
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/1636/1
Character conversion: do not destroy sequence while iterating on it
Change-Id: Ib77e15b776384cc75880a907a6425c6105bc3fab
---
M sw/source/core/txtnode/txtedt.cxx
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index d5bc382..82c6cf8 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -74,6 +74,7 @@
#include com/sun/star/i18n/TransliterationModulesExtra.hpp
#include vector
+#include utility
using rtl::OUString;
using namespace ::com::sun::star;
@@ -1073,6 +1074,12 @@
{
SwLanguageIterator aIter( *this, nBegin );
+// Implicit changes require setting new attributes, which in turn
destroys
+// the attribute sequence on which aIter iterates. We store the
necessary
+// coordinates and apply those changes after iterating through the
text.
+typedef std::pairxub_StrLen, xub_StrLen ImplicitChangesRange;
+std::vectorImplicitChangesRange aImplicitChanges;
+
// find non zero length text portion of appropriate language
do {
nLangFound = aIter.GetLanguage();
@@ -1108,13 +1115,22 @@
if (!bIsAsianScript
rArgs.bAllowImplicitChangesForNotConvertibleText)
{
-SetLanguageAndFont( aCurPaM,
-rArgs.nConvTargetLang, RES_CHRATR_CJK_LANGUAGE,
-rArgs.pTargetFont, RES_CHRATR_CJK_FONT );
+// Store for later use
+aImplicitChanges.push_back(ImplicitChangesRange(nBegin,
nBegin+nLen));
}
nBegin = nChPos;// start of next language portion
}
} while (!bFound aIter.Next()); /* loop while nothing was found
and still sth is left to be searched */
+
+// Apply implicit changes, if any, now that aIter is no longer used
+for (size_t i = 0; i aImplicitChanges.size(); ++i)
+{
+SwPaM aPaM( *this, aImplicitChanges[i].first );
+aPaM.SetMark();
+aPaM.GetPoint()-nContent = aImplicitChanges[i].second;
+SetLanguageAndFont( aPaM, rArgs.nConvTargetLang,
RES_CHRATR_CJK_LANGUAGE, rArgs.pTargetFont, RES_CHRATR_CJK_FONT );
+}
+
}
// keep resulting text within selection / range of text to be converted
--
To view, visit https://gerrit.libreoffice.org/1636
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib77e15b776384cc75880a907a6425c6105bc3fab
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused #define
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1641 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1641/1 Remove unused #define Change-Id: Ic92663d13892d7e4978b5f3a10ed7f473e091835 --- M sw/source/ui/lingu/hhcwrp.cxx 1 file changed, 0 insertions(+), 2 deletions(-) diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 82e7d3a..4d9a0d4 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -56,8 +56,6 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::i18n; -#define CHAR_PAR_BRK((sal_Char) 0x0D) - // // Description: Turn off frame/object shell if applicable -- To view, visit https://gerrit.libreoffice.org/1641 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic92663d13892d7e4978b5f3a10ed7f473e091835 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Use forward declaration instead of (doubled) #include
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1642 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1642/1 Use forward declaration instead of (doubled) #include Change-Id: I1cfb65a809e5dd56fb395c2f801bce5e5d75acfe --- M sw/inc/hhcwrp.hxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index c3e1443..1ab2251 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -20,12 +20,12 @@ #define _HHCWRP_HXX #include editeng/hangulhanja.hxx -#include pam.hxx class SwView; class Window; class SwWrtShell; struct SwConversionArgs; +class SwPaM; // -- To view, visit https://gerrit.libreoffice.org/1642 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cfb65a809e5dd56fb395c2f801bce5e5d75acfe Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Prefix class data members
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1639
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/1639/1
Prefix class data members
Change-Id: I6734df58b589088809c712c3906f0cee3fd6a103
---
M sw/inc/hhcwrp.hxx
M sw/source/ui/lingu/hhcwrp.cxx
2 files changed, 131 insertions(+), 131 deletions(-)
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 0d0c6b1..c3e1443 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -31,27 +31,27 @@
class SwHHCWrapper : public editeng::HangulHanjaConversion
{
-SwView *pView;
-Window* pWin;
-SwWrtShell rWrtShell;
+SwView *mpView;
+Window* mpWin;
+SwWrtShell mrWrtShell;
-SwConversionArgs *pConvArgs;/** object for arguments (and results)
needed
+SwConversionArgs *mpConvArgs;/** object for arguments (and results)
needed
to find of next convertible text
portion */
-xub_StrLen nLastPos; /** starting position of the last found
text part
+xub_StrLen mnLastPos; /** starting position of the last found
text part
(needs to be sth that gets not moved
like
SwPaM or SwPosition by replace
operations!) */
-sal_Int32 nUnitOffset;
+sal_Int32 mnUnitOffset;
-sal_uInt16 nPageCount; /// page count for progress bar
-sal_uInt16 nPageStart; /// first checked page
+sal_uInt16 mnPageCount; /// page count for progress bar
+sal_uInt16 mnPageStart; /// first checked page
-sal_BoolbIsDrawObj;
-sal_BoolbIsOtherCntnt;
-sal_BoolbStartChk;
-sal_BoolbIsSelection; /// true if only the selected text should
be converted
-sal_BoolbStartDone;
-sal_BoolbEndDone;
+sal_BoolmbIsDrawObj;
+sal_BoolmbIsOtherCntnt;
+sal_BoolmbStartChk;
+sal_BoolmbIsSelection; /// true if only the selected text
should be converted
+sal_BoolmbStartDone;
+sal_BoolmbEndDone;
/// from SvxSpellWrapper copied and modified
sal_BoolConvNext_impl();/// former SpellNext
@@ -71,8 +71,8 @@
SwPaM *pCrsr );
voidChangeText_impl( const String rNewText, sal_Bool
bKeepAttributes );
-inline sal_Bool IsDrawObj() { return bIsDrawObj; }
-inline void SetDrawObj( sal_Bool bNew ) { bIsDrawObj = bNew; }
+inline sal_Bool IsDrawObj() { return mbIsDrawObj; }
+inline void SetDrawObj( sal_Bool bNew ) { mbIsDrawObj = bNew; }
protected:
virtual voidGetNextPortion( ::rtl::OUString rNextPortion,
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 03bdc7a..f1ec1d5 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -103,56 +103,56 @@
pTargetFont,
nConvOptions,
bIsInteractive ),
-rWrtShell( pSwView-GetWrtShell() )
+mrWrtShell( pSwView-GetWrtShell() )
{
-pConvArgs = 0;
-nLastPos= 0;
-nUnitOffset = 0;
+mpConvArgs = 0;
+mnLastPos = 0;
+mnUnitOffset= 0;
-pView = pSwView;
-pWin= pSwView-GetEditWin();
-bIsDrawObj = sal_False;
-bIsOtherCntnt = bStartChk = bOther;
-bIsSelection= bSelection;
-bStartDone = bOther || bStart;
-bEndDone= sal_False;
+mpView = pSwView;
+mpWin = pSwView-GetEditWin();
+mbIsDrawObj = sal_False;
+mbIsOtherCntnt = mbStartChk = bOther;
+mbIsSelection = bSelection;
+mbStartDone = bOther || bStart;
+mbEndDone= sal_False;
//bLastRet= sal_True;
-nPageCount = nPageStart = 0;
+mnPageCount = mnPageStart = 0;
}
SwHHCWrapper::~SwHHCWrapper()
{
-delete pConvArgs;
+delete mpConvArgs;
-rWrtShell.SetCareWin( NULL );
+mrWrtShell.SetCareWin( NULL );
// check for existence of a draw view which means that there are
// (or previously were) draw objects present in the document.
// I.e. we like to check those too.
-if ( IsDrawObj() /* bLastRet*/ pView-GetWrtShell().HasDrawView() )
+if ( IsDrawObj() /* bLastRet*/ mpView-GetWrtShell().HasDrawView() )
{
-Cursor *pSave = pView-GetWindow()-GetCursor();
+Cursor *pSave = mpView-GetWindow()-GetCursor();
{
SwKeepConversionDirectionStateContext aContext;
-SdrHHCWrapper aSdrConvWrap( pView, GetSourceLanguage(),
+SdrHHCWrapper aSdrConvWrap( mpView, GetSourceLanguage(),
GetTargetLanguage(), GetTargetFont(),
GetConversionOptions(), IsInteractive() );
aSdrConvWrap.StartTextConversion();
}
[Libreoffice-commits] .: 2 commits - configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit fee278b222f1a8d15706b78cc0e39a1300c19186 Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 11 10:16:43 2013 +0200 Warning is now unnecessary as there are no real TABs any more here Change-Id: Ia286635b9f225fdec1afc6e6af2a898676ac8554 diff --git a/configure.ac b/configure.ac index 3f176fb..e99640f 100644 --- a/configure.ac +++ b/configure.ac @@ -4620,7 +4620,7 @@ A := \$(wildcard *.a) .PHONY: all all: \$(A:.a=.b) -TAB@echo survived bug20033. #dont kill these tabs, you will break the Makefile +TAB@echo survived bug20033. .PHONY: setup setup: commit 079de44b00be0e6e06388415b65f1195c9005921 Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 11 10:14:57 2013 +0200 There are several TABs on one line in this here document So replace all the TAB with real TABs. (Sure, only the first TAB on that line is part of the Makefile syntax, the rest are just whitespace.) Change-Id: Ie500c30400b72ee1cdf81716627bbac689f0 diff --git a/configure.ac b/configure.ac index 3b4fb48..3f176fb 100644 --- a/configure.ac +++ b/configure.ac @@ -4615,7 +4615,7 @@ elif test $_make_longver -ge 038100; then fi AC_MSG_CHECKING([for GNU make bug 20033]) TESTGMAKEBUG20033=`mktemp -d tmp.XX` -$SED -e s/TAB/$TAB/ $TESTGMAKEBUG20033/Makefile EOF +$SED -e s/TAB/$TAB/g $TESTGMAKEBUG20033/Makefile EOF A := \$(wildcard *.a) .PHONY: all ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docedt.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 36c5abb012e48f0c7e8b8b0d50e562b423e43869 Author: Matteo Casalin matteo.casa...@gmx.com Date: Mon Jan 7 23:41:15 2013 +0100 Remove unneeded #include Change-Id: Ic0c82079aeb586af97c864aebf966f01643ebfd6 Reviewed-on: https://gerrit.libreoffice.org/1637 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 693e2bf..5aa66f3 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -60,7 +60,6 @@ #include UndoInsert.hxx #include UndoDelete.hxx #include breakit.hxx -#include hhcwrp.hxx #include vcl/msgbox.hxx #include comcore.hrc #include editsh.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Remove unneeded #include
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1637 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1637 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0c82079aeb586af97c864aebf966f01643ebfd6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - avmedia/source canvas/source cui/source desktop/source extensions/source framework/source scp2/source sd/source sfx2/source slideshow/source solenv/gbuild solenv/i
avmedia/source/inc/mediamisc.hxx |2 - canvas/source/cairo/cairo_devicehelper.cxx|2 - canvas/source/cairo/cairo_quartz_cairo.cxx|2 - canvas/source/cairo/cairo_textlayout.cxx |4 +- canvas/source/vcl/backbuffer.cxx |2 - canvas/source/vcl/bitmapbackbuffer.cxx|2 - canvas/source/vcl/spritedevicehelper.cxx |2 - canvas/source/vcl/spritehelper.cxx|6 +-- cui/source/options/optgdlg.cxx|4 +- desktop/source/app/app.cxx|4 +- extensions/source/plugin/base/nfuncs.cxx | 10 ++--- extensions/source/plugin/base/xplugin.cxx |6 +-- extensions/source/plugin/inc/plugin/impl.hxx |4 +- framework/source/dispatch/closedispatcher.cxx |2 - framework/source/uielement/menubarmanager.cxx |2 - scp2/source/ooo/common_brand.scp |2 - scp2/source/ooo/file_library_ooo.scp | 14 +++ scp2/source/ooo/file_ooo.scp |4 +- scp2/source/ooo/file_resource_ooo.scp |2 - sd/source/ui/dlg/prntopts.cxx |6 +-- sd/source/ui/slideshow/slideshowimpl.cxx |2 - sfx2/source/appl/shutdownicon.cxx |8 ++-- sfx2/source/appl/shutdownicon.hxx |2 - sfx2/source/dialog/filedlghelper.cxx |2 - slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |2 - slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.cxx |2 - slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx |6 +-- solenv/gbuild/platform/macosx.mk |1 solenv/inc/unxmacx.mk |1 svtools/source/misc/sampletext.cxx|2 - svtools/source/misc/transfer.cxx |4 +- sw/source/core/text/itrform2.cxx |2 - sw/source/core/view/viewsh.cxx|2 - toolkit/source/awt/vclxsystemdependentwindow.cxx |6 +-- toolkit/source/awt/vclxtoolkit.cxx|8 ++-- toolkit/source/awt/vclxtopwindow.cxx |4 +- toolkit/source/awt/vclxwindow1.cxx|4 +- vcl/generic/print/genprnpsp.cxx |4 +- vcl/inc/svsys.h |2 - vcl/inc/vcl/bitmap.hxx|2 - vcl/inc/vcl/sysdata.hxx | 18 +- vcl/source/components/dtranscomp.cxx | 10 ++--- vcl/source/gdi/outdev6.cxx|2 - vcl/source/window/menu.cxx|2 - vcl/source/window/syschild.cxx|3 - vcl/source/window/window.cxx |6 +-- 46 files changed, 93 insertions(+), 96 deletions(-) New commits: commit e103887c8c158e7059a586ef5a5f7b234c547dfe Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 11 11:07:23 2013 +0200 QUARTZ is equivalent to MACOSX So just check MACOSX in the sources, and don't pass any -DQUARTZ to compilations. Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20 diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx index 218cdbb..1e439340 100644 --- a/avmedia/source/inc/mediamisc.hxx +++ b/avmedia/source/inc/mediamisc.hxx @@ -24,7 +24,7 @@ class ResMgr; #ifdef WNT #define AVMEDIA_MANAGER_SERVICE_NAME com.sun.star.comp.avmedia.Manager_DirectX #else -#ifdef QUARTZ +#ifdef MACOSX #define AVMEDIA_MANAGER_SERVICE_NAME com.sun.star.comp.avmedia.Manager_QuickTime #else #define AVMEDIA_MANAGER_SERVICE_NAME_OLD com.sun.star.comp.avmedia.Manager_GStreamer_0_10 diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 057f913..f9df779 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -90,7 +90,7 @@ namespace cairocanvas OutputDevice* pOutDev=getOutputDevice(); -#if defined (UNX) !defined (QUARTZ) +#if defined (UNX) !defined (MACOSX) // X11 only if( mpSurface ) mpSurface-Resize( rSize.getX() + pOutDev-GetOutOffXPixel(), diff --git
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docedt.cxx | 27 ---
1 file changed, 27 deletions(-)
New commits:
commit 2c1eca7bd70ff5f66132aeb8d3919a1362fb3e57
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 11 10:19:53 2013 +0100
sw: more unused includes in docedt
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 5aa66f3..4ec41ac 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -18,42 +18,21 @@
*/
-#include string.h // for strchr()
-#include hintids.hxx
-
-#include editeng/cscoitem.hxx
-#include editeng/brkitem.hxx
-#include linguistic/lngprops.hxx
-#include com/sun/star/beans/XPropertySet.hpp
-#include com/sun/star/i18n/WordType.hpp
-#include unotools/charclass.hxx
-#include unotools/transliterationwrapper.hxx
#include fmtanchr.hxx
#include fmtcntnt.hxx
-#include fmtpdsc.hxx
#include txtftn.hxx
#include acorrect.hxx // AutoCorrect
-#include IMark.hxx// for SwBookmark
-#include cntfrm.hxx // for Spell
-#include crsrsh.hxx
-#include doc.hxx
#include UndoManager.hxx
#include docsh.hxx
#include docary.hxx
#include doctxm.hxx // when moving: correct indexes
#include ftnidx.hxx
-#include ftninfo.hxx
#include mdiexp.hxx // status bar
#include mvsave.hxx // structures to save when moving/deleting
-#include ndtxt.hxx
-#include pam.hxx
#include redline.hxx
#include rootfrm.hxx // for UpdateFtn
#include splargs.hxx // for Spell
-#include swtable.hxx
-#include swundo.hxx // for the UndoIds
#include txtfrm.hxx
-#include hints.hxx
#include UndoSplitMove.hxx
#include UndoRedline.hxx
#include UndoOverwrite.hxx
@@ -63,7 +42,6 @@
#include vcl/msgbox.hxx
#include comcore.hrc
#include editsh.hxx
-#include fldbas.hxx
#include fmtfld.hxx
#include docufld.hxx
#include unoflatpara.hxx
@@ -71,15 +49,10 @@
#include vector
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::i18n;
-#ifndef S2U
-#define S2U(rString) OUString::createFromAscii(rString)
-#endif
-
struct _SaveRedline
{
SwRedline* pRedl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/hhcwrp.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1af49927f56c97baf4dec4d0a54faff251126db7 Author: Matteo Casalin matteo.casa...@gmx.com Date: Fri Jan 11 08:12:12 2013 +0100 Use forward declaration instead of (doubled) #include Change-Id: I1cfb65a809e5dd56fb395c2f801bce5e5d75acfe Reviewed-on: https://gerrit.libreoffice.org/1642 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 0be12b5..b5819c8 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -20,12 +20,12 @@ #define _HHCWRP_HXX #include editeng/hangulhanja.hxx -#include pam.hxx class SwView; class Window; class SwWrtShell; struct SwConversionArgs; +class SwPaM; // ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/lingu/hhcwrp.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit bbab2d865996e7f3ed52f4d70358bb16bb73a81b Author: Matteo Casalin matteo.casa...@gmx.com Date: Fri Jan 11 08:00:16 2013 +0100 Remove unused #define Change-Id: Ic92663d13892d7e4978b5f3a10ed7f473e091835 Reviewed-on: https://gerrit.libreoffice.org/1641 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx index 953fdc7..d6256e9 100644 --- a/sw/source/ui/lingu/hhcwrp.cxx +++ b/sw/source/ui/lingu/hhcwrp.cxx @@ -56,8 +56,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::i18n; -#define CHAR_PAR_BRK((sal_Char) 0x0D) - // // Description: Turn off frame/object shell if applicable ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Use forward declaration instead of (doubled) #include
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1642 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1642 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1cfb65a809e5dd56fb395c2f801bce5e5d75acfe Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/txtnode/txtedt.cxx | 22 +++---
1 file changed, 19 insertions(+), 3 deletions(-)
New commits:
commit a0477d991661de605aec4fec87ca52e32ec8f743
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Mon Jan 7 22:20:59 2013 +0100
Character conversion: do not destroy sequence while iterating on it
Change-Id: Ib77e15b776384cc75880a907a6425c6105bc3fab
Reviewed-on: https://gerrit.libreoffice.org/1636
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index d5bc382..82c6cf8 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -74,6 +74,7 @@
#include com/sun/star/i18n/TransliterationModulesExtra.hpp
#include vector
+#include utility
using rtl::OUString;
using namespace ::com::sun::star;
@@ -1073,6 +1074,12 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs rArgs )
{
SwLanguageIterator aIter( *this, nBegin );
+// Implicit changes require setting new attributes, which in turn
destroys
+// the attribute sequence on which aIter iterates. We store the
necessary
+// coordinates and apply those changes after iterating through the
text.
+typedef std::pairxub_StrLen, xub_StrLen ImplicitChangesRange;
+std::vectorImplicitChangesRange aImplicitChanges;
+
// find non zero length text portion of appropriate language
do {
nLangFound = aIter.GetLanguage();
@@ -1108,13 +1115,22 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs rArgs )
if (!bIsAsianScript
rArgs.bAllowImplicitChangesForNotConvertibleText)
{
-SetLanguageAndFont( aCurPaM,
-rArgs.nConvTargetLang, RES_CHRATR_CJK_LANGUAGE,
-rArgs.pTargetFont, RES_CHRATR_CJK_FONT );
+// Store for later use
+aImplicitChanges.push_back(ImplicitChangesRange(nBegin,
nBegin+nLen));
}
nBegin = nChPos;// start of next language portion
}
} while (!bFound aIter.Next()); /* loop while nothing was found
and still sth is left to be searched */
+
+// Apply implicit changes, if any, now that aIter is no longer used
+for (size_t i = 0; i aImplicitChanges.size(); ++i)
+{
+SwPaM aPaM( *this, aImplicitChanges[i].first );
+aPaM.SetMark();
+aPaM.GetPoint()-nContent = aImplicitChanges[i].second;
+SetLanguageAndFont( aPaM, rArgs.nConvTargetLang,
RES_CHRATR_CJK_LANGUAGE, rArgs.pTargetFont, RES_CHRATR_CJK_FONT );
+}
+
}
// keep resulting text within selection / range of text to be converted
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/hhcwrp.hxx |3 ---
sw/source/ui/lingu/hhcwrp.cxx |8 +---
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 9d3789af2b509a8a8a1c9a923218d67104f11f3f
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Mon Jan 7 23:42:10 2013 +0100
Remove unused class members
Change-Id: I44fe6ad3dacc65e28256aca98588b7dfe92d73ae
Reviewed-on: https://gerrit.libreoffice.org/1638
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index b5819c8..85ee116 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -47,12 +47,9 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
sal_uInt16 nPageStart; /// first checked page
sal_BoolbIsDrawObj;
-sal_BoolbIsStart;
sal_BoolbIsOtherCntnt;
sal_BoolbStartChk;
sal_BoolbIsSelection; /// true if only the selected text should
be converted
-sal_BoolbInfoBox; /// true if message should be displayed
at the end
-sal_BoolbIsConvSpecial; /// true if special regions: header,
footer, ... should be converted
sal_BoolbStartDone;
sal_BoolbEndDone;
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index d6256e9..25187b2 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -110,11 +110,8 @@ SwHHCWrapper::SwHHCWrapper(
pView = pSwView;
pWin= pSwView-GetEditWin();
bIsDrawObj = sal_False;
-bIsStart= bStart;
bIsOtherCntnt = bStartChk = bOther;
-bIsConvSpecial = sal_True;
bIsSelection= bSelection;
-bInfoBox= sal_False;
bStartDone = bOther || bStart;
bEndDone= sal_False;
//bLastRet= sal_True;
@@ -660,7 +657,6 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
if( bIsOtherCntnt bStartDone bEndDone ) // document completely
checked?
{
-bInfoBox = sal_True;
return sal_False;
}
@@ -675,13 +671,11 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
else if ( bStartDone bEndDone )
{
// body region done, ask about special region
-if( bIsConvSpecial HasOtherCnt_impl() )
+if( HasOtherCnt_impl() )
{
ConvStart_impl( pConvArgs, SVX_SPELL_OTHER );
bIsOtherCntnt = bGoOn = sal_True;
}
-else
-bInfoBox = sal_True;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Character conversion: do not destroy sequence while iteratin...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1636 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1636 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib77e15b776384cc75880a907a6425c6105bc3fab Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove unused class members
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1638 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1638 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44fe6ad3dacc65e28256aca98588b7dfe92d73ae Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/annotations/annotationmanager.cxx | 127 -
1 file changed, 62 insertions(+), 65 deletions(-)
New commits:
commit 8bb976bae46a88ae3534078ec22ba8a25da68249
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Fri Jan 11 10:15:40 2013 +0100
Fix format
Change-Id: I2a7c8e88b689f913f8e37ecc3cfdda43ba60aea3
diff --git a/sd/source/ui/annotations/annotationmanager.cxx
b/sd/source/ui/annotations/annotationmanager.cxx
index 2fc9492..359f7b3 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -264,7 +264,7 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow )
mbShowAnnotations = bShow;
SdOptions* pOptions = SD_MOD()-GetSdOptions(mpDoc-GetDocumentType());
- if( pOptions )
+if( pOptions )
pOptions-SetShowComments( mbShowAnnotations ? sal_True :
sal_False );
UpdateTags();
@@ -368,49 +368,49 @@ void AnnotationManagerImpl::InsertAnnotation()
// find free space for new annotation
int y = 0, x = 0;
- AnnotationVector aAnnotations( pPage-getAnnotations() );
- if( !aAnnotations.empty() )
- {
- const int page_width = pPage-GetSize().Width();
+AnnotationVector aAnnotations( pPage-getAnnotations() );
+if( !aAnnotations.empty() )
+{
+const int page_width = pPage-GetSize().Width();
const int width = 1000;
const int height = 800;
Rectangle aTagRect;
- while( true )
- {
+while( true )
+{
Rectangle aNewRect( x, y, x + width - 1, y + height - 1 );
- bool bFree = true;
-
- for( AnnotationVector::iterator iter =
aAnnotations.begin(); iter != aAnnotations.end(); ++iter )
- {
- RealPoint2D aPoint( (*iter)-getPosition() );
- aTagRect.Left() = sal::static_int_cast long (
aPoint.X * 100.0 );
- aTagRect.Top()= sal::static_int_cast long (
aPoint.Y * 100.0 );
- aTagRect.Right() = aTagRect.Left() + width - 1;
- aTagRect.Bottom() = aTagRect.Top() + height - 1;
-
- if( aNewRect.IsOver( aTagRect ) )
- {
- bFree = false;
- break;
- }
- }
-
- if( bFree == false)
- {
- x += width;
- if( x page_width )
- {
- x = 0;
- y += height;
- }
- }
- else
- {
- break;
- }
- }
- }
+bool bFree = true;
+
+for( AnnotationVector::iterator iter = aAnnotations.begin();
iter != aAnnotations.end(); ++iter )
+{
+RealPoint2D aPoint( (*iter)-getPosition() );
+aTagRect.Left() = sal::static_int_cast long ( aPoint.X
* 100.0 );
+aTagRect.Top()= sal::static_int_cast long ( aPoint.Y
* 100.0 );
+aTagRect.Right() = aTagRect.Left() + width - 1;
+aTagRect.Bottom() = aTagRect.Top() + height - 1;
+
+if( aNewRect.IsOver( aTagRect ) )
+{
+bFree = false;
+break;
+}
+}
+
+if( bFree == false)
+{
+x += width;
+if( x page_width )
+{
+x = 0;
+y += height;
+}
+}
+else
+{
+break;
+}
+}
+}
Reference XAnnotation xAnnotation;
pPage-createAnnotation( xAnnotation );
@@ -547,7 +547,7 @@ void AnnotationManagerImpl::DeleteAnnotationsByAuthor(
const rtl::OUString sAut
pPage-removeAnnotation( xAnnotation );
}
}
- }
+}
} while( pPage );
if( mpDoc-IsUndoEnabled() )
@@ -572,7 +572,7 @@ void AnnotationManagerImpl::DeleteAllAnnotations()
{
pPage-removeAnnotation( (*iter) );
}
- }
+}
}
while( pPage );
@@ -640,25 +640,25 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool
bForeward)
if( !pPage )
return;
- AnnotationVector aAnnotations( pPage-getAnnotations() );
+AnnotationVector aAnnotations( pPage-getAnnotations() );
if( bForeward )
{
if( xCurrent.is() )
{
-
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfexport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c031fde0518257b3272d5baa3de29ba5a0a90a89
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 11 10:30:18 2013 +0100
RtfExport::WriteInfo: use config_version.h
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 9b01126..1b211b8 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_version.h
#include rtfexportfilter.hxx
#include rtfsdrexport.hxx
#include rtfattributeoutput.hxx
@@ -412,7 +413,7 @@ void RtfExport::WriteInfo()
Strm() '{' OOO_STRING_SVTOOLS_RTF_COMMENT ;
Strm() OUStringToOString( utl::ConfigManager::getProductName(),
eCurrentEncoding).getStr() }{ OOO_STRING_SVTOOLS_RTF_VERN;
-OutULong( SUPD*10 ) '}';
+Strm() LIBO_VERSION_MAJOR LIBO_VERSION_MINOR LIBO_VERSION_MICRO 0
'}';
Strm() '}';
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/osl
sal/osl/unx/socket.c | 14 --
sal/osl/unx/sockimpl.h |4
sal/osl/w32/socket.cxx | 10 --
sal/osl/w32/sockimpl.h |4
4 files changed, 32 deletions(-)
New commits:
commit 69f2f50c99ba218b185d94b118b38ea92b6560a0
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 11 10:35:00 2013 +0100
Further socket callback clean-up
Change-Id: Ifcbb87cff50584934f214634c1b6f1d0a43ae8f3
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index 353d915..cfcd1a4 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -28,8 +28,6 @@
extern C {
#endif
-typedef void* (*oslCloseCallback) (void*);
-
struct oslSocketImpl {
int m_Socket;
int m_nLastError;
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index 09206b1..c200a7b 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -1126,8 +1126,6 @@ oslSocket SAL_CALL osl_createSocket (
else
{
pSocket-m_Flags= 0;
-pSocket-m_CloseCallback= NULL;
-pSocket-m_CallbackArg = NULL;
}
return pSocket;
@@ -1160,12 +1158,6 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
closesocket(pSocket-m_Socket);
pSocket-m_Socket = OSL_INVALID_SOCKET;
-
-/* registrierten Callback ausfuehren */
-if (pSocket-m_CloseCallback != NULL)
-{
-pSocket-m_CloseCallback(pSocket-m_CallbackArg);
-}
}
/*/
@@ -1423,8 +1415,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket (
pConnectionSocket= __osl_createSocketImpl(Connection);
pConnectionSocket-m_Flags = 0;
-pConnectionSocket-m_CloseCallback = NULL;
-pConnectionSocket-m_CallbackArg= NULL;
return pConnectionSocket;
}
diff --git a/sal/osl/w32/sockimpl.h b/sal/osl/w32/sockimpl.h
index 8d5468a..2b5ebeb 100644
--- a/sal/osl/w32/sockimpl.h
+++ b/sal/osl/w32/sockimpl.h
@@ -32,14 +32,10 @@ extern C {
/*/
#define OSL_SOCKET_FLAGS_NONBLOCKING0x0001
-typedef void* (SAL_CALL * oslCloseCallback) (void*);
-
struct oslSocketImpl {
oslInterlockedCount m_nRefCount;
SOCKET m_Socket;
int m_Flags;
-oslCloseCallbackm_CloseCallback;
-void* m_CallbackArg;
};
struct oslSocketAddrImpl
commit 48e236dabd6c89bda4e9e599e2ac1173f27e1b39
Author: Arnaud Versini arnaud.vers...@gmail.com
Date: Thu Jan 10 20:04:41 2013 +0100
Remove useless callback in unix socket implementation
Change-Id: Ibe46e2f1628f4d2e4840429703e0d5a69059a188
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 1af9039..a9f3fc0 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -469,8 +469,6 @@ oslSocket __osl_createSocketImpl(int Socket)
pSocket-m_Socket = Socket;
pSocket-m_nLastError = 0;
-pSocket-m_CloseCallback = 0;
-pSocket-m_CallbackArg = 0;
pSocket-m_nRefCount = 1;
#if defined(LINUX)
@@ -1466,10 +1464,6 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily
Family,
{
pSocket-m_nLastError=errno;
}
-
-
-pSocket-m_CloseCallback= NULL;
-pSocket-m_CallbackArg = NULL;
}
return pSocket;
@@ -1560,12 +1554,6 @@ void SAL_CALL osl_closeSocket(oslSocket pSocket)
}
#endif /* LINUX */
-/* registrierten Callback ausfuehren */
-if (pSocket-m_CloseCallback != NULL)
-{
-pSocket-m_CloseCallback(pSocket-m_CallbackArg);
-}
-
nRet=close(nFD);
if ( nRet != 0 )
{
@@ -1905,8 +1893,6 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket(oslSocket
pSocket,
pConnectionSockImpl-m_Socket = Connection;
pConnectionSockImpl-m_nLastError = 0;
-pConnectionSockImpl-m_CloseCallback= NULL;
-pConnectionSockImpl-m_CallbackArg = NULL;
#if defined(LINUX)
pConnectionSockImpl-m_bIsAccepting = sal_False;
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index d2c68b6..353d915 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -33,8 +33,6 @@ typedef void* (*oslCloseCallback) (void*);
struct oslSocketImpl {
int m_Socket;
int m_nLastError;
-oslCloseCallbackm_CloseCallback;
-void* m_CallbackArg;
oslInterlockedCount m_nRefCount;
#if defined(LINUX)
sal_Boolm_bIsAccepting;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Remove useless callback in unix socket implementation
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1633 -- To view, visit https://gerrit.libreoffice.org/1633 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe46e2f1628f4d2e4840429703e0d5a69059a188 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] 4 commits - bin/tinbuild2 bin/tinbuild_internals.sh README.tinbuild2
README.tinbuild2 | 282 +++--- bin/tinbuild2 | 28 bin/tinbuild_internals.sh |6 3 files changed, 199 insertions(+), 117 deletions(-) New commits: commit 57b2c1cf905f327d8a81c730091ca65bbda49cda Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Jan 11 03:56:54 2013 -0600 tb: major overall of the README diff --git a/README.tinbuild2 b/README.tinbuild2 index f197f3f..c453d5e 100644 --- a/README.tinbuild2 +++ b/README.tinbuild2 @@ -8,105 +8,199 @@ build, or uploads the build results to http://dev-builds.libreoffice.org/daily/ Short version - +profile_name is a name you chose for you profile... usually use 'master' for a tinderbox +that run the master branch. but you can call it anything you want. +You can create different profile that do different kind of build, following the same procedure. Read http://wiki.documentfoundation.org/Development/Tinderbox . # clone tinbuild -git clone git://anongit.freedesktop.org/libreoffice/contrib/buildbot ~/buildbot +git clone git://gerrit.libreoffice.org/buildbot /lo/buildbot # clone LibreOffice -git clone git://anongit.freedesktop.org/libreoffice/core ~/master +git clone git://gerrit.libreoffice.org/core /lo/core # make the LibreOffice build -cd ~/master -./autogen.sh +cd /lo/core +./autogen.sh [ which ever argument are needed ] make make dev-install # after the above succeeded, configure buildbot mkdir -p ~/.tinbuild/config -cat ~/.tinbuild/config/your_name.cfg EOF +mkdir -p ~/.tinbuild/metadata/profile_name +cat ~/.tinbuild/config/profile_name.cfg EOF SMTPHOST=your value SMTPUSER=your value SMTPPW=your value -TINDER_NAME=your value -OWNER=your value +TINDER_NAME=your value # [ see https://wiki.documentfoundation.org/Development/Tinderbox for naming conventions ] +TINDER_ID=id # [ see https://wiki.documentfoundation.org/Development/Tinderbox for how to get an ID ] +OWNER=email address of the owner of this TB +METADATA_DIR=~/.tinbuild/meta/profile_name # this can be any existing directory you want + # if METADATA_DIR is not specified the tinderbox metadata are stored in the core repo itself +GERRIT_PLATFORM=(MAC|LINUX|WINDOWS) # platform this TB is building when doing gerrit path verification EOF # save you autogen configuration. mkdir -p ~/.tinbuild/autogen -cp ~/master/autogen.lastrun ~/.tinbuild/autogen/your_name.autogen +cp /lo/core/autogen.lastrun ~/.tinbuild/autogen/prodile_name.autogen # check the configuration -cd ~/master -~/buildbot/bin/tinbuild2 -p your_name -c +cd /lo/core +/lo/buildbot/bin/tinbuild2 -p profile_name -c # prime the tinderbox -cd ~/master -~/buildbot/bin/tinbuild2 -p your_name -z +cd /lo/core +/lo/buildbot/bin/tinbuild2 -p profile_name -z # and if that succeeds, start the periodical building -cd ~/master -~/buildbot/bin/tinbuild2 -m all -p your_name +cd /lo/core +/lo/buildbot/bin/tinbuild2 -m all -p profile_name -That's it; for more possibilities, like uploading the builds, or what to do -when it complains that your architecture does not have flock, see the help, -the below explanation, or the sources :-) +# to also build gerrit patches +/lo/buildbot/bin/tinbuild2 -m all -p prodile_name --mode=fair -Longer explanation --- -Why: - -The main motivation was the need to have a more flexible customisation for the -different build step. For performance reason, I needed to be able to set-up a -ram_disk after the make clean, create a bunch of directory and link them in -the tree to preempt solver and all the *.pro build directory - -I also needed a pre-clean step to be able to destroy that ram_disk (hence -speeding up the make clean a lot) - - -so rather than hacking the existing tinbuild in a way I could never upstream -I started tinbuild2. - -while at it, I set-up a few more goals: - -Have the list of commits and committers - in case of failure - be generated -based on the heads of the last sucessfull build, rather than based on a -timestamp. this is needed because the timestamp associated to the commits -have little correlation to the time when they have become available in the -public tree. - -Working based on a set of heads, meant I also wanted to tinbuild to be -'restartable'. in other words, if the tinbuild stop of any reason -(Ctrl-C for instance). when it restart it will behave as if it was stopped -just after the last sucessful build it did. -This require to prime/bootstrap the tinbuild, that is to sucessfully complete a -build sequence. this is achieved with runnning it once with -z. -It will then attempt a build iteration (without pulling) and stop immediatly -after that. - -There is a 'sanity-check' option which is intended to do reasonable attempt to -verify that your configuration is workable. this check mostly for the existance -of the config file and make sure that it result in the ability to send emails -a test email is send to
[Libreoffice-commits] bin/tinbuild_internals.sh
bin/tinbuild_internals.sh | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 279429cc7b1fbfd291cac15de574508b3ab1d2ae
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed Jan 9 20:31:09 2013 -0600
allow thr next_priority setting to survice the sub-shell
diff --git a/bin/tinbuild_internals.sh b/bin/tinbuild_internals.sh
index b1f7526..d6220b7 100644
--- a/bin/tinbuild_internals.sh
+++ b/bin/tinbuild_internals.sh
@@ -681,10 +681,10 @@ local log_type=$1
fi
if [ ${retval?} = 0 ] ; then
-log_msgs Repport Success for gerrit ref '$GERRIT_REF'.
+log_msgs Report Success for gerrit ref '$GERRIT_TASK_TICKET'.
cat ${gzlog} | ssh ${GERRIT_HOST?} buildbot put --id ${TINDER_ID?}
--ticket ${GERRIT_TASK_TICKET} --succeed --log -
else
-log_msgs Repport Failure for gerrit ref '$GERRIT_REF'.
+log_msgs Report Failure for gerrit ref '$GERRIT_TASK_TICKET.
cat ${gzlog} | ssh ${GERRIT_HOST?} buildbot report --id
${TINDER_ID?} --ticket ${GERRIT_TASK_TICKET} --failed --log -
fi
}
@@ -857,8 +857,12 @@ run_tb_gerrit_loop()
if [ ${priority?} = fair ] ; then
next_priority=tb
+if [ ! -f ${METADATA_DIR?}/tb_${B}_next_priority ] ; then
+echo -n {next_priority}
${METADATA_DIR?}/tb_${B}_next_priority
+fi
+else
+echo -n {next_priority} ${METADATA_DIR?}/tb_${B}_next_priority
fi
-
while true; do
if [ -f tb_${B?}_stop ] ; then
@@ -867,6 +871,7 @@ run_tb_gerrit_loop()
(
do_flock -x 200
build_type=
+next_priority=$(cat ${METADATA_DIR?}/tb_${B}_next_priority)
if [ ${next_priority?} = tb ] ; then
check_for_commit
if [ ${IS_NEW_COMMIT?} = yes ] ; then
@@ -900,6 +905,7 @@ run_tb_gerrit_loop()
fi
fi
fi
+echo -n ${next_priority}
${METADATA_DIR?}/tb_${B}_next_priority
if [ ${build_type} = tb ] ; then
last_checkout_date=$(cat
${METADATA_DIR?}/tb_${B}_current-git-timestamp.log)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/inc vcl/source
vcl/inc/vcl/settings.hxx | 10 +-
vcl/source/app/settings.cxx | 38 +++---
vcl/source/window/dockingarea.cxx |8
vcl/source/window/menu.cxx| 12 ++--
4 files changed, 30 insertions(+), 38 deletions(-)
New commits:
commit 5d1137fce2329ff463d11b46ee31ec210254445c
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Jan 9 11:16:47 2013 +0100
Personas: As Michael suggested, use BitmapEx instead of BitmapEx*.
Change-Id: Ib1d84b37d452785d12502095c0eedaac4a25fb6b
(cherry picked from commit 0721b5b83e34de1e2fcb320d6a7deae1ad109d61)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index d4d4438..8e49b2c 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -23,13 +23,13 @@
#include tools/solar.h
#include vcl/dllapi.h
#include tools/color.hxx
+#include vcl/bitmapex.hxx
#include vcl/font.hxx
#include vcl/accel.hxx
#include vcl/wall.hxx
#include i18npool/languagetag.hxx
#include unotools/syslocale.hxx
-class BitmapEx;
class CollatorWrapper;
class LocaleDataWrapper;
@@ -351,8 +351,8 @@ private:
OUStringmaPersonaHeaderFooter; /// Cache the
settings to detect changes.
-BitmapEx* mpPersonaHeaderBitmap; /// Cache the
header bitmap.
-BitmapEx* mpPersonaFooterBitmap; /// Cache the
footer bitmap.
+BitmapExmpPersonaHeaderBitmap; /// Cache the
header bitmap.
+BitmapExmpPersonaFooterBitmap; /// Cache the
footer bitmap.
};
#define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
@@ -866,8 +866,8 @@ public:
voidSetFrameStyle( const FrameStyle rStyle )
{ CopyData(); mpData-maFrameStyle =
rStyle; }
-const BitmapEx* GetPersonaHeader() const;
-const BitmapEx* GetPersonaFooter() const;
+const BitmapEx GetPersonaHeader() const;
+const BitmapEx GetPersonaFooter() const;
voidSetStandardStyles();
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 17d523d..32366fa 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -34,7 +34,6 @@
#include vcl/i18nhelp.hxx
#include vcl/configsettings.hxx
#include vcl/gradient.hxx
-#include vcl/bitmapex.hxx
#include unotools/fontcfg.hxx
#include unotools/localedatawrapper.hxx
@@ -204,8 +203,8 @@ sal_Bool MouseSettings::operator ==( const MouseSettings
rSet ) const
ImplStyleData::ImplStyleData() :
maPersonaHeaderFooter(),
-mpPersonaHeaderBitmap( NULL ),
-mpPersonaFooterBitmap( NULL )
+mpPersonaHeaderBitmap(),
+mpPersonaFooterBitmap()
{
mnRefCount = 1;
mnScrollBarSize = 16;
@@ -305,8 +304,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData rData ) :
maDialogStyle( rData.maDialogStyle ),
maFrameStyle( rData.maFrameStyle ),
maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
-mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap? new BitmapEx(
*rData.mpPersonaHeaderBitmap ): NULL ),
-mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap? new BitmapEx(
*rData.mpPersonaFooterBitmap ): NULL )
+mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap ),
+mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap )
{
mnRefCount = 1;
mnBorderSize= rData.mnBorderSize;
@@ -687,7 +686,7 @@ sal_Bool StyleSettings::GetUseImagesInMenus() const
// ---
-static BitmapEx* readBitmapEx( const OUString rPath )
+static BitmapEx readBitmapEx( const OUString rPath )
{
OUString aPath( rPath );
rtl::Bootstrap::expandMacros( aPath );
@@ -695,19 +694,15 @@ static BitmapEx* readBitmapEx( const OUString rPath )
// import the image
Graphic aGraphic;
if ( GraphicFilter::LoadGraphic( aPath, String(), aGraphic ) !=
GRFILTER_OK )
-return NULL;
+return BitmapEx();
-const BitmapEx rBitmap( aGraphic.GetBitmapEx() );
-if ( rBitmap.IsEmpty() )
-return NULL;
-
-return new BitmapEx( rBitmap );
+return aGraphic.GetBitmapEx();
}
enum WhichPersona { PERSONA_HEADER, PERSONA_FOOTER };
/** Update the setting of the Persona header / footer in ImplStyleData */
-static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString
rHeaderFooter, BitmapEx* pHeaderFooterBitmap )
+static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString
rHeaderFooter, BitmapEx rHeaderFooterBitmap )
{
uno::Reference uno::XComponentContext xContext(
comphelper::getProcessComponentContext() );
if ( !xContext.is() )
@@ -745,9 +740,6 @@ static void
Re: [PUSHED 4.0] BitmapEx* - BitmapEx [was: Re: LATE FEATURE: Personas in LibreOffice]
On Thu, Jan 10, 2013 at 06:10:30PM +0100, Jan Holesovsky ke...@suse.cz wrote: Ah right, can you please cherry-pick http://cgit.freedesktop.org/libreoffice/core/commit/?id=0721b5b83e34de1e2fcb320d6a7deae1ad109d61 to libreoffice-4-0? :-) Makes sense, pushed to -4-0. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 3.6.5.1 from libreoffice-3-6 branch
Hi, please note that the commit deadline for 3.6.5.1 (aka rc1) is on Monday, January 14, 2013. The tag and branch libreoffice-3-6-5 is going to be created the day after. Only commits with 3 reviewers will be allowed for that branch. IMPORTANT: If there are not found serious regressions, we will release rc1 as the final build. By other words, we will try to avoid rc2[*]. See also http://wiki.documentfoundation.org/ReleasePlan#3.6_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr PS: Please, help with reviewing pending commits. [*] This is a special case. QA suggested to have two weeks between 4.0.0 betas and rcs. I modified the schedule in October but it was too late to change the feature freeze. We also could not shift the final release date because it is synced some distro releases. The result is that 4.0.0 release is not ideal. There is only one week between rc2 and rc3 and there is no time to do 3.6.5.2 in between. If we need 3.6.5.2 in the end, it has to be done after 4.0.0.3 and thus 3 weeks after rc1. It is pretty long delay and we would like to avoid it :-) Note that the schedule for 4.1.0 and 4.2.0 release are better interlaced with the other bugfix releases. See https://wiki.documentfoundation.org/ReleasePlan for more details. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - o3tl/inc sw/inc sw/source
o3tl/inc/o3tl/sorted_vector.hxx| 12 +++-
sw/inc/ndhints.hxx |2 -
sw/source/core/txtnode/ndhints.cxx | 52 ++---
sw/source/ui/shells/textsh1.cxx|1
4 files changed, 21 insertions(+), 46 deletions(-)
New commits:
commit fd5a921a00f034817f67e7e00bd61f0a3f851441
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 11 11:27:52 2013 +0100
SwpHintsArray::Resort(): remove mostly unused return value
Change-Id: Ia330e545c2727efb6e1b12c4c317f86f9ebdf955
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 475d87a..0d7a158 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -91,7 +91,7 @@ protected:
public:
void Insert( const SwTxtAttr *pHt );
void DeleteAtPos( const sal_uInt16 nPosInStart );
-bool Resort();
+void Resort();
SwTxtAttr * Cut( const sal_uInt16 nPosInStart );
inline const SwTxtAttr * GetStart( const sal_uInt16 nPos ) const
diff --git a/sw/source/core/txtnode/ndhints.cxx
b/sw/source/core/txtnode/ndhints.cxx
index a627c1d..2ebdef8 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -167,7 +167,8 @@ sal_uInt16 SwpHintsArray::GetPos( const SwTxtAttr *pHt )
const
{ \
SAL_WARN(sw.core, text); \
DumpHints(m_HintStarts, m_HintEnds); \
-return !(const_castSwpHintsArray*(this))-Resort(); \
+(const_castSwpHintsArray*(this))-Resort(); \
+return false; \
}
bool SwpHintsArray::Check() const
@@ -315,11 +316,10 @@ bool SwpHintsArray::Check() const
// sort order of the m_HintStarts, m_HintEnds arrays, so this method is needed
// to restore the order.
-bool SwpHintsArray::Resort()
+void SwpHintsArray::Resort()
{
m_HintStarts.Resort();
m_HintEnds.Resort();
-return false; // TODO: probably unused return value?
}
commit c59355e936446fe55960209e543b072acb6b2170
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 11 11:04:31 2013 +0100
fdo#58793: re-implement SwpHintsArray::Resort():
The previous implementation uses sorted_vector::insert, which relies on
the array already being sorted.
Change-Id: I4a2e49e7d8fcfd934f8990be61f83d00d1a09ddd
diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index d8bceb7..3028f03 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -155,6 +155,16 @@ public:
clear();
}
+// fdo#58793: some existing code in Writer (SwpHintsArray)
+// routinely modifies the members of the vector in a way that
+// violates the sort order, and then re-sorts the array.
+// This is a kludge to enable that code to work.
+// If you are calling this function, you are Doing It Wrong!
+void Resort()
+{
+std::stable_sort(begin_nonconst(), end_nonconst(), Compare());
+}
+
private:
typename base_t::iterator begin_nonconst() { return base_t::begin(); }
@@ -191,7 +201,7 @@ struct find_unique
}
};
-/** the elments are partially ordered by Compare,
+/** the elements are partially ordered by Compare,
2 elements are allowed if they are not the same element (pointer equal)
*/
templateclass Value, class Compare
diff --git a/sw/source/core/txtnode/ndhints.cxx
b/sw/source/core/txtnode/ndhints.cxx
index aa0a36d..a627c1d 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -310,50 +310,16 @@ bool SwpHintsArray::Check() const
* SwpHintsArray::Resort()
*/
-// Resort() wird vor jedem Insert und Delete gerufen.
-// Wenn Textmasse geloescht wird, so werden die Indizes in
-// ndtxt.cxx angepasst. Leider erfolgt noch keine Neusortierung
-// auf gleichen Positionen.
+// Resort() is called before every Insert and Delete.
+// Various SwTxtNode methods modify hints in a way that violates the
+// sort order of the m_HintStarts, m_HintEnds arrays, so this method is needed
+// to restore the order.
bool SwpHintsArray::Resort()
{
-bool bResort = false;
-const SwTxtAttr *pLast = 0;
-sal_uInt16 i;
-
-for ( i = 0; i m_HintStarts.size(); ++i )
-{
-SwTxtAttr *pHt = m_HintStarts[i];
-if( pLast !lcl_IsLessStart( *pLast, *pHt ) )
-{
-m_HintStarts.erase( m_HintStarts.begin() + i );
-m_HintStarts.insert( pHt );
-pHt = m_HintStarts[i];
-if ( pHt != pLast )
---i;
-bResort = true;
-}
-pLast = pHt;
-}
-
-pLast = 0;
-for ( i = 0; i m_HintEnds.size(); ++i )
-{
-SwTxtAttr *pHt = m_HintEnds[i];
-if( pLast !lcl_IsLessEnd( *pLast, *pHt ) )
-{
-m_HintEnds.erase( m_HintEnds.begin() + i );
-m_HintEnds.insert( pHt );
-pHt = m_HintEnds[i]; // normalerweise == pLast
-
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - o3tl/inc sw/source
o3tl/inc/o3tl/sorted_vector.hxx| 12 -
sw/source/core/txtnode/ndhints.cxx | 48 +
2 files changed, 18 insertions(+), 42 deletions(-)
New commits:
commit cdd0555aefa0a01d0d90fed8640811c5601f314e
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 11 11:04:31 2013 +0100
fdo#58793: re-implement SwpHintsArray::Resort():
The previous implementation uses sorted_vector::insert, which relies on
the array already being sorted.
Change-Id: I4a2e49e7d8fcfd934f8990be61f83d00d1a09ddd
(cherry picked from commit c59355e936446fe55960209e543b072acb6b2170)
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index d8bceb7..3028f03 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -155,6 +155,16 @@ public:
clear();
}
+// fdo#58793: some existing code in Writer (SwpHintsArray)
+// routinely modifies the members of the vector in a way that
+// violates the sort order, and then re-sorts the array.
+// This is a kludge to enable that code to work.
+// If you are calling this function, you are Doing It Wrong!
+void Resort()
+{
+std::stable_sort(begin_nonconst(), end_nonconst(), Compare());
+}
+
private:
typename base_t::iterator begin_nonconst() { return base_t::begin(); }
@@ -191,7 +201,7 @@ struct find_unique
}
};
-/** the elments are partially ordered by Compare,
+/** the elements are partially ordered by Compare,
2 elements are allowed if they are not the same element (pointer equal)
*/
templateclass Value, class Compare
diff --git a/sw/source/core/txtnode/ndhints.cxx
b/sw/source/core/txtnode/ndhints.cxx
index 20f1de5..a15bd12 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -310,50 +310,16 @@ bool SwpHintsArray::Check() const
* SwpHintsArray::Resort()
*/
-// Resort() wird vor jedem Insert und Delete gerufen.
-// Wenn Textmasse geloescht wird, so werden die Indizes in
-// ndtxt.cxx angepasst. Leider erfolgt noch keine Neusortierung
-// auf gleichen Positionen.
+// Resort() is called before every Insert and Delete.
+// Various SwTxtNode methods modify hints in a way that violates the
+// sort order of the m_HintStarts, m_HintEnds arrays, so this method is needed
+// to restore the order.
bool SwpHintsArray::Resort()
{
-bool bResort = false;
-const SwTxtAttr *pLast = 0;
-sal_uInt16 i;
-
-for ( i = 0; i m_HintStarts.size(); ++i )
-{
-SwTxtAttr *pHt = m_HintStarts[i];
-if( pLast !lcl_IsLessStart( *pLast, *pHt ) )
-{
-m_HintStarts.erase( m_HintStarts.begin() + i );
-m_HintStarts.insert( pHt );
-pHt = m_HintStarts[i];
-if ( pHt != pLast )
---i;
-bResort = true;
-}
-pLast = pHt;
-}
-
-pLast = 0;
-for ( i = 0; i m_HintEnds.size(); ++i )
-{
-SwTxtAttr *pHt = m_HintEnds[i];
-if( pLast !lcl_IsLessEnd( *pLast, *pHt ) )
-{
-m_HintEnds.erase( m_HintEnds.begin() + i );
-m_HintEnds.insert( pHt );
-pHt = m_HintEnds[i]; // normalerweise == pLast
-// Wenn die Unordnung etwas groesser ist (24200),
-// muessen wir Position i erneut vergleichen.
-if ( pLast != pHt )
---i;
-bResort = true;
-}
-pLast = pHt;
-}
-return bResort;
+m_HintStarts.Resort();
+m_HintEnds.Resort();
+return false; // TODO: probably unused return value?
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: replacing OUString::valueOf(static_castsal_Int32) ??
2013/1/10 Lubos Lunak l.lu...@suse.cz Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. Sure, if you feel like writing one. Actually, I'd prefer to write a howto about that first, whenever I get to doing that, so that I don't have to write every single plugin. Such a plugin will be still much simpler than a regexp or any other way. Please do, I would be interested in that. Maybe you already have some URLs to share on this subject? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py
src/docrecord.py | 78 +++ 1 file changed, 78 insertions(+) New commits: commit c3e2a6ffa100fb6267aca568cab282b78fcd160f Author: Miklos Vajna vmik...@suse.cz Date: Fri Jan 11 11:31:44 2013 +0100 dump LVL and LVLF diff --git a/src/docrecord.py b/src/docrecord.py index 1dbff49..6e69156 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -560,6 +560,12 @@ class Sprm(DOCDirStream): return self.getuInt8() + 1 elif self.sprm == 0xD608: return self.getuInt16() + 1 +elif self.sprm == 0xC615: +cb = self.getuInt8() +if cb 255: +return cb + 1 +else: +raise Exception(PChgTabsOperand: cb is 255) raise Exception(No idea what is the size of SPRM %s % hex(self.sprm)) return self.operandSizeMap[self.spra] @@ -2408,6 +2414,69 @@ class LSTF(DOCDirStream): self.printAndSet(grfhic, self.readuInt8()) # TODO dump grfhic print '/lstf' +class LVLF(DOCDirStream): +The LVLF structure contains formatting properties for an individual level in a list. +def __init__(self, lvl): +DOCDirStream.__init__(self, lvl.bytes) +self.pos = lvl.pos + +def dump(self): +print 'lvlf type=LVLF offset=%d' % self.pos +self.printAndSet(iStartAt, self.readInt32()) +self.printAndSet(nfc, self.readuInt8()) +buf = self.readuInt8() +self.printAndSet(jc, buf 0x3) # 1..2nd bits +self.printAndSet(fLegal, self.getBit(buf, 2)) +self.printAndSet(fNoRestart, self.getBit(buf, 3)) +self.printAndSet(fIndentSav, self.getBit(buf, 4)) +self.printAndSet(fConverted, self.getBit(buf, 5)) +self.printAndSet(unused1, self.getBit(buf, 6)) +self.printAndSet(fTentative, self.getBit(buf, 7)) +for i in range(9): +print 'rgrgbxchNums index=%d value=%s/' % (i, self.readuInt8()) +self.printAndSet(ixchFollow, self.readuInt8()) +self.printAndSet(dxaIndentSav, self.readInt32()) +self.printAndSet(unused2, self.readuInt32()) +self.printAndSet(cbGrpprlChpx, self.readuInt8()) +self.printAndSet(cbGrpprlPapx, self.readuInt8()) +self.printAndSet(ilvlRestartLim, self.readuInt8()) +self.printAndSet(grfhic, self.readuInt8()) # TODO dump grfhic +print '/lvlf' + +class LVL(DOCDirStream): +The LVL structure contains formatting information about a specific level in a list. +def __init__(self, plfLst): +DOCDirStream.__init__(self, plfLst.bytes) +self.pos = plfLst.pos + +def dump(self): +print 'lvl type=LVL offset=%d' % self.pos +lvlf = LVLF(self) +lvlf.dump() +self.pos = lvlf.pos + +print 'grpprlPapx offset=%d' % self.pos +pos = self.pos +while (lvlf.cbGrpprlPapx - (pos - self.pos)) 0: +prl = Prl(self.bytes, pos) +prl.dump() +pos += prl.getSize() +self.pos = pos +print '/grpprlPapx' + +print 'grpprlChpx offset=%d' % self.pos +pos = self.pos +while (lvlf.cbGrpprlChpx - (pos - self.pos)) 0: +prl = Prl(self.bytes, pos) +prl.dump() +pos += prl.getSize() +self.pos = pos +print '/grpprlChpx' +xst = Xst(self) +xst.dump() +self.pos = xst.pos +print '/lvl' + class PlfLst(DOCDirStream): The PlfLst structure contains the list formatting information for the document. def __init__(self, mainStream): @@ -2418,10 +2487,19 @@ class PlfLst(DOCDirStream): def dump(self): print 'plfLst type=PlfLst offset=%d size=%d bytes' % (self.pos, self.size) self.printAndSet(cLst, self.readInt16()) +cLvl = 0 for i in range(self.cLst): rgLstf = LSTF(self) rgLstf.dump() +if rgLstf.fSimpleList: +cLvl += 1 +else: +cLvl += 9 self.pos = rgLstf.pos +for i in range(cLvl): +lvl = LVL(self) +lvl.dump() +self.pos = lvl.pos print '/plfLst' # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] bin/tinbuild_internals.sh
bin/tinbuild_internals.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 27cd6c50aeee137fd93e6dce3fd246d2fc2a2554
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Jan 11 04:53:55 2013 -0600
tb2: the way to report success/failed in gerrit buildbot has changed
diff --git a/bin/tinbuild_internals.sh b/bin/tinbuild_internals.sh
index d6220b7..d0b7db5 100644
--- a/bin/tinbuild_internals.sh
+++ b/bin/tinbuild_internals.sh
@@ -650,6 +650,7 @@ push_nightly()
report_gerrit()
{
local log_type=$1
+local status=failed
[ $V ] echo report to gerrit retval=${retval} log_type=${log_type}
if [ $log_type = short -a ${retval?} = 0 ] ; then
@@ -681,12 +682,11 @@ local log_type=$1
fi
if [ ${retval?} = 0 ] ; then
-log_msgs Report Success for gerrit ref '$GERRIT_TASK_TICKET'.
-cat ${gzlog} | ssh ${GERRIT_HOST?} buildbot put --id ${TINDER_ID?}
--ticket ${GERRIT_TASK_TICKET} --succeed --log -
-else
-log_msgs Report Failure for gerrit ref '$GERRIT_TASK_TICKET.
-cat ${gzlog} | ssh ${GERRIT_HOST?} buildbot report --id
${TINDER_ID?} --ticket ${GERRIT_TASK_TICKET} --failed --log -
+ status=success
fi
+log_msgs Report Success for gerrit ref '$GERRIT_TASK_TICKET'.
+cat ${gzlog} | ssh ${GERRIT_HOST?} buildbot put --id ${TINDER_ID?}
--ticket ${GERRIT_TASK_TICKET} --status $status --log -
+
}
fetch_gerrit()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Need confirmation about non-clearing of Character Styles
Seeing David's proposed option, maybe an easy way: - Select the paragraph or the text to clear the format. - Copy - Paste special as unformatted text. -- View this message in context: http://nabble.documentfoundation.org/Need-confirmation-about-non-clearing-of-Character-Styles-tp4028186p4028438.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sw/source
sw/source/core/crsr/pam.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 5a0dc1d1fdeac4b06b39ea616374d3f81b6be8a9
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Jan 10 16:21:55 2013 +0100
fdo#57938 SwPaM::HasReadonlySel: commented text ranges are not read-only
(cherry picked from commit fd0da52d371ca13d66be3b04d89f9d9cf73baddd)
Change-Id: I8191ed6383c4c636be67b8d42654dbba0a5c8b6f
Reviewed-on: https://gerrit.libreoffice.org/1629
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index baf62ad..6d7f07a 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -685,6 +685,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
sw::mark::IMark* pA = NULL;
sw::mark::IMark* pB = NULL;
bool bUnhandledMark = false;
+bool bCommentrangeMark = false;
if ( pDoc )
{
const IDocumentMarkAccess* pMarksAccess =
pDoc-getIDocumentMarkAccess( );
@@ -693,7 +694,11 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
sw::mark::IFieldmark* pFieldmark = pMarksAccess-getFieldmarkFor(
*GetPoint() );
if ( pFieldmark )
+{
bUnhandledMark = pFieldmark-GetFieldname( ) == ODF_UNHANDLED;
+if (!bUnhandledMark)
+bCommentrangeMark = pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE;
+}
}
if (!bRet)
@@ -701,7 +706,8 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const
// Unhandled fieldmarks case shouldn't be edited manually to avoid
breaking anything
if ( ( pA == pB ) bUnhandledMark )
bRet = sal_True;
-else
+// Allow editing of commented ranges.
+else if (!((pA == pB) bCommentrangeMark))
{
// Form protection case
bool bAtStartA = pA != NULL pA-GetMarkStart() == *GetPoint();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: fdo#57938 SwPaM::HasReadonlySel: commented text ranges are n...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1629 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1629 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8191ed6383c4c636be67b8d42654dbba0a5c8b6f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 45 +++
1 file changed, 45 insertions(+)
New commits:
commit 7850822b27981ce46d16532267975b3a91f91102
Author: Radek Doulik r...@novell.com
Date: Thu Jan 10 15:58:30 2013 +0100
implemented EmfPlusRecordTypeFillPie record
Change-Id: I15e7464a6a295bb4c1313c0a65ee33b6443c61c8
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 82df051..e95d37e 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -38,6 +38,7 @@
#include basegfx/range/b2drange.hxx
#include basegfx/range/b2drectangle.hxx
#include basegfx/polygon/b2dpolygon.hxx
+#include basegfx/polygon/b2dpolygontools.hxx
#include basegfx/polygon/b2dpolypolygon.hxx
#include basegfx/polygon/b2dpolypolygontools.hxx
#include vcl/canvastools.hxx
@@ -61,6 +62,7 @@
#define EmfPlusRecordTypeFillRects 16394
#define EmfPlusRecordTypeFillPolygon 16396
#define EmfPlusRecordTypeDrawLines 16397
+#define EmfPlusRecordTypeFillPie 16400
#define EmfPlusRecordTypeFillPath 16404
#define EmfPlusRecordTypeDrawPath 16405
#define EmfPlusRecordTypeDrawImagePoints 16411
@@ -101,6 +103,7 @@
#endif
using namespace ::com::sun::star;
+using namespace ::basegfx;
namespace cppcanvas
{
@@ -1261,6 +1264,48 @@ namespace cppcanvas
case EmfPlusRecordTypeObject:
processObjectRecord (rMF, flags);
break;
+case EmfPlusRecordTypeFillPie:
+{
+sal_uInt32 brushIndexOrColor;
+float startAngle, sweepAngle;
+
+rMF brushIndexOrColor startAngle sweepAngle;
+
+EMFP_DEBUG (printf (EMF+ FillPie colorOrIndex: %x
startAngle: %f sweepAngle: %f\n, (unsigned int)brushIndexOrColor, startAngle,
sweepAngle));
+
+float dx, dy, dw, dh;
+
+ReadRectangle (rMF, dx, dy, dw, dh, flags 0x4000);
+
+EMFP_DEBUG (printf (EMF+ RectData: %f,%f %fx%f\n,
dx, dy, dw, dh));
+
+startAngle = 2*M_PI*startAngle/360;
+sweepAngle = 2*M_PI*sweepAngle/360;
+
+B2DPoint mappedCenter (Map (dx + dw/2, dy + dh/2));
+B2DSize mappedSize( MapSize (dw/2, dh/2));
+
+double endAngle = startAngle + sweepAngle;
+if (endAngle 0)
+endAngle += M_PI*2;
+endAngle = fmod (endAngle, M_PI*2);
+
+if (sweepAngle 0) {
+double tmp = startAngle;
+startAngle = endAngle;
+endAngle = tmp;
+}
+
+EMFP_DEBUG (printf (EMF+ angles: %f,%f ---
%f,%f\n, startAngle, sweepAngle, startAngle, endAngle));
+
+B2DPolygon polygon =
tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (),
mappedSize.getY (), startAngle, endAngle);
+polygon.append (mappedCenter);
+polygon.setClosed (true);
+
+B2DPolyPolygon polyPolygon (polygon);
+EMFPPlusFillPolygon (polyPolygon, rFactoryParms,
rState, rCanvas, flags 0x8000, brushIndexOrColor);
+}
+break;
case EmfPlusRecordTypeFillPath:
{
sal_uInt32 index = flags 0xff;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58699, which changed state. Bug 58699 Summary: Impress remote doesn't close https://bugs.freedesktop.org/show_bug.cgi?id=58699 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py src/docstream.py test/doc
src/docrecord.py | 67 +- src/docstream.py |5 +++- test/doc/list.doc |binary test/doc/list.rtf | 49 +++ test/doc/test.py |6 5 files changed, 120 insertions(+), 7 deletions(-) New commits: commit abd802bff3247df6fb1c87ed41fce45ba01a9a95 Author: Miklos Vajna vmik...@suse.cz Date: Fri Jan 11 12:19:28 2013 +0100 dump PlfLfo diff --git a/src/docrecord.py b/src/docrecord.py index 6e69156..ef87891 100644 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -2393,13 +2393,14 @@ class PlcfGram(DOCDirStream, PLC): class LSTF(DOCDirStream): The LSTF structure contains formatting properties that apply to an entire list. -def __init__(self, plfLst): +def __init__(self, plfLst, index): DOCDirStream.__init__(self, plfLst.bytes) self.pos = plfLst.pos self.size = 28 +self.index = index def dump(self): -print 'lstf type=LSTF offset=%d size=%d bytes' % (self.pos, self.size) +print 'lstf type=LSTF index=%d offset=%d size=%d bytes' % (self.index, self.pos, self.size) self.printAndSet(lsid, self.readInt32()) self.printAndSet(tplc, self.readInt32()) for i in range(9): @@ -2445,12 +2446,13 @@ class LVLF(DOCDirStream): class LVL(DOCDirStream): The LVL structure contains formatting information about a specific level in a list. -def __init__(self, plfLst): +def __init__(self, plfLst, index): DOCDirStream.__init__(self, plfLst.bytes) self.pos = plfLst.pos +self.index = index def dump(self): -print 'lvl type=LVL offset=%d' % self.pos +print 'lvl type=LVL index=%d offset=%d' % (self.index, self.pos) lvlf = LVLF(self) lvlf.dump() self.pos = lvlf.pos @@ -2489,7 +2491,7 @@ class PlfLst(DOCDirStream): self.printAndSet(cLst, self.readInt16()) cLvl = 0 for i in range(self.cLst): -rgLstf = LSTF(self) +rgLstf = LSTF(self, i) rgLstf.dump() if rgLstf.fSimpleList: cLvl += 1 @@ -2497,9 +2499,62 @@ class PlfLst(DOCDirStream): cLvl += 9 self.pos = rgLstf.pos for i in range(cLvl): -lvl = LVL(self) +lvl = LVL(self, i) lvl.dump() self.pos = lvl.pos print '/plfLst' +class LFO(DOCDirStream): +The LFO structure specifies the LSTF element that corresponds to a list that contains a paragraph. +def __init__(self, plfLfo): +DOCDirStream.__init__(self, plfLfo.bytes) +self.pos = plfLfo.pos + +def dump(self): +print 'lfo type=LFO offset=%d' % self.pos +self.printAndSet(lsid, self.readInt32()) +self.printAndSet(unused1, self.readuInt32()) +self.printAndSet(unused2, self.readuInt32()) +self.printAndSet(clfolvl, self.readuInt8()) +self.printAndSet(ibstFltAutoNum, self.readuInt8()) +self.printAndSet(grfhic, self.readuInt8()) # TODO dump grfhic +self.printAndSet(unused3, self.readuInt8()) +print '/lfo' + +class LFOData(DOCDirStream): +The LFOData structure contains the Main Document CP of the corresponding LFO. +def __init__(self, plfLfo, lfo): +DOCDirStream.__init__(self, plfLfo.bytes) +self.pos = plfLfo.pos +self.lfo = lfo + +def dump(self): +print 'lfoData type=LFOData offset=%d' % self.pos +self.printAndSet(cp, self.readuInt32()) +if self.lfo.clfolvl 0: +print 'todo what=LFOData: clfolvl != 0/' +print '/lfoData' + +class PlfLfo(DOCDirStream): +The PlfLfo structure contains the list format override data for the document. +def __init__(self, mainStream): +DOCDirStream.__init__(self, mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream = mainStream) +self.pos = mainStream.fcPlfLfo +self.size = mainStream.lcbPlfLfo + +def dump(self): +print 'plfLfo type=PlfLfo offset=%d size=%d bytes' % (self.pos, self.size) +self.printAndSet(lfoMac, self.readInt32()) +lfos = [] +for i in range(self.lfoMac): +lfo = LFO(self) +lfos.append(lfo) +lfo.dump() +self.pos = lfo.pos +for i in range(self.lfoMac): +lfoData = LFOData(self, lfos[i]) +lfoData.dump() +self.pos = lfoData.pos +print '/plfLfo' + # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab: diff --git a/src/docstream.py b/src/docstream.py index ad46e1a..648fe81 100644 --- a/src/docstream.py +++ b/src/docstream.py @@ -352,7 +352,7 @@ class WordDocumentStream(DOCDirStream): [fcPlfLst], [lcbPlfLst, self.handleLcbPlfLst], [fcPlfLfo], -[lcbPlfLfo], +[lcbPlfLfo, self.handleLcbPlfLfo],
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On Fri, 2013-01-11 at 08:46 +0200, Noel Grandin wrote: That seems like it would have some backwards compatibility issues, but I suppose we could mark them as deprecated for a time before actually removing them. Sure - well, since they're in-lined I think this is prolly a sensible API management rather than ABI management issue - and sal/ is a sensitive area there; but yes - deprecating the old bits shortly would be best :-) [ I wouldn't want to block the commit based on that - if there is an incremental approach committment to cleaning up our old method invocations ]. IIRC we have a 'externally deprecated' semantic we can use as well somewhere. - I'm still not sold on the naming, OUString::valueInt() doesn't say much and OUString::valueOfInt() feels cryptic. Can we please use something obvious that doesn't need decyphering, such as , such as OUString::number() or OUString::fromInt() (as much as I still don't like the idea of harcoding the irrelevant type information in the name)? I think valueOf() is fine, but then I do a lot of programming in Java :-) But whatever, if the C++ people prefer another name, then so be it. bikeshed oooh - the 'fromFoo' seems rather more descriptive to me ;-) and shorter than both value and number ;- /bikeshed ;-) nice work here though Noel, thanks for persisting - looking forward to seeing it on master. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/inc sc/source
sc/inc/compiler.hxx |1 +
sc/inc/externalrefmgr.hxx|4 ++--
sc/source/core/tool/compiler.cxx | 31 +++
3 files changed, 34 insertions(+), 2 deletions(-)
New commits:
commit 260f1b19ce7340b02fce5aea948caa61ee128f44
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Jan 10 12:02:07 2013 -0500
fdo#58531: Register cells with external references at compile time.
In the old code, we would do this during interpretation. But we need
to move that to the compilation to make this work properly without
full recalculation during ods import.
For 4.0, we'll just add calls to insertRefCells in ScCompiler. On
master we should remove these calls from the old places to avoid
duplicate calls. Duplicate calls for the same external file ID - cell
address pair will not hurt; it just adds more overhead.
Change-Id: I25cf2e08195da17c6c8f7d19c74d744df6e1638e
Reviewed-on: https://gerrit.libreoffice.org/1631
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index d40d261..10af901 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -331,6 +331,7 @@ private:
ExtendedErrorDetection meExtendedErrorDetection;
boolmbCloseBrackets;// whether to close open brackets
automatically, default TRUE
boolmbRewind; // whether symbol is to be rewound
to some step during lexical analysis
+std::vectorsal_uInt16 maExternalFiles;
bool NextNewToken(bool bInArray = false);
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 3fd3ab5..87693a3 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -679,14 +679,14 @@ public:
*/
bool containsUnsavedReferences() { return !maUnsavedDocShells.empty(); }
+void insertRefCell(sal_uInt16 nFileId, const ScAddress rCell);
+
private:
ScExternalRefManager();
ScExternalRefManager(const ScExternalRefManager);
void refreshAllRefCells(sal_uInt16 nFileId);
-void insertRefCell(sal_uInt16 nFileId, const ScAddress rCell);
-
void fillCellFormat(sal_uLong nFmtIndex, ScExternalRefCache::CellFormat*
pFmt) const;
ScExternalRefCache::TokenRef getSingleRefTokenFromSrcDoc(
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b827019..b6183ba 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2717,6 +2717,7 @@ bool ScCompiler::IsDoubleReference( const String rName )
const OUString* pRealTab =
pRefMgr-getRealTableName(aExtInfo.mnFileId, aExtInfo.maTabName);
aToken.SetExternalDoubleRef(
aExtInfo.mnFileId, pRealTab ? *pRealTab : aExtInfo.maTabName,
aRef);
+maExternalFiles.push_back(aExtInfo.mnFileId);
}
else
{
@@ -2765,6 +2766,7 @@ bool ScCompiler::IsSingleReference( const String rName )
const OUString* pRealTab =
pRefMgr-getRealTableName(aExtInfo.mnFileId, aExtInfo.maTabName);
aToken.SetExternalSingleRef(
aExtInfo.mnFileId, pRealTab ? *pRealTab : aExtInfo.maTabName,
aRef);
+maExternalFiles.push_back(aExtInfo.mnFileId);
}
else
aToken.SetSingleReference(aRef);
@@ -2973,6 +2975,7 @@ bool ScCompiler::IsExternalNamedRange( const String
rSymbol )
const OUString* pRealName = pRefMgr-getRealRangeName(nFileId, aName);
aToken.SetExternalName(nFileId, pRealName ? *pRealName : OUString(aTmp));
pRawToken = aToken.Clone();
+maExternalFiles.push_back(nFileId);
return true;
}
@@ -3737,6 +3740,24 @@ void ScCompiler::CreateStringFromXMLTokenArray(
rtl::OUString rFormula, rtl::OU
rFormulaNmsp = aFormulaNmsp;
}
+namespace {
+
+class ExternalFileInserter : std::unary_functionsal_uInt16, void
+{
+ScAddress maPos;
+ScExternalRefManager mrRefMgr;
+public:
+ExternalFileInserter(const ScAddress rPos, ScExternalRefManager rRefMgr)
:
+maPos(rPos), mrRefMgr(rRefMgr) {}
+
+void operator() (sal_uInt16 nFileId) const
+{
+mrRefMgr.insertRefCell(nFileId, maPos);
+}
+};
+
+}
+
ScTokenArray* ScCompiler::CompileString( const String rFormula )
{
OSL_ENSURE( meGrammar != FormulaGrammar::GRAM_EXTERNAL,
ScCompiler::CompileString - unexpected grammar GRAM_EXTERNAL );
@@ -3943,6 +3964,16 @@ ScTokenArray* ScCompiler::CompileString( const String
rFormula )
// remember pArr, in case a subsequent CompileTokenArray() is executed.
ScTokenArray* pNew = new ScTokenArray( aArr );
pArr = pNew;
+
+if (!maExternalFiles.empty())
+{
+// Remove duplicates, and register all external files found in this
cell.
+std::sort(maExternalFiles.begin(), maExternalFiles.end());
+std::vectorsal_uInt16::iterator itEnd =
[PUSHED] Change in core[libreoffice-4-0]: fdo#58531: Register cells with external references at compil...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1631 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25cf2e08195da17c6c8f7d19c74d744df6e1638e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: replacing OUString::valueOf(static_castsal_Int32) ??
Hi Noel, Noel Grandin píše v Pá 11. 01. 2013 v 08:46 +0200: - There's no need for valueOfChar(). There is already OUString ctor from sal_Unicode, so the valueOf() overload for it is just making an obvious thing complicated. Code using it can be converted to use the ctor instead. I've already dealt with why we can't use the constructor. git grep String::valueOf.*Unicode says we do in fact appear to need such a method. I've had a look at this git grep, and most of them could be written an easier way thanks to the Lubos' OUString magic; like: - aPropName += OUString::valueOf( (sal_Unicode) '/' ); + aPropName += /; The only more tricky one is - aRepresentation += OUString::valueOf( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'A' ) ); + aRepresentation += OUString( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'A' ) ); Or did you mean something different? - It's a question if we really need 'OUString::valueOfBool( foo )' instead of simply 'foo ? OUString( true ) : OUString( false )' (such a pity the string literals handling doesn't allow foo ? true : false' ). I wonder how many places in the code really need to convert a boolean to the hardcoded english string representation. I have no idea how to count call sites automatically. But at least 10 places need to use a cast to access the method, so there is definitely code using it. I've counted exactly 5 - seeing the trouble we have un-publishing something that we have published, I'd really prefer not to introduce a method in our core API that would satisfy only 5 callers ;-) Either way, thanks for looking into this! All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py src/docstream.py
src/docrecord.py | 21 +
src/docstream.py |5 -
2 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 614d9656f45bb48580eee2453b13b351b12a0bcd
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 11 13:02:56 2013 +0100
dump SttbListNames
diff --git a/src/docrecord.py b/src/docrecord.py
index ef87891..fb1c5dc 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -2557,4 +2557,25 @@ class PlfLfo(DOCDirStream):
self.pos = lfoData.pos
print '/plfLfo'
+class SttbListNames(DOCDirStream):
+The SttbListNames structure is an STTB structure whose strings are the
names used by the LISTNUM field.
+def __init__(self, mainStream):
+DOCDirStream.__init__(self,
mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream=mainStream)
+self.pos = mainStream.fcSttbListNames
+self.size = mainStream.lcbSttbListNames
+
+def dump(self):
+print 'sttbListNames type=SttbListNames offset=%d size=%d
bytes' % (self.pos, self.size)
+self.printAndSet(fExtend, self.readuInt16())
+self.printAndSet(cData, self.readuInt16())
+self.printAndSet(cbExtra, self.readuInt16())
+for i in range(self.cData):
+cchData = self.readuInt16()
+print 'cchData index=%s offset=%d size=%d bytes' % (i,
self.pos, cchData)
+print 'string value=%s/' %
globals.encodeName(self.bytes[self.pos:self.pos+2*cchData].decode('utf-16'),
lowOnly = True)
+self.pos += 2*cchData
+print '/cchData'
+assert self.pos == self.mainStream.fcSttbListNames + self.size
+print '/sttbListNames'
+
# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/src/docstream.py b/src/docstream.py
index 648fe81..6edb4b5 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -386,7 +386,7 @@ class WordDocumentStream(DOCDirStream):
[fcPlcfGram],
[lcbPlcfGram, self.handleLcbPlcfGram],
[fcSttbListNames],
-[lcbSttbListNames],
+[lcbSttbListNames, self.handleLcbSttbListNames],
[fcSttbfUssr],
[lcbSttbfUssr],
]
@@ -524,6 +524,9 @@ class WordDocumentStream(DOCDirStream):
def handleLcbPlfLfo(self):
docrecord.PlfLfo(self).dump()
+def handleLcbSttbListNames(self):
+docrecord.SttbListNames(self).dump()
+
def dumpFibRgFcLcb97(self, name):
print '%s type=FibRgFcLcb97 size=744 bytes' % name
self.__dumpFibRgFcLcb97()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - config/config_version.h.in configure.ac sc/source sw/source vcl/inc
config/config_version.h.in | 12
configure.ac |8
sc/source/filter/xml/xmlstyle.cxx |6 +++---
sw/source/filter/ww8/rtfexport.cxx | 12 +++-
vcl/inc/svdata.hxx |3 ---
5 files changed, 30 insertions(+), 11 deletions(-)
New commits:
commit 3c91ac17ae401a1a2bb5752892fb108872096160
Author: Tor Lillqvist t...@iki.fi
Date: Fri Jan 11 14:09:53 2013 +0200
WaE: unused parameters
Change-Id: I8457b72f0f844fe9fb4bf5b670248224e7d60911
diff --git a/sc/source/filter/xml/xmlstyle.cxx
b/sc/source/filter/xml/xmlstyle.cxx
index e81a173..a74113b 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -523,9 +523,9 @@ void ScXMLCellExportPropertyMapper::handleSpecialItem(
void ScXMLCellExportPropertyMapper::handleElementItem(
SvXMLExport rExport,
const XMLPropertyState rProperty,
-sal_uInt16 nFlags,
-const ::std::vector XMLPropertyState *pProperties,
-sal_uInt32 nIdx ) const
+sal_uInt16 /* nFlags */,
+const ::std::vector XMLPropertyState * /* pProperties */,
+sal_uInt32 /* nIdx */) const
{
sal_uInt32 nContextId = getPropertySetMapper()-GetEntryContextId(
rProperty.mnIndex );
OUString sURL;
commit fc4003e960340d6ace29c59b6d9f00f5b19308b0
Author: Tor Lillqvist t...@iki.fi
Date: Fri Jan 11 13:21:22 2013 +0200
Make the LIBO_VERSION_* macros integers, not strings
Change-Id: I6083de4a3f88d50cf4e923aa7fb495fe1711b632
diff --git a/config/config_version.h.in b/config/config_version.h.in
index caaa9c4..736c578 100644
--- a/config/config_version.h.in
+++ b/config/config_version.h.in
@@ -6,9 +6,21 @@ Version settings
#ifndef CONFIG_VERSION_H
#define CONFIG_VERSION_H
+#define LIBO_VERSION_STRINGIFY_inner(s) #s
+#define LIBO_VERSION_STRINGIFY(s) LIBO_VERSION_STRINGIFY_inner(s)
+
#undef LIBO_VERSION_MAJOR
#undef LIBO_VERSION_MINOR
#undef LIBO_VERSION_MICRO
#undef LIBO_VERSION_PATCH
+#define LIBO_VERSION_DOTTED \
+(LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) . \
+ LIBO_VERSION_STRINGIFY(LIBO_VERSION_MINOR) . \
+ LIBO_VERSION_STRINGIFY(LIBO_VERSION_MICRO) . \
+ LIBO_VERSION_STRINGIFY(LIBO_VERSION_PATCH))
+
+#define LIBO_VERSION_ENCODED_IN_32BITS \
+((LIBO_VERSION_MAJOR 24) | (LIBO_VERSION_MINOR 16) |
(LIBO_VERSION_MICRO 8) | LIBO_VERSION_PATCH)
+
#endif
diff --git a/configure.ac b/configure.ac
index e99640f..9f14bb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4331,10 +4331,10 @@ AC_SUBST(LIBO_VERSION_MAJOR)
AC_SUBST(LIBO_VERSION_MINOR)
AC_SUBST(LIBO_VERSION_MICRO)
AC_SUBST(LIBO_VERSION_PATCH)
-AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
-AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
-AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
-AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
+AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
+AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
+AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
+AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
dnl ===
dnl Check for syslog header
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 1b211b8..80085ed 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -408,12 +408,22 @@ void RtfExport::WriteInfo()
OutUnicode(OOO_STRING_SVTOOLS_RTF_AUTHOR,xDocProps-getModifiedBy());
OutDateTime(OOO_STRING_SVTOOLS_RTF_REVTIM,
xDocProps-getModificationDate());
+
OutDateTime(OOO_STRING_SVTOOLS_RTF_PRINTIM, xDocProps-getPrintDate());
}
Strm() '{' OOO_STRING_SVTOOLS_RTF_COMMENT ;
Strm() OUStringToOString( utl::ConfigManager::getProductName(),
eCurrentEncoding).getStr() }{ OOO_STRING_SVTOOLS_RTF_VERN;
-Strm() LIBO_VERSION_MAJOR LIBO_VERSION_MINOR LIBO_VERSION_MICRO 0
'}';
+
+// The convention that we follow is that the version number
+// should be a non-negative 32-bit int
+#if LIBO_VERSION_MAJOR 127
+#error Major version number must be less than 128
+#elif LIBO_VERSION_MINOR 255 || LIBO_VERSION_MICRO 255 ||
LIBO_VERSION_PATCH 255
+#error Minor, micro and patchlevel version numbers must be less than 256
+#endif
+
+Strm() (sal_Int32) LIBO_VERSION_ENCODED_IN_32BITS '}';
Strm() '}';
}
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 515bcbc..bca3ea7 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -47,9 +47,6 @@
#include config_version.h
-#define LIBO_VERSION_DOTTED (LIBO_VERSION_MAJOR . LIBO_VERSION_MINOR . \
- LIBO_VERSION_MICRO . LIBO_VERSION_PATCH)
-
struct ImplTimerData;
struct ImplConfigData;
class ImplDirectFontSubstitution;
___
Libreoffice-commits mailing
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On 2013-01-11 14:02, Jan Holesovsky wrote: Noel Grandin píše v Pá 11. 01. 2013 v 08:46 +0200: - There's no need for valueOfChar(). There is already OUString ctor from sal_Unicode, so the valueOf() overload for it is just making an obvious thing complicated. Code using it can be converted to use the ctor instead. I've already dealt with why we can't use the constructor. git grep String::valueOf.*Unicode says we do in fact appear to need such a method. I've had a look at this git grep, and most of them could be written an easier way thanks to the Lubos' OUString magic; like: - aPropName += OUString::valueOf( (sal_Unicode) '/' ); + aPropName += /; The only more tricky one is - aRepresentation += OUString::valueOf( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'A' ) ); + aRepresentation += OUString( (sal_Unicode)(char)( ( nPageNumber - 1 ) % 26 + 'A' ) ); Or did you mean something different? OK, in that case, I'll drop the valueOfChar() methods. - It's a question if we really need 'OUString::valueOfBool( foo )' instead of simply 'foo ? OUString( true ) : OUString( false )' (such a pity the string literals handling doesn't allow foo ? true : false' ). I wonder how many places in the code really need to convert a boolean to the hardcoded english string representation. I have no idea how to count call sites automatically. But at least 10 places need to use a cast to access the method, so there is definitely code using it. I've counted exactly 5 - seeing the trouble we have un-publishing something that we have published, I'd really prefer not to introduce a method in our core API that would satisfy only 5 callers ;-) OK, fair enough. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: replacing OUString::valueOf(static_castsal_Int32) ??
Hi Noel, Noel Grandin píše v Pá 11. 01. 2013 v 14:12 +0200: Or did you mean something different? OK, in that case, I'll drop the valueOfChar() methods. If others agree too - would you please mark the valueOf( sal_Unicode ) and valueOf( sal_Bool ) as deprecated when you are at that? [And would be awesome to have a clang plugin that warns of the use of valueOf( sal_Unicode ) and valueOf( sal_Bool ), so that we could EasyHack-ise the removal of their mentions in the code for good ;-)] Thank you a lot, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed: What|Removed |Added Depends on||58998 --- Comment #76 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- I nominate bug 58998 which is a regression: Inserting a section, inserts 2 sections with the same name. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On 01/11/2013 01:02 PM, Jan Holesovsky wrote: - It's a question if we really need 'OUString::valueOfBool( foo )' instead of simply 'foo ? OUString( true ) : OUString( false )' (such a pity the string literals handling doesn't allow foo ? true : false' ). I wonder how many places in the code really need to convert a boolean to the hardcoded english string representation. I have no idea how to count call sites automatically. But at least 10 places need to use a cast to access the method, so there is definitely code using it. I've counted exactly 5 - seeing the trouble we have un-publishing something that we have published, I'd really prefer not to introduce a method in our core API that would satisfy only 5 callers ;-) As I wrote, we have rtl_ustr_valueOfBoolean anyway. And eventually getting rid of inline-online functions in the URE interface isn't that controversial either. So I see no reason not to keep offering such a function. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: apache-commons/ExternalProject_apache_commons_codec.mk apache-commons/ExternalProject_apache_commons_httpclient.mk apache-commons/ExternalProject_apache_commons_lang.mk apache
apache-commons/ExternalProject_apache_commons_codec.mk |5 - apache-commons/ExternalProject_apache_commons_httpclient.mk |5 - apache-commons/ExternalProject_apache_commons_lang.mk |5 - apache-commons/ExternalProject_apache_commons_logging.mk|5 - config_host.mk.in |4 + configure.ac| 42 jfreereport/ExternalProject_jfreereport_flow_engine.mk |5 - jfreereport/ExternalProject_jfreereport_flute.mk|4 - jfreereport/ExternalProject_jfreereport_libbase.mk |4 - jfreereport/ExternalProject_jfreereport_libfonts.mk |4 - jfreereport/ExternalProject_jfreereport_libformula.mk |4 - jfreereport/ExternalProject_jfreereport_liblayout.mk|5 - jfreereport/ExternalProject_jfreereport_libloader.mk|4 - jfreereport/ExternalProject_jfreereport_librepository.mk|4 - jfreereport/ExternalProject_jfreereport_libserializer.mk|4 - jfreereport/ExternalProject_jfreereport_libxml.mk |4 - jfreereport/ExternalProject_jfreereport_sac.mk |5 - odk/pack/copying/makefile.mk|2 offapi/UnoApiMerge_types.mk |2 rhino/ExternalProject_rhino.mk |5 - solenv/gbuild/Jar.mk|2 solenv/inc/_tg_srs.mk | 40 +-- solenv/inc/ant.mk |2 solenv/inc/minor.mk | 11 --- solenv/inc/minor.mk.in |9 ++ solenv/inc/settings.mk |4 - solenv/inc/target.mk|1 solenv/inc/tg_jar.mk|3 solenv/inc/tg_java.mk |4 - solenv/inc/tg_srs.mk|4 - tomcat/ExternalProject_tomcat.mk|5 - 31 files changed, 87 insertions(+), 120 deletions(-) New commits: commit f5cde53719544c7445ab6fdb465e332ac5678b02 Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 11 15:07:10 2013 +0200 Set version number in AC_INIT() in configure.ac only Output a solenv/inc/minor.mk based on that. Get rid of RSCVERSION and RSCREVISION. Automate the end of the copyright year range, although I am actually not sure if that is OK. Change-Id: Ibae2d139b1dd468ee80d18a2a41b786a532df809 diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk index 950c2f4..59d53e5 100644 --- a/apache-commons/ExternalProject_apache_commons_codec.mk +++ b/apache-commons/ExternalProject_apache_commons_codec.mk @@ -7,9 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# for RSCREVISION -include $(SOLARENV)/inc/minor.mk - $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec)) $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_codec)) @@ -24,7 +21,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) : $(ICECREAM_RUN) $(ANT) \ -q \ -f build.xml \ - -Dbuild.label=build-$(RSCREVISION) \ + -Dbuild.label=build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk index c9bde3f..c3c1513 100644 --- a/apache-commons/ExternalProject_apache_commons_httpclient.mk +++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk @@ -7,9 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# for RSCREVISION -include $(SOLARENV)/inc/minor.mk - $(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient)) $(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_httpclient)) @@ -27,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) : $(ICECREAM_RUN) $(ANT) \ -q \ -f build.xml \ - -Dbuild.label=build-$(RSCREVISION) \ + -Dbuild.label=build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ -Dcommons-logging.jar=$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar \ -Dcommons-codec.jar=$(call
Re: replacing OUString::valueOf(static_castsal_Int32) ??
On Friday 11 of January 2013, Noel Grandin wrote: On 2013-01-10 15:55, Lubos Lunak wrote: - There's no need for valueOfChar(). There is already OUString ctor from sal_Unicode, so the valueOf() overload for it is just making an obvious thing complicated. Code using it can be converted to use the ctor instead. I've already dealt with why we can't use the constructor. git grep String::valueOf.*Unicode says we do in fact appear to need such a method. OUString has a ctor that takes sal_Unicode and creates OUString. Your valueOfChar() proposal would add a function that takes sal_Unicode and creates OUString = complete duplicate, the ctor can be used instead. I do not even see API reasons to have it, it's different from the other valueOf() cases in that in the character case there's conceptually actually no conversion, so there's no need for consistency. - When more or less deprecating valueOf() this way, it has also float overloads, so something should be created for those too. Fair enough. We don't have many of them, but for completeness sake, it makes sense. Yes. They would be needed, if the original valueOf() is deprecated/removed. - I'm still not sold on the naming, OUString::valueInt() doesn't say much and OUString::valueOfInt() feels cryptic. Can we please use something obvious that doesn't need decyphering, such as , such as OUString::number() or OUString::fromInt() (as much as I still don't like the idea of harcoding the irrelevant type information in the name)? I think valueOf() is fine, but then I do a lot of programming in Java :-) But whatever, if the C++ people prefer another name, then so be it. I think I might know why we don't understand each other. There is a code problem and you've created new code to solve the problem, and, code-wise, your patch is correct. The catch is though that I'm not looking at this from the code point of view, but from the API point of view, and it is possible to have good code that nevertheless implements API that is not good. IOW, I'm not saying that your code is wrong, because I'm thinking one level up and saying that the problem you've solved wouldn't even exist at all if the API was done better. The purpose of libraries is to focus a solution to a problem in a single place and provide means to solve the problem. And a good library, among other things, solves as much as possible of the problem itself, making it easy for the library user. To take an example from elsewhere, cars have a button for switching the lights on, it has probably a shining bulb or similar symbol on it, and when the driver presses it, it switches the lights on. And that's really all the driver needs to know and cares about. The symbol on it doesn't show the battery that powers the lights or any other implementation details, nor does the button require that you press it with a specific finger. It's made as simple as possible and implementation details are hidden. The same way, good API should strive to make things as simple as possible and hide implementation details. Following this, what the developer really wants is to create a string from a number. So OUString::fromNumber() seems like the obvious name for it. And it should take numbers of any kind, as it doesn't really matter, in the common case give me this number as a string is conceptually the same whether the number is a long or float. So that should be the optimal API for the functionality. Now some real-world issues may enter into play, e.g. when the number is integer, it may be useful to specify the radix, which doesn't make much sense with floats; valueOf() has a default argument there, so it can be handled the same way. Another thing, since valueOf() is often used when constructing strings, OUString::fromNumber() may be considered a bit too long and it may be acceptable trade-off to shorten it to OUString::number(). Anything less, such as leaking irrelevant implementation details and forcing the developer to explicitly specify the underlying type, is settling on sub-optimal API that moves part of the implementation burden on the user of the library. So, based on this, the best solution to the problem that I can see is creating fromNumber() or number() , overloaded for all signed/unsigned int/long/long long types and all floats because of the lame language ambiguity. The original valueOf() can be wrapped inside #ifndef LIBO_INTERNAL_ONLY after LO is moved away from this problematic function to keep it only for external backwards compatibility, while LO itself will no longer have it. So rather than bitting us in small ways every now and then, the (possibly smaller in the end, if it wasn't for this discussion) effort is spent now, and the effort is not that big (all the duplicates can be only 6 lines, 2 for doxygen @overload @since, 4 for code forwarding to the overload taking the largest type). Win/win. And if this is still not convincing
sal: add timeout option when using pipe in connect mode
Pierre-Eric Pelloux-Prayer has abandoned this change. Change subject: sal: add timeout option when using pipe in connect mode .. Patch Set 1: Abandoned Not needed anymore. -- To view, visit https://gerrit.libreoffice.org/1310 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I94b9edccf194e971f375853459d73c37bdb4c6a3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sw unit test: add call to CalcLayout before using the layout
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1645 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1645/1 sw unit test: add call to CalcLayout before using the layout Change-Id: Ibb3f8175729cb579a687275a11884c397152fe94 --- M sw/qa/extras/inc/swmodeltestbase.hxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index cc05b2b..2bb2369 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -88,6 +88,7 @@ // create the dump SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument *(mxComponent.get()); SwDoc* pDoc = pTxtDoc-GetDocShell()-GetDoc(); +pDoc-GetCurrentViewShell()-CalcLayout(); SwRootFrm* pLayout = pDoc-GetCurrentLayout(); pLayout-dumpAsXml(pXmlWriter); -- To view, visit https://gerrit.libreoffice.org/1645 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb3f8175729cb579a687275a11884c397152fe94 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] doc export: add unit test for bug i106749
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1646
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1646/1
doc export: add unit test for bug i106749
Change-Id: I1df4cbb013d94cff7ae5195427044b1e1b2d8895
---
A sw/qa/extras/ww8export/data/new-page-styles.doc
M sw/qa/extras/ww8export/ww8export.cxx
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/sw/qa/extras/ww8export/data/new-page-styles.doc
b/sw/qa/extras/ww8export/data/new-page-styles.doc
new file mode 100644
index 000..c3886fd
--- /dev/null
+++ b/sw/qa/extras/ww8export/data/new-page-styles.doc
Binary files differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 7c61d95..650fbbf 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -43,6 +43,7 @@
void testFirstHeaderFooter();
void testZoom();
void test56513();
+void testNewPageStylesTable();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -63,6 +64,7 @@
{first-header-footer.doc, Test::testFirstHeaderFooter},
{zoom.doc, Test::testZoom},
{fdo56513.doc, Test::test56513},
+{new-page-styles.doc, Test::testNewPageStylesTable},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -154,6 +156,13 @@
CPPUNIT_ASSERT_EQUAL(OUString(This is the non-first-page header of the
second section), parseDump(/root/page[3]/header/txt/text()));
}
+void Test::testNewPageStylesTable()
+{
+CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Goals and Results
(Page 1)*), parseDump(/root/page[1]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Assessment (Page
2)), parseDump(/root/page[2]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Goals: Next Year
(Page 3)***), parseDump(/root/page[3]/header/txt/text()));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
--
To view, visit https://gerrit.libreoffice.org/1646
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1df4cbb013d94cff7ae5195427044b1e1b2d8895
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: invalid sectPr added at the beginning of the do...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1647
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/1647/1
docx export: invalid sectPr added at the beginning of the doc
This reverts commit 60fa5057039d2413d56813df4d45e5cfdfbb40ac,
which was a revert of 723f772d (fix for ooo#106749) with an
alternative fix to avoid a regression (fdo#56513).
This commit contain a fix for the sectPr issue, and does not
regress on the 2 previously fixed issue.
Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f
---
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8atr.cxx
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b89a143..01d61c5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2368,9 +2368,7 @@
}
else if ( pNd-IsTableNode() )
{
-SwTable * pTable = pNd-GetTableNode()-GetTable();
-OutputSectionBreaks( pTable-GetTableFmt()-GetAttrSet(), *pNd );
-mpTableInfo-processSwTable( pTable );
+mpTableInfo-processSwTable( pNd-GetTableNode()-GetTable() );
}
else if ( pNd-IsSectionNode() TXT_MAINTEXT == nTxtTyp )
OutputSectionNode( *pNd-GetSectionNode() );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d6cbdaa..393a685 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -403,6 +403,15 @@
//section.
bool bBreakSet = false;
+const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False);
+
+if (pAktPageDesc != pPageDesc)
+{
+bBreakSet = true;
+bNewPageDesc = true;
+pAktPageDesc = pPageDesc;
+}
+
if ( pSet pSet-Count() )
{
if ( SFX_ITEM_SET == pSet-GetItemState( RES_PAGEDESC, false, pItem )
@@ -456,7 +465,7 @@
if ( pBreak
pBreak-GetBreak() == SVX_BREAK_PAGE_BEFORE )
{
-bNewPageDesc = SetAktPageDescFromNode( rNd );
+bNewPageDesc |= SetAktPageDescFromNode( rNd );
}
}
if ( !bNewPageDesc )
--
To view, visit https://gerrit.libreoffice.org/1647
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sw unit test: layout dump must be resetted in 'reload' metho...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1643
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/1643/1
sw unit test: layout dump must be resetted in 'reload' method
Otherwise tests relying on layout dumps will parse the wrong dump.
Change-Id: Ib7b4bc3a231eb3082567a1d1ed38c96835d43add
---
M sw/qa/extras/inc/swmodeltestbase.hxx
1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 128983c..cc05b2b 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -251,6 +251,11 @@
uno::Referencelang::XComponent xComponent(xStorable, uno::UNO_QUERY);
xComponent-dispose();
mxComponent = loadFromDesktop(aTempFile.GetURL());
+if (mpXmlBuffer)
+{
+xmlBufferFree(mpXmlBuffer);
+mpXmlBuffer = 0;
+}
}
void finish()
--
To view, visit https://gerrit.libreoffice.org/1643
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7b4bc3a231eb3082567a1d1ed38c96835d43add
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: add test case for paragraph mark export
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1650
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1650/1
docx export: add test case for paragraph mark export
Change-Id: I2701ee12221460f8ff19397ea215cc1484648d18
---
A sw/qa/extras/ooxmlexport/data/1-table-1-page.docx
M sw/qa/extras/ooxmlexport/ooxmlexport.cxx
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx
b/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx
new file mode 100755
index 000..07d91ae
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0f99cf5..8d14409 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -35,6 +35,7 @@
#include com/sun/star/style/ParagraphAdjust.hpp
#include com/sun/star/view/XSelectionSupplier.hpp
#include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/text/XPageCursor.hpp
#include unotools/tempfile.hxx
#include swmodeltestbase.hxx
@@ -66,6 +67,7 @@
void testTableBorders();
void testFdo51550();
void testN789482();
+void test1Table1Page();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -104,6 +106,7 @@
{table-borders.docx, Test::testTableBorders},
{fdo51550.odt, Test::testFdo51550},
{n789482.docx, Test::testN789482},
+{1-table-1-page.docx, Test::test1Table1Page},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -494,6 +497,18 @@
getRun(xParagraph, 5, After.);
}
+void Test::test1Table1Page()
+{
+// 2 problem for this document after export:
+// - invalid sectPr inserted at the beginning of the page
+// - font of empty cell is not preserved, leading to change in rows
height
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
--
To view, visit https://gerrit.libreoffice.org/1650
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2701ee12221460f8ff19397ea215cc1484648d18
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] doc export: add unit test for fdo#56513
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1644
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1644/1
doc export: add unit test for fdo#56513
Change-Id: Ie87648368f877af56878bc83fe3d5ece66f77304
---
A sw/qa/extras/ww8export/data/fdo56513.doc
M sw/qa/extras/ww8export/ww8export.cxx
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/sw/qa/extras/ww8export/data/fdo56513.doc
b/sw/qa/extras/ww8export/data/fdo56513.doc
new file mode 100644
index 000..f5be1c3
--- /dev/null
+++ b/sw/qa/extras/ww8export/data/fdo56513.doc
Binary files differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index f7a8f04..7c61d95 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -42,6 +42,7 @@
void testFdo46020();
void testFirstHeaderFooter();
void testZoom();
+void test56513();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -61,6 +62,7 @@
{fdo46020.odt, Test::testFdo46020},
{first-header-footer.doc, Test::testFirstHeaderFooter},
{zoom.doc, Test::testZoom},
+{fdo56513.doc, Test::test56513},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -145,6 +147,13 @@
CPPUNIT_ASSERT_EQUAL(sal_Int16(42), nValue);
}
+void Test::test56513()
+{
+CPPUNIT_ASSERT_EQUAL(OUString(This is the header of the first section),
parseDump(/root/page[1]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(This is the first page header of the second
section), parseDump(/root/page[2]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(This is the non-first-page header of the
second section), parseDump(/root/page[3]/header/txt/text()));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
--
To view, visit https://gerrit.libreoffice.org/1644
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie87648368f877af56878bc83fe3d5ece66f77304
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: also export rPr in pPr (paragraph mark stylin...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1649
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/1649/1
docx export: also export rPr in pPr (paragraph mark styling)
Change-Id: I179363e7d0acc3d6a1f95dcfe975275a9243e863
---
M sw/source/filter/ww8/docxattributeoutput.cxx
1 file changed, 6 insertions(+), 0 deletions(-)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b97b368..aefd172 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -442,6 +442,9 @@
{
WriteCollectedParagraphProperties();
+// insert copy of rPr
+m_pSerializer-copyTopMarkPop();
+
m_pSerializer-endElementNS( XML_w, XML_pPr );
if ( m_nColBreakStatus == COLBRK_WRITE )
@@ -973,6 +976,9 @@
m_pSerializer-endElementNS( XML_w, XML_rPr );
+// Clone rPr.../rPr for later re-use, in pPr
+m_pSerializer-copyTopMarkPush();
+
// write footnotes/endnotes if we have any
FootnoteEndnoteReference();
--
To view, visit https://gerrit.libreoffice.org/1649
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I179363e7d0acc3d6a1f95dcfe975275a9243e863
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sax: add methods to duplicate current top marker and reapply...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1648
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1648/1
sax: add methods to duplicate current top marker and reapply it later
The need for this is ooxml: we need to have a duplicate entry (rPr)
like this:
p
pPr
rPr.../rPr
/pPr
r
rPr.../rPR
/r
/p
This patch allows to do that by setting aside a copy of the rPr line,
and then merging the copy when needed.
Change-Id: I3868a822aa9e5210f3d814c68398a38f95072cd5
---
M sax/inc/sax/fshelper.hxx
M sax/source/tools/fastserializer.cxx
M sax/source/tools/fastserializer.hxx
M sax/source/tools/fshelper.cxx
4 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index b0b8b09..2e9d07b 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -142,6 +142,8 @@
void mark( ::com::sun::star::uno::Sequence sal_Int32 aOrder =
::com::sun::star::uno::Sequence sal_Int32 () );
void mergeTopMarks( MergeMarksEnum eMergeType = MERGE_MARKS_APPEND );
+void copyTopMarkPush();
+void copyTopMarkPop();
/*
Now create all the overloads in a typesafe way (i.e. without varargs) by
creating a number of overloads
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index bc2b12e..31aac1e 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -265,6 +265,20 @@
}
}
+void FastSaxSerializer::copyTopMarkPush()
+{
+assert (!maMarkStack.empty());
+maSavedMarkStack.push(boost::shared_ptr ForMerge ( new
ForMerge(*maMarkStack.top(;
+}
+
+void FastSaxSerializer::copyTopMarkPop()
+{
+assert (!maSavedMarkStack.empty());
+maMarkStack.push(maSavedMarkStack.top());
+mergeTopMarks();
+maSavedMarkStack.pop();
+}
+
void FastSaxSerializer::writeBytes( const Sequence ::sal_Int8 aData )
throw ( NotConnectedException, BufferSizeExceededException, IOException,
RuntimeException )
{
if ( maMarkStack.empty() )
diff --git a/sax/source/tools/fastserializer.hxx
b/sax/source/tools/fastserializer.hxx
index b80f1cc..70bc153 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -145,6 +145,8 @@
@see mark()
*/
void mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType =
sax_fastparser::MERGE_MARKS_APPEND );
+void copyTopMarkPush();
+void copyTopMarkPop();
private:
::com::sun::star::uno::Reference ::com::sun::star::io::XOutputStream
mxOutputStream;
@@ -203,6 +205,7 @@
};
::std::stack boost::shared_ptr ForMerge maMarkStack;
+::std::stack boost::shared_ptr ForMerge maSavedMarkStack;
void writeFastAttributeList( const ::com::sun::star::uno::Reference
::com::sun::star::xml::sax::XFastAttributeList Attribs );
void write( const ::rtl::OUString s );
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 2f3f7bf..37cf3d0 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -162,6 +162,16 @@
mpSerializer-mergeTopMarks( eMergeType );
}
+void FastSerializerHelper::copyTopMarkPush()
+{
+mpSerializer-copyTopMarkPush();
+}
+
+void FastSerializerHelper::copyTopMarkPop()
+{
+mpSerializer-copyTopMarkPop();
+}
+
FastAttributeList * FastSerializerHelper::createAttrList()
{
return new FastAttributeList( mxTokenHandler );
--
To view, visit https://gerrit.libreoffice.org/1648
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3868a822aa9e5210f3d814c68398a38f95072cd5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfexport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3527efa7e078ce11ac537d8f8591b159c05e760f Author: Tor Lillqvist t...@iki.fi Date: Fri Jan 11 15:43:56 2013 +0200 Output version number as text, not binary Change-Id: I1ada5bd38a55fa2815c03260a2465c1908b5019f diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 80085ed..3edad2a 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -423,7 +423,7 @@ void RtfExport::WriteInfo() #error Minor, micro and patchlevel version numbers must be less than 256 #endif -Strm() (sal_Int32) LIBO_VERSION_ENCODED_IN_32BITS '}'; +Strm().WriteNumber((sal_Int32) LIBO_VERSION_ENCODED_IN_32BITS) '}'; Strm() '}'; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Writing new Clang plugins (Re: replacing OUString::valueOf(static_castsal_Int32) ??)
On Friday 11 of January 2013, Jean-Noël Rouvignac wrote: 2013/1/10 Lubos Lunak l.lu...@suse.cz Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. Sure, if you feel like writing one. Actually, I'd prefer to write a howto about that first, whenever I get to doing that, so that I don't have to write every single plugin. Such a plugin will be still much simpler than a regexp or any other way. Please do, I would be interested in that. Maybe you already have some URLs to share on this subject? I'm not aware of anything very useful at this point. The existing tutorials that can be found mostly say how to create a plugin itself, but not much more. Since I've already created a plugin for LO, now writing a plugin in LO actually means adding another class with new functionality to the one LO plugin, so what is needed now is documentation on the internal Clang API that is used for writing the functionality. That API is documented at http://clang.llvm.org/doxygen/ , but I understand that throwing that at somebody unfamiliar with it must be scaring (hint: the most commonly needed is the class hiearchy starting from clang::Stmt, as those are classes representing the program in the AST). I myself actually find it easier to read directly doxygen docs in the includes, mostly Decl*.h Expr*.h Stmt*.h in include/clang/AST/ . The API is however rather intuitive and straightforward, once one gets into it. And finding out how a particular piece of code is represented in the AST is a matter of compiling it with 'clang++ -Xclang -ast-dump' and matching the output to Clang classes. If you want to give it a try now, look under compilerplugins/ in the LO sources. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failure to build 3.6 branch
Le 10/01/13 19:06, Lubos Lunak a écrit : Hi Lubos, I'd rather guess simply a bug in the compiler (since it's on Mac, it's the old gcc-4.0.1, right?). Try if the file compiles successfully with 'make DEBUG=1', that will disable optimizations. No, it is actually gcc 4.2.1, but I'll try your tip anwyay, thanks. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - compilerplugins/clang compilerplugins/README writerfilter/source
compilerplugins/README |2 +- compilerplugins/clang/plugin.cxx|5 ++--- writerfilter/source/ooxml/model.xml |5 - 3 files changed, 3 insertions(+), 9 deletions(-) New commits: commit 03910bdfd964ee34bdd93fda3339908cad2b01f4 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri Jan 11 14:55:17 2013 +0100 point to our wiki page on clang rather than clang homepage Change-Id: Ia54040c7ed02e6a2d62dd93890a7d1467dd83a40 diff --git a/compilerplugins/README b/compilerplugins/README index 1261a34..9dae9a1 100644 --- a/compilerplugins/README +++ b/compilerplugins/README @@ -7,7 +7,7 @@ This directory contains code for compiler plugins. These are used to perform additional actions during compilation (such as additional warnings) and also to perform mass code refactoring. -Currently only the Clang compiler is supported (http://clang.llvm.org). +Currently only the Clang compiler is supported (http://wiki.documentfoundation.org/Development/Clang). == Usage == commit a18aa3016b6e97d3702c99a7dff37022e9ae2580 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jan 7 17:49:58 2013 +0100 remove block that is a complete nonsense result of incorrect merges Change-Id: I43f5ef2afbd5390f937f1220613ffa7d1f284634 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index d961f87..73acba6 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -22798,11 +22798,6 @@ attribute name=element tokenid=ooxml:CT_SmartTagRun_element/ /resource resource name=EG_PContent resource=Properties tag=content - element name=sdtPr tokenid=ooxml:CT_SdtPr/ - element name=sdtEndPr tokenid=ooxml:CT_SdtEndPr/ - element name=sdtContent tokenid=ooxml:CT_SdtContentRun/ -/resource -resource name=EG_PContent resource=Properties tag=content element name=fldSimple tokenid=ooxml:EG_PContent_fldSimple/ element name=hyperlink tokenid=ooxml:EG_PContent_hyperlink/ element name=subDoc tokenid=ooxml:EG_PContent_subDoc/ commit d9a5c6bdf0106c9cf7eb6a94c8ed0b68867b29e9 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Mon Jan 7 12:24:58 2013 +0100 fix detection whether to ignore a source file or not When compiling using icecream, the whole input is one file fed from stdin, so getBufferName() is stdin, so get the filename from #line directives. Change-Id: Ie87937b10b0c7e8ddfa57a405b80fd9bde68dd0a diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx index 7c4256b..db9521f 100644 --- a/compilerplugins/clang/plugin.cxx +++ b/compilerplugins/clang/plugin.cxx @@ -55,9 +55,8 @@ bool Plugin::ignoreLocation( SourceLocation loc ) SourceLocation expansionLoc = context.getSourceManager().getExpansionLoc( loc ); if( context.getSourceManager().isInSystemHeader( expansionLoc )) return true; -bool invalid; -const char* bufferName = context.getSourceManager().getBufferName( expansionLoc, invalid ); -if( invalid ) +const char* bufferName = context.getSourceManager().getPresumedLoc( expansionLoc ).getFilename(); +if( bufferName == NULL ) return true; if( strncmp( bufferName, OUTDIR, strlen( OUTDIR )) == 0 || strncmp( bufferName, WORKDIR, strlen( WORKDIR )) == 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58531, which changed state. Bug 58531 Summary: FILEOPEN: Reload no longer refreshes external links in 4.0 https://bugs.freedesktop.org/show_bug.cgi?id=58531 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Writing new Clang plugins (Re: replacing OUString::valueOf(static_castsal_Int32) ??)
2013/1/11 Lubos Lunak l.lu...@suse.cz On Friday 11 of January 2013, Jean-Noël Rouvignac wrote: 2013/1/10 Lubos Lunak l.lu...@suse.cz Unless all you want to convert is only places which do the explicit cast, this will need a (fairly simple) Clang plugin. Sure, if you feel like writing one. Actually, I'd prefer to write a howto about that first, whenever I get to doing that, so that I don't have to write every single plugin. Such a plugin will be still much simpler than a regexp or any other way. Please do, I would be interested in that. Maybe you already have some URLs to share on this subject? That API is documented at http://clang.llvm.org/doxygen/ , but I understand that throwing that at somebody unfamiliar with it must be scaring (hint: the most commonly needed is the class hiearchy starting from clang::Stmt, as those are classes representing the program in the AST). I myself actually find it easier to read directly doxygen docs in the includes, mostly Decl*.h Expr*.h Stmt*.h in include/clang/AST/ . The API is however rather intuitive and straightforward, once one gets into it. And finding out how a particular piece of code is represented in the AST is a matter of compiling it with 'clang++ -Xclang -ast-dump' and matching the output to Clang classes. If you want to give it a try now, look under compilerplugins/ in the LO sources. I don't find this more intimidating than Eclipse's documentation for org.eclipse.cdt.core.dom.ast.cpp (Eclipse CDT's AST parser for C++) or org.eclipse.jdt.core.dom (Eclipse JDT's AST parser for Java). Only clang doc is harder to go through but it has nice graphics :). I might take a look at this. Thanks for sharing this info. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/osl
sal/osl/all/log.cxx | 36
1 file changed, 24 insertions(+), 12 deletions(-)
New commits:
commit 4fbf6df784529d48cf194a2d9c495ffb47933d59
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 11 15:46:47 2013 +0100
Fix workaround for thead-unsafe getenv again
...from d19c40f45dc8e8bcd9db4c6b83bdcf6367f6fbe7 Work around some potential
problems with thread-unsafe getenv that had been broken with
60628799633ffde502cb105b98d3f254f93115aa Notice if SAL_LOG is changed
while the
process is running.
Change-Id: Ibd6dbc9921ae1f8dee114380f01a076b0770788c
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 2b94f18..13bd7c0 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -89,27 +89,36 @@ char const * toString(sal_detail_LogLevel level) {
}
}
-// getenv is not thread safe, so minimize use of result:
+// getenv is not thread safe, so minimize use of result; except on Android and
+// iOS, see 60628799633ffde502cb105b98d3f254f93115aa Notice if SAL_LOG is
+// changed while the process is running:
+#if defined ANDROID || defined IOS
+
char const * getEnvironmentVariable() {
-static char const * cached_value = NULL;
+return std::getenv(SAL_LOG);
+}
+
+#else
+
+char const * getEnvironmentVariable_() {
char const * p1 = std::getenv(SAL_LOG);
if (p1 == 0) {
-return +WARN;
+return 0;
}
-char * p2 = strdup(p1); // leaked whenever it has changed
+char const * p2 = strdup(p1); // leaked
if (p2 == 0) {
std::abort(); // cannot do much here
}
-if (cached_value == NULL) {
-cached_value = p2;
-} else if (strcmp(cached_value, p2) == 0) {
-free(p2);
-} else {
-cached_value = p2;
-}
-return cached_value;
+return p2;
}
+char const * getEnvironmentVariable() {
+static char const * env = getEnvironmentVariable_();
+return env;
+}
+
+#endif
+
#ifdef HAVE_SYSLOG_H
int toSyslogPriority(sal_detail_LogLevel level) {
switch (level) {
@@ -131,6 +140,9 @@ bool report(sal_detail_LogLevel level, char const * area) {
return true;
assert(area != 0);
char const * env = getEnvironmentVariable();
+if (env == 0) {
+env = +WARN;
+}
std::size_t areaLen = std::strlen(area);
enum Sense { POSITIVE = 0, NEGATIVE = 1 };
std::size_t senseLen[2] = { 0, 1 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] doc export: add unit test for bug i106749
Hello all, On Fri, Jan 11, 2013 at 8:44 PM, Pierre-Eric Pelloux-Prayer (via Code Review) ger...@gerrit.libreoffice.org wrote: I have submitted a patch for review: https://gerrit.libreoffice.org/1646 doc export: add unit test for bug i106749 IMHO it's great to have many unit tests as possible :), but I wonder ... diff --git a/sw/qa/extras/ww8export/data/new-page-styles.doc b/sw/qa/extras/ww8export/data/new-page-styles.doc new file mode 100644 index 000..c3886fd --- /dev/null +++ b/sw/qa/extras/ww8export/data/new-page-styles.doc Do we have a license to use this file? (no offense of course! :) Or in general, what about any bugzilla attachments? Because it seems you have taken this file from apache bugzilla ... What about another patch at https://gerrit.libreoffice.org/1644, doc export: add unit test for fdo#56513 ? It's an attachment from Luke Deller, which we already have a license statement from him. Does the license statement include this file? Does this differ to the first case? or is this file simple enough that it doesn't have copyright? OK, maybe I'm wrong, because I'm not a lawyer, but ... :) Michael Meeks, since you are rebasing the code from apache, do you have any opinions? Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#59084: Sync dimension members after reloading the group ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1651
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1651/1
fdo#59084: Sync dimension members after reloading the group data.
Else the syncing would end up syncing to the older version of the
group data before the reload, which (as you can see in the bug report)
may lead to a crash.
Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3
Reviewed-on: https://gerrit.libreoffice.org/1635
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
---
M sc/source/ui/docshell/dbdocfun.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index e424763..5216c68 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1330,6 +1330,8 @@
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
+if (!pDestObj-SyncAllDimensionMembers())
+return false;
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
@@ -1472,8 +1474,6 @@
for (; it != itEnd; ++it)
{
ScDPObject* pObj = *it;
-if (!pObj-SyncAllDimensionMembers())
-continue;
// This action is intentionally not undoable since it modifies cache.
DataPilotUpdate(pObj, pObj, false, bApi);
--
To view, visit https://gerrit.libreoffice.org/1651
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/hhcwrp.hxx | 32 ++---
sw/source/ui/lingu/hhcwrp.cxx | 232 +-
2 files changed, 132 insertions(+), 132 deletions(-)
New commits:
commit 6704bb8eb0ac93da96cf58aac28c4f04e794dfd6
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Thu Jan 10 23:13:16 2013 +0100
Prefix class data members
Change-Id: I6734df58b589088809c712c3906f0cee3fd6a103
Reviewed-on: https://gerrit.libreoffice.org/1639
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 85ee116..1ab2251 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -31,27 +31,27 @@ class SwPaM;
class SwHHCWrapper : public editeng::HangulHanjaConversion
{
-SwView *pView;
-Window* pWin;
-SwWrtShell rWrtShell;
+SwView *mpView;
+Window* mpWin;
+SwWrtShell mrWrtShell;
-SwConversionArgs *pConvArgs;/** object for arguments (and results)
needed
+SwConversionArgs *mpConvArgs;/** object for arguments (and results)
needed
to find of next convertible text
portion */
-xub_StrLen nLastPos; /** starting position of the last found
text part
+xub_StrLen mnLastPos; /** starting position of the last found
text part
(needs to be sth that gets not moved
like
SwPaM or SwPosition by replace
operations!) */
-sal_Int32 nUnitOffset;
+sal_Int32 mnUnitOffset;
-sal_uInt16 nPageCount; /// page count for progress bar
-sal_uInt16 nPageStart; /// first checked page
+sal_uInt16 mnPageCount; /// page count for progress bar
+sal_uInt16 mnPageStart; /// first checked page
-sal_BoolbIsDrawObj;
-sal_BoolbIsOtherCntnt;
-sal_BoolbStartChk;
-sal_BoolbIsSelection; /// true if only the selected text should
be converted
-sal_BoolbStartDone;
-sal_BoolbEndDone;
+sal_BoolmbIsDrawObj;
+sal_BoolmbIsOtherCntnt;
+sal_BoolmbStartChk;
+sal_BoolmbIsSelection; /// true if only the selected text
should be converted
+sal_BoolmbStartDone;
+sal_BoolmbEndDone;
/// from SvxSpellWrapper copied and modified
sal_BoolConvNext_impl();/// former SpellNext
@@ -71,8 +71,8 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
SwPaM *pCrsr );
voidChangeText_impl( const String rNewText, sal_Bool
bKeepAttributes );
-inline sal_Bool IsDrawObj() { return bIsDrawObj; }
-inline void SetDrawObj( sal_Bool bNew ) { bIsDrawObj = bNew; }
+inline sal_Bool IsDrawObj() { return mbIsDrawObj; }
+inline void SetDrawObj( sal_Bool bNew ) { mbIsDrawObj = bNew; }
protected:
virtual voidGetNextPortion( ::rtl::OUString rNextPortion,
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 25187b2..b6da29b 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -101,56 +101,56 @@ SwHHCWrapper::SwHHCWrapper(
pTargetFont,
nConvOptions,
bIsInteractive ),
-rWrtShell( pSwView-GetWrtShell() )
+mrWrtShell( pSwView-GetWrtShell() )
{
-pConvArgs = 0;
-nLastPos= 0;
-nUnitOffset = 0;
-
-pView = pSwView;
-pWin= pSwView-GetEditWin();
-bIsDrawObj = sal_False;
-bIsOtherCntnt = bStartChk = bOther;
-bIsSelection= bSelection;
-bStartDone = bOther || bStart;
-bEndDone= sal_False;
+mpConvArgs = 0;
+mnLastPos = 0;
+mnUnitOffset= 0;
+
+mpView = pSwView;
+mpWin = pSwView-GetEditWin();
+mbIsDrawObj = sal_False;
+mbIsOtherCntnt = mbStartChk = bOther;
+mbIsSelection = bSelection;
+mbStartDone = bOther || bStart;
+mbEndDone= sal_False;
//bLastRet= sal_True;
-nPageCount = nPageStart = 0;
+mnPageCount = mnPageStart = 0;
}
SwHHCWrapper::~SwHHCWrapper()
{
-delete pConvArgs;
+delete mpConvArgs;
-rWrtShell.SetCareWin( NULL );
+mrWrtShell.SetCareWin( NULL );
// check for existence of a draw view which means that there are
// (or previously were) draw objects present in the document.
// I.e. we like to check those too.
-if ( IsDrawObj() /* bLastRet*/ pView-GetWrtShell().HasDrawView() )
+if ( IsDrawObj() /* bLastRet*/ mpView-GetWrtShell().HasDrawView() )
{
-Cursor *pSave = pView-GetWindow()-GetCursor();
+Cursor *pSave = mpView-GetWindow()-GetCursor();
[Libreoffice-commits] .: sw/source
sw/source/ui/lingu/hhcwrp.cxx | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 40cfbd62e9f3aa52036a339cbbc9e542647017d3
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Thu Jan 10 23:36:51 2013 +0100
Use member initializer list in constructor
Change-Id: I8d4f8b95909b91917b456f49d7a3ac270703cc96
Reviewed-on: https://gerrit.libreoffice.org/1640
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index b6da29b..4d9a0d4 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -101,21 +101,21 @@ SwHHCWrapper::SwHHCWrapper(
pTargetFont,
nConvOptions,
bIsInteractive ),
-mrWrtShell( pSwView-GetWrtShell() )
+mpView( pSwView ),
+mpWin( pSwView-GetEditWin() ),
+mrWrtShell( pSwView-GetWrtShell() ),
+mpConvArgs( 0 ),
+mnLastPos( 0 ),
+mnUnitOffset( 0 ),
+mnPageCount( 0 ),
+mnPageStart( 0 ),
+mbIsDrawObj( sal_False ),
+mbIsOtherCntnt( bOther ),
+mbStartChk( bOther ),
+mbIsSelection( bSelection ),
+mbStartDone( bOther || bStart ),
+mbEndDone( sal_False )
{
-mpConvArgs = 0;
-mnLastPos = 0;
-mnUnitOffset= 0;
-
-mpView = pSwView;
-mpWin = pSwView-GetEditWin();
-mbIsDrawObj = sal_False;
-mbIsOtherCntnt = mbStartChk = bOther;
-mbIsSelection = bSelection;
-mbStartDone = bOther || bStart;
-mbEndDone= sal_False;
-//bLastRet= sal_True;
-mnPageCount = mnPageStart = 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Prefix class data members
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1639 Approvals: Noel Power: Verified; Looks good to me, approved Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1639 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6734df58b589088809c712c3906f0cee3fd6a103 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Use member initializer list in constructor
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1640 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1640 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d4f8b95909b91917b456f49d7a3ac270703cc96 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin matteo.casa...@gmx.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] doc export: add unit test for bug i106749
Hi Korrawit, On Fri, 2013-01-11 at 21:58 +0700, Korrawit Pruegsanusak wrote: Do we have a license to use this file? (no offense of course! :) I'm most concerned about the source files; having said that this is not an appropriate forum to raise legal concerns - please spam the legal@ alias and/or me directly :-) If we're worried - then constructing a suitable minimal test case manually would be a good option. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source
cui/source/tabpages/chardlg.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit eccae3ee63cc561c0b0ace0b95e9a2344081bb9c
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Jan 12 00:42:38 2013 +0900
Drop deserted m_aTransparentText
Its usage was gone with adda1a25f248586b46682bb9e19cd7a6b2c9debc.
Change-Id: I055c15f5154c6f78d2314d4b502ca3db751ab891
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 598edbc..ff52f40 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -237,7 +237,6 @@ struct SvxCharNamePage_Impl
{
Timer m_aUpdateTimer;
String m_aNoStyleText;
-String m_aTransparentText;
const FontList* m_pFontList;
sal_uInt16 m_nExtraEntryPos;
sal_Boolm_bMustDelete;
@@ -282,7 +281,6 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const
SfxItemSet rInSet )
, m_pImpl(new SvxCharNamePage_Impl)
{
m_pImpl-m_aNoStyleText = String( CUI_RES( RID_SVXSTR_CHARNAME_NOSTYLE ) );
-m_pImpl-m_aTransparentText = String( CUI_RES(
RID_SVXSTR_CHARNAME_TRANSPARENT ) );
SvtLanguageOptions aLanguageOptions;
sal_Bool bShowCJK = aLanguageOptions.IsCJKFontEnabled();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Failure to build 3.6 branch
Le 11/01/13 14:57, Alexander Thurgood a écrit : I'd rather guess simply a bug in the compiler (since it's on Mac, it's the old gcc-4.0.1, right?). Try if the file compiles successfully with 'make DEBUG=1', that will disable optimizations. No joy, still fails at exactly the same place, even if I just attempt to build with make DEBUG=1 unotools.all. Will try a general non-debug enabled build instead, but that kind of defeats my aim. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/ui/docshell/dbdocfun.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1975fe4be8347d244643a0fbab20357485d41522
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Jan 10 23:48:17 2013 -0500
fdo#59084: Sync dimension members after reloading the group data.
Else the syncing would end up syncing to the older version of the
group data before the reload, which (as you can see in the bug report)
may lead to a crash.
Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3
Reviewed-on: https://gerrit.libreoffice.org/1635
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-on: https://gerrit.libreoffice.org/1651
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index e424763..5216c68 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1330,6 +1330,8 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj,
const ScDPObject* pNewOb
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
+if (!pDestObj-SyncAllDimensionMembers())
+return false;
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
@@ -1472,8 +1474,6 @@ sal_uLong ScDBDocFunc::RefreshPivotTables(ScDPObject*
pDPObj, bool bApi)
for (; it != itEnd; ++it)
{
ScDPObject* pObj = *it;
-if (!pObj-SyncAllDimensionMembers())
-continue;
// This action is intentionally not undoable since it modifies cache.
DataPilotUpdate(pObj, pObj, false, bApi);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - formula/inc formula/source sc/inc sc/qa sc/source sc/util
formula/inc/formula/compiler.hrc | 42 ++---
formula/inc/formula/errorcodes.hxx |3
formula/inc/formula/opcode.hxx |2
formula/source/core/api/FormulaCompiler.cxx| 77 +++--
formula/source/core/api/token.cxx | 22 +-
formula/source/core/resource/core_resource.src | 12 +
sc/inc/helpids.h |2
sc/qa/unit/ucalc.cxx | 71
sc/source/core/inc/interpre.hxx|1
sc/source/core/tool/interpr1.cxx | 198 +++--
sc/source/core/tool/interpr4.cxx | 13 +
sc/source/core/tool/parclass.cxx |4
sc/source/core/tool/token.cxx |5
sc/source/ui/src/scfuncs.src | 64
sc/util/hidother.src |2
15 files changed, 458 insertions(+), 60 deletions(-)
New commits:
commit 3914d00c32c4226d3a73ffdd8985c887016887e0
Author: Eike Rathke er...@redhat.com
Date: Fri Jan 11 16:50:48 2013 +0100
fdo#56124 changes to add functions IFERROR and IFNA
* reimplemented actual ScIfError() function for matrix cases and simpler
pop/push of non-error values
* various smaller adaptions, see also inline comments of
https://gerrit.libreoffice.org/1522
Change-Id: I80a8235a2cbb548c0ef993862e76741af46e30d2
diff --git a/formula/inc/formula/errorcodes.hxx
b/formula/inc/formula/errorcodes.hxx
index a99dc7b..1e145e0 100644
--- a/formula/inc/formula/errorcodes.hxx
+++ b/formula/inc/formula/errorcodes.hxx
@@ -72,6 +72,9 @@ const sal_uInt16 errNestedArray = 533;
// be used to distinguish that condition from all other (inherited) errors. Do
// not use for anything else! Never push or inherit the error otherwise!
const sal_uInt16 errNotNumericString = 534;
+// ScInterpreter internal: jump matrix already has a result at this position,
+// do not overwrite in case of empty code path.
+const sal_uInt16 errJumpMatHasResult = 535;
// Interpreter: NA() not available condition, not a real error
const sal_uInt16 NOTAVAILABLE= 0x7fff;
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index e919123..d4d69dd 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1179,12 +1179,21 @@ void FormulaCompiler::Factor()
{
// the PC counters are -1
pFacToken = mpToken;
-if ( eOp == ocIf )
-pFacToken-GetJump()[ 0 ] = 3; // if, else, behind
-else if ( eOp == ocChose )
-pFacToken-GetJump()[ 0 ] = MAXJUMPCOUNT+1;
-else
-pFacToken-GetJump()[ 0 ] = 2; // if, else
+switch (eOp)
+{
+case ocIf:
+pFacToken-GetJump()[ 0 ] = 3; // if, else, behind
+break;
+case ocChose:
+pFacToken-GetJump()[ 0 ] = MAXJUMPCOUNT+1;
+break;
+case ocIfError:
+case ocIfNA:
+pFacToken-GetJump()[ 0 ] = 2; // if, behind
+break;
+default:
+SAL_WARN( formula.core, FormulaCompiler::Factor: forgot
to add a jump count case?);
+}
eOp = NextToken();
if (eOp == ocOpen)
{
@@ -1193,15 +1202,30 @@ void FormulaCompiler::Factor()
}
else
SetError(errPairExpected);
-short nJumpCount = 0;
PutCode( pFacToken );
-// during AutoCorrect (since pArr-GetCodeError() is
+// During AutoCorrect (since pArr-GetCodeError() is
// ignored) an unlimited ocIf would crash because
// ScRawToken::Clone() allocates the JumpBuffer according to
// nJump[0]*2+2, which is 3*2+2 on ocIf and 2*2+2 ocIfError and
ocIfNA.
+short nJumpMax;
OpCode eFacOpCode = pFacToken-GetOpCode();
-const short nJumpMax = ( eFacOpCode == ocIf ? 3 :
- ( eFacOpCode == ocChose ? MAXJUMPCOUNT
: 2 ) );
+switch (eFacOpCode)
+{
+case ocIf:
+nJumpMax = 3;
+break;
+case ocChose:
+nJumpMax = MAXJUMPCOUNT;
+break;
+case ocIfError:
+case ocIfNA:
+nJumpMax = 2;
+break;
+default:
+nJumpMax = 0;
+SAL_WARN( formula.core, FormulaCompiler::Factor: forgot
to add a jump max case?);
+}
+short nJumpCount = 0;
while ( (nJumpCount (MAXJUMPCOUNT - 1)) (eOp == ocSep)
[PUSHED] fdo#56124 add functions IFERROR and IFNA to calc as in ODFF1...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1522 Objections: Eike Rathke: Do not submit -- To view, visit https://gerrit.libreoffice.org/1522 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6403b51ac8c710ad3b8d2625e1482971f50e6b1d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#59084: Sync dimension members after reloading the group ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1651 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1651 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Extending Dictionaries
Thanks! I've extended it a bit and added a list of Contacts with the Maintainers of the Dictionaries found in the READMEs. I hope that this will encourage people to help update the dictionaries. But the list is not complete, and there may be errors, so everyone feel free to update or correct the list: http://wiki.documentfoundation.org/Development/Dictionaries Samuel Am 10.01.2013 16:53, schrieb Petr Mladek: I have created https://wiki.documentfoundation.org/Development/Dictionaries Feel free to update it or ask if anything is unclear. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 58aeb8e6aadd8511a700ec1c289bdc229f7592c9
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Jan 10 16:29:58 2013 +0100
sw unit test: layout dump must be resetted in 'reload' method
Otherwise tests relying on layout dumps will parse the wrong dump.
Change-Id: Ib7b4bc3a231eb3082567a1d1ed38c96835d43add
Reviewed-on: https://gerrit.libreoffice.org/1643
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 128983c..cc05b2b 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -251,6 +251,11 @@ protected:
uno::Referencelang::XComponent xComponent(xStorable, uno::UNO_QUERY);
xComponent-dispose();
mxComponent = loadFromDesktop(aTempFile.GetURL());
+if (mpXmlBuffer)
+{
+xmlBufferFree(mpXmlBuffer);
+mpXmlBuffer = 0;
+}
}
void finish()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] sw unit test: layout dump must be resetted in 'reload' metho...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1643 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1643 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7b4bc3a231eb3082567a1d1ed38c96835d43add Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ww8export/data/fdo56513.doc |binary
sw/qa/extras/ww8export/ww8export.cxx |9 +
2 files changed, 9 insertions(+)
New commits:
commit 40e0a5d73a5b7a0f23015ee481a94639400f581d
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Jan 10 16:10:53 2013 +0100
doc export: add unit test for fdo#56513
Change-Id: Ie87648368f877af56878bc83fe3d5ece66f77304
Reviewed-on: https://gerrit.libreoffice.org/1644
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/qa/extras/ww8export/data/fdo56513.doc
b/sw/qa/extras/ww8export/data/fdo56513.doc
new file mode 100644
index 000..f5be1c3
Binary files /dev/null and b/sw/qa/extras/ww8export/data/fdo56513.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index f7a8f04..7c61d95 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -42,6 +42,7 @@ public:
void testFdo46020();
void testFirstHeaderFooter();
void testZoom();
+void test56513();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -61,6 +62,7 @@ void Test::run()
{fdo46020.odt, Test::testFdo46020},
{first-header-footer.doc, Test::testFirstHeaderFooter},
{zoom.doc, Test::testZoom},
+{fdo56513.doc, Test::test56513},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -145,6 +147,13 @@ void Test::testZoom()
CPPUNIT_ASSERT_EQUAL(sal_Int16(42), nValue);
}
+void Test::test56513()
+{
+CPPUNIT_ASSERT_EQUAL(OUString(This is the header of the first section),
parseDump(/root/page[1]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(This is the first page header of the second
section), parseDump(/root/page[2]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(This is the non-first-page header of the
second section), parseDump(/root/page[3]/header/txt/text()));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit 87c66e9e3d7ab1351fac8db9aad80ed01e7634b6 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Thu Jan 10 18:41:05 2013 +0100 sw unit test: add call to CalcLayout before using the layout Change-Id: Ibb3f8175729cb579a687275a11884c397152fe94 Reviewed-on: https://gerrit.libreoffice.org/1645 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index cc05b2b..2bb2369 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -88,6 +88,7 @@ private: // create the dump SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument *(mxComponent.get()); SwDoc* pDoc = pTxtDoc-GetDocShell()-GetDoc(); +pDoc-GetCurrentViewShell()-CalcLayout(); SwRootFrm* pLayout = pDoc-GetCurrentLayout(); pLayout-dumpAsXml(pXmlWriter); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] doc export: add unit test for fdo#56513
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1644 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1644 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie87648368f877af56878bc83fe3d5ece66f77304 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] sw unit test: add call to CalcLayout before using the layout
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1645 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1645 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb3f8175729cb579a687275a11884c397152fe94 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ww8export/data/new-page-styles.doc |binary
sw/qa/extras/ww8export/ww8export.cxx|9 +
2 files changed, 9 insertions(+)
New commits:
commit 1874df3041789729478ef99ff156ccee489c6a7a
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Jan 10 18:42:38 2013 +0100
doc export: add unit test for bug i106749
Change-Id: I1df4cbb013d94cff7ae5195427044b1e1b2d8895
Reviewed-on: https://gerrit.libreoffice.org/1646
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
diff --git a/sw/qa/extras/ww8export/data/new-page-styles.doc
b/sw/qa/extras/ww8export/data/new-page-styles.doc
new file mode 100644
index 000..c3886fd
Binary files /dev/null and b/sw/qa/extras/ww8export/data/new-page-styles.doc
differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 7c61d95..650fbbf 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -43,6 +43,7 @@ public:
void testFirstHeaderFooter();
void testZoom();
void test56513();
+void testNewPageStylesTable();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -63,6 +64,7 @@ void Test::run()
{first-header-footer.doc, Test::testFirstHeaderFooter},
{zoom.doc, Test::testZoom},
{fdo56513.doc, Test::test56513},
+{new-page-styles.doc, Test::testNewPageStylesTable},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -154,6 +156,13 @@ void Test::test56513()
CPPUNIT_ASSERT_EQUAL(OUString(This is the non-first-page header of the
second section), parseDump(/root/page[3]/header/txt/text()));
}
+void Test::testNewPageStylesTable()
+{
+CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Goals and Results
(Page 1)*), parseDump(/root/page[1]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Assessment (Page
2)), parseDump(/root/page[2]/header/txt/text()));
+CPPUNIT_ASSERT_EQUAL(OUString(Sigma Space Performance Goals: Next Year
(Page 3)***), parseDump(/root/page[3]/header/txt/text()));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] doc export: add unit test for bug i106749
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1646 Approvals: Noel Power: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1646 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1df4cbb013d94cff7ae5195427044b1e1b2d8895 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/undo/unins.cxx | 21 +
1 file changed, 21 insertions(+)
New commits:
commit f132eaa5a6ec6fd3051442bda9caf94a3341c680
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jan 11 17:32:18 2013 +0100
fdo#53487 SwUndoInsert: take care of fieldmarks when deleting field chars
The problem was that while SwUndoInsert removed the field characters, it
didn't remove the fieldmark, so after unding a comment insert, it wasn't
possible to re-insert a comment.
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 0dbb1be..473a915 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -25,6 +25,7 @@
#include sot/storage.hxx
#include editeng/keepitem.hxx
#include svx/svdobj.hxx
+#include xmloff/odffields.hxx
#include docsh.hxx
#include fmtcntnt.hxx
@@ -242,6 +243,26 @@ void SwUndoInsert::UndoImpl(::sw::UndoRedoContext
rContext)
RemoveIdxFromRange( aPaM, sal_False );
pTxt = new String( pTxtNode-GetTxt().Copy(nCntnt-nLen, nLen)
);
pTxtNode-EraseText( aPaM.GetPoint()-nContent, nLen );
+
+// Undo deletes fieldmarks in two step: first the end then the
start position.
+// Once the start position is deleted, make sure the fieldmark
itself is deleted as well.
+if (nLen == 1)
+{
+IDocumentMarkAccess* const pMarkAccess =
pTmpDoc-getIDocumentMarkAccess();
+for ( IDocumentMarkAccess::const_iterator_t i =
pMarkAccess-getMarksBegin(); i != pMarkAccess-getMarksEnd(); ++i)
+{
+sw::mark::IMark* pMark = i-get();
+if (pMark-GetMarkStart() == *aPaM.GetPoint()
pMark-GetMarkStart().nContent == aPaM.GetPoint()-nContent)
+{
+sw::mark::IFieldmark* pFieldmark =
dynamic_castsw::mark::IFieldmark*(pMark);
+if (pFieldmark pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE)
+{
+
pTmpDoc-getIDocumentMarkAccess()-deleteMark(pMark);
+break;
+}
+}
+}
+}
}
else// otherwise Graphics/OLE/Text/...
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 194ba3a2cacbb5438dfcb8fb35167055e01ca251
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Jan 11 17:40:39 2013 +0100
docx import: fix incorrect nested table margins
Change-Id: I07f0f47fcbd3d463d7831820cde338d8d59d9b68
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index b5c993b..46c418d 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -414,7 +414,9 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
{
aTableBorder.LeftLine = aLeftBorder;
aTableBorder.IsLeftLineValid = sal_True;
-rInfo.nLeftBorderDistance += aLeftBorder.LineWidth * 0.5;
+// Only top level table position depends on border width
+if (rInfo.nNestLevel == 1)
+rInfo.nLeftBorderDistance += aLeftBorder.LineWidth * 0.5;
}
if (lcl_extractTableBorderProperty(m_aTableProperties,
PROP_RIGHT_BORDER, rInfo, aBorderLine))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scripting/source
scripting/source/pyprov/mailmerge.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7a7e19c166df326c45f76a142b478b0629f784c9
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 11 18:29:14 2013 +0100
fdo#59249: String literal needs a b prefix in Pyhton 3
as the corresponding test is otherwise seen to fail, with user being b, but
I have
no idea if this is the most Python-3-ish approach to fix that, or whether
more code
needs to be fixed, too.
Change-Id: Ia7fbcbca3cf578ffe1bd5ce3c7c5b709cc77317e
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index e87f9a5..cc7a5df 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -101,7 +101,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
user = xAuthenticator.getUserName().encode('ascii')
password = xAuthenticator.getPassword().encode('ascii')
- if user != '':
+ if user != b'':
if dbg:
print(Logging in, username of + user,
file=dbgout)
self.server.login(user, password)
@@ -281,7 +281,7 @@ class PyMailIMAPService(unohelper.Base, XMailService):
user = xAuthenticator.getUserName().encode('ascii')
password = xAuthenticator.getPassword().encode('ascii')
- if user != '':
+ if user != b'':
if dbg:
print(Logging in, username of + user,
file=dbgout)
self.server.login(user, password)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scripting/source
scripting/source/pyprov/mailmerge.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ac56d9373a66378a04048993ed5aec65cf39f149
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 11 18:32:04 2013 +0100
Can't convert 'Enum' resp. 'bytes' object to str implicitly
...when you set dbg = True
Change-Id: Ifc170e9336a662dce2ae59227baf3bea692eedac
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index cc7a5df..9dce4d3 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -103,7 +103,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
password = xAuthenticator.getPassword().encode('ascii')
if user != b'':
if dbg:
- print(Logging in, username of + user,
file=dbgout)
+ print(Logging in, username of, user,
file=dbgout)
self.server.login(user, password)
for listener in self.listeners:
@@ -381,7 +381,7 @@ class PyMailServiceProvider(unohelper.Base,
XMailServiceProvider):
self.ctx = ctx
def create(self, aType):
if dbg:
- print(PyMailServiceProvider create with + aType,
file=dbgout)
+ print(PyMailServiceProvider create with, aType,
file=dbgout)
if aType == SMTP:
return PyMailSMTPService(self.ctx);
elif aType == POP3:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: fdo#53487 SwUndoInsert: take care of fieldmarks when deletin...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1652
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/1652/1
fdo#53487 SwUndoInsert: take care of fieldmarks when deleting field chars
The problem was that while SwUndoInsert removed the field characters, it
didn't remove the fieldmark, so after unding a comment insert, it wasn't
possible to re-insert a comment.
(cherry picked from commit ecce43877167c1cd6e24208208aed4274100c11a)
Change-Id: If42b0992be29e3336b8e9d736497e4fb09184c55
---
M sw/source/core/undo/unins.cxx
1 file changed, 21 insertions(+), 0 deletions(-)
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index d1cef84..03cc454 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -25,6 +25,7 @@
#include sot/storage.hxx
#include editeng/keepitem.hxx
#include svx/svdobj.hxx
+#include xmloff/odffields.hxx
#include docsh.hxx
#include fmtcntnt.hxx
@@ -250,6 +251,26 @@
RemoveIdxFromRange( aPaM, sal_False );
pTxt = new String( pTxtNode-GetTxt().Copy(nCntnt-nLen, nLen)
);
pTxtNode-EraseText( aPaM.GetPoint()-nContent, nLen );
+
+// Undo deletes fieldmarks in two step: first the end then the
start position.
+// Once the start position is deleted, make sure the fieldmark
itself is deleted as well.
+if (nLen == 1)
+{
+IDocumentMarkAccess* const pMarkAccess =
pTmpDoc-getIDocumentMarkAccess();
+for ( IDocumentMarkAccess::const_iterator_t i =
pMarkAccess-getMarksBegin(); i != pMarkAccess-getMarksEnd(); ++i)
+{
+sw::mark::IMark* pMark = i-get();
+if (pMark-GetMarkStart() == *aPaM.GetPoint()
pMark-GetMarkStart().nContent == aPaM.GetPoint()-nContent)
+{
+sw::mark::IFieldmark* pFieldmark =
dynamic_castsw::mark::IFieldmark*(pMark);
+if (pFieldmark pFieldmark-GetFieldname() ==
ODF_COMMENTRANGE)
+{
+
pTmpDoc-getIDocumentMarkAccess()-deleteMark(pMark);
+break;
+}
+}
+}
+}
}
else// otherwise Graphics/OLE/Text/...
{
--
To view, visit https://gerrit.libreoffice.org/1652
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If42b0992be29e3336b8e9d736497e4fb09184c55
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/ui/docshell/dbdocfun.cxx | 146 +++--
sc/source/ui/inc/dbdocfun.hxx |2
sc/source/ui/view/dbfunc3.cxx |2
sc/source/ui/view/gridwin2.cxx |2
4 files changed, 146 insertions(+), 6 deletions(-)
New commits:
commit d99abd61a9091426bfccd871d6a8f036d5f49479
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jan 11 12:51:13 2013 -0500
Let's not return here to prevent memory leak.
There are several heap objects that are deleted at the end of the
method. Returning prematurely would leak those objects.
Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 403ecd3..d0e3ebb 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1320,8 +1320,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj,
const ScDPObject* pNewOb
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
-if (!pDestObj-SyncAllDimensionMembers())
-return false;
+pDestObj-SyncAllDimensionMembers();
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
commit feef29286f0a7c6abd512a07fce9ef48327e0a78
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri Jan 11 12:12:09 2013 -0500
Create a self-update variant of DataPilotUpdate().
DataPilotUpdate() is getting more and more complicated, with so many
branches. Since self-updating a pivot table object is common, let's
create a variant just for that. This variant has much less branching.
Change-Id: I75b0512258a09961ef13516d8d9bc8a2939287e1
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 3b1db2f..403ecd3 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -50,6 +50,7 @@
#include progress.hxx
#include set
+#include memory
using namespace ::com::sun::star;
@@ -1448,6 +1449,144 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj,
const ScDPObject* pNewOb
return bDone;
}
+bool ScDBDocFunc::UpdatePivotTable(ScDPObject rDPObj, bool bRecord, bool bApi)
+{
+ScDocShellModificator aModificator( rDocShell );
+WaitObject aWait( rDocShell.GetActiveDialogParent() );
+
+std::auto_ptrScDocument pOldUndoDoc;
+std::auto_ptrScDocument pNewUndoDoc;
+
+ScDPObject aUndoDPObj(rDPObj); // For undo or revert on failure.
+
+ScDocument* pDoc = rDocShell.GetDocument();
+if (bRecord !pDoc-IsUndoEnabled())
+bRecord = false;
+
+if (!rDocShell.IsEditable() || pDoc-GetChangeTrack())
+{
+// not recorded - disallow
+//! different error messages?
+if (!bApi)
+rDocShell.ErrorMessage(STR_PROTECTIONERR);
+
+return false;
+}
+
+{
+ScEditableTester aTester(pDoc, rDPObj.GetOutRange());
+if (!aTester.IsEditable())
+{
+if (!bApi)
+rDocShell.ErrorMessage(aTester.GetMessageId());
+
+return false;
+}
+}
+
+if (bRecord)
+{
+ScRange aRange = rDPObj.GetOutRange();
+SCTAB nTab = aRange.aStart.Tab();
+pOldUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
+pOldUndoDoc-InitUndo( pDoc, nTab, nTab );
+pDoc-CopyToDocument(aRange, IDF_ALL, false, pOldUndoDoc.get());
+}
+
+rDPObj.SetAllowMove(false);
+rDPObj.ReloadGroupTableData();
+if (!rDPObj.SyncAllDimensionMembers())
+return false;
+
+rDPObj.InvalidateData(); // before getting the new output area
+
+// make sure the table has a name (not set by dialog)
+if (rDPObj.GetName().isEmpty())
+rDPObj.SetName( pDoc-GetDPCollection()-CreateNewName() );
+
+bool bOverflow = false;
+ScRange aNewOut = rDPObj.GetNewOutputRange(bOverflow);
+
+//! test for overlap with other data pilot tables
+const ScSheetSourceDesc* pSheetDesc = rDPObj.GetSheetDesc();
+if (pSheetDesc pSheetDesc-GetSourceRange().Intersects(aNewOut))
+{
+ScRange aOldRange = rDPObj.GetOutRange();
+SCsROW nDiff = aOldRange.aStart.Row()-aNewOut.aStart.Row();
+aNewOut.aStart.SetRow( aOldRange.aStart.Row() );
+aNewOut.aEnd.SetRow( aNewOut.aEnd.Row()+nDiff );
+if (!ValidRow(aNewOut.aStart.Row()) || !ValidRow(aNewOut.aEnd.Row()))
+bOverflow = true;
+}
+
+if (bOverflow)
+{
+// like with STR_PROTECTIONERR, use undo to reverse everything
+OSL_ENSURE( bRecord, DataPilotUpdate: can't undo );
+
+if (!bApi)
+rDocShell.ErrorMessage(STR_PIVOT_ERROR);
+
+rDPObj = aUndoDPObj;
+return false;
+}
+
+{
+ScEditableTester aTester(pDoc, aNewOut);
+if
[PATCH] Change in core[libreoffice-4-0]: Let's not return here to prevent memory leak.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1653
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/1653/1
Let's not return here to prevent memory leak.
There are several heap objects that are deleted at the end of the
method. Returning prematurely would leak those objects.
Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
---
M sc/source/ui/docshell/dbdocfun.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 3b1db2f..9f4d58d 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1319,8 +1319,7 @@
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
-if (!pDestObj-SyncAllDimensionMembers())
-return false;
+pDestObj-SyncAllDimensionMembers();
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
--
To view, visit https://gerrit.libreoffice.org/1653
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 4-0] Re: Adding hyphenation patterns for Swedish
Thank you for creating the patch, I hope that I'll be able to do it myself the next time. :) Regards, Niklas Johansson Petr Mladek skrev 2013-01-10 12:19: Hi Niklas, I have added the dictionary into master, see http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=9cfd4282a7a522bed2dc4f4b9ede2c8ee444c29b We need one review to get it into 4-0 branch. Thanks for the nice improvement. Best Regards, Petr Niklas Johansson píše v Po 07. 01. 2013 v 20:02 +0100: What would be the easiest way to add the hyphenation patterns bundled with LibreOffice? I've updated the hyphenation extension on the LibreOffice extension site: http://extensions.libreoffice.org/extension-center/swedish-hyphenation Regards, Niklas Johansson Petr Mladek skrev 2012-12-03 12:25: Niklas Johansson píše v Ne 02. 12. 2012 v 21:07 +0100: I thought I would add Swedish hyphenation patterns to the next release of LibreOffice. The plan was to do it together with an update of the spelling dictionary that is planed in mid January. Sounds great. Since Swedish doesn't have any patterns bundled today, will there be any problems with the feature freeze? Or will it be possible to add it together with the update of the spelling dictionary? It should not be a problem. We are less strict in this area. I am not aware about any breakage or regression caused by updating or adding a dictionary. We are looking forward to update and add the dictionary. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Let's not return here to prevent memory leak.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1654
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/1654/1
Let's not return here to prevent memory leak.
There are several heap objects that are deleted at the end of the
method. Returning prematurely would leak those objects.
Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
---
M sc/source/ui/docshell/dbdocfun.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 5216c68..9fea320 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1330,8 +1330,7 @@
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
-if (!pDestObj-SyncAllDimensionMembers())
-return false;
+pDestObj-SyncAllDimensionMembers();
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
--
To view, visit https://gerrit.libreoffice.org/1654
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/inc sw/source
sw/inc/hhcwrp.hxx | 32 ++---
sw/source/ui/lingu/hhcwrp.cxx | 240 +-
2 files changed, 136 insertions(+), 136 deletions(-)
New commits:
commit f902073e4790ab3de1d48758d4e38ba583809030
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Fri Jan 11 19:07:05 2013 +0100
Update style of initializer list to preferred convention
Change-Id: Ia8874a881d2a625500bbf74997ab75457e6f6b7e
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index a5bea20..260afda 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -94,27 +94,27 @@ SwHHCWrapper::SwHHCWrapper(
const Font *pTargetFont,
sal_Int32 nConvOptions,
sal_Bool bIsInteractive,
-sal_Bool bStart, sal_Bool bOther, sal_Bool bSelection ) :
-editeng::HangulHanjaConversion( pSwView-GetEditWin(), rxContext,
+sal_Bool bStart, sal_Bool bOther, sal_Bool bSelection )
+: editeng::HangulHanjaConversion( pSwView-GetEditWin(), rxContext,
LanguageTag( nSourceLanguage ).getLocale(),
LanguageTag( nTargetLanguage ).getLocale(),
pTargetFont,
nConvOptions,
-bIsInteractive ),
-m_pView( pSwView ),
-m_pWin( pSwView-GetEditWin() ),
-m_rWrtShell( pSwView-GetWrtShell() ),
-m_pConvArgs( 0 ),
-m_nLastPos( 0 ),
-m_nUnitOffset( 0 ),
-m_nPageCount( 0 ),
-m_nPageStart( 0 ),
-m_bIsDrawObj( sal_False ),
-m_bIsOtherCntnt( bOther ),
-m_bStartChk( bOther ),
-m_bIsSelection( bSelection ),
-m_bStartDone( bOther || bStart ),
-m_bEndDone( sal_False )
+bIsInteractive )
+, m_pView( pSwView )
+, m_pWin( pSwView-GetEditWin() )
+, m_rWrtShell( pSwView-GetWrtShell() )
+, m_pConvArgs( 0 )
+, m_nLastPos( 0 )
+, m_nUnitOffset( 0 )
+, m_nPageCount( 0 )
+, m_nPageStart( 0 )
+, m_bIsDrawObj( sal_False )
+, m_bIsOtherCntnt( bOther )
+, m_bStartChk( bOther )
+, m_bIsSelection( bSelection )
+, m_bStartDone( bOther || bStart )
+, m_bEndDone( sal_False )
{
}
commit b0cf4b3ef6438b1e049ed7db5840d698f3200a34
Author: Matteo Casalin matteo.casa...@gmx.com
Date: Fri Jan 11 18:50:30 2013 +0100
Update name of data members to preferred convention
Change-Id: I2ce959942f95a123d2ec75a7df2194dff11fac64
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 1ab2251..18fcd65 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -31,27 +31,27 @@ class SwPaM;
class SwHHCWrapper : public editeng::HangulHanjaConversion
{
-SwView *mpView;
-Window* mpWin;
-SwWrtShell mrWrtShell;
+SwView *m_pView;
+Window* m_pWin;
+SwWrtShell m_rWrtShell;
-SwConversionArgs *mpConvArgs;/** object for arguments (and results)
needed
+SwConversionArgs *m_pConvArgs;/** object for arguments (and results)
needed
to find of next convertible text
portion */
-xub_StrLen mnLastPos; /** starting position of the last found
text part
+xub_StrLen m_nLastPos; /** starting position of the last found
text part
(needs to be sth that gets not moved
like
SwPaM or SwPosition by replace
operations!) */
-sal_Int32 mnUnitOffset;
+sal_Int32 m_nUnitOffset;
-sal_uInt16 mnPageCount; /// page count for progress bar
-sal_uInt16 mnPageStart; /// first checked page
+sal_uInt16 m_nPageCount; /// page count for progress bar
+sal_uInt16 m_nPageStart; /// first checked page
-sal_BoolmbIsDrawObj;
-sal_BoolmbIsOtherCntnt;
-sal_BoolmbStartChk;
-sal_BoolmbIsSelection; /// true if only the selected text
should be converted
-sal_BoolmbStartDone;
-sal_BoolmbEndDone;
+sal_Boolm_bIsDrawObj;
+sal_Boolm_bIsOtherCntnt;
+sal_Boolm_bStartChk;
+sal_Boolm_bIsSelection; /// true if only the selected text
should be converted
+sal_Boolm_bStartDone;
+sal_Boolm_bEndDone;
/// from SvxSpellWrapper copied and modified
sal_BoolConvNext_impl();/// former SpellNext
@@ -71,8 +71,8 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
SwPaM *pCrsr );
voidChangeText_impl( const String rNewText, sal_Bool
bKeepAttributes );
-inline sal_Bool IsDrawObj() { return mbIsDrawObj; }
-inline void SetDrawObj( sal_Bool bNew ) { mbIsDrawObj = bNew; }
+inline sal_Bool IsDrawObj() { return m_bIsDrawObj; }
+inline void SetDrawObj( sal_Bool bNew ) { m_bIsDrawObj = bNew; }
protected:
virtual voidGetNextPortion(
[Libreoffice-commits] .: scripting/source
scripting/source/pyprov/mailmerge.py |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9dec0c79011a0c09068d86fba9387c67da84a39b
Author: Michael Stahl mst...@redhat.com
Date: Fri Jan 11 19:07:08 2013 +0100
fdo#59249: mailmerge.py: some more bytes vs. str mangling
Obvious problems are in debug code only.
Change-Id: I45aafb4f194a5a020bb95bd96c2d92ca7ee578f8
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index 9dce4d3..cfbe761 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -103,7 +103,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
password = xAuthenticator.getPassword().encode('ascii')
if user != b'':
if dbg:
- print(Logging in, username of, user,
file=dbgout)
+ print(Logging in, username of +
user.decode('ascii'), file=dbgout)
self.server.login(user, password)
for listener in self.listeners:
@@ -137,7 +137,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
bccrecipients = xMailMessage.getBccRecipients()
if dbg:
print(PyMailSMTPService subject + subject,
file=dbgout)
- print(PyMailSMTPService from +
sendername.encode('utf-8'), file=dbgout)
+ print(PyMailSMTPService from + sendername,
file=dbgout)
print(PyMailSMTPService from + sendermail,
file=dbgout)
print(PyMailSMTPService send to + recipients,
file=dbgout)
@@ -283,7 +283,7 @@ class PyMailIMAPService(unohelper.Base, XMailService):
password = xAuthenticator.getPassword().encode('ascii')
if user != b'':
if dbg:
- print(Logging in, username of + user,
file=dbgout)
+ print(Logging in, username of +
user.decode('ascii'), file=dbgout)
self.server.login(user, password)
for listener in self.listeners:
@@ -351,7 +351,7 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
user = xAuthenticator.getUserName().encode('ascii')
password = xAuthenticator.getPassword().encode('ascii')
if dbg:
- print(Logging in, username of + user, file=dbgout)
+ print(Logging in, username of + user.decode('ascii'),
file=dbgout)
self.server.user(user)
self.server.pass_(user, password)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
