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

[Stephan Bergmann]

 binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx |    2 +-
 binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx   |    3 +--
 binfilter/bf_sw/source/core/fields/sw_dbfld.cxx  |    7 ++++---
 binfilter/inc/bf_sw/doc.hxx                      |    5 +----
 4 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 49737cfe9cb2b04aad2d041ba31241f2f117f910
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 19 10:15:02 2011 +0200

    Some more warning cleanup.

diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
index a20c8c7..0ca24d8 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unomodel.cxx
@@ -1280,7 +1280,7 @@ struct ImplRenderPaintProc
     {}
 };
 
-void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& /*rSelection*/,
+void SAL_CALL SdXImpressDocument::render( sal_Int32, const uno::Any& /*rSelection*/,
                                           const uno::Sequence< beans::PropertyValue >& rxOptions )
     throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index e4eb8ac..bd20077 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -1088,8 +1088,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
     // es noch nicht, dann erzeuge es
 
 /*N*/ typedef SwFmt* (SwDoc::*FnMakeFmt)( const String &, SwFmt * );
-/*M*/ SwFmt* SwDoc::GetFmtFromPool( USHORT nId, String* pDesc,
-/*M*/   SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric )
+/*M*/ SwFmt* SwDoc::GetFmtFromPool( USHORT nId, String* pDesc )
 /*M*/ {
 /*M*/   SwFmt *pNewFmt, *pDeriveFmt;
 /*M*/
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index 70c2c7b..df1af4e 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -653,11 +653,12 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
     SwNewDBMgr* pMgr = pDoc->GetNewDBMgr();
     const SwDBData& aTmpData = GetDBData();
 
-    if( bCondValid
+    bCondValid
     && pMgr
     && pMgr->IsInMerge()
-    && pMgr->IsDataSourceOpen(aTmpData.sDataSource, aTmpData.sCommand, sal_True)
-    );  // IsDataSourceOpen() may have a side effect
+    && pMgr->IsDataSourceOpen(
+        aTmpData.sDataSource, aTmpData.sCommand, sal_True);
+        // IsDataSourceOpen() may have a side effect
 }
 
 /*--------------------------------------------------------------------
diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx
index 2f7647d..31fa778 100644
--- a/binfilter/inc/bf_sw/doc.hxx
+++ b/binfilter/inc/bf_sw/doc.hxx
@@ -954,10 +954,7 @@ public:
         SfxMapUnit ePresMetric = SFX_MAPUNIT_TWIP,
         BOOL bRegardLanguage = TRUE );
         // return das geforderte automatische  Format - Basis-Klasse !
-    SwFmt* GetFmtFromPool( sal_uInt16 nId, String* pDescription = 0,
-        SfxItemPresentation ePres = SFX_ITEM_PRESENTATION_COMPLETE,
-        SfxMapUnit eCoreMetric = SFX_MAPUNIT_TWIP,
-        SfxMapUnit ePresMetric = SFX_MAPUNIT_TWIP );
+    SwFmt* GetFmtFromPool( sal_uInt16 nId, String* pDescription = 0 );
         // returne das geforderte automatische Format
     SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId, String* pDescription = 0 )
         { return (SwFrmFmt*)GetFmtFromPool( nId, pDescription ); }