[Libreoffice-commits] .: 5 commits - binfilter/bf_sw binfilter/inc filter/prj

Caolán McNamara caolan at kemper.freedesktop.org
Fri Apr 15 06:09:16 PDT 2011


 binfilter/bf_sw/source/core/bastyp/sw_index.cxx     |  162 --------------------
 binfilter/bf_sw/source/core/para/makefile.mk        |    2 
 binfilter/bf_sw/source/core/para/sw_paratr.cxx      |   20 +-
 binfilter/bf_sw/source/filter/excel/excxfbuf.hxx    |   26 ---
 binfilter/bf_sw/source/filter/excel/makefile.mk     |    2 
 binfilter/bf_sw/source/filter/excel/sw_fltglbls.cxx |    4 
 binfilter/bf_sw/source/filter/makefile.mk           |    2 
 binfilter/bf_sw/source/filter/w4w/makefile.mk       |    2 
 binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx    |    2 
 binfilter/inc/bf_sw/index.hxx                       |   82 ++++------
 binfilter/inc/bf_sw/swatrset.hxx                    |    2 
 filter/prj/d.lst                                    |    2 
 12 files changed, 50 insertions(+), 258 deletions(-)

New commits:
commit 6f33da75f9349b7395d6c97d60a9537752308ef9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 14 21:17:59 2011 +0100

    these xsl are gone AFAICS

diff --git a/filter/prj/d.lst b/filter/prj/d.lst
index 160c266..d6a84f8 100644
--- a/filter/prj/d.lst
+++ b/filter/prj/d.lst
@@ -24,7 +24,6 @@ mkdir: %_DEST%\bin%_EXT%\xslt\import\common
 mkdir: %_DEST%\bin%_EXT%\xslt\import\spreadsheetml
 mkdir: %_DEST%\bin%_EXT%\xslt\import\uof
 mkdir: %_DEST%\bin%_EXT%\xslt\import\wordml
-mkdir: %_DEST%\bin%_EXT%\xslt\odfflatxml
 mkdir: %_DEST%\xml%_EXT%\registry
 mkdir: %_DEST%\xml%_EXT%\registry\spool
 mkdir: %_DEST%\bin%_EXT%\pdfimport
@@ -44,7 +43,6 @@ mkdir: %_DEST%\bin%_EXT%\pdfimport
 ..\source\xslt\import\spreadsheetml\*.xsl %_DEST%\bin%_EXT%\xslt\import\spreadsheetml\*.xsl
 ..\source\xslt\import\wordml\*.xsl %_DEST%\bin%_EXT%\xslt\import\wordml\*.xsl
 ..\source\xslt\import\uof\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof\*.xsl
-..\source\odfflatxml\*.xsl %_DEST%\bin%_EXT%\xslt\odfflatxml\*.xsl
 ..\%__SRC%\bin\*.xsl %_DEST%\bin%_EXT%\*.xsl
 ..\%__SRC%\bin\*.stw %_DEST%\bin%_EXT%\*.stw
 ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
commit 10f0ec48a2596c483f7420e26f114843cf5bf212
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 14 15:31:43 2011 +0100

    throw out some more warnings

diff --git a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
index 068e51b..43369ea 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
@@ -67,7 +67,7 @@ int SwIndex::nSerial = 0;
 
 
 /*N*/ SwIndex::SwIndex( SwIndexReg* pArr, xub_StrLen nIdx )
-/*N*/ 	: pArray( pArr ), nIndex( nIdx ), pNext( 0 ), pPrev( 0 )
+/*N*/ 	: nIndex( nIdx ), pArray( pArr ), pNext( 0 ), pPrev( 0 )
 /*N*/ {
 /*N*/ 	if( !pArray )
 /*N*/ 	{
@@ -106,7 +106,7 @@ int SwIndex::nSerial = 0;
 
 
 /*N*/ SwIndex::SwIndex( const SwIndex& rIdx )
-/*N*/ 	: pArray( rIdx.pArray ), nIndex( rIdx.nIndex ), pNext( 0 ), pPrev( 0 )
+/*N*/ 	: nIndex( rIdx.nIndex ), pArray( rIdx.pArray ), pNext( 0 ), pPrev( 0 )
 /*N*/ {
 /*N*/ 	ChgValue( rIdx, rIdx.nIndex );
 /*N*/ #ifdef DBG_UTIL
@@ -363,164 +363,6 @@ int SwIndex::nSerial = 0;
 /*N*/ }
 
 
-/*************************************************************************
-|*
-|*	  SwIndex::operator++()
-|*
-*************************************************************************/
-
-#ifdef DBG_UTIL
-
-#ifndef CFRONT
-
-
-xub_StrLen SwIndex::operator++(int) {DBG_BF_ASSERT(0, "STRIP"); return 0;}
-
-#endif
-
-
-xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator--()
-|*
-*************************************************************************/
-
-#ifndef CFRONT
-
-
-/*N*/ xub_StrLen SwIndex::operator--(int)
-/*N*/ {
-/*N*/ 	OSL_ASSERT( nIndex );
-/*N*/ 
-/*N*/ 	xub_StrLen nOldIndex = nIndex;
-/*N*/ 	ChgValue( *this, nIndex-1 );
-/*N*/ 	return nOldIndex;
-/*N*/ }
-
-#endif
-
-
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator+=( xub_StrLen )
-|*
-*************************************************************************/
-
-
-/*N*/ xub_StrLen SwIndex::operator+=( xub_StrLen nWert )
-/*N*/ {
-/*N*/ 	OSL_ASSERT( nIndex < INVALID_INDEX - nWert );
-/*N*/ 	return ChgValue( *this, nIndex + nWert ).nIndex;
-/*N*/ }
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator-=( xub_StrLen )
-|*
-*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator+=( const SwIndex & )
-|*
-*************************************************************************/
-
-
-/*N*/ xub_StrLen SwIndex::operator+=( const SwIndex & rIndex )
-/*N*/ {
-/*N*/ 	OSL_ASSERT( nIndex < INVALID_INDEX - rIndex.nIndex );
-/*N*/ 	return ChgValue( *this, nIndex + rIndex.nIndex ).nIndex;
-/*N*/ }
-
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator-=( const SwIndex & )
-|*
-*************************************************************************/
-
-
-
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator<( const SwIndex & )
-|*
-*************************************************************************/
-
-
-/*N*/ BOOL SwIndex::operator<( const SwIndex & rIndex ) const
-/*N*/ {
-/*N*/ 	OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
-/*N*/ 	return nIndex < rIndex.nIndex;
-/*N*/ }
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator<=( const SwIndex & )
-|*
-*************************************************************************/
-
-
-/*N*/ BOOL SwIndex::operator<=( const SwIndex & rIndex ) const
-/*N*/ {
-/*N*/ 	OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
-/*N*/ 	return nIndex <= rIndex.nIndex;
-/*N*/ }
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator>( const SwIndex & )
-|*
-*************************************************************************/
-
-
-/*N*/ BOOL SwIndex::operator>( const SwIndex & rIndex ) const
-/*N*/ {
-/*N*/ 	OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
-/*N*/ 	return nIndex > rIndex.nIndex;
-/*N*/ }
-
-/*************************************************************************
-|*
-|*	  SwIndex::operator>=( const SwIndex & )
-|*
-*************************************************************************/
-
-
-/*N*/ BOOL SwIndex::operator>=( const SwIndex & rIndex ) const
-/*N*/ {
-/*N*/ 	OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
-/*N*/ 	return nIndex >= rIndex.nIndex;
-/*N*/ }
-
-#endif
-
-/*************************************************************************
-|*
-|*	  SwIndex & SwIndex::operator=( xub_StrLen )
-|*
-*************************************************************************/
-
-#ifdef DBG_UTIL
-
-
-/*N*/ SwIndex& SwIndex::operator=( xub_StrLen nWert )
-/*N*/ {
-/*N*/ 	// Werte kopieren und im neuen Array anmelden
-/*N*/ 	if( nIndex != nWert )
-/*N*/ 		ChgValue( *this, nWert );
-/*N*/ 
-/*N*/ 	return *this;
-/*N*/ }
-
-#endif
-
 
 
 
diff --git a/binfilter/inc/bf_sw/index.hxx b/binfilter/inc/bf_sw/index.hxx
index 6ca5501..54a875e 100644
--- a/binfilter/inc/bf_sw/index.hxx
+++ b/binfilter/inc/bf_sw/index.hxx
@@ -41,14 +41,6 @@ namespace binfilter {
 class SwIndex;
 class SwIndexReg;
 
-#ifndef INLINE
-#ifndef DBG_UTIL
-#define INLINE inline
-#else
-#define INLINE
-#endif
-#endif
-
 class SwIndex
 {
     friend class SwIndexReg;
@@ -70,19 +62,17 @@ public:
     SwIndex( const SwIndex & );
     ~SwIndex() { Remove(); }
 
-    INLINE xub_StrLen operator++();
-#ifndef CFRONT
-    INLINE xub_StrLen operator++(int);
-    INLINE xub_StrLen operator--(int);
-#endif
+    inline xub_StrLen operator++();
+    inline xub_StrLen operator++(int);
+    inline xub_StrLen operator--(int);
 
-    INLINE xub_StrLen operator+=( xub_StrLen );
-    INLINE xub_StrLen operator+=( const SwIndex& );
+    inline xub_StrLen operator+=( xub_StrLen );
+    inline xub_StrLen operator+=( const SwIndex& );
 
-    INLINE BOOL operator<( const SwIndex& ) const;
-    INLINE BOOL operator<=( const SwIndex& ) const;
-    INLINE BOOL operator>( const SwIndex& ) const;
-    INLINE BOOL operator>=( const SwIndex& ) const;
+    inline BOOL operator<( const SwIndex& ) const;
+    inline BOOL operator<=( const SwIndex& ) const;
+    inline BOOL operator>( const SwIndex& ) const;
+    inline BOOL operator>=( const SwIndex& ) const;
     BOOL operator==( const SwIndex& rSwIndex ) const
     { return (nIndex == rSwIndex.nIndex) &&  (pArray == rSwIndex.pArray); }
 
@@ -96,7 +86,7 @@ public:
     BOOL operator==( xub_StrLen nWert ) const   { return nIndex == nWert; }
     BOOL operator!=( xub_StrLen nWert ) const   { return nIndex != nWert; }
 
-    INLINE SwIndex& operator=( xub_StrLen );
+    inline SwIndex& operator=( xub_StrLen );
     SwIndex& operator=( const SwIndex & );
 
     // gebe den Wert vom Index als xub_StrLen zurueck
@@ -111,7 +101,7 @@ public:
     const SwIndexReg* GetIdxReg() const { return pArray; }
 };
 
-#undef INLINE
+#undef inline
 
 class SwIndexReg
 {
@@ -149,10 +139,7 @@ public:
 };
 
 
-#ifndef DBG_UTIL
-
 inline xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
-#ifndef CFRONT
 inline xub_StrLen SwIndex::operator++(int) {DBG_BF_ASSERT(0, "STRIP"); return 0;}
  inline xub_StrLen SwIndex::operator--(int)
  {
@@ -160,7 +147,6 @@ inline xub_StrLen SwIndex::operator++(int) {DBG_BF_ASSERT(0, "STRIP"); return 0;
      ChgValue( *this, nIndex-1 );
      return nOldIndex;
  }
-#endif
 
 inline xub_StrLen SwIndex::operator+=( xub_StrLen nWert )
 {
@@ -171,32 +157,28 @@ inline xub_StrLen SwIndex::operator+=( const  SwIndex& rIndex )
     return ChgValue( *this, nIndex + rIndex.nIndex ).nIndex;
 }
 
-  inline BOOL SwIndex::operator<( const SwIndex& rIndex ) const
-  {
-      return nIndex < rIndex.nIndex;
-  }
-  inline BOOL SwIndex::operator<=( const SwIndex& rIndex ) const
-  {
-      return nIndex <= rIndex.nIndex;
-  }
-  inline BOOL SwIndex::operator>( const SwIndex& rIndex ) const
-  {
-      return nIndex > rIndex.nIndex;
-  }
-  inline BOOL SwIndex::operator>=( const SwIndex& rIndex ) const
-  {
-      return nIndex >= rIndex.nIndex;
-  }
- inline SwIndex& SwIndex::operator=( xub_StrLen nWert )
- {
-     if( nIndex != nWert )
-         ChgValue( *this, nWert );
-     return *this;
- }
-
-// PRODUCT
-#endif
-
+inline BOOL SwIndex::operator<( const SwIndex& rIndex ) const
+{
+    return nIndex < rIndex.nIndex;
+}
+inline BOOL SwIndex::operator<=( const SwIndex& rIndex ) const
+{
+    return nIndex <= rIndex.nIndex;
+}
+inline BOOL SwIndex::operator>( const SwIndex& rIndex ) const
+{
+    return nIndex > rIndex.nIndex;
+}
+inline BOOL SwIndex::operator>=( const SwIndex& rIndex ) const
+{
+    return nIndex >= rIndex.nIndex;
+}
+inline SwIndex& SwIndex::operator=( xub_StrLen nWert )
+{
+   if( nIndex != nWert )
+       ChgValue( *this, nWert );
+   return *this;
+}
 
 } //namespace binfilter
 #endif
commit 7fc1706f19a9fc1fab6c9f97f6bc5dbb9002f601
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 13 21:16:34 2011 +0100

    WaE: mark this dir as warnings free

diff --git a/binfilter/bf_sw/source/core/para/makefile.mk b/binfilter/bf_sw/source/core/para/makefile.mk
index f0ed4d3..dbb6b89 100644
--- a/binfilter/bf_sw/source/core/para/makefile.mk
+++ b/binfilter/bf_sw/source/core/para/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
 PRJ=..$/..$/..$/..
 BFPRJ=..$/..$/..
 
diff --git a/binfilter/bf_sw/source/core/para/sw_paratr.cxx b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
index 8525aca..aa94869 100644
--- a/binfilter/bf_sw/source/core/para/sw_paratr.cxx
+++ b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
@@ -60,12 +60,12 @@ using namespace ::com::sun::star;
 /*N*/ SwFmtDrop::SwFmtDrop()
 /*N*/ 	: SfxPoolItem( RES_PARATR_DROP ),
 /*N*/ 	SwClient( 0 ),
+/*N*/ 	pDefinedIn( 0 ),
+/*N*/ 	nDistance( 0 ),
+/*N*/ 	nReadFmt( USHRT_MAX ),
 /*N*/ 	nLines( 0 ),
 /*N*/ 	nChars( 0 ),
-/*N*/ 	nDistance( 0 ),
-/*N*/ 	pDefinedIn( 0 ),
-/*N*/ 	bWholeWord( sal_False ),
-/*N*/ 	nReadFmt( USHRT_MAX )
+/*N*/ 	bWholeWord( sal_False )
 /*N*/ {
 /*N*/ }
 
@@ -74,12 +74,12 @@ using namespace ::com::sun::star;
 /*N*/ SwFmtDrop::SwFmtDrop( const SwFmtDrop &rCpy )
 /*N*/ 	: SfxPoolItem( RES_PARATR_DROP ),
 /*N*/ 	SwClient( rCpy.pRegisteredIn ),
+/*N*/ 	pDefinedIn( 0 ),
+/*N*/ 	nDistance( rCpy.GetDistance() ),
+/*N*/ 	nReadFmt( rCpy.nReadFmt ),
 /*N*/ 	nLines( rCpy.GetLines() ),
 /*N*/ 	nChars( rCpy.GetChars() ),
-/*N*/ 	nDistance( rCpy.GetDistance() ),
-/*N*/ 	bWholeWord( rCpy.GetWholeWord() ),
-/*N*/ 	pDefinedIn( 0 ),
-/*N*/ 	nReadFmt( rCpy.nReadFmt )
+/*N*/ 	bWholeWord( rCpy.GetWholeWord() )
 /*N*/ {
 /*N*/ }
 
@@ -178,13 +178,13 @@ using namespace ::com::sun::star;
 /*N*/ 	{
 /*N*/         case MID_DROPCAP_LINES : rVal <<= (sal_Int16)nLines; break;
 /*N*/         case MID_DROPCAP_COUNT : rVal <<= (sal_Int16)nChars; break;
-/*N*/         case MID_DROPCAP_DISTANCE : rVal <<= (sal_Int16) TWIP_TO_MM100(nDistance); break;
+/*N*/         case MID_DROPCAP_DISTANCE : rVal <<= (sal_Int16)TWIP_TO_MM100_UNSIGNED(nDistance); break;
 /*N*/         case MID_DROPCAP_FORMAT:
 /*N*/ 		{
 /*N*/ 		 	style::DropCapFormat aDrop;
 /*N*/ 			aDrop.Lines	= nLines   ;
 /*N*/ 			aDrop.Count	= nChars   ;
-/*N*/ 			aDrop.Distance	= TWIP_TO_MM100(nDistance);
+/*N*/ 			aDrop.Distance	= TWIP_TO_MM100_UNSIGNED(nDistance);
 /*N*/ 			rVal.setValue(&aDrop, ::getCppuType((const style::DropCapFormat*)0));
 /*N*/ 		}
 /*N*/ 		break;
commit ca836414daee752dacf5b22d9f53ec707dd1661d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 13 21:12:40 2011 +0100

    WaE: mark this dir as warnings free

diff --git a/binfilter/bf_sw/source/filter/makefile.mk b/binfilter/bf_sw/source/filter/makefile.mk
index 951cb3e..9374f3a 100644
--- a/binfilter/bf_sw/source/filter/makefile.mk
+++ b/binfilter/bf_sw/source/filter/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
 PRJ=..$/..$/..
 BFPRJ=..$/..
 
diff --git a/binfilter/bf_sw/source/filter/w4w/makefile.mk b/binfilter/bf_sw/source/filter/w4w/makefile.mk
index af3125a..cc3f259 100644
--- a/binfilter/bf_sw/source/filter/w4w/makefile.mk
+++ b/binfilter/bf_sw/source/filter/w4w/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
 PRJ=..$/..$/..$/..
 BFPRJ=..$/..$/..
 
diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
index 11ecada..3e902dd 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx
@@ -1579,7 +1579,7 @@ void SwW4WParser::Read_HardNewLine()			// (HNL)
 
     BYTE c = ReadChar();
 
-    if ( (0 == c) || (EOF == c) )
+    if ( (0 == c) || (static_cast<BYTE>(EOF) == c) )
     {
         nError = ERR_CHAR; 	// falsches Zeichen oder EOF
         return;
diff --git a/binfilter/inc/bf_sw/index.hxx b/binfilter/inc/bf_sw/index.hxx
index 2664fee..6ca5501 100644
--- a/binfilter/inc/bf_sw/index.hxx
+++ b/binfilter/inc/bf_sw/index.hxx
@@ -41,11 +41,13 @@ namespace binfilter {
 class SwIndex;
 class SwIndexReg;
 
+#ifndef INLINE
 #ifndef DBG_UTIL
 #define INLINE inline
 #else
 #define INLINE
 #endif
+#endif
 
 class SwIndex
 {
diff --git a/binfilter/inc/bf_sw/swatrset.hxx b/binfilter/inc/bf_sw/swatrset.hxx
index c4ffba5..e296386 100644
--- a/binfilter/inc/bf_sw/swatrset.hxx
+++ b/binfilter/inc/bf_sw/swatrset.hxx
@@ -140,11 +140,13 @@ class SwTblBoxNumFormat;
 class SwTblBoxFormula;
 class SwTblBoxValue;
 
+#ifndef INLINE
 #if defined(MACOSX) && ( __GNUC__ < 3 )
 #define INLINE /* GrP revisit with gcc3 */
 #else
 #define INLINE inline
 #endif
+#endif
 
 class SwAttrPool : public SfxItemPool
 {
commit 9aa467978e0a3637ade5b6a66b98fce031b47712
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 13 21:09:42 2011 +0100

    remove laughable wrong and luckily unused nonsense

diff --git a/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx b/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx
index 75c3937..3391fb0 100644
--- a/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx
+++ b/binfilter/bf_sw/source/filter/excel/excxfbuf.hxx
@@ -192,9 +192,6 @@ class XF_Buffer
 
         inline void			NewXF( XF_Data *pD );
 
-        inline void		GetItemSets( USHORT nIndex, const SfxItemSet *pTxtAttr,
-                            const SfxItemSet *pBoxAttr );
-
         sal_uInt32		GetNumFormat( USHORT nIndex );
         void			SetItemSets( USHORT nCol, USHORT nSR, USHORT nER,
                             USHORT nXF );
@@ -212,29 +209,6 @@ inline void XF_Buffer::NewXF( XF_Data *pD )
     if( nCount < nMax )
         ppData[ nCount++ ] = pD;
     }
-
-inline void XF_Buffer::GetItemSets( USHORT nIndex, const SfxItemSet *pTxtAttr,
-                    const SfxItemSet *pBoxAttr )
-    {
-    DBG_ASSERT( nIndex < nCount ,
-        "+XF_Buffer::GetItemSets(): das ist zuviel des Guten!" );
-    if( nIndex >= nCount )
-        {
-        pTxtAttr = pDefTxtAttr;			// nicht im Puffer
-        pBoxAttr = pDefBoxAttr;
-        }
-    else
-        {
-        if( ppTxtAttr[ nIndex ] == NULL )
-            CreateItemSets( nIndex );		// erste Nutzung
-
-        pTxtAttr = ppTxtAttr[ nIndex ];
-        pBoxAttr = ppBoxAttr[ nIndex ];
-        }
-    }
-
-
-
 } //namespace binfilter
 #endif
 
diff --git a/binfilter/bf_sw/source/filter/excel/makefile.mk b/binfilter/bf_sw/source/filter/excel/makefile.mk
index 54c61fa..16eaae4 100644
--- a/binfilter/bf_sw/source/filter/excel/makefile.mk
+++ b/binfilter/bf_sw/source/filter/excel/makefile.mk
@@ -25,8 +25,6 @@
 #
 #*************************************************************************
 
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
 # makefile Verteiler
 
 PRJ=..$/..$/..$/..
diff --git a/binfilter/bf_sw/source/filter/excel/sw_fltglbls.cxx b/binfilter/bf_sw/source/filter/excel/sw_fltglbls.cxx
index 9251249..ed65595 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_fltglbls.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_fltglbls.cxx
@@ -41,8 +41,8 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 FilterGlobals::FilterGlobals( SwDoc& rDoc, const SwPaM& rPam )
-    : aStandard( String::CreateFromAscii("General") ),
-    aTblFmts( 0, 10 )
+    : aTblFmts( 0, 10 )
+    , aStandard( String::CreateFromAscii("General") )
 {
     pD = &rDoc;			// "globaler" Dokument-Pointer
     pPam = new SwPaM( *rPam.GetPoint() );


More information about the Libreoffice-commits mailing list