[Libreoffice-commits] .: canvas/source slideshow/source
canvas/source/tools/spriteredrawmanager.cxx | 21 +++--
slideshow/source/engine/shapes/drawshape.cxx |1 -
2 files changed, 19 insertions(+), 3 deletions(-)
New commits:
commit 7ffe517dea4190334c1ddf376af17ddfc1d3f128
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Nov 3 08:13:08 2011 +0100
RangeExpander functor removed, but needed in one place.
Added a local class for it: there may be a better fix, but it avoids the
build to break.
Removed a few remaining includes
diff --git a/canvas/source/tools/spriteredrawmanager.cxx
b/canvas/source/tools/spriteredrawmanager.cxx
index 32faba6..730361c 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -36,7 +36,6 @@
#include basegfx/range/b2drectangle.hxx
#include basegfx/tools/canvastools.hxx
#include basegfx/vector/b2dsize.hxx
-#include basegfx/range/rangeexpander.hxx
#include algorithm
#include o3tl/compat_functional.hxx
@@ -223,6 +222,24 @@ namespace canvas
SpriteRedrawManager::SpriteConnectedRanges mrUpdater;
const SpriteRedrawManager::VectorOfChangeRecords
mrChangeContainer;
};
+
+class RangeExpander
+{
+private:
+basegfx::B2DRange mrBounds;
+
+public:
+typedef voidresult_type;
+
+RangeExpander( basegfx::B2DRange rBounds ) : mrBounds(
rBounds )
+{
+}
+
+void operator()( const basegfx::B2DRange rBounds )
+{
+mrBounds.expand( rBounds );
+}
+};
}
void SpriteRedrawManager::setupUpdateAreas( SpriteConnectedRanges
rUpdateAreas ) const
@@ -424,7 +441,7 @@ namespace canvas
::basegfx::B2DRange aTrueArea( aBegin-second.getUpdateArea() );
::std::for_each( aBegin,
aEnd,
- ::boost::bind( ::basegfx::B2DRangeExpander(aTrueArea),
+ ::boost::bind( RangeExpander(aTrueArea),
::boost::bind(
SpriteInfo::getUpdateArea,
::boost::bind(
::o3tl::select2ndAreaComponent(),
_1 ) ) )
);
diff --git a/slideshow/source/engine/shapes/drawshape.cxx
b/slideshow/source/engine/shapes/drawshape.cxx
index 153ffb2..f4b21a9 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -47,7 +47,6 @@
#include vcl/wrkwin.hxx
#include basegfx/numeric/ftools.hxx
-#include basegfx/range/rangeexpander.hxx
#include rtl/math.hxx
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/inc editeng/source unusedcode.easy
editeng/inc/editeng/editeng.hxx| 30 -- editeng/source/editeng/editeng.cxx | 176 - unusedcode.easy| 25 - 3 files changed, 1 insertion(+), 230 deletions(-) New commits: commit 46bc8b9027a6a68791973a3da702db39b3cd0e30 Author: Felix Zhang fezh...@suse.com Date: Thu Nov 3 15:59:37 2011 +0800 remove unused methods in EditEngine diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index 0db0464..f23223e 100644 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -135,7 +135,6 @@ public: const SfxItemSet GetEmptyItemSet(); voidSetDefTab( sal_uInt16 nDefTab ); -sal_uInt16 GetDefTab() const; voidSetRefDevice( OutputDevice* pRefDef ); OutputDevice* GetRefDevice() const; @@ -150,7 +149,6 @@ public: Color GetBackgroundColor() const; Color GetAutoColor() const; voidEnableAutoColor( sal_Bool b ); -sal_BoolIsAutoColorEnabled() const; voidForceAutoColor( sal_Bool b ); sal_BoolIsForceAutoColor() const; @@ -161,7 +159,6 @@ public: sal_uInt16 GetViewCount() const; sal_BoolHasView( EditView* pView ) const; EditView* GetActiveView() const; -voidSetActiveView( EditView* pView ); voidSetPaperSize( const Size rSize ); const Size GetPaperSize() const; @@ -170,7 +167,6 @@ public: sal_BoolIsVertical() const; voidSetFixedCellHeight( sal_Bool bUseFixedCellHeight ); -sal_BoolIsFixedCellHeight() const; voidSetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ); EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; @@ -181,18 +177,14 @@ public: voidTransliterateText( const ESelection rSelection, sal_Int32 nTransliterationMode ); voidSetAsianCompressionMode( sal_uInt16 nCompression ); -sal_uInt16 GetAsianCompressionMode() const; voidSetKernAsianPunctuation( sal_Bool bEnabled ); -sal_BoolIsKernAsianPunctuation() const; voidSetAddExtLeading( sal_Bool b ); -sal_BoolIsAddExtLeading() const; voidSetPolygon( const basegfx::B2DPolyPolygon rPolyPolygon ); voidSetPolygon( const basegfx::B2DPolyPolygon rPolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon); voidClearPolygon(); -const PolyPolygon* GetPolygon(); const Size GetMinAutoPaperSize() const; voidSetMinAutoPaperSize( const Size rSz ); @@ -218,7 +210,6 @@ public: voidGetLineBoundaries( /*out*/sal_uInt16 rStart, /*out*/sal_uInt16 rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const; sal_uInt16 GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const; sal_uInt32 GetLineHeight( sal_uInt16 nParagraph, sal_uInt16 nLine = 0 ); -sal_uInt16 GetFirstLineOffset( sal_uInt16 nParagraph ); ParagraphInfos GetParagraphInfos( sal_uInt16 nPara ); sal_uInt16 FindParagraph( long nDocPosY ); EPosition FindDocPosition( const Point rDocPos ) const; @@ -227,7 +218,6 @@ public: String GetWord( sal_uInt16 nPara, xub_StrLen nIndex ); ESelection GetWord( const ESelection rSelection, sal_uInt16 nWordType ) const; -ESelection SelectSentence( const ESelection rCurSel ) const; voidClear(); voidSetText( const String rStr ); @@ -241,7 +231,6 @@ public: voidInsertParagraph( sal_uInt16 nPara, const EditTextObject rTxtObj ); voidInsertParagraph( sal_uInt16 nPara, const String rText); -voidSetText( sal_uInt16 nPara, const EditTextObject rTxtObj ); voidSetText( sal_uInt16 nPara, const String rText); virtual voidSetParaAttribs( sal_uInt16 nPara, const SfxItemSet rSet ); @@ -261,7 +250,6 @@ public: voidRemoveAttribs( const ESelection rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); voidShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow = sal_True ); -sal_BoolIsParagraphVisible( sal_uInt16 nParagraph ); ::svl::IUndoManager GetUndoManager(); @@ -285,7 +273,6 @@ public: LinkGetModifyHdl() const; sal_BoolIsInSelectionMode() const; -voidStopSelectionMode(); voidStripPortions(); voidGetPortions( sal_uInt16 nPara, std::vectorsal_uInt16 rList ); @@ -347,12 +334,6 @@ public: voidSetWordDelimiters( const String rDelimiters ); String
[Libreoffice-commits] .: distro-configs/LibreOfficeAndroid.conf
distro-configs/LibreOfficeAndroid.conf |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 223aa43ad4e7f5529c003d12138a3c50ddb918c8 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 3 10:44:52 2011 +0200 Disable xmlsec for Android diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 6075646..255ae6a 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -1,4 +1,6 @@ --host=arm-linux-androideabi +--disable-cairo-canvas +--disable-ext-pdfimport --disable-gconf --disable-gnome-vfs --disable-gstreamer @@ -11,8 +13,7 @@ --disable-randr --disable-randr-link --disable-systray ---disable-ext-pdfimport ---disable-cairo-canvas +--disable-xmlsec --enable-python=internal --without-fonts --without-java ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/tools/spriteredrawmanager.cxx | 22 +++---
1 file changed, 3 insertions(+), 19 deletions(-)
New commits:
commit 7c22d03fb6394ae4b9a82061cb160c1bcd7df8da
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Nov 3 09:48:52 2011 +0100
Better fix for removed RangeExpander
The sole reason for that late class was the overloaded
Range::expand() method - but it's actually quite easy to
disambiguate that for boost::bind.
diff --git a/canvas/source/tools/spriteredrawmanager.cxx
b/canvas/source/tools/spriteredrawmanager.cxx
index 730361c..8f6f306 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -222,24 +222,6 @@ namespace canvas
SpriteRedrawManager::SpriteConnectedRanges mrUpdater;
const SpriteRedrawManager::VectorOfChangeRecords
mrChangeContainer;
};
-
-class RangeExpander
-{
-private:
-basegfx::B2DRange mrBounds;
-
-public:
-typedef voidresult_type;
-
-RangeExpander( basegfx::B2DRange rBounds ) : mrBounds(
rBounds )
-{
-}
-
-void operator()( const basegfx::B2DRange rBounds )
-{
-mrBounds.expand( rBounds );
-}
-};
}
void SpriteRedrawManager::setupUpdateAreas( SpriteConnectedRanges
rUpdateAreas ) const
@@ -441,7 +423,9 @@ namespace canvas
::basegfx::B2DRange aTrueArea( aBegin-second.getUpdateArea() );
::std::for_each( aBegin,
aEnd,
- ::boost::bind( RangeExpander(aTrueArea),
+ ::boost::bind( (void (basegfx::B2DRange::*)(const
basegfx::B2DRange))(
+basegfx::B2DRange::expand),
+aTrueArea,
::boost::bind(
SpriteInfo::getUpdateArea,
::boost::bind(
::o3tl::select2ndAreaComponent(),
_1 ) ) )
);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bug/bug
bug/bug/bug.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7d5caeb31b3bb42d2efe48f6bab1695a110ce637
Author: Loic Dachary l...@dachary.org
Date: Thu Nov 3 10:39:02 2011 +0100
https://bugs.freedesktop.org/show_bug.cgi?id=42525
Add missing $.bug.url when building the related bugs urls.
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 388f04f..a875eaf 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -283,7 +283,7 @@
var lines = data.split('\n');
var bug_urls = [];
for(var i = 1; i lines.length; i++) {
-bug_urls.push(lines[i].replace(/([0-9]*),(.*)/,'a
href=/show_bug.cgi?id=$1$2/a'));
+bug_urls.push(lines[i].replace(/([0-9]*),(.*)/,'a
href=' + $.bug.url + '/show_bug.cgi?id=$1$2/a'));
}
$('.related_bugs').html(bug_urls.join('br'));
});
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - unusedcode.easy vcl/inc vcl/source
unusedcode.easy | 46 --
vcl/inc/vcl/salbtype.hxx | 17 +
vcl/source/gdi/bitmap.cxx | 41 ++---
3 files changed, 19 insertions(+), 85 deletions(-)
New commits:
commit b9474a8cacd02bcb7b2d3b48e20eed266923a6e2
Author: Michael Meeks michael.me...@suse.com
Date: Thu Nov 3 11:32:23 2011 +
Cleanup inline IsGreyPalette implementation for mac platforms.
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 111fdec..3e8c4c9 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -180,8 +180,8 @@ class VCL_DLLPUBLIC BitmapPalette
private:
BitmapColor*mpBitmapColor;
-sal_uInt16 mnCount;
-
+sal_uInt16 mnCount;
+boolmbIsGrey;
public:
@@ -196,18 +196,19 @@ public:
inline ~BitmapPalette();
inline BitmapPalette operator=( const BitmapPalette rBitmapPalette
);
-inline sal_Bool operator==( const BitmapPalette
rBitmapPalette ) const;
-inline sal_Bool operator!=( const BitmapPalette
rBitmapPalette ) const;
-inline sal_Bool operator!();
+inline sal_Bool operator==( const BitmapPalette
rBitmapPalette ) const;
+inline sal_Bool operator!=( const BitmapPalette
rBitmapPalette ) const;
+inline sal_Bool operator!();
-inline sal_uInt16 GetEntryCount() const;
+inline sal_uInt16 GetEntryCount() const;
inline void SetEntryCount( sal_uInt16 nCount );
inline const BitmapColor operator[]( sal_uInt16 nIndex ) const;
inline BitmapColor operator[]( sal_uInt16 nIndex );
-inline sal_uInt16 GetBestIndex( const BitmapColor rCol )
const;
-boolIsGreyPalette() const;
+inline sal_uInt16 GetBestIndex( const BitmapColor rCol ) const;
+boolIsGreyPalette() const { return mbIsGrey; }
+voidSetGreyPalette( bool bGrey ) { mbIsGrey =
bGrey; }
};
// ---
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 318ba68..4df609a 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -177,6 +177,7 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
aGreyPalette2.SetEntryCount( 2 );
aGreyPalette2[ 0 ] = BitmapColor( 0, 0, 0 );
aGreyPalette2[ 1 ] = BitmapColor( 255, 255, 255 );
+aGreyPalette2.SetGreyPalette( true );
}
return aGreyPalette2;
@@ -190,6 +191,7 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
aGreyPalette4[ 1 ] = BitmapColor( 85, 85, 85 );
aGreyPalette4[ 2 ] = BitmapColor( 170, 170, 170 );
aGreyPalette4[ 3 ] = BitmapColor( 255, 255, 255 );
+aGreyPalette4.SetGreyPalette( true );
}
return aGreyPalette4;
@@ -204,6 +206,7 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
for( sal_uInt16 i = 0; i 16; i++, cGrey =
sal::static_int_castsal_uInt8(cGrey + cGreyInc) )
aGreyPalette16[ i ] = BitmapColor( cGrey, cGrey, cGrey );
+aGreyPalette16.SetGreyPalette( true );
}
return aGreyPalette16;
@@ -216,6 +219,7 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
for( sal_uInt16 i = 0; i 256; i++ )
aGreyPalette256[ i ] = BitmapColor( (sal_uInt8) i,
(sal_uInt8) i, (sal_uInt8) i );
+aGreyPalette256.SetGreyPalette( true );
}
return aGreyPalette256;
@@ -224,7 +228,7 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
else
{
OSL_FAIL( Bitmap::GetGreyPalette: invalid entry count (2/4/16/256
allowed) );
-return aGreyPalette2;
+return GetGreyPalette( 2 );
}
}
@@ -301,12 +305,9 @@ sal_Bool Bitmap::HasGreyPalette() const
{
const BitmapColor rCol0( pRAcc-GetPaletteColor( 0 ) );
const BitmapColor rCol1( pRAcc-GetPaletteColor( 1 ) );
-if( rCol0.GetRed() == rCol0.GetGreen() rCol0.GetRed() ==
rCol0.GetBlue()
-rCol1.GetRed() == rCol1.GetGreen() rCol1.GetRed() ==
rCol1.GetBlue() )
-{
-bRet = sal_True;
-}
- ( (Bitmap*) this )-ReleaseAccess( pRAcc );
+bRet = rCol0.GetRed() == rCol0.GetGreen() rCol0.GetRed() ==
rCol0.GetBlue()
+ rCol1.GetRed() == rCol1.GetGreen() rCol1.GetRed() ==
rCol1.GetBlue();
+( (Bitmap*) this )-ReleaseAccess( pRAcc );
}
else
bRet = sal_True;
@@ -317,10 +318,8 @@ sal_Bool
[Libreoffice-commits] .: solenv/inc
solenv/inc/unx.mk |4 1 file changed, 4 insertions(+) New commits: commit be5855de62ea99a9bb67556f1db548aa56cda605 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 3 13:33:18 2011 +0200 Use DYLD_LIBRARY_PATH when OS_FOR_BUILD == MACOSX diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index 74ed8d5..2dfbaf7 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -179,4 +179,8 @@ SOLARLIB+=-L$(KDE_ROOT)/lib64 .ENDIF # $(KDE_ROOT)!= .ENDIF # $(ENABLE_KDE) != +.IF $(OS_FOR_BUILD) == MACOSX +OOO_LIBRARY_PATH_VAR *= DYLD_LIBRARY_PATH +.ELSE OOO_LIBRARY_PATH_VAR *= LD_LIBRARY_PATH +.ENDIF \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxslt/makefile.mk
libxslt/makefile.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4abf8729b8344a4d2084ba299b570ec7badc5a10 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 3 14:42:17 2011 +0200 Use the xml2-config from our own libxml2 copy if not using a system libxml2 diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index fe808dd..f884c35 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -134,6 +134,9 @@ CONFIGURE_ACTION=.$/configure # and we want it to find our dummy one that prints the LIBXML_CFLAGS and LIBXML_LIBS that # the configure script found out. CONFIGURE_FLAGS=--disable-shared --with-libxml-prefix=$(SRC_ROOT)/$(PRJNAME)/dummy +.ELIF $(SYSTEM_LIBXML)!=YES +# Use the xml2-config from our own libxml2 copy +CONFIGURE_FLAGS=--disable-static --with-libxml-prefix=$(SOLARVER)/$(INPATH) .ELSE CONFIGURE_FLAGS=--disable-static .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/SpellDialog.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 36edda75a9035f15e361b5a99423568e9ae7826e Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 3 12:56:48 2011 + Resolves: fdo#36678 regenerate language-specific user dict list Regenerate language-specific user dict list when language of underlying text changes. Not just when the user overrides it from the top menu. diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 9990e4c..fee3bdd 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -367,6 +367,7 @@ void SpellDialog::UpdateBoxes_Impl() else SetTitle_Impl( nAltLanguage ); SetSelectedLang_Impl( nAltLanguage ); +InitUserDicts(); // Alternativen eintragen const ::rtl::OUString *pNewWords = aNewWords.getConstArray(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: redland/raptor
redland/raptor/makefile.mk |9 + 1 file changed, 9 insertions(+) New commits: commit 7a17b2b9d0e9bc0a95ba8bee72c2b24fb529005b Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 3 15:12:26 2011 +0200 Use xml2-config and xslt-config from our own copies if not using system ones diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index d437a4d..6ddeef1 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -146,6 +146,15 @@ CONFIGURE_FLAGS=--disable-static .ENDIF # do not enable grddl parser (#i93768#) CONFIGURE_FLAGS+= --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --enable-parsers=rdfxml ntriples turtle trig guess rss-tag-soup --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore --with-regex-library=posix --with-decimal=none --with-www=xml + +.IF $(SYSTEM_LIBXML) != YES +CONFIGURE_FLAGS+=--with-xml2-config=$(SOLARVER)/$(INPATH)/bin/xml2-config +.ENDIF + +.IF $(SYSTEM_LIBXSLT) != YES +CONFIGURE_FLAGS+=--with-xslt-config=$(SOLARVER)/$(INPATH)/bin/xslt-config +.ENDIF + .IF $(CROSS_COMPILING)==YES CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postprocess/packcomponents postprocess/prj scp2/source scripting/Extension_ScriptProviderForBeanShell.mk scripting/Extension_ScriptProviderForJavaScript.mk scripting/Jar_Scrip
postprocess/packcomponents/makefile.mk | 31 postprocess/prj/d.lst |2 scp2/source/extensions/directory_extensions.scp | 22 - scp2/source/extensions/file_extensions.scp | 30 +--- scp2/source/extensions/makefile.mk |4 + scp2/source/extensions/module_extensions.scp | 12 ++- scp2/source/ooo/common_brand.scp |7 - scp2/source/ooo/file_ooo.scp |6 - scp2/source/ooo/makefile.mk |4 - scp2/source/ooo/module_hidden_ooo.scp |1 scripting/Extension_ScriptProviderForBeanShell.mk | 34 - scripting/Extension_ScriptProviderForJavaScript.mk | 34 - scripting/Jar_ScriptProviderForBeanShell.mk | 14 ++- scripting/Jar_ScriptProviderForJavaScript.mk |7 + scripting/Module_scripting.mk | 10 +- scripting/java/ScriptProviderForBeanShell.component | 37 ++ scripting/java/ScriptProviderForJavaScript.component | 37 ++ scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 35 - scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF |2 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 34 - scripting/util/provider/beanshell/description.xml | 23 -- scripting/util/provider/beanshell/manifest.xml |7 - scripting/util/provider/javascript/description.xml | 23 -- scripting/util/provider/javascript/manifest.xml |7 - 25 files changed, 166 insertions(+), 259 deletions(-) New commits: commit a72a7dc500ffd57662e8b9be61e4676266861c33 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 3 14:11:00 2011 +0100 fdo#42312: Change bsh and js script providers from extensions to optional modules. Their jar files reference other non-URE jars, so they cannot be extensions. bsh.jar has been moved into the optional module (it used to be installed always, but it looks like only the bsh script provider needs it; also, it had been added to URE_MORE_JAVA_CLASSPATH_URLS if SYSTEM_BSH, which also appears unnecessary as it is mentioned with an absolute file URL in the Class-Path of the script provider jar). js.jar has been included in the optional module (it used to be not installed at all?). diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index b983928..e40327e 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -368,7 +368,10 @@ my_components += component/avmedia/source/gstreamer/avmediagstreamer .INCLUDE: target.mk -ALLTAR : $(MISC)/services.rdb +ALLTAR : \ +$(MISC)/services.rdb \ +$(MISC)/scriptproviderforbeanshell.rdb \ +$(MISC)/scriptproviderforjavascript.rdb $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/services.input $(my_components:^$(SOLARXMLDIR)/:+.component) @@ -379,3 +382,29 @@ $(MISC)/services.input : makefile.mk echo \ 'list$(my_components:^filename:+.component/filename)/list' \ $@ + +$(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \ +$(SOLARENV)/bin/packcomponents.xslt \ +$(MISC)/scriptproviderforbeanshell.input \ + $(SOLARXMLDIR)/component/scripting/java/ScriptProviderForBeanShell.component +$(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \ +$(SOLARENV)/bin/packcomponents.xslt \ +$(MISC)/scriptproviderforbeanshell.input + +$(MISC)/scriptproviderforbeanshell.input : makefile.mk +echo \ +
[Libreoffice-commits] .: postprocess/packcomponents
postprocess/packcomponents/makefile.mk |4 1 file changed, 4 insertions(+) New commits: commit 5d9a23ccec9fc3733786d64b83d768719951b89f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 3 14:52:58 2011 +0100 Missing conditionalizaton. diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index e40327e..2de3f99 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -383,6 +383,7 @@ $(MISC)/services.input : makefile.mk 'list$(my_components:^filename:+.component/filename)/list' \ $@ +.IF $(ENABLE_SCRIPTING_BEANSHELL) == YES $(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \ $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/scriptproviderforbeanshell.input \ @@ -395,7 +396,9 @@ $(MISC)/scriptproviderforbeanshell.input : makefile.mk echo \ 'listfilenamecomponent/scripting/java/ScriptProviderForBeanShell.component/filename/list' \ $@ +.END +.IF $(ENABLE_SCRIPTING_JAVASCRIPT) == YES $(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \ $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/scriptproviderforjavascript.input \ @@ -408,3 +411,4 @@ $(MISC)/scriptproviderforjavascript.input : makefile.mk echo \ 'listfilenamecomponent/scripting/java/ScriptProviderForJavaScript.component/filename/list' \ $@ +.END ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdtGenerator.cxx |9 +++--
writerperfect/source/filter/TextRunStyle.cxx | 47 ---
2 files changed, 34 insertions(+), 22 deletions(-)
New commits:
commit 3e8dee1a48bd80c52b5adda6bd9358c2136ea764
Author: Laurent Alonso alo...@loria.fr
Date: Thu Nov 3 14:57:48 2011 +0100
Add possibilty to embed ole object and to pass paragraph borders
diff --git a/writerperfect/source/filter/OdtGenerator.cxx
b/writerperfect/source/filter/OdtGenerator.cxx
index 7c1e19e..9e9ae10 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -1268,9 +1268,12 @@ void OdtGenerator::insertBinaryObject(const
WPXPropertyList propList, const WPX
}
}
else
-// assuming we have a binary image that we can just insert as it is
+// assuming we have a binary image or a object_ole that we can just
insert as it is
{
-mpImpl-mpCurrentContentElements-push_back(new
TagOpenElement(draw:image));
+std::string dataType = draw:image;
+if (propList[libwpd:mimetype]-getStr() == object/ole)
+dataType = draw:object-ole;
+mpImpl-mpCurrentContentElements-push_back(new
TagOpenElement(dataType.c_str()));
mpImpl-mpCurrentContentElements-push_back(new
TagOpenElement(office:binary-data));
@@ -1280,7 +1283,7 @@ void OdtGenerator::insertBinaryObject(const
WPXPropertyList propList, const WPX
mpImpl-mpCurrentContentElements-push_back(new
TagCloseElement(office:binary-data));
-mpImpl-mpCurrentContentElements-push_back(new
TagCloseElement(draw:image));
+mpImpl-mpCurrentContentElements-push_back(new
TagCloseElement(dataType.c_str()));
}
}
diff --git a/writerperfect/source/filter/TextRunStyle.cxx
b/writerperfect/source/filter/TextRunStyle.cxx
index 092d3a2..6cc7378 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -69,32 +69,41 @@ void ParagraphStyle::write(OdfDocumentHandler *pHandler)
const
if (strcmp(i.key(), style:list-style-name) == 0)
propList.insert(style:list-style-name, i()-getStr());
#endif
-if (strcmp(i.key(), fo:margin-left) == 0)
-propList.insert(fo:margin-left, i()-getStr());
-if (strcmp(i.key(), fo:margin-right) == 0)
-propList.insert(fo:margin-right, i()-getStr());
-if (strcmp(i.key(), fo:text-indent) == 0)
-propList.insert(fo:text-indent, i()-getStr());
-if (strcmp(i.key(), fo:margin-top) == 0)
-propList.insert(fo:margin-top, i()-getStr());
-if (strcmp(i.key(), fo:margin-bottom) == 0)
+if (strncmp(i.key(), fo:margin-,10) == 0)
{
-if (i()-getDouble() 0.0)
-propList.insert(fo:margin-bottom, i()-getStr());
-else
-propList.insert(fo:margin-bottom, 0.0);
+if (strcmp(i.key(), fo:margin-left) == 0 ||
+strcmp(i.key(), fo:margin-right) == 0 ||
+strcmp(i.key(), fo:margin-top) == 0)
+propList.insert(i.key(), i()-getStr());
+else if (strcmp(i.key(), fo:margin-bottom) == 0)
+{
+if (i()-getDouble() 0.0)
+propList.insert(fo:margin-bottom, i()-getStr());
+else
+propList.insert(fo:margin-bottom, 0.0);
+}
}
-if (strcmp(i.key(), fo:line-height) == 0)
+else if (strcmp(i.key(), fo:text-indent) == 0)
+propList.insert(fo:text-indent, i()-getStr());
+else if (strcmp(i.key(), fo:line-height) == 0)
propList.insert(fo:line-height, i()-getStr());
-if (strcmp(i.key(), fo:break-before) == 0)
+else if (strcmp(i.key(), fo:break-before) == 0)
propList.insert(fo:break-before, i()-getStr());
-if (strcmp(i.key(), fo:text-align) == 0)
+else if (strcmp(i.key(), fo:text-align) == 0)
propList.insert(fo:text-align, i()-getStr());
-if (strcmp(i.key(), fo:text-align-last) == 0)
+else if (strcmp(i.key(), fo:text-align-last) == 0)
propList.insert(fo:text-align-last, i()-getStr());
-if (strcmp(i.key(), style:page-number) == 0)
+else if (strcmp(i.key(), style:page-number) == 0)
propList.insert(style:page-number, i()-getStr());
-
+else if (strncmp(i.key(), fo:border, 9) == 0)
+{
+if (strcmp(i.key(), fo:border) == 0 ||
+strcmp(i.key(), fo:border-left) == 0 ||
+strcmp(i.key(), fo:border-right) == 0 ||
+strcmp(i.key(), fo:border-top) == 0 ||
+strcmp(i.key(), fo:border-bottom) == 0)
+propList.insert(i.key(), i()-getStr());
+}
}
propList.insert(style:justify-single-word, false);
[Libreoffice-commits] .: basebmp/inc basebmp/source basebmp/test basegfx/inc basegfx/test
basebmp/inc/basebmp/bitmapdevice.hxx| 22 ++-- basebmp/inc/basebmp/clippedlinerenderer.hxx |2 basebmp/source/bitmapdevice.cxx | 35 ++- basebmp/test/basictest.cxx | 16 +++ basebmp/test/polytest.cxx |2 basegfx/inc/basegfx/tools/rectcliptools.hxx | 14 +++ basegfx/test/basegfx2d.cxx | 126 ++-- 7 files changed, 177 insertions(+), 40 deletions(-) New commits: commit f7975d2335334899e5d14e35e7640d3afdf220f6 Author: Thorsten Behrens tbehr...@suse.com Date: Thu Nov 3 14:58:40 2011 +0100 Fix one more subtlety around B2IBox / B2IRange changes. The Cohen/Sutherland clip flag routine was not aware of B2IBox, thusly yielding incorrect line clipping for BitmapDevice software rendering. Cleaned that up, added some more unit tests around the problem, and removed the now-extraneous maLineClip member from the bitmap device. diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx index 1e6d73b..f97ec4f 100644 --- a/basebmp/inc/basebmp/bitmapdevice.hxx +++ b/basebmp/inc/basebmp/bitmapdevice.hxx @@ -664,8 +664,8 @@ private: /** Factory method to create a BitmapDevice for given scanline format */ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVector rSize, - bool bTopDown, - sal_Int32 nScanlineFormat ); +bool bTopDown, +sal_Int32 nScanlineFormat ); /** Factory method to create a BitmapDevice for given scanline format with the given palette @@ -675,9 +675,9 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe format. */ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVectorrSize, - bool bTopDown, - sal_Int32 nScanlineFormat, - const PaletteMemorySharedVector rPalette ); +bool bTopDown, +sal_Int32 nScanlineFormat, +const PaletteMemorySharedVector rPalette ); /** Factory method to create a BitmapDevice for given scanline format from the given piece of raw memory and palette @@ -686,10 +686,10 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVe image of the specified area and format. */ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVectorrSize, - bool bTopDown, - sal_Int32 nScanlineFormat, - const RawMemorySharedArray rMem, - const PaletteMemorySharedVector rPalette ); +bool bTopDown, +sal_Int32 nScanlineFormat, +const RawMemorySharedArray rMem, +const PaletteMemorySharedVector rPalette ); /** Factory method to retrieve a subsetted BitmapDevice to the same @@ -709,8 +709,8 @@ BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSh copied, only the size can be varied. Note that the prototype's bitmap content is emnot/em copied, only a palette (if any). */ -BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVectorrSize, - const BitmapDeviceSharedPtr rProto ); +BASEBMP_DLLPUBLIC BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVectorrSize, + const BitmapDeviceSharedPtr rProto ); } diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx index 2fbf2f7..9969b96 100644 --- a/basebmp/inc/basebmp/clippedlinerenderer.hxx +++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx @@ -200,7 +200,7 @@ inline bool prepareClip( sal_Int32 a1, template class Iterator, class Accessor void renderClippedLine( basegfx::B2IPoint aPt1, basegfx::B2IPoint aPt2, -
[Libreoffice-commits] .: postprocess/packcomponents
postprocess/packcomponents/makefile.mk |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit 2e68995221d45a296e8bee306a12e9a4f4a0cc91 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 3 15:15:05 2011 +0100 Still missing conditionalization. diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 2de3f99..9d36059 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -368,10 +368,7 @@ my_components += component/avmedia/source/gstreamer/avmediagstreamer .INCLUDE: target.mk -ALLTAR : \ -$(MISC)/services.rdb \ -$(MISC)/scriptproviderforbeanshell.rdb \ -$(MISC)/scriptproviderforjavascript.rdb +ALLTAR : $(MISC)/services.rdb $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/services.input $(my_components:^$(SOLARXMLDIR)/:+.component) @@ -384,6 +381,8 @@ $(MISC)/services.input : makefile.mk $@ .IF $(ENABLE_SCRIPTING_BEANSHELL) == YES +ALLTAR : $(MISC)/scriptproviderforbeanshell.rdb + $(MISC)/scriptproviderforbeanshell.rdb .ERRREMOVE : \ $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/scriptproviderforbeanshell.input \ @@ -399,6 +398,8 @@ $(MISC)/scriptproviderforbeanshell.input : makefile.mk .END .IF $(ENABLE_SCRIPTING_JAVASCRIPT) == YES +ALLTAR : $(MISC)/scriptproviderforjavascript.rdb + $(MISC)/scriptproviderforjavascript.rdb .ERRREMOVE : \ $(SOLARENV)/bin/packcomponents.xslt \ $(MISC)/scriptproviderforjavascript.input \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in translate_toolkit/makefile.mk translate_toolkit/prj translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
ooo.lst.in |1 translate_toolkit/makefile.mk | 80 -- translate_toolkit/prj/build.lst|3 translate_toolkit/prj/d.lst| 35 translate_toolkit/translate-toolkit-1.8.1-skipsource.patch | 99 - 5 files changed, 218 deletions(-) New commits: commit 3433ac9b0f350d5cfa86d92239cd41e6c75dbeb1 Author: Tomas Chvatal tchva...@suse.cz Date: Thu Nov 3 16:32:53 2011 +0100 Drop translate_toolkit folder and its internal download. Signed-off-by: Tomas Chvatal tchva...@suse.cz diff --git a/ooo.lst.in b/ooo.lst.in index 223ec9b..5a45936 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -94,7 +94,6 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll -b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOP_GALLERY_PACK@ @OOOP_TEMPLATES_PACK@ diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk deleted file mode 100644 index b311001..000 --- a/translate_toolkit/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#* -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Petr Mladek pmla...@suse.cz -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# Ted t...@bear.com -# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# -#* - -PRJ=. - -PRJNAME=trt -TARGET=trt - -# --- Settings - - -.INCLUDE : settings.mk - -.IF $(SYSTEM_TRANSLATE_TOOLKIT) == YES -@all: - @echo Using system translate toolkit... -.ENDIF - -# --- Python paths -- - -.IF $(SYSTEM_PYTHON) == YES -PY_CMD=$(PYTHON) -.ELSE # $(SYSTEM_PYTHON) == YES -.IF $(OS)==MACOSX -# the framework only gets delivered as zip, so call it from python's output-dir -PY_CMD=$(SRC_ROOT)/python/$(INPATH)/misc/build/python-inst/OOoPython.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/OOoPython -.ELSE -PY_CMD=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python -# watch for the path delimiter -.IF $(GUI)==WNT -PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)/python;$(SOLARLIBDIR)/python/lib-dynload -.ELSE # $(GUI)==WNT -PYTHONPATH:=$(SOLARLIBDIR):$(SOLARLIBDIR)/python:$(SOLARLIBDIR)/python/lib-dynload -.ENDIF # $(GUI)==WNT -.EXPORT: PYTHONPATH -.ENDIF # $(OS)==MACOSX -.ENDIF # $(SYSTEM_PYTHON) == YES - -# --- Files - -TARFILE_NAME=translate-toolkit-1.8.1 -TARFILE_MD5=b4cae0700aa1c2aef7eb7f345365e6f1 -PATCH_FILES=translate-toolkit-1.8.1-skipsource.patch -BUILD_ACTION=$(PY_CMD) setup.py build -BUILD_DIR= - -# --- Targets -- - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk diff --git a/translate_toolkit/prj/build.lst b/translate_toolkit/prj/build.lst deleted file mode 100644 index f87945c..000 --- a/translate_toolkit/prj/build.lst +++ /dev/null @@ -1,3 +0,0 @@ -trt translate_toolkit : solenv PYTHON:python NULL -trt translate_toolkit usr1- all trt_mkout NULL -trt translate_toolkit nmake - all translate_toolkit NULL diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst deleted file mode 100644 index 31d61b0..000 --- a/translate_toolkit/prj/d.lst +++ /dev/null @@ -1,35 +0,0 @@ -mkdir: %_DEST%\bin\translate -mkdir: %_DEST%\bin\translate\convert -mkdir: %_DEST%\bin\translate\filters -mkdir:
[Libreoffice-commits] .: 3 commits - vcl/inc
vcl/inc/vcl/salbtype.hxx | 20
1 file changed, 12 insertions(+), 8 deletions(-)
New commits:
commit 6598e65cfcabd270199d09d11d9d93639bca620d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 3 15:36:28 2011 +
probably need to add mbIsGrey to operator== comparison
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 8e238be..41c90e9 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -607,7 +607,7 @@ inline sal_Bool BitmapPalette::operator==( const
BitmapPalette rBitmapPalette )
{
sal_Bool bRet = sal_False;
-if( rBitmapPalette.mnCount == mnCount )
+if( rBitmapPalette.mnCount == mnCount rBitmapPalette.mbIsGrey ==
mbIsGrey )
{
bRet = sal_True;
commit 33a49504779cae71e079bc13f71ff2a77352b116
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 3 15:20:36 2011 +
need to assign mbIsGrey in operator=
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index efd981a..8e238be 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -587,6 +587,7 @@ inline BitmapPalette BitmapPalette::operator=( const
BitmapPalette rBitmapPale
{
delete[] (sal_uInt8*) mpBitmapColor;
mnCount = rBitmapPalette.mnCount;
+mbIsGrey = rBitmapPalette.mbIsGrey;
if( mnCount )
{
commit d0d1cd58cf0e51ba1dcb60291abe623c504c3c18
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 3 15:06:52 2011 +
mbIsGrey needs to be initialized in ctor
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index 3e8c4c9..efd981a 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -535,16 +535,18 @@ inline sal_uLong BitmapColor::GetColorError( const
BitmapColor rBitmapColor ) c
// --
-inline BitmapPalette::BitmapPalette() :
-mpBitmapColor ( NULL ),
-mnCount ( 0 )
+inline BitmapPalette::BitmapPalette()
+: mpBitmapColor(NULL)
+, mnCount(0)
+, mbIsGrey(false)
{
}
// --
-inline BitmapPalette::BitmapPalette( const BitmapPalette rBitmapPalette ) :
-mnCount( rBitmapPalette.mnCount )
+inline BitmapPalette::BitmapPalette( const BitmapPalette rBitmapPalette )
+: mnCount(rBitmapPalette.mnCount)
+, mbIsGrey(rBitmapPalette.mbIsGrey)
{
if( mnCount )
{
@@ -558,8 +560,9 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette
rBitmapPalette ) :
// --
-inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) :
-mnCount( nCount )
+inline BitmapPalette::BitmapPalette( sal_uInt16 nCount )
+: mnCount(nCount)
+, mbIsGrey(false)
{
if( mnCount )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/deliver.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 97724a27a4055da1b743f3850e5382883e09172d
Author: Tor Lillqvist tlillqv...@suse.com
Date: Thu Nov 3 17:45:31 2011 +0200
Check $OS, not the build platform
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 3860fc8..3211e01 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -815,7 +815,7 @@ sub copy_if_newer
}
if ( $success ) {
# handle special packaging of *.dylib files for Mac OS X
-if ( $^O eq 'darwin' )
+if ( $ENV{OS} eq 'MACOSX' )
{
system(macosx-create-bundle, $to=$from.app) if ( -d
$from.app );
system(ranlib, $to ) if ( $to =~ /\.a/ );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source solenv/gbuild
sc/source/core/data/document.cxx |5 -
solenv/gbuild/CppunitTest.mk |2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 82ceea3903bd361ad97c71a3ab89c7d2a92ec6e9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Nov 3 02:33:04 2011 +0100
need to quote command here
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 6d9ce4d..d7911cf 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -33,7 +33,7 @@
DBGSV_ERROR_OUT := shell
export DBGSV_ERROR_OUT
-UNIT_FAILED_MSG := echo; echo Error: a unit test failed, please do one of:;
echo; echo export DEBUGCPPUNIT=TRUE \# for exception catching; echo
export GDBCPPUNITTRACE=gdb --args \# for interactive debugging; echo export
VALGRIND=memcheck \# for memory checking ; echo and retry.
+UNIT_FAILED_MSG := echo; echo Error: a unit test failed, please do one of:;
echo; echo export DEBUGCPPUNIT=TRUE\# for exception catching;
echo export GDBCPPUNITTRACE=\gdb --args\ \# for interactive debugging; echo
export VALGRIND=memcheck\# for memory checking ; echo and retry.
ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
gb_CppunitTest_GDBTRACE := gdb -nx
--command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
commit 1c8256c704de6b1f0e81436219a4f4b6a0a87b24
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Nov 2 22:50:45 2011 +0100
codename is set by ScTabel constructor
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 196bc17..7dfbd09 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -408,7 +408,6 @@ void ScDocument::AppendTabOnLoad(const rtl::OUString rName)
if (ValidTab(nTabCount) ValidNewTabName(rName))
{
maTabs.push_back( new ScTable(this, nTabCount, rName) );
-maTabs[nTabCount]-SetCodeName( rName );
}
}
@@ -425,7 +424,6 @@ sal_Bool ScDocument::InsertTab( SCTAB nPos, const String
rName,
if (nPos == SC_TAB_APPEND || nPos = nTabCount)
{
maTabs.push_back( new ScTable(this, nTabCount, rName) );
-maTabs[nTabCount]-SetCodeName( rName );
if ( bExternalDocument )
maTabs[nTabCount]-SetVisible( false );
}
@@ -461,7 +459,6 @@ sal_Bool ScDocument::InsertTab( SCTAB nPos, const String
rName,
}
maTabs[nPos] = new ScTable(this, nPos, rName);
-maTabs[nPos]-SetCodeName( rName );
// UpdateBroadcastAreas must be called between UpdateInsertTab,
// which ends listening, and StartAllListeners, to not modify
@@ -514,7 +511,6 @@ bool ScDocument::InsertTabs( SCTAB nPos, const
std::vectorrtl::OUString rName
for ( SCTAB i = 0; i nNewSheets; ++i )
{
maTabs.push_back( new ScTable(this, nTabCount + i,
rNames.at(i)) );
-maTabs[nTabCount+i]-SetCodeName( rNames.at(i) );
if ( bExternalDocument )
maTabs[nTabCount+i]-SetVisible( false );
}
@@ -548,7 +544,6 @@ bool ScDocument::InsertTabs( SCTAB nPos, const
std::vectorrtl::OUString rName
for (SCTAB i = 0; i nNewSheets; ++i)
{
maTabs[nPos + i] = new ScTable(this, nPos + i,
rNames.at(i));
-maTabs[nPos + i]-SetCodeName( rNames.at(i) );
}
// UpdateBroadcastAreas must be called between UpdateInsertTab,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/filters-test.cxx | 29 -
1 file changed, 29 deletions(-)
New commits:
commit 97b5ed250d531382564d64521f8b803c92f775a0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Nov 3 17:26:28 2011 +0100
remove all debug output from filters-test that was for the xls bug
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 74a9006..b9e9e23 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -468,33 +468,6 @@ void ScFiltersTest::testFormats()
CPPUNIT_ASSERT_MESSAGE(Failed to load formats.*, xDocSh.Is());
ScDocument* pDoc = xDocSh-GetDocument();
-SheetPrinter StringPrinter( 8, 3);
-SheetPrinter ValuePrinter( 8, 3);
-for (SCROW nRow = 0; nRow 8; ++nRow)
-{
-for (SCCOL nCol = 0; nCol 3; ++nCol)
-{
-String aString;
-double aVal;
-pDoc-GetValue(nCol, nRow, 0, aVal);
-pDoc-GetString(nCol, nRow, 0, aString);
-ValuePrinter.set(nRow, nCol, rtl::OUString::valueOf(aVal));
-StringPrinter.set(nRow, nCol, aString);
-}
-}
-ValuePrinter.print(Data sheet content: Value);
-ValuePrinter.clear();
-StringPrinter.print(Data sheet content: String);
-StringPrinter.clear();
-
-
-//output this just for debugging, should make it easier to see which
local the numberformatter really used
-//it helps to understand why some windows build fails in this test
-LanguageType aLang, aCjkLang, aCtlLang;
-pDoc-GetLanguage(aLang, aCjkLang, aCtlLang);
-std::cout Language Settings in ScDocument: normal: aLang
Cjk: aCjkLang Ctl: aCtlLang std::endl;
-std::cout Language for NumberFormatter:
pDoc-GetFormatTable()-GetLanguage() std::endl;
-
//test Sheet1 with csv file
rtl::OUString aCSVFileName;
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(numberFormat.)),
aCSVFileName);
@@ -553,7 +526,6 @@ void ScFiltersTest::testFormats()
if ( i == ODS )
{
rtl::OUString aCondString = getConditionalFormatString(pDoc,
3,0,2);
-std::cerr rtl::OUStringToOString(aCondString,
RTL_TEXTENCODING_UTF8).getStr() std::endl;
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(conditionalFormatting.)),
aCSVFileName);
testCondFile(aCSVFileName, pDoc, 2);
}
@@ -577,7 +549,6 @@ void ScFiltersTest::testMatrix()
CPPUNIT_ASSERT_MESSAGE(Failed to load matrix.*, xDocSh.Is());
ScDocument* pDoc = xDocSh-GetDocument();
-
rtl::OUString aCSVFileName;
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(matrix.)),
aCSVFileName);
testFile(aCSVFileName, pDoc, 0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dpobject.cxx|2 +-
sc/source/core/tool/addincol.cxx|2 +-
sc/source/core/tool/charthelper.cxx |3 +--
sc/source/filter/xml/xmlimprt.cxx |2 +-
sc/source/filter/xml/xmlwrap.cxx|8
sc/source/ui/Accessibility/DrawModelBroadcaster.cxx |2 +-
sc/source/ui/docshell/dbdocimp.cxx |2 +-
sc/source/ui/docshell/docsh8.cxx|2 +-
sc/source/ui/unoobj/scdetect.cxx|2 +-
sc/source/ui/vba/vbaaxis.cxx| 10 +-
sc/source/ui/vba/vbachartobjects.cxx|2 +-
sc/source/ui/vba/vbarange.cxx |6 +++---
12 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit 225cbd10f7fcb285c20c18c68fcae3a2cbfe9711
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Nov 4 02:02:20 2011 +0900
catch exception by const reference
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index ff18497..f42043a 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2524,7 +2524,7 @@ const ScDPCache*
ScDPCollection::DBCaches::getCache(sal_Int32 nSdbType, const OU
xRowSet-execute();
}
}
-catch ( sdbc::SQLException rError )
+catch ( const sdbc::SQLException rError )
{
//! store error message
InfoBox aInfoBox( 0, String(rError.Message) );
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index e4c6734..e6ed044 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -1556,7 +1556,7 @@ void
ScUnoAddInCall::ExecuteCallWithArgs(uno::Sequenceuno::Any rCallArgs)
nErrCode = errIllegalArgument;
}
-catch(reflection::InvocationTargetException rWrapped)
+catch(const reflection::InvocationTargetException rWrapped)
{
if ( rWrapped.TargetException.getValueType().equals(
getCppuType( (lang::IllegalArgumentException*)0 ) ) )
diff --git a/sc/source/core/tool/charthelper.cxx
b/sc/source/core/tool/charthelper.cxx
index 282f0f9..d4bfbc2 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -278,9 +278,8 @@ void ScChartHelper::SetChartRanges( const uno::Reference
chart2::XChartDocument
}
}
}
-catch ( uno::Exception ex )
+catch (const uno::Exception)
{
-(void)ex;
OSL_FAIL(Exception in ScChartHelper::SetChartRanges - invalid range
string?);
}
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 3beef27..eeb3546 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2323,7 +2323,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32
nKey, const rtl::OUStri
}
}
}
-catch ( util::MalformedNumberFormatException rException )
+catch ( const util::MalformedNumberFormatException rException )
{
rtl::OUString
sErrorMessage(RTL_CONSTASCII_USTRINGPARAM(Fehler im Formatstring ));
sErrorMessage += sFormatString;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 6c8fd7e..ba9d4fc 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -245,7 +245,7 @@ sal_uInt32
ScXMLImportWrapper::ImportFromComponent(uno::Referencelang::XMultiSe
}
}
}
-catch( xml::sax::SAXException r )
+catch( const xml::sax::SAXException r )
{
packages::zip::ZipIOException aBrokenPackage;
if ( r.WrappedException = aBrokenPackage )
@@ -265,7 +265,7 @@ sal_uInt32
ScXMLImportWrapper::ImportFromComponent(uno::Referencelang::XMultiSe
nReturn = SCERR_IMPORT_FORMAT;
}
}
-catch( packages::zip::ZipIOException r )
+catch( const packages::zip::ZipIOException r )
{
#if OSL_DEBUG_LEVEL 0
ByteString aError( Zip exception catched while importing:\n );
@@ -276,7 +276,7 @@ sal_uInt32
ScXMLImportWrapper::ImportFromComponent(uno::Referencelang::XMultiSe
nReturn = ERRCODE_IO_BROKENPACKAGE;
}
-catch( io::IOException r )
+catch( const io::IOException r )
{
#if OSL_DEBUG_LEVEL 0
ByteString aError( IO exception catched while importing:\n );
@@ -287,7 +287,7 @@ sal_uInt32
ScXMLImportWrapper::ImportFromComponent(uno::Referencelang::XMultiSe
nReturn = SCERR_IMPORT_OPEN;
}
-catch( uno::Exception r )
+catch( const uno::Exception r )
{
#if OSL_DEBUG_LEVEL 0
ByteString aError( uno exception catched while importing:\n );
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
[Libreoffice-commits] .: 7 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkdata.hxx |9
vcl/inc/unx/gtk/gtkgdi.hxx| 26 +
vcl/unx/gtk/window/gtkframe.cxx | 68 ++--
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 423 --
4 files changed, 466 insertions(+), 60 deletions(-)
New commits:
commit 06840c3b3d90ad79c58398d1420577c28d630d57
Author: Cosimo Cecchi cosi...@gnome.org
Date: Thu Nov 3 08:56:12 2011 -0400
gtk3: implement rendering for Listbox widgets
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 6722cea..878fa61 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -78,12 +78,13 @@ private:
static GtkStyleContext *mpMenuItemStyle;
static GtkStyleContext *mpSpinStyle;
static GtkStyleContext *mpComboboxStyle;
+static GtkStyleContext *mpListboxStyle;
void renderAreaToPix( cairo_t* cr, cairo_rectangle_int_t *region );
void getStyleContext( GtkStyleContext** style, GtkWidget* widget );
Rectangle NWGetScrollButtonRect( ControlPart nPart, Rectangle aAreaRect );
Rectangle NWGetSpinButtonRect( ControlPart nPart, Rectangle aAreaRect);
-Rectangle NWGetComboBoxButtonRect( ControlPart nPart, Rectangle aAreaRect
);
+Rectangle NWGetComboBoxButtonRect( ControlType nType, ControlPart nPart,
Rectangle aAreaRect );
void PaintScrollbar(GtkStyleContext *context,
cairo_t *cr,
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 0cd171e..9e93a02 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -46,6 +46,7 @@ GtkStyleContext* GtkSalGraphics::mpMenuStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpMenuItemStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpSpinStyle = NULL;
GtkStyleContext* GtkSalGraphics::mpComboboxStyle = NULL;
+GtkStyleContext* GtkSalGraphics::mpListboxStyle = NULL;
bool GtkSalGraphics::style_loaded = false;
/
@@ -644,7 +645,8 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext
*context,
}
#define ARROW_SIZE 11 * 0.85
-Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlPart nPart,
+Rectangle GtkSalGraphics::NWGetComboBoxButtonRect( ControlType nType,
+ ControlPart nPart,
Rectangle aAreaRect )
{
RectangleaButtonRect;
@@ -700,40 +702,60 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext
*context,
// plus its actual draw rect excluding adornment
areaRect = rControlRectangle;
-buttonRect = NWGetComboBoxButtonRect( PART_BUTTON_DOWN, areaRect );
+buttonRect = NWGetComboBoxButtonRect( nType, PART_BUTTON_DOWN, areaRect );
if( nPart == PART_BUTTON_DOWN )
buttonRect.Left() += 1;
RectangleaEditBoxRect( areaRect );
aEditBoxRect.SetSize( Size( areaRect.GetWidth() - buttonRect.GetWidth(),
aEditBoxRect.GetHeight() ) );
-if( nPart == PART_ENTIRE_CONTROL )
- {
- PrepareComboboxStyle(context, true);
- gtk_render_background(context, cr,
- 0, 0,
- aEditBoxRect.GetWidth(),
aEditBoxRect.GetHeight() );
- gtk_render_frame(context, cr,
- 0, 0,
- aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() );
- }
+if ( nType == CTRL_COMBOBOX )
+{
+if( nPart == PART_ENTIRE_CONTROL )
+{
+PrepareComboboxStyle(context, true);
+gtk_render_background(context, cr,
+ 0, 0,
+ aEditBoxRect.GetWidth(),
aEditBoxRect.GetHeight() );
+gtk_render_frame(context, cr,
+ 0, 0,
+ aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight()
);
+}
+
+PrepareComboboxStyle(context, false);
+gtk_render_background(context, cr,
+ (buttonRect.Left() - areaRect.Left()),
+ (buttonRect.Top() - areaRect.Top()),
+ buttonRect.GetWidth(), buttonRect.GetHeight() );
+gtk_render_frame(context, cr,
+ (buttonRect.Left() - areaRect.Left()),
+ (buttonRect.Top() - areaRect.Top()),
+ buttonRect.GetWidth(), buttonRect.GetHeight() );
+}
+else if (nType == CTRL_LISTBOX)
+{
+if( nPart == PART_WINDOW )
+{
+/* render the popup window with the menu style */
+gtk_render_frame(mpMenuStyle, cr,
+ 0, 0,
+ areaRect.GetWidth(), areaRect.GetHeight());
+}
+else
+{
+gtk_render_background(context, cr,
+
[Libreoffice-commits] .: scp2/source setup_native/prj setup_native/source solenv/bin
scp2/source/ooo/scpaction_ooo.scp |1 +
setup_native/prj/d.lst |1 +
setup_native/source/mac/ooo/DS_Store_Dev|binary
solenv/bin/make_installer.pl|1 +
solenv/bin/modules/installer/scriptitems.pm | 15 +++
5 files changed, 18 insertions(+)
New commits:
commit dab79744767c05fd5268866937e225b74e658cea
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Nov 3 18:57:23 2011 +0100
Give Mac master builds a nice background .dmg image, too
Added a new DevVersionCopy action to scp2, that fires if PRODUCTNAME
equals LibO-dev - in that case, we use the DS_Store_Dev one.
diff --git a/scp2/source/ooo/scpaction_ooo.scp
b/scp2/source/ooo/scpaction_ooo.scp
index dba0ce7..8dccba2 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -291,6 +291,7 @@ End
ScpAction scp_Copy_Ds_Store
Copy = DS_Store;
+DevVersionCopy = DS_Store_Dev;
LangPackCopy = DS_Store_Langpack;
PatchCopy = DS_Store_Patch;
Name = .DS_Store;
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 71290f1..6e8cae9 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -31,6 +31,7 @@ mkdir: %_DEST%\bin\osolsmf
..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack
..\source\mac\ooo\osxdndinstall.png %_DEST%\bin\osl\osxdndinstall.png
..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store
+..\source\mac\ooo\DS_Store_Dev %_DEST%\bin\osl\DS_Store_Dev
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack
..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat
..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat
diff --git a/setup_native/source/mac/ooo/DS_Store_Dev
b/setup_native/source/mac/ooo/DS_Store_Dev
new file mode 100644
index 000..2a6fcf9
Binary files /dev/null and b/setup_native/source/mac/ooo/DS_Store_Dev differ
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 10dac77..3fa31f5 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -487,6 +487,7 @@ if (( ! $allvariableshashref-{'XPDINSTALLER'} ) || ( !
$installer::globals::isx
if ( $installer::globals::languagepack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::helppack ) {
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
}
+if ( $allvariables-{'PRODUCTNAME'} eq LibO-dev ) {
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::patch ) {
installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref);
}
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . productscpactions1b.log,
$scpactionsinproductarrayref); }
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 9189b10..96bdec9 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -620,6 +620,21 @@ sub use_langpack_copy_scpaction
}
+# Using different HostName for dev builds
+
+
+sub use_devversion_copy_scpaction
+{
+my ($scpactionsref) = @_;
+
+for ( my $i = 0; $i = $#{$scpactionsref}; $i++ )
+{
+my $onescpaction = ${$scpactionsref}[$i];
+if (( $onescpaction-{'DevVersionCopy'} ) (
$onescpaction-{'DevVersionCopy'} ne )) { $onescpaction-{'Copy'} =
$onescpaction-{'DevVersionCopy'}; }
+}
+}
+
+
# Using different HostName for language packs
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx | 32
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit dab309e782cce77b3c22915627f2a2d3ff66cf01
Author: Cosimo Cecchi cosi...@gnome.org
Date: Thu Nov 3 14:07:48 2011 -0400
gtk: fix the build
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index a80e0be..2df357b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -506,7 +506,7 @@ GtkSalFrame::~GtkSalFrame()
if( m_hBackgroundPixmap )
{
XSetWindowBackgroundPixmap( getDisplay()-GetDisplay(),
-window_get_xid(m_pWindow),
+widget_get_xid(m_pWindow),
None );
XFreePixmap( getDisplay()-GetDisplay(), m_hBackgroundPixmap );
}
@@ -663,7 +663,7 @@ void GtkSalFrame::InitCommon()
m_aSystemData.pVisual = pDisp-GetVisual( m_nScreen
).GetVisual();
m_aSystemData.nDepth = pDisp-GetVisual( m_nScreen
).GetDepth();
m_aSystemData.aColormap= pDisp-GetColormap( m_nScreen
).GetXColormap();
-m_aSystemData.aWindow = window_get_xid(m_pWindow);
+m_aSystemData.aWindow = widget_get_xid(m_pWindow);
#endif
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
@@ -713,7 +713,7 @@ void GtkSalFrame::InitCommon()
* some paint issues
*/
XSetWindowBackgroundPixmap( getDisplay()-GetDisplay(),
-window_get_xid(m_pWindow),
+widget_get_xid(m_pWindow),
m_hBackgroundPixmap );
#endif
}
@@ -751,7 +751,7 @@ static void lcl_set_accept_focus( GtkWindow* pWindow,
gboolean bAccept, bool bBe
else if( ! bBeforeRealize )
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
-XLIB_Window aWindow = window_get_xid(m_pWindow);
+XLIB_Window aWindow = widget_get_xid(m_pWindow);
XWMHints* pHints = XGetWMHints( pDisplay, aWindow );
if( ! pHints )
{
@@ -1039,7 +1039,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData )
if( ! m_bWindowIsGtkPlug )
{
XReparentWindow( getDisplay()-GetDisplay(),
- window_get_xid(m_pWindow),
+ widget_get_xid(m_pWindow),
(XLIB_Window)pSysData-aWindow,
0, 0 );
}
@@ -1101,7 +1101,7 @@ SalGraphics* GtkSalFrame::GetGraphics()
AllocateFrame();
m_aGraphics[i].pGraphics-setDevice( m_aFrame );
#else // common case:
-m_aGraphics[i].pGraphics-Init( this,
window_get_xid(m_pWindow), m_nScreen );
+m_aGraphics[i].pGraphics-Init( this,
widget_get_xid(m_pWindow), m_nScreen );
#endif
}
return m_aGraphics[i].pGraphics;
@@ -2285,7 +2285,7 @@ void GtkSalFrame::grabPointer( sal_Bool bGrab, sal_Bool
bOwnerEvents )
// set the right cursor this way
if( !pEnv || !*pEnv )
XGrabPointer( getDisplay()-GetDisplay(),
- window_get_xid( m_pWindow ),
+ widget_get_xid( m_pWindow ),
bOwnerEvents,
PointerMotionMask | ButtonPressMask |
ButtonReleaseMask,
GrabModeAsync,
@@ -2467,7 +2467,7 @@ SalBitmap* GtkSalFrame::SnapShot()
#else
X11SalBitmap *pBmp = new X11SalBitmap;
if( pBmp-SnapShot( GDK_DISPLAY_XDISPLAY( getGdkDisplay() ),
-window_get_xid(m_pWindow) ) )
+widget_get_xid(m_pWindow) ) )
return pBmp;
else
delete pBmp;
@@ -2612,7 +2612,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window
aNewParent, bool bXEmbed, int nSc
{
if( m_aGraphics[i].bInUse )
{
-m_aGraphics[i].pGraphics-SetDrawable( window_get_xid(m_pWindow),
m_nScreen );
+m_aGraphics[i].pGraphics-SetDrawable( widget_get_xid(m_pWindow),
m_nScreen );
m_aGraphics[i].pGraphics-SetWindow( m_pWindow );
}
}
@@ -2701,7 +2701,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
if( pEvent-xproperty.atom == nDesktopAtom
pEvent-xproperty.state == PropertyNewValue )
{
-m_nWorkArea = pAdaptor-getWindowWorkArea(
window_get_xid(m_pWindow) );
+m_nWorkArea = pAdaptor-getWindowWorkArea(
widget_get_xid(m_pWindow) );
}
}
else if( pEvent-type == ConfigureNotify )
@@ -2729,7 +2729,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
int x = 0, y = 0;
XLIB_Window aChild;
XTranslateCoordinates( getDisplay()-GetDisplay(),
-
[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |7 +--
sc/source/ui/inc/checklistmenu.hxx |4 +
sc/source/ui/inc/gridwin.hxx |1
sc/source/ui/view/gridwin.cxx| 74 ++-
sc/source/ui/view/gridwin2.cxx | 18 +---
5 files changed, 91 insertions(+), 13 deletions(-)
New commits:
commit daa79d76ff32274849d25c6c396bd2474088c3e8
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Thu Nov 3 15:58:49 2011 -0400
Test-run the filter query after pressing OK. It's far from perfect.
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index ed32c8f..5cf3762 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1178,15 +1178,14 @@ const Size ScCheckListMenuWindow::getWindowSize() const
return maWndSize;
}
-void ScCheckListMenuWindow::getResult(boost::unordered_mapOUString, bool,
OUStringHash rResult)
+void ScCheckListMenuWindow::getResult(ResultType rResult)
{
-typedef boost::unordered_mapOUString, bool, OUStringHash ResultMap;
-ResultMap aResult;
+ResultType aResult;
size_t n = maMembers.size();
for (size_t i = 0; i n; ++i)
{
bool bState = maChecks.IsChecked(static_cast sal_uInt16 ( i ));
-aResult.insert(ResultMap::value_type(maMembers[i].maName, bState));
+aResult.insert(ResultType::value_type(maMembers[i].maName, bState));
}
rResult.swap(aResult);
}
diff --git a/sc/source/ui/inc/checklistmenu.hxx
b/sc/source/ui/inc/checklistmenu.hxx
index 6816b06..f2555d1 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -208,6 +208,8 @@ private:
class ScCheckListMenuWindow : public ScMenuFloatingWindow
{
public:
+typedef boost::unordered_maprtl::OUString, bool, rtl::OUStringHash
ResultType;
+
/**
* Extended data that the client code may need to store. Create a
* sub-class of this and store data there.
@@ -229,7 +231,7 @@ public:
const Size getWindowSize() const;
-void getResult(::boost::unordered_map ::rtl::OUString, bool,
::rtl::OUStringHash rResult);
+void getResult(ResultType rResult);
void launch(const Rectangle rRect);
void close(bool bOK);
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 0bb6b4d..00827d9 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -379,6 +379,7 @@ public:
voidCheckNeedsRepaint();
+voidUpdateAutoFilterFromMenu();
voidUpdateDPFromFieldPopupMenu();
voidUpdateVisibleRange();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 02486cc..9ed7fd2 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -595,14 +595,37 @@ public:
}
};
+struct AutoFilterData : public ScCheckListMenuWindow::ExtendedData
+{
+ScAddress maPos;
+};
+
+class AutoFilterOKAction : public ScMenuFloatingWindow::Action
+{
+ScGridWindow* mpWindow;
+public:
+AutoFilterOKAction(ScGridWindow* p) : mpWindow(p) {}
+
+virtual void execute()
+{
+mpWindow-UpdateAutoFilterFromMenu();
+}
+};
+
}
void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
{
+SCTAB nTab = pViewData-GetTabNo();
+
mpAutoFilterPopup.reset(new ScCheckListMenuWindow(this,
pViewData-GetDocument()));
+mpAutoFilterPopup-setOKAction(new AutoFilterOKAction(this));
+std::auto_ptrAutoFilterData pData(new AutoFilterData);
+pData-maPos = ScAddress(nCol, nRow, nTab);
+mpAutoFilterPopup-setExtendedData(pData.release());
+
Point aPos = pViewData-GetScrPos(nCol, nRow, eWhich);
-SCTAB nTab = pViewData-GetTabNo();
ScDocument* pDoc = pViewData-GetDocument();
long nSizeX = 0;
long nSizeY = 0;
@@ -621,7 +644,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
mpAutoFilterPopup-initMembers();
// Populate the menu.
-
mpAutoFilterPopup-addMenuItem(ScResId::toString(ScResId(SCSTR_ALLFILTER)),
true, new PopupAction);
+//
mpAutoFilterPopup-addMenuItem(ScResId::toString(ScResId(SCSTR_ALLFILTER)),
true, new PopupAction);
mpAutoFilterPopup-addMenuItem(ScResId::toString(ScResId(SCSTR_TOP10FILTER)),
true, new PopupAction);
mpAutoFilterPopup-addMenuItem(ScResId::toString(ScResId(SCSTR_STDFILTER)),
true, new PopupAction);
mpAutoFilterPopup-addMenuItem(ScResId::toString(ScResId(SCSTR_EMPTY)),
true, new PopupAction);
@@ -631,6 +654,53 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
mpAutoFilterPopup-launch(aCellRect);
}
+void ScGridWindow::UpdateAutoFilterFromMenu()
+{
+ScCheckListMenuWindow::ResultType aResult;
+mpAutoFilterPopup-getResult(aResult);
+size_t nCount = aResult.size();
+std::vectorrtl::OUString aSelected;
+ScCheckListMenuWindow::ResultType::const_iterator itr = aResult.begin(),
itrEnd
[Libreoffice-commits] .: vcl/unx
vcl/unx/gtk/window/gtkframe.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 910bbf6f1e4c6bed983b51bc611b25a119960809
Author: Cosimo Cecchi cosi...@gnome.org
Date: Thu Nov 3 20:35:11 2011 +
fix gtk2 build
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 2df357b..f3e7f6f 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -751,7 +751,7 @@ static void lcl_set_accept_focus( GtkWindow* pWindow,
gboolean bAccept, bool bBe
else if( ! bBeforeRealize )
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
-XLIB_Window aWindow = widget_get_xid(m_pWindow);
+XLIB_Window aWindow = widget_get_xid(GTK_WIDGET(pWindow));
XWMHints* pHints = XGetWMHints( pDisplay, aWindow );
if( ! pHints )
{
@@ -814,14 +814,14 @@ static void lcl_set_user_time( GtkWindow* i_pWindow,
guint32 i_nTime )
p_gdk_x11_window_set_user_time =
(setUserTimeFn)osl_getAsciiFunctionSymbol( GetSalData()-m_pPlugin,
gdk_x11_window_set_user_time );
}
if( p_gdk_x11_window_set_user_time )
-p_gdk_x11_window_set_user_time( widget_get_window(i_pWindow), i_nTime
);
+p_gdk_x11_window_set_user_time(
widget_get_window(GTK_WIDGET(i_pWindow)), i_nTime );
else
{
Display* pDisplay = GetGtkSalData()-GetGtkDisplay()-GetDisplay();
Atom nUserTime = XInternAtom( pDisplay, _NET_WM_USER_TIME, True );
if( nUserTime )
{
-XChangeProperty( pDisplay, widget_get_xid(i_pWindow),
+XChangeProperty( pDisplay, widget_get_xid(GTK_WIDGET(i_pWindow)),
nUserTime, XA_CARDINAL, 32,
PropModeReplace, (unsigned char*)i_nTime, 1 );
}
@@ -3251,7 +3251,7 @@ gboolean implDelayedFullScreenHdl (void *pWindow)
}
}
-gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
+gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame
)
{
GtkSalFrame* pThis = (GtkSalFrame*)frame;
@@ -3280,7 +3280,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*,
gpointer frame )
if( bSetFocus )
{
XSetInputFocus( pThis-getDisplay()-GetDisplay(),
-widget_get_xid(m_pWindow),
+widget_get_xid(pWidget),
RevertToParent, CurrentTime );
}
#else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/inc
svx/inc/svx/extrud3d.hxx |4 - svx/inc/svx/fmgridcl.hxx |6 - svx/inc/svx/fmsrccfg.hxx | 12 +-- svx/inc/svx/fmsrcimp.hxx | 152 +++ 4 files changed, 86 insertions(+), 88 deletions(-) New commits: commit 8d47725cf897ea2a1c312fbe556e70b92df925e9 Author: Tim Hardeck thard...@suse.com Date: Thu Nov 3 18:17:06 2011 +0100 Translated some comments in svx Translated the comments of four files from German to English in the svx part. diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx index ac1b630..16d3c42 100644 --- a/svx/inc/svx/extrud3d.hxx +++ b/svx/inc/svx/extrud3d.hxx @@ -34,7 +34,7 @@ /* |* -|* 3D-Extrusionsobjekt aus uebergebenem 2D-Polygon erzeugen +|* 3D extrusion object created from the provided 2D polygon |* \/ @@ -44,7 +44,7 @@ private: // to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid() friend class sdr::properties::E3dExtrudeProperties; -// Geometrie, die dieses Objekt bestimmt +// geometry, which determines the object basegfx::B2DPolyPolygon maExtrudePolygon; protected: diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index 3f5e267..a6107d4 100644 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx @@ -179,10 +179,10 @@ protected: virtual void EndCursorAction(); virtual void Select(); -// Initialisieren der Spalten -// a.) nur ueber Spaltenbeschreibung +// Initialize columns +// a.) only by column description virtual void InitColumnsByModels(const ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexContainer xColumns); -// b.) im alivemode ueber Datenbankfelder +// b.) during alivemode by database fields virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexAccess xFields); // some kind of impl version (for one single column) of our version of InitColumnsByFields diff --git a/svx/inc/svx/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 744c3b4..08a5dfd 100644 --- a/svx/inc/svx/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx @@ -41,10 +41,10 @@ #define MATCHING_END2 #define MATCHING_WHOLETEXT 3 -// diese Konstanten duerfen NICHT einfach geaendert werden, da der SearchDialog aus den Einstellungen seiner ListBox -// keine Umrechnungen vornimmt, sondern die einfach in die entsprechenden Methoden der SearchEngine steckt -// (wenn man also die Konstanten oder die Reihenfolge der Listbox-Eintraege im Dialog aendert, muss das jeweils andere -// angepasst werden) +// this constants should NOT be just changed, since the SearchDialog performs no conversion of the settings of +// its ListBox, but instead just passes them along to the appropriate methods of SearchEngine +// (so if you change the constants or the order of the listbox entries in the dialog, then the other has +// to be adapted) // @@ -53,7 +53,7 @@ namespace svxform // // === -// = struct FmSearchParams - Parameter einer Suche +// = struct FmSearchParams - parameters of a search // === struct SVX_DLLPUBLIC FmSearchParams @@ -98,7 +98,7 @@ namespace svxform }; // === -// = class FmSearchConfigItem - ein ConfigItem, dass sich Suchparameter merkt +// = class FmSearchConfigItem - a ConfigItem, that remembers search parameters // === class SVX_DLLPUBLIC FmSearchConfigItem diff --git a/svx/inc/svx/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 8598340..322a2bc 100644 --- a/svx/inc/svx/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -50,7 +50,7 @@ #include deque // === -// = class FmSearchThread - wie der Name schon sagt +// = class FmSearchThread // === class FmSearchEngine; @@ -68,44 +68,44 @@ public: }; // === -// = struct FmSearchProgress - diese Struktur bekommt der Owner der SearchEngine fuer Status-Updates -// = (und am Ende der Suche) +// = struct FmSearchProgress - the owner of
[Libreoffice-commits] .: vcl/inc vcl/source
vcl/inc/vcl/salbtype.hxx | 24 ++
vcl/source/gdi/bitmap.cxx | 61 --
2 files changed, 42 insertions(+), 43 deletions(-)
New commits:
commit 5436b3242ae84aca1d8a3d750bee6bf39ea52224
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 3 23:40:04 2011 +
Unwind and refactor some of the Grey Palette stuff
We get some assertions in the smoketest with --enable-debug, looking
closer I think to use a single bIsGrey flag we...
a) would need to check after every modification of a Palette that mbIsGrey
is
still valid and update it accordingly
b) There are a lot of routes outside of direct assignation to the stock Grey
Palettes that can result in Grey palettes in e.g. the pngreader, they would
all need updating :-(
So, how about just refactoring the original HasGreyPalette and
IsGreyPalette.
diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index aca81ab..fc323c7 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.hxx
@@ -181,7 +181,6 @@ private:
BitmapColor*mpBitmapColor;
sal_uInt16 mnCount;
-boolmbIsGrey;
public:
@@ -207,8 +206,7 @@ public:
inline BitmapColor operator[]( sal_uInt16 nIndex );
inline sal_uInt16 GetBestIndex( const BitmapColor rCol ) const;
-boolIsGreyPalette() const { return
!GetEntryCount() || mbIsGrey; }
-voidSetGreyPalette( bool bGrey ) { mbIsGrey =
bGrey; }
+boolIsGreyPalette() const;
};
// ---
@@ -535,18 +533,16 @@ inline sal_uLong BitmapColor::GetColorError( const
BitmapColor rBitmapColor ) c
// --
-inline BitmapPalette::BitmapPalette()
-: mpBitmapColor(NULL)
-, mnCount(0)
-, mbIsGrey(false)
+inline BitmapPalette::BitmapPalette() :
+mpBitmapColor ( NULL ),
+mnCount ( 0 )
{
}
// --
-inline BitmapPalette::BitmapPalette( const BitmapPalette rBitmapPalette )
-: mnCount(rBitmapPalette.mnCount)
-, mbIsGrey(rBitmapPalette.mbIsGrey)
+inline BitmapPalette::BitmapPalette( const BitmapPalette rBitmapPalette ) :
+mnCount( rBitmapPalette.mnCount )
{
if( mnCount )
{
@@ -560,9 +556,8 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette
rBitmapPalette )
// --
-inline BitmapPalette::BitmapPalette( sal_uInt16 nCount )
-: mnCount(nCount)
-, mbIsGrey(false)
+inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) :
+mnCount( nCount )
{
if( mnCount )
{
@@ -587,7 +582,6 @@ inline BitmapPalette BitmapPalette::operator=( const
BitmapPalette rBitmapPale
{
delete[] (sal_uInt8*) mpBitmapColor;
mnCount = rBitmapPalette.mnCount;
-mbIsGrey = rBitmapPalette.mbIsGrey;
if( mnCount )
{
@@ -607,7 +601,7 @@ inline sal_Bool BitmapPalette::operator==( const
BitmapPalette rBitmapPalette )
{
sal_Bool bRet = sal_False;
-if( rBitmapPalette.mnCount == mnCount rBitmapPalette.mbIsGrey ==
mbIsGrey )
+if( rBitmapPalette.mnCount == mnCount )
{
bRet = sal_True;
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 4df609a..bdfc53e 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -177,7 +177,6 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
aGreyPalette2.SetEntryCount( 2 );
aGreyPalette2[ 0 ] = BitmapColor( 0, 0, 0 );
aGreyPalette2[ 1 ] = BitmapColor( 255, 255, 255 );
-aGreyPalette2.SetGreyPalette( true );
}
return aGreyPalette2;
@@ -191,7 +190,6 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
aGreyPalette4[ 1 ] = BitmapColor( 85, 85, 85 );
aGreyPalette4[ 2 ] = BitmapColor( 170, 170, 170 );
aGreyPalette4[ 3 ] = BitmapColor( 255, 255, 255 );
-aGreyPalette4.SetGreyPalette( true );
}
return aGreyPalette4;
@@ -206,7 +204,6 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
for( sal_uInt16 i = 0; i 16; i++, cGrey =
sal::static_int_castsal_uInt8(cGrey + cGreyInc) )
aGreyPalette16[ i ] = BitmapColor( cGrey, cGrey, cGrey );
-aGreyPalette16.SetGreyPalette( true );
}
return aGreyPalette16;
@@ -219,7 +216,6 @@ const BitmapPalette Bitmap::GetGreyPalette( int nEntries )
for( sal_uInt16 i = 0; i 256; i++ )
aGreyPalette256[ i ] = BitmapColor( (sal_uInt8) i,
(sal_uInt8) i, (sal_uInt8) i );
-
[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - 2 commits - sc/inc sc/source
sc/inc/global.hxx |9 +-
sc/inc/queryparam.hxx |2
sc/source/core/data/dociter.cxx|3
sc/source/core/data/global2.cxx|4 -
sc/source/core/tool/dbdata.cxx |9 --
sc/source/core/tool/queryparam.cxx | 17 +++--
sc/source/filter/xml/xmldrani.cxx |2
sc/source/ui/dbgui/filtdlg.cxx | 118 +++--
sc/source/ui/dbgui/sfiltdlg.cxx| 10 ---
sc/source/ui/inc/filtdlg.hxx |9 +-
sc/source/ui/unoobj/datauno.cxx| 12 ---
sc/source/ui/vba/vbarange.cxx |5 -
sc/source/ui/view/gridwin.cxx |8 +-
sc/source/ui/view/gridwin4.cxx |6 +
14 files changed, 116 insertions(+), 98 deletions(-)
New commits:
commit 7b52f9c32dea268f7ea53f11ece47418bc679111
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Thu Nov 3 22:05:12 2011 -0400
Let's not use a hard-coded MAXQUERY all over the place.
For now, the maximum query size is determined by the size of the
vector that holds the entries. For now, the size of the vector is
fixed, and won't change. We may later work on making it dynamically
sized, however...
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 7a96782..ead69ba 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -96,7 +96,6 @@ const sal_Unicode CHAR_ZWNBSP = 0x2060;
#define MAXZOOM 400
const SCSIZE MAXSUBTOTAL= 3;
-const SCSIZE MAXQUERY = 8;
#define SC_START_INDEX_DB_COLL 5
// Above this threshold are indices
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 1515cd1..9154224 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -60,7 +60,7 @@ protected:
ScQueryParamBase();
ScQueryParamBase(const ScQueryParamBase r);
-mutable ::std::vectorScQueryEntry maEntries;
+mutable std::vectorScQueryEntry maEntries;
};
//
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index bc9689b..632abf8 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1102,7 +1102,8 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument*
pDocument, SCTAB nTable,
SCSIZE i;
if (bMod) // sonst schon eingetragen
{
-for (i=0; (iMAXQUERY) (aParam.GetEntry(i).bDoQuery); i++)
+SCSIZE nCount = aParam.GetEntryCount();
+for (i = 0; (i nCount) (aParam.GetEntry(i).bDoQuery); ++i)
{
ScQueryEntry rEntry = aParam.GetEntry(i);
sal_uInt32 nIndex = 0;
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 609fc52..40bc0d3 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -313,9 +313,8 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW n
}
}
-if (maQueryParam.GetEntryCount() MAXQUERY)
-maQueryParam.Resize(MAXQUERY);
-for (i=0; iMAXQUERY; i++)
+SCSIZE nCount = maQueryParam.GetEntryCount();
+for (i = 0; i nCount; ++i)
{
ScQueryEntry rEntry = maQueryParam.GetEntry(i);
rEntry.nField += nDifX;
@@ -369,10 +368,6 @@ void ScDBData::GetQueryParam( ScQueryParam rQueryParam )
const
void ScDBData::SetQueryParam(const ScQueryParam rQueryParam)
{
-OSL_ENSURE( rQueryParam.GetEntryCount() = MAXQUERY ||
-!rQueryParam.GetEntry(MAXQUERY).bDoQuery,
-zuviele Eintraege bei ScDBData::SetQueryParam );
-
maQueryParam = rQueryParam;
// set bIsAdvanced to false for everything that is not from the
diff --git a/sc/source/core/tool/queryparam.cxx
b/sc/source/core/tool/queryparam.cxx
index 46a14a2..61a763c 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -35,13 +35,17 @@
using ::std::vector;
+namespace {
+
+const SCSIZE MAXQUERY = 8;
+
+}
+
//
-ScQueryParamBase::ScQueryParamBase()
+ScQueryParamBase::ScQueryParamBase() :
+maEntries(MAXQUERY)
{
-Resize( MAXQUERY );
-for (sal_uInt16 i=0; iMAXQUERY; i++)
-maEntries[i].Clear();
}
ScQueryParamBase::ScQueryParamBase(const ScQueryParamBase r) :
@@ -219,9 +223,8 @@ void ScQueryParam::Clear()
bHasHeader = bCaseSens = bRegExp = bMixedComparison = false;
bInplace = bByRow = bDuplicate = sal_True;
-Resize( MAXQUERY );
-for (sal_uInt16 i=0; iMAXQUERY; i++)
-maEntries[i].Clear();
+std::vectorScQueryEntry aNewEntries(MAXQUERY);
+maEntries.swap(aNewEntries);
ClearDestParams();
}
diff --git a/sc/source/filter/xml/xmldrani.cxx
b/sc/source/filter/xml/xmldrani.cxx
index 785d03e..9f88a20 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -358,7 +358,7 @@ ScDBData*
[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - 2 commits - sc/inc sc/source
sc/inc/global.hxx | 40 -
sc/inc/lookupcache.hxx |1
sc/inc/queryparam.hxx | 48 ++-
sc/source/core/data/dptablecache.cxx|2
sc/source/core/data/global2.cxx | 106 -
sc/source/core/data/table3.cxx |2
sc/source/core/tool/queryparam.cxx | 116 +++-
sc/source/filter/inc/excrecds.hxx |1
sc/source/filter/xml/XMLExportDataPilot.hxx |1
sc/source/ui/dbgui/pfiltdlg.cxx |2
sc/source/ui/inc/filtdlg.hxx|2
11 files changed, 163 insertions(+), 158 deletions(-)
New commits:
commit 175ff3d1f932063febbe46be739a69bca75f93e9
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Thu Nov 3 22:57:31 2011 -0400
Moved ScQueryEntry out of global.?xx to queryparam.?xx.
This is more appropriate.
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 197f15f..b8e3184 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -720,46 +720,6 @@ enum ScSubTotalFunc
SUBTOTAL_FUNC_VARP = 11
};
-/*
- * dialog returns the special field values empty/not empty
- * as constants SC_EMPTYFIELDS and SC_NONEMPTYFIELDS respectively in nVal in
- * conjuctions with the flag bQueryByString = FALSE.
- */
-
-#define SC_EMPTYFIELDS ((double)0x0042)
-#define SC_NONEMPTYFIELDS ((double)0x0043)
-
-namespace utl
-{
-class SearchParam;
-class TextSearch;
-}
-
-struct ScQueryEntry
-{
-boolbDoQuery;
-boolbQueryByString;
-boolbQueryByDate;
-SCCOLROWnField;
-ScQueryOp eOp;
-ScQueryConnect eConnect;
-String* pStr;
-double nVal;
-mutable utl::SearchParam* pSearchParam; // if RegExp, not saved
-mutable utl::TextSearch* pSearchText;// if RegExp, not saved
-
-ScQueryEntry();
-ScQueryEntry(const ScQueryEntry r);
-~ScQueryEntry();
-
-// creates pSearchParam and pSearchText if necessary, always RegExp!
-utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const;
-
-voidClear();
-ScQueryEntry operator=( const ScQueryEntry r );
-booloperator==( const ScQueryEntry r ) const;
-};
-
class ScArea;
struct ScConsolidateParam
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 9901ba5..01ab425 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -31,6 +31,7 @@
#include address.hxx
#include global.hxx
+#include queryparam.hxx
#include formula/token.hxx
#include svl/listener.hxx
#include tools/string.hxx
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index a083f74..105a801 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -34,8 +34,47 @@
#include vector
+/*
+ * dialog returns the special field values empty/not empty
+ * as constants SC_EMPTYFIELDS and SC_NONEMPTYFIELDS respectively in nVal in
+ * conjuctions with the flag bQueryByString = FALSE.
+ */
+
+#define SC_EMPTYFIELDS ((double)0x0042)
+#define SC_NONEMPTYFIELDS ((double)0x0043)
+
struct ScDBQueryParamInternal;
+namespace utl {
+class SearchParam;
+class TextSearch;
+}
+
+struct ScQueryEntry
+{
+boolbDoQuery;
+boolbQueryByString;
+boolbQueryByDate;
+SCCOLROWnField;
+ScQueryOp eOp;
+ScQueryConnect eConnect;
+String* pStr;
+double nVal;
+mutable utl::SearchParam* pSearchParam; // if RegExp, not saved
+mutable utl::TextSearch* pSearchText;// if RegExp, not saved
+
+ScQueryEntry();
+ScQueryEntry(const ScQueryEntry r);
+~ScQueryEntry();
+
+// creates pSearchParam and pSearchText if necessary, always RegExp!
+utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const;
+
+voidClear();
+ScQueryEntry operator=( const ScQueryEntry r );
+booloperator==( const ScQueryEntry r ) const;
+};
+
struct ScQueryParamBase
{
boolbHasHeader;
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 91c4ff6..28219fd 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -33,7 +33,6 @@
#include sfx2/docfile.hxx
#include sfx2/objsh.hxx
-#include unotools/textsearch.hxx
#include unotools/pathoptions.hxx
#include unotools/useroptions.hxx
#include tools/urlobj.hxx
@@ -123,111 +122,6 @@ bool ScImportParam::operator==( const ScImportParam
rOther ) const
}
//
-// struct ScQueryParam:
-
-ScQueryEntry::ScQueryEntry() :
-bDoQuery(false),
-bQueryByString(false),
-bQueryByDate(false),
-nField(0),
-eOp(SC_EQUAL),
-eConnect(SC_AND),
-pStr(new String),
-nVal(0.0),
-pSearchParam(NULL),
-pSearchText(NULL)
-{
-}
-
[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_filters_test.mk sc/qa sc/RdbTarget_sc_filters_test.mk
sc/CppunitTest_sc_filters_test.mk|4
sc/RdbTarget_sc_filters_test.mk |3 ---
sc/qa/unit/data/contentCSV/information-functions.csv | 18 ++
sc/qa/unit/data/ods/functions.ods|binary
sc/qa/unit/filters-test.cxx | 12
5 files changed, 22 insertions(+), 15 deletions(-)
New commits:
commit 651aa258c9f2b58e241b1fab7bfb4fc0dae9fbb2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Nov 4 03:46:56 2011 +0100
remove some unneeded dependencies
they are no longer used because we separated macros_test and
filters-test
diff --git a/sc/CppunitTest_sc_filters_test.mk
b/sc/CppunitTest_sc_filters_test.mk
index 3260d32..a8aed81 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test,
\
sal \
salhelper \
sax \
-sb \
sc \
sfx \
sot \
@@ -65,7 +64,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test,
\
ucbhelper \
unotest \
utl \
-vbahelper \
vcl \
xo \
$(gb_STDLIBS) \
@@ -81,14 +79,12 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
$(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
offapi \
-oovbaapi \
udkapi \
))
$(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
$(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
-oovbaapi \
types \
))
diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk
index 2c0cb1b..cd25567 100644
--- a/sc/RdbTarget_sc_filters_test.mk
+++ b/sc/RdbTarget_sc_filters_test.mk
@@ -46,9 +46,6 @@ $(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
sax/source/fastparser/fastsax \
sc/util/sc \
sc/util/scfilt \
-sc/util/vbaobj \
-scripting/source/basprov/basprov \
-scripting/util/scriptframe \
sfx2/util/sfx \
sot/util/sot \
toolkit/util/tk \
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 857f386..0c9482a 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -37,12 +37,10 @@
#include sfx2/docfilt.hxx
#include sfx2/docfile.hxx
#include sfx2/sfxmodelfactory.hxx
-#include svl/intitem.hxx
#include svl/stritem.hxx
#include editeng/brshitem.hxx
#include editeng/justifyitem.hxx
-#include basic/sbxdef.hxx
#define CALC_DEBUG_OUTPUT 0
commit 989ee5998b99497caa619341fb4f3d8e32fd0765
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Nov 4 03:46:27 2011 +0100
add test cases for Informations functions to functions.ods
diff --git a/sc/qa/unit/data/contentCSV/information-functions.csv
b/sc/qa/unit/data/contentCSV/information-functions.csv
new file mode 100644
index 000..e332b8f
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/information-functions.csv
@@ -0,0 +1,18 @@
+27, 1, 4, $E$1, $Logical.$A$1, 4, b, v, l
+6
+=CELL(ROW,AA1), =ADDRESS(2,3)
+FALSE, TRUE, FALSE
+FALSE, TRUE, FALSE, TRUE
+TRUE, FALSE, TRUE, TRUE
+1, 0, 0, 1
+TRUE, FALSE, FALSE
+FALSE, FALSE, FALSE, TRUE
+TRUE, FALSE, FALSE, FALSE
+TRUE, TRUE, FALSE
+TRUE, FALSE, TRUE
+1, 0, 0, 1, 0
+TRUE, TRUE, FALSE, FALSE, FALSE, FALSE
+FALSE, TRUE, FALSE, TRUE
+0, 1, 42, 0
+#N/A
+1, 2, 8, 64, 16
diff --git a/sc/qa/unit/data/ods/functions.ods
b/sc/qa/unit/data/ods/functions.ods
index cfdd263..22ebf65 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and
b/sc/qa/unit/data/ods/functions.ods differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 487ee22..857f386 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -44,7 +44,7 @@
#include editeng/justifyitem.hxx
#include basic/sbxdef.hxx
-#define CALC_DEBUG_OUTPUT 1
+#define CALC_DEBUG_OUTPUT 0
#include helper/csv_handler.hxx
#include helper/debughelper.hxx
@@ -219,11 +219,6 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
rFilter, const rtl::OUStr
// load failed.
xDocShRef.Clear();
}
-else if (nFormatType)
-{
-pSrcMed-GetItemSet()-Put( SfxUInt16Item( SID_MACROEXECMODE, 4));
-SfxObjectShell::SetCurrentComponent( xDocShRef-GetModel() );
-}
return xDocShRef;
}
@@ -408,6 +403,9 @@ void ScFiltersTest::testFunctions()
//test mathematical functions
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(mathematical-functions.)),
aCSVFileName);
testFile(aCSVFileName, pDoc, 2, PureString);
+//test informations functions
+
createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(information-functions.)),
aCSVFileName);
+testFile(aCSVFileName, pDoc, 3);
xDocSh-DoClose();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basebmp/inc basebmp/Package_inc.mk basebmp/source unusedcode.easy vcl/headless vcl/inc vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_svp.mk vcl/unx
basebmp/Package_inc.mk| 31 -- basebmp/inc/basebmp/bitmapdevice.hxx | 16 - basebmp/inc/basebmp/debug.hxx |2 basebmp/inc/basebmp/linerenderer.hxx | 184 basebmp/inc/basebmp/truecolormaskaccessor.hxx | 293 -- basebmp/source/bitmapdevice.cxx | 21 - unusedcode.easy |2 vcl/Library_vclplug_gtk3.mk |1 vcl/Library_vclplug_svp.mk|3 vcl/headless/svpgdi.cxx |1 vcl/headless/svpprn.cxx |3 vcl/headless/svppspgraphics.cxx | 200 - vcl/headless/svptext.cxx |1 vcl/inc/headless/svpprn.hxx |2 vcl/inc/headless/svppspgraphics.hxx | 43 --- vcl/unx/gtk/app/gtkinst.cxx |7 16 files changed, 5 insertions(+), 805 deletions(-) New commits: commit d0d62edf3f398e9ddb2fd0f1f5fbe1dd0393ff47 Author: Joseph Powers jpower...@cox.net Date: Thu Nov 3 20:25:04 2011 -0700 Cleanup basebmp a little I removed 2 unused headers. I also stopped delivering a lot of headers that no one outside of basebmp cared about. I also removed the unused methods: basebmp::BitmapDevice::getPaletteEntryCount() const basebmp::BitmapDevice::getPixelData(basegfx::B2IPoint const) diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk index 5619a30..b1298e9 100644 --- a/basebmp/Package_inc.mk +++ b/basebmp/Package_inc.mk @@ -2,7 +2,7 @@ #* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,40 +27,11 @@ #* $(eval $(call gb_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessor.hxx,basebmp/accessor.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessoradapters.hxx,basebmp/accessoradapters.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessorfunctors.hxx,basebmp/accessorfunctors.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/accessortraits.hxx,basebmp/accessortraits.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/basebmpdllapi.h,basebmp/basebmpdllapi.h)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/clippedlinerenderer.hxx,basebmp/clippedlinerenderer.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colorblendaccessoradapter.hxx,basebmp/colorblendaccessoradapter.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colormisc.hxx,basebmp/colormisc.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/colortraits.hxx,basebmp/colortraits.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/compositeiterator.hxx,basebmp/compositeiterator.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx)) $(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/endian.hxx,basebmp/endian.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/fillimage.hxx,basebmp/fillimage.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/genericcolorimageaccessor.hxx,basebmp/genericcolorimageaccessor.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/greylevelformats.hxx,basebmp/greylevelformats.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/iteratortraits.hxx,basebmp/iteratortraits.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/linerenderer.hxx,basebmp/linerenderer.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/metafunctions.hxx,basebmp/metafunctions.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/nonstandarditerator.hxx,basebmp/nonstandarditerator.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/packedpixeliterator.hxx,basebmp/packedpixeliterator.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteformats.hxx,basebmp/paletteformats.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/paletteimageaccessor.hxx,basebmp/paletteimageaccessor.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixelformatadapters.hxx,basebmp/pixelformatadapters.hxx)) -$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/pixeliterator.hxx,basebmp/pixeliterator.hxx))
[Libreoffice-commits] .: Branch 'feature/new-autofilter-popup' - 3 commits - sc/inc sc/source svl/inc svl/source
sc/inc/queryparam.hxx|3 +
sc/source/core/data/dociter.cxx | 15 ++-
sc/source/core/data/dpshttab.cxx |6 +-
sc/source/core/data/dptablecache.cxx | 18 +++-
sc/source/core/tool/doubleref.cxx|4 -
sc/source/core/tool/queryparam.cxx | 38 ++---
sc/source/filter/excel/excimp8.cxx | 74 ++-
sc/source/filter/inc/excimp8.hxx |2
sc/source/ui/unoobj/cellsuno.cxx |6 ++
sc/source/ui/unoobj/datauno.cxx | 38 -
svl/inc/svl/zforlist.hxx |5 +-
svl/source/numbers/zforlist.cxx |9
12 files changed, 121 insertions(+), 97 deletions(-)
New commits:
commit cf5eed57e7c566144b5b4e6c65ae5a806a8b2d25
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 4 01:03:27 2011 -0400
Remove direct access to the query string (pStr).
I'm about half-way through.
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 105a801..dd09aa3 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -70,6 +70,9 @@ struct ScQueryEntry
// creates pSearchParam and pSearchText if necessary, always RegExp!
utl::TextSearch* GetSearchTextPtr( bool bCaseSens ) const;
+boolMatchByString(const rtl::OUString rStr) const;
+SC_DLLPUBLIC void SetQueryString(const rtl::OUString rStr);
+SC_DLLPUBLIC rtl::OUString GetQueryString() const;
voidClear();
ScQueryEntry operator=( const ScQueryEntry r );
booloperator==( const ScQueryEntry r ) const;
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 632abf8..aba2ac5 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -532,7 +532,7 @@
ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDat
ScQueryEntry rEntry = mpParam-GetEntry(i);
sal_uInt32 nIndex = 0;
rEntry.bQueryByString =
-!(mpDoc-GetFormatTable()-IsNumberFormat(*rEntry.pStr, nIndex,
rEntry.nVal));
+!(mpDoc-GetFormatTable()-IsNumberFormat(rEntry.GetQueryString(),
nIndex, rEntry.nVal));
}
nNumFormat = 0; // werden bei GetNumberFormat initialisiert
pAttrArray = 0;
@@ -814,14 +814,11 @@ bool
ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM
// By string
do
{
-if (!rEntry.pStr)
-break;
-
// Equality check first.
OUString aMatStr = rMat.GetString(nField, nRow);
lcl_toUpper(aMatStr);
-OUString aQueryStr = *rEntry.pStr;
+OUString aQueryStr = rEntry.GetQueryString();
lcl_toUpper(aQueryStr);
bool bDone = false;
switch (rEntry.eOp)
@@ -1108,8 +1105,8 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument*
pDocument, SCTAB nTable,
ScQueryEntry rEntry = aParam.GetEntry(i);
sal_uInt32 nIndex = 0;
rEntry.bQueryByString =
- !(pDoc-GetFormatTable()-IsNumberFormat(*rEntry.pStr,
- nIndex,
rEntry.nVal));
+!(pDoc-GetFormatTable()-IsNumberFormat(
+rEntry.GetQueryString(), nIndex, rEntry.nVal));
}
}
nNumFormat = 0; // werden bei GetNumberFormat initialisiert
@@ -1415,7 +1412,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch()
sal_uLong nFormat = pCol-GetNumberFormat( pItems[nLo].nRow);
ScCellFormat::GetInputString( pItems[nLo].pCell, nFormat, aCellStr,
rFormatter);
-sal_Int32 nTmp = pCollator-compareString( aCellStr, *rEntry.pStr);
+sal_Int32 nTmp = pCollator-compareString(aCellStr,
rEntry.GetQueryString());
if ((rEntry.eOp == SC_LESS_EQUAL nTmp 0) ||
(rEntry.eOp == SC_GREATER_EQUAL nTmp 0) ||
(rEntry.eOp == SC_EQUAL nTmp != 0))
@@ -1547,7 +1544,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch()
sal_uLong nFormat = pCol-GetNumberFormat( pItems[i].nRow);
ScCellFormat::GetInputString( pItems[i].pCell, nFormat, aCellStr,
rFormatter);
-nRes = pCollator-compareString( aCellStr, *rEntry.pStr);
+nRes = pCollator-compareString( aCellStr,
rEntry.GetQueryString());
if (nRes 0 bLessEqual)
{
sal_Int32 nTmp = pCollator-compareString( aLastInRangeString,
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index b65bb47..ebac350 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -78,7 +78,7 @@ ScSheetDPData::ScSheetDPData(ScDocument* pD, const
ScSheetSourceDesc rDesc, con
pSpecial[j] = false;
if
[Libreoffice-commits] .: vcl/headless
vcl/headless/svpprn.cxx |2 ++ vcl/headless/svptext.cxx |1 + 2 files changed, 3 insertions(+) New commits: commit 08488edd45b7b4fa6b255c4a3e5b882765e6fc13 Author: David Tardon dtar...@redhat.com Date: Fri Nov 4 06:22:44 2011 +0100 add missing includes diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index 533499e..bcad98e 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -38,6 +38,8 @@ #include salptype.hxx #include saldatabasic.hxx +#include generic/genpspgraphics.h + #include headless/svpprn.hxx #include headless/svpinst.hxx diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 79b87f1..bfa5952 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -42,6 +42,7 @@ #include impfont.hxx #include rtl/instance.hxx +#include generic/genpspgraphics.h #include generic/glyphcache.hxx #include headless/svpgdi.hxx #include headless/svpbmp.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
