[Libreoffice-commits] .: 2 commits - binfilter/bf_sw binfilter/inc

[Caolán McNamara]

 binfilter/bf_sw/source/core/layout/sw_laycache.cxx |    2 +-
 binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx |    1 +
 binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx      |    4 +---
 binfilter/inc/bf_sw/calc.hxx                       |    2 +-
 binfilter/inc/bf_sw/ndhints.hxx                    |    4 +---
 5 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit e4562ff078e35d166c58335a0cd46e362042a4a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 17 10:00:43 2011 +0000

    fix build error

diff --git a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
index 60693c3..3b446d9 100644
--- a/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
+++ b/binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx
@@ -84,6 +84,7 @@ inline void _SetFltPtr( USHORT& rPos, SwRead pReader, const sal_Char* pNm )
 /* pNm optimiert der Compiler weg, wird nur in der nicht PRODUCT benoetigt! */
 {
     ASSERT( !strcmp( aReaderWriter[ rPos ].pName, pNm ), "falscher Filter" );
+    (void)pNm;
     aReaderWriter[ rPos++ ].pReader = pReader;
 }
 
diff --git a/binfilter/inc/bf_sw/calc.hxx b/binfilter/inc/bf_sw/calc.hxx
index 38539ac..878124f 100644
--- a/binfilter/inc/bf_sw/calc.hxx
+++ b/binfilter/inc/bf_sw/calc.hxx
@@ -123,7 +123,7 @@ public:
     //				anzufangen.
     SwSbxValue( long n = 0 ) 		{ PutLong( n ); }
     SwSbxValue( const double& rD )	{ PutDouble( rD ); }
-    SwSbxValue( const SwSbxValue& rVal ) : SbxValue( rVal )	{}
+    SwSbxValue( const SwSbxValue& rVal ) : SvRefBase(), SbxValue( rVal )	{}
     virtual ~SwSbxValue();
 
 
diff --git a/binfilter/inc/bf_sw/ndhints.hxx b/binfilter/inc/bf_sw/ndhints.hxx
index 074aea3..4905adc 100644
--- a/binfilter/inc/bf_sw/ndhints.hxx
+++ b/binfilter/inc/bf_sw/ndhints.hxx
@@ -84,9 +84,7 @@ public:
     inline USHORT GetStartCount() const { return Count(); }
     inline USHORT GetStartOf( const SwTxtAttr *pHt ) const;
     inline USHORT GetEndOf( const SwTxtAttr *pHt ) const;
-    inline USHORT GetPos( const SwTxtAttr *pHt ) const
-
-    return SwpHtStart::GetPos( pHt );
+    inline USHORT GetPos( const SwTxtAttr *pHt ) const { return SwpHtStart::GetPos( pHt ); }
 
 #ifdef USED
     // Der Zugriffsoperator soll bald nur noch const sein!
commit e28daa6b4336a230820b83f6216683f1ec459a12
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 17 09:40:11 2011 +0000

    silence some warnings

diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
index f1dd16a..984231a 100644
--- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx
@@ -569,7 +569,7 @@ namespace binfilter {
 /*N*/ {
 /*N*/     BOOL bRet = FALSE;
 /*N*/     BOOL bLongTab = FALSE;
-/*N*/     ULONG nMaxRowPerPage;
+/*N*/     ULONG nMaxRowPerPage(0);
 /*N*/     nNodeIndex -= nStartOfContent;
 /*N*/     USHORT nRows;
 /*N*/     if( rpFrm->IsTabFrm() )
diff --git a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx
index fed767f..798f211 100644
--- a/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx
+++ b/binfilter/bf_sw/source/ui/wrtsh/sw_wrtsh1.cxx
@@ -49,9 +49,7 @@
 #include <wrtsh.hrc>
 namespace binfilter {
 
-/*N*/ void SwWrtShell::CalcAndSetScale( SvEmbeddedObjectRef xObj,
-/*N*/ 							 const SwRect *pFlyPrtRect,
-/*N*/ 							 const SwRect *pFlyFrmRect )
+/*N*/ void SwWrtShell::CalcAndSetScale( SvEmbeddedObjectRef, const SwRect *, const SwRect * )
 /*N*/ {
             DBG_ERROR("Split!");
 /*N*/ }