[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_sw

Caolán McNamara caolan at kemper.freedesktop.org
Mon Sep 12 02:03:05 PDT 2011


 binfilter/bf_sc/source/core/data/sc_documen3.cxx   |    4 +-
 binfilter/bf_sc/source/core/data/sc_document.cxx   |   17 +++++-----
 binfilter/bf_sc/source/core/data/sc_table1.cxx     |    2 -
 binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx |    6 +--
 binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx  |   33 +++++++++------------
 binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx   |    5 ---
 binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx   |    3 -
 binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx     |    2 -
 binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx      |   14 ++------
 binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx      |    8 -----
 binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx      |   11 -------
 binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx  |    2 -
 12 files changed, 38 insertions(+), 69 deletions(-)

New commits:
commit f0a54b4d565af1ee9704b97fb208b74b196a592e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 12 09:50:18 2011 +0100

    WaE: fix this up to be warnings free again

diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index 3d8b9e5..dbed6ac 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -477,7 +477,7 @@ using namespace ::com::sun::star;
 
 //  Outline anpassen
 
-BOOL ScDocument::UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, USHORT nTab, BOOL bShow )
+BOOL ScDocument::UpdateOutlineCol( USHORT, USHORT, USHORT nTab, BOOL )
 {
     DBG_BF_ASSERT(0, "STRIP");
     if ( nTab<=MAXTAB && pTab[nTab] )
@@ -496,7 +496,7 @@ BOOL ScDocument::UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, USHORT nTab
 /*N*/   return FALSE;
 /*N*/ }
 
-BOOL ScDocument::CreateQueryParam(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, USHORT nTab, ScQueryParam& rQueryParam)
+BOOL ScDocument::CreateQueryParam(USHORT, USHORT, USHORT, USHORT, USHORT nTab, ScQueryParam&)
 {
     DBG_BF_ASSERT(0, "STRIP");
     if ( nTab<=MAXTAB && pTab[nTab] )
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index ff194d6..d583ace 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -450,8 +450,7 @@ namespace binfilter {
 
 //  zusammenhaengender Bereich
 
-void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
-                              USHORT& rEndCol, USHORT& rEndRow, BOOL bIncludeOld )
+void ScDocument::GetDataArea( USHORT, USHORT&, USHORT&, USHORT&, USHORT&, BOOL )
 {
     DBG_BF_ASSERT(0, "STRIP");
 }
@@ -1191,7 +1190,7 @@ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
 /*N*/ }
 
 
-void ScDocument::GetValue( USHORT nCol, USHORT nRow, USHORT nTab, double& rValue )
+void ScDocument::GetValue( USHORT, USHORT, USHORT, double& rValue )
 {
     DBG_BF_ASSERT(0, "STRIP");
     rValue = 0.0;
@@ -1344,7 +1343,7 @@ void ScDocument::GetValue( USHORT nCol, USHORT nRow, USHORT nTab, double& rValue
 /*N*/ }
 
 
-void ScDocument::SetDirty( const ScRange& rRange )
+void ScDocument::SetDirty( const ScRange& )
 {
     DBG_BF_ASSERT(0, "STRIP");
 }
@@ -2320,9 +2319,9 @@ void ScDocument::SetDirty( const ScRange& rRange )
 
 
 
-void ScDocument::ApplySelectionFrame( const ScMarkData& rMark,
-                                      const SvxBoxItem* pLineOuter,
-                                      const SvxBoxInfoItem* pLineInner )
+void ScDocument::ApplySelectionFrame( const ScMarkData&,
+                                      const SvxBoxItem*,
+                                      const SvxBoxInfoItem* )
 {
     DBG_BF_ASSERT(0, "STRIP");
 }
@@ -2382,8 +2381,8 @@ void ScDocument::ApplySelectionFrame( const ScMarkData& rMark,
 
 
 
-void ScDocument::GetNextPos( USHORT& rCol, USHORT& rRow, USHORT nTab, short nMovX, short nMovY,
-                             BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark )
+void ScDocument::GetNextPos( USHORT&, USHORT&, USHORT, short, short,
+                             BOOL, BOOL, const ScMarkData& )
 {
     DBG_BF_ASSERT(0, "STRIP");
 }
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index 6a8a765..2a5f2ff 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -502,7 +502,7 @@ extern BOOL bIsOlk, bOderSo;
 
 /*N*/ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
 /*N*/                    USHORT nCol2, USHORT nRow2, USHORT nTab2, short nDx, short nDy, short nDz,
-/*N*/                    ScDocument* pUndoDoc, BOOL bIncludeDraw )
+/*N*/                    ScDocument* pUndoDoc, BOOL /*bIncludeDraw*/ )
 /*N*/ {
 /*N*/   USHORT i;
 /*N*/   USHORT iMax;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index 85ae8e5..e911f97 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -271,7 +271,7 @@ namespace binfilter {
 
 
 /*N*/ BOOL ScDBDocFunc::Sort( USHORT nTab, const ScSortParam& rSortParam,
-/*N*/                           BOOL bRecord, BOOL bPaint, BOOL bApi )
+/*N*/                           BOOL bRecord, BOOL bPaint, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -629,7 +629,7 @@ namespace binfilter {
 
 
 /*N*/ BOOL ScDBDocFunc::DoSubTotals( USHORT nTab, const ScSubTotalParam& rParam,
-/*N*/                               const ScSortParam* /*pForceNewSort*/, BOOL bRecord, BOOL bApi )
+/*N*/                               const ScSortParam* /*pForceNewSort*/, BOOL bRecord, BOOL )
 /*N*/ {
 /*N*/   //! auch fuer ScDBFunc::DoSubTotals benutzen!
 /*N*/   //  dann bleibt aussen:
@@ -712,7 +712,7 @@ namespace binfilter {
 /*N*/ }
 
 /*N*/ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
-/*N*/                                       BOOL bRecord, BOOL bApi )
+/*N*/                                       BOOL bRecord, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/   WaitObject aWait( rDocShell.GetDialogParent() );
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index 0ef3814..2ff1893 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -324,7 +324,7 @@ using namespace ::com::sun::star;
 //------------------------------------------------------------------------
 
 /*N*/ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
-/*N*/                                   BOOL /*bRecord*/, BOOL bApi )
+/*N*/                                   BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -358,14 +358,11 @@ using namespace ::com::sun::star;
 /*N*/       pDoc->ExtendMerge( aExtendedRange, TRUE );
 /*N*/
 /*N*/   // keine Objekte auf geschuetzten Tabellen
-/*N*/   BOOL bObjects = FALSE;
 /*N*/   if ( nFlags & IDF_OBJECTS )
 /*N*/   {
-/*N*/       bObjects = TRUE;
 /*N*/       USHORT nTabCount = pDoc->GetTableCount();
 /*N*/       for (USHORT nTab=0; nTab<nTabCount; nTab++)
-/*N*/           if (aMultiMark.GetTableSelect(nTab) && pDoc->IsTabProtected(nTab))
-/*N*/               bObjects = FALSE;
+/*N*/           aMultiMark.GetTableSelect(nTab);
 /*N*/   }
 /*N*/
 /*N*/   USHORT nExtFlags = 0;                       // Linien interessieren nur, wenn Attribute
@@ -644,7 +641,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ BOOL ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL bApi )
+/*N*/ BOOL ScDocFunc::SetNoteText( const ScAddress& rPos, const String& rText, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -684,7 +681,7 @@ using namespace ::com::sun::star;
 //------------------------------------------------------------------------
 
 /*N*/ BOOL ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
-/*N*/                                   BOOL /*bRecord*/, BOOL bApi )
+/*N*/                                   BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   ScDocument* pDoc = rDocShell.GetDocument();
 /*N*/
@@ -727,7 +724,7 @@ using namespace ::com::sun::star;
 
 
 /*N*/ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
-/*N*/                                   BOOL /*bRecord*/, BOOL bApi )
+/*N*/                                   BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   ScDocument* pDoc = rDocShell.GetDocument();
 /*N*/
@@ -766,7 +763,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ BOOL ScDocFunc::InsertTable( USHORT nTab, const String& rName, BOOL /*bRecord*/, BOOL bApi )
+/*N*/ BOOL ScDocFunc::InsertTable( USHORT nTab, const String& rName, BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   BOOL bSuccess = FALSE;
 /*N*/   WaitObject aWait( rDocShell.GetDialogParent() );
@@ -794,7 +791,7 @@ using namespace ::com::sun::star;
 /*N*/   return bSuccess;
 /*N*/ }
 
-/*N*/ BOOL ScDocFunc::SetTableVisible( USHORT nTab, BOOL bVisible, BOOL bApi )
+/*N*/ BOOL ScDocFunc::SetTableVisible( USHORT nTab, BOOL bVisible, BOOL )
 /*N*/ {
 /*N*/   ScDocument* pDoc = rDocShell.GetDocument();
 /*N*/   if ( pDoc->IsVisible( nTab ) == bVisible )
@@ -836,7 +833,7 @@ using namespace ::com::sun::star;
 /*N*/   return TRUE;
 /*N*/ }
 
-/*N*/ BOOL ScDocFunc::RenameTable( USHORT nTab, const String& rName, BOOL /*bRecord*/, BOOL bApi )
+/*N*/ BOOL ScDocFunc::RenameTable( USHORT nTab, const String& rName, BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   ScDocument* pDoc = rDocShell.GetDocument();
 /*N*/   if ( !pDoc->IsDocEditable() )
@@ -886,7 +883,7 @@ using namespace ::com::sun::star;
 
 /*N*/ BOOL ScDocFunc::SetWidthOrHeight( BOOL bWidth, USHORT nRangeCnt, USHORT* pRanges, USHORT nTab,
 /*N*/                                       ScSizeMode eMode, USHORT nSizeTwips,
-/*N*/                                       BOOL /*bRecord*/, BOOL bApi )
+/*N*/                                       BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   if (!nRangeCnt)
 /*N*/       return TRUE;
@@ -1116,7 +1113,7 @@ using namespace ::com::sun::star;
 
 //------------------------------------------------------------------------
 
-/*N*/ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* /*pWhich*/, BOOL bApi )
+/*N*/ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* /*pWhich*/, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -1139,7 +1136,7 @@ using namespace ::com::sun::star;
 /*N*/   return TRUE;
 /*N*/ }
 
-/*N*/ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL /*bIncrement*/, BOOL bApi )
+/*N*/ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL /*bIncrement*/, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -1160,7 +1157,7 @@ using namespace ::com::sun::star;
 /*N*/ }
 
 /*N*/ BOOL ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
-/*N*/                           USHORT nFormatNo, BOOL /*bRecord*/, BOOL bApi )
+/*N*/                           USHORT nFormatNo, BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -1229,7 +1226,7 @@ using namespace ::com::sun::star;
 /*N*/ }
 
 /*N*/ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
-/*N*/                               const String& rString, BOOL bApi, BOOL bEnglish )
+/*N*/                               const String& rString, BOOL , BOOL bEnglish )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -1296,7 +1293,7 @@ using namespace ::com::sun::star;
 /*N*/       return DIR_LEFT;
 /*N*/ }
 
-/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL /*bRecord*/, BOOL bApi )
+/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL /*bRecord*/, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
@@ -1504,7 +1501,7 @@ using namespace ::com::sun::star;
 /*N*/   return bDone;
 /*N*/ }
 
-/*N*/ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
+/*N*/ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL )
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( rDocShell );
 /*N*/
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
index 47b200d..b361700 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
@@ -95,8 +95,6 @@ namespace binfilter {
 /*N*/ {
 /*N*/   ScDocShellModificator aModificator( *this );
 /*N*/
-/*N*/   BOOL bWarn = FALSE;
-/*N*/
 /*N*/   USHORT nTabCount = aDocument.GetTableCount();
 /*N*/   USHORT nUseTab = MAXTAB+1;
 /*N*/   for (USHORT nTab=0; nTab<nTabCount && nUseTab>MAXTAB; nTab++)
@@ -108,8 +106,7 @@ namespace binfilter {
 /*N*/   if (nUseTab<=MAXTAB)        // nicht verwendet -> nichts zu tun
 /*N*/   {
 /*?*/       ScPrintFunc aPrintFunc( this, GetPrinter(), nUseTab );  //! ohne CountPages auskommen
-/*?*/       if (!aPrintFunc.UpdatePages())                          //  setzt Umbrueche auf allen Tabs
-/*?*/           bWarn = TRUE;
+/*?*/       aPrintFunc.UpdatePages();                          //  setzt Umbrueche auf allen Tabs
 /*?*/
 /*N*/   }
 /*N*/
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
index 98059dd..0eeeb2e 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
@@ -268,13 +268,10 @@ namespace binfilter {
 /*N*/       }
 /*N*/       else
 /*N*/       {
-/*N*/           ScDBCollection* pUndoColl = NULL;
-/*N*/
 /*N*/           String aNewName;
 /*N*/           if (eMode==SC_DB_IMPORT)
 /*N*/           {
 /*N*/               aDocument.CompileDBFormula( TRUE );         // CreateFormulaString
-/*N*/               pUndoColl = new ScDBCollection( *pColl );   // Undo fuer Import1-Bereich
 /*N*/
 /*N*/               String aImport = ScGlobal::GetRscString( STR_DBNAME_IMPORT );
 /*N*/               long nCount = 0;
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
index a1e9860..19b155b 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
@@ -1326,7 +1326,7 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const ::rtl::OUString& aName, s
         throw uno::RuntimeException();      // no other exceptions specified
 }
 
-void SAL_CALL ScTableSheetsObj::moveByName( const ::rtl::OUString& aName, sal_Int16 nDestination )
+void SAL_CALL ScTableSheetsObj::moveByName( const ::rtl::OUString& aName, sal_Int16 )
                                             throw(uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
index 11b9671..5a7526c 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
@@ -766,9 +766,9 @@ void SfxObjectShell::PrepareReload( )
 
 //-------------------------------------------------------------------------
 
-/*N*/ ErrCode SfxObjectShell::CallBasic( const String& rMacro,
-/*N*/   const String& rBasic, SbxObject* pVCtrl, SbxArray* pArgs,
-/*N*/   SbxValue* pRet )
+/*N*/ ErrCode SfxObjectShell::CallBasic( const String& /*rMacro*/,
+/*N*/   const String& rBasic, SbxObject* /*pVCtrl*/, SbxArray* /*pArgs*/,
+/*N*/   SbxValue* /*pRet*/ )
 /*N*/ {
 /*N*/     SfxApplication* pApp = SFX_APP();
 /*N*/     if( pApp->GetName() != rBasic )
@@ -778,13 +778,7 @@ void SfxObjectShell::PrepareReload( )
 /*N*/             return ERRCODE_IO_ACCESSDENIED;
 /*N*/     }
 /*?*/
-/*?*/     pApp->EnterBasicCall();
-/*?*/     BasicManager *pMgr = GetBasicManager();
-/*?*/     if( pApp->GetName() == rBasic )
-/*?*/         pMgr = pApp->GetBasicManager();
-/*?*/     ErrCode nRet = 0;
-/*?*/     pApp->LeaveBasicCall();
-/*?*/     return nRet;
+/*?*/     return 0;
 /*N*/ }
 
 } //namespace binfilter
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index 75d9f9d..e0bf9c8 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -347,7 +347,6 @@ sal_False           Das Objekt konnte nicht geladen werden
         SvStorageRef xStor( pMed->GetStorage() );
         if( pMed->GetLastStorageCreationState() == ERRCODE_NONE )
         {
-            DBG_ASSERT( pFilter, "No filter for storage found!" );
             if( xStor.Is() && !xStor->GetError() && pMed->GetFilter() && pMed->GetFilter()->GetVersion() < SOFFICE_FILEFORMAT_60 )
             {
                 // Undoobjekte aufraeumen, muss vor dem eigentlichen Laden erfolgen
@@ -644,7 +643,7 @@ void Lock_Impl( SfxObjectShell* /*pDoc*/, BOOL /*bLock*/ )
 sal_Bool SfxObjectShell::SaveTo_Impl
 (
     SfxMedium &rMedium, // Medium, in das gespeichert werden soll
-    const SfxItemSet* pSet,
+    const SfxItemSet* /*pSet*/,
     BOOL bPrepareForDirectAccess
 )
 
@@ -713,11 +712,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
         else
             // save to target
             bOk = false;
-
-        // look for a "version" parameter
-        const SfxStringItem *pVersionItem = pSet ? (const SfxStringItem*)
-            SfxRequest::GetItem( pSet, SID_DOCINFO_COMMENTS, sal_False, TYPE(SfxStringItem) ) : NULL;
-
     }
     // SetModified must be enabled when SaveCompleted is called, otherwise the modified flag of child objects will not be cleared
     EnableSetModified( sal_True );
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index 84bdf77..bef8ad1 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -326,7 +326,7 @@ extern AsynchronLink* pPendingCloser;
 
 /*N*/ sal_uInt16 SfxObjectShell::PrepareClose
 /*N*/ (
-/*N*/   sal_Bool    bUI,        // sal_True: Dialoge etc. erlaubt, sal_False: silent-mode
+/*N*/   sal_Bool    /*bUI*/,  // sal_True: Dialoge etc. erlaubt, sal_False: silent-mode
 /*N*/   sal_Bool    /*bForBrowsing*/
 /*N*/ )
 /*N*/ {
@@ -350,15 +350,6 @@ extern AsynchronLink* pPendingCloser;
 /*N*/   SfxApplication *pSfxApp = SFX_APP();
 /*N*/   pSfxApp->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEDOC, this) );
 /*N*/
-/*N*/   // ggf. hinweisen, da\s unter Fremdformat gespeichert
-/*N*/   if( pMedium )
-/*N*/   {
-/*N*/       SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIgnoreInformationLost,
-/*N*/                        SfxBoolItem, SID_DOC_IGNOREINFORMATIONLOST, sal_False);
-/*N*/       if( pIgnoreInformationLost && pIgnoreInformationLost->GetValue() )
-/*N*/           bUI = sal_False;
-/*N*/   }
-/*N*/
 /*N*/   pImp->bPreparedForClose = sal_True;
 /*N*/   return sal_True;
 /*N*/ }
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
index 0f6572b..bbdabe2 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
@@ -542,7 +542,7 @@ Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
 }
 Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFrame(
         const OUString& rName,
-        const OUString& rHRef,
+        const OUString& /*rHRef*/,
         const OUString& rStyleName,
         sal_Int32 nWidth, sal_Int32 nHeight )
 {


More information about the Libreoffice-commits mailing list