[ooo-build-commit] .: 4 commits - binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/filter

[Fridrich Strba]

 binfilter/bf_svx/source/svdraw/svx_svdouno.cxx       |    2 +-
 binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx   |    5 -----
 binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx   |    5 +++++
 binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx  |    2 +-
 binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx |    4 ++--
 binfilter/filter/source/bf_offwrp/makefile.mk        |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 123f06d7746c491476b49b2c25ff7770e297882a
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Sep 16 18:43:07 2010 +0200

    fit-list-to-size-binfilter.diff: Shrink text automatically if overflows
    
    i#94086

diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
index dbeecc1..3082a43 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
@@ -675,7 +675,7 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
     { XML_FALSE,		drawing::TextFitToSizeType_NONE },
     { XML_TRUE, 		drawing::TextFitToSizeType_PROPORTIONAL },
     { XML_TRUE,	    	drawing::TextFitToSizeType_ALLLINES },
-    { XML_TRUE,		    drawing::TextFitToSizeType_RESIZEATTR },
+    { XML_TRUE,		    drawing::TextFitToSizeType_AUTOFIT },
     { XML_TOKEN_INVALID, 0 }
 };
 
commit 63c2f069420222a6cba628ed9ea32c9ca6f2e452
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Sep 16 18:40:07 2010 +0200

    binfilter-dont-extern-sRTF-sHTML.diff: don't export trivial strings
    
    i#86772
    don't export trivial strings in svtools, increases linking time, bloats size

diff --git a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
index c378948..c58f8b4 100644
--- a/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
+++ b/binfilter/bf_sw/source/filter/inc/SwAppletImpl.hxx
@@ -61,11 +61,6 @@
 namespace binfilter {
 
 class SfxItemSet; 
-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_hidden, "HIDDEN" );
-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_HIDDEN_false, "FALSE" );
-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_archive, "ARCHIVE" );
-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_archives, "ARCHIVES" );
-extern sal_Char const SVTOOLS_CONSTASCII_DECL( sHTML_O_object, "OBJECT" );
 
 class SwApplet_Impl
 {
commit dc2c092746cc33b3dab2e76a9c28b021c8ab1857
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Sep 16 18:24:33 2010 +0200

    link-as-needed-bf.diff: use -Wl,--as-needed, save 1% of relocations
    
    i#89511

diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk
index 18d8730..d98d5c5 100644
--- a/binfilter/filter/source/bf_offwrp/makefile.mk
+++ b/binfilter/filter/source/bf_offwrp/makefile.mk
@@ -51,7 +51,6 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 
 SHL1IMPLIB= ibf_wrp
 SHL1STDLIBS=    \
-                $(BFSO3LIB) 			\
                 $(BFSVTOOLLIB) 		\
                 $(BFOFALIB)			\
                 $(VCLLIB) 			\
@@ -66,6 +65,7 @@ SHL1STDLIBS=    \
                 $(BFSDLIB)          \
                 $(BFSCLIB)          \
                 $(BFSVXLIB)         \
+                $(BFSO3LIB) 			\
                 $(UNOTOOLSLIB)		\
                 $(COMPHELPERLIB)	\
                 $(LEGACYSMGRLIB)
commit 97311ea9def1961bcbd845f0c7de5588b7f7ef60
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Thu Sep 16 18:14:11 2010 +0200

    binfilter-stl.diff: Migrated
    
    i#63770

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
index 1610501..0e2fbda 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdouno.cxx
@@ -376,7 +376,7 @@ namespace binfilter {
 /*N*/         SdrViewIter aIter( this );
 /*N*/ 	    for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
 /*N*/         {
-/*N*/             ::std::set< SdrView* >::const_iterator aPrevPos = aPreviouslyVisible.find( pView );
+/*N*/             ::std::set< SdrView* >::iterator aPrevPos = aPreviouslyVisible.find( pView );
 /*N*/             if ( aPreviouslyVisible.end() != aPrevPos )
 /*N*/             {   // in pView, we were visible _before_ the layer change, and are
 /*N*/                 // visible _after_ the layer change, too
diff --git a/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
index 0012d6c..bb1c6d7 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_nmspmap.cxx
@@ -88,7 +88,12 @@ SvXMLNamespaceMap::~SvXMLNamespaceMap()
 
 int SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const
 {
+#if STLPORT_VERSION >= 500
+//FIXME: STLport5 alternative map compare?
+    return static_cast < int > (aNameHash.size() == rCmp.aNameHash.size());
+#else
     return static_cast < int > (aNameHash == rCmp.aNameHash);
+#endif
 }
 
 sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey )
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
index 7dddc0e..752ec11 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
@@ -149,13 +149,13 @@ void SvXMLNumUsedList_Impl::SetUsed( sal_uInt32 nKey )
 
 sal_Bool SvXMLNumUsedList_Impl::IsUsed( sal_uInt32 nKey ) const
 {
-    SvXMLuInt32Set::iterator aItr = aUsed.find(nKey);
+    SvXMLuInt32Set::const_iterator aItr = aUsed.find(nKey);
     return (aItr != aUsed.end());
 }
 
 sal_Bool SvXMLNumUsedList_Impl::IsWasUsed( sal_uInt32 nKey ) const
 {
-    SvXMLuInt32Set::iterator aItr = aWasUsed.find(nKey);
+    SvXMLuInt32Set::const_iterator aItr = aWasUsed.find(nKey);
     return (aItr != aWasUsed.end());
 }