[Libreoffice-commits] .: sc/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Jan 27 12:02:23 PST 2011


 sc/source/ui/app/scmod.cxx         |   10 ----------
 sc/source/ui/docshell/dbdocfun.cxx |    2 --
 sc/source/ui/docshell/docsh6.cxx   |    7 -------
 sc/source/ui/undo/undoutil.cxx     |    1 +
 4 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit f56e42b46dd9bda8cfff1fe09b6318353999f2bd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 11:22:52 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f66832b..99b872d 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1047,7 +1047,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
     BOOL					bUpdateMarks		= FALSE;
     BOOL					bUpdateRefDev		= FALSE;
     BOOL					bCalcAll			= FALSE;
-    BOOL					bSaveSpellCheck		= FALSE;
     BOOL					bSaveAppOptions		= FALSE;
     BOOL					bSaveInputOptions	= FALSE;
 
@@ -1227,10 +1226,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
         }
 
         if ( bOldAutoSpell != bDoAutoSpell )
-        {
             SetAutoSpellProperty( bDoAutoSpell );
-            bSaveSpellCheck = TRUE;
-        }
         if ( pDocSh )
             pDocSh->PostPaintGridAll();						// wegen Markierungen
         ScInputHandler* pInputHandler = GetInputHdl();
@@ -1314,12 +1310,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
 
     //----------------------------------------------------------
 
-//	if ( bSaveSpellCheck )
-//	{
-        //	currently LinguProperties are saved only at program exit.
-        //	if a save method becomes available, it should be called here.
-//	}
-
     if ( bSaveAppOptions )
         pAppCfg->OptionsChanged();
 
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 43533d0..a37a48c 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1021,11 +1021,9 @@ BOOL ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
     }
 
     BOOL bOk = TRUE;
-    BOOL bDelete = FALSE;
     if (rParam.bReplace)
         if (pDoc->TestRemoveSubTotals( nTab, rParam ))
         {
-            bDelete = TRUE;
             bOk = ( MessBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
                 // "StarCalc" "Daten loeschen?"
                 ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 6b25930..adcd646 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -218,7 +218,6 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
     Rectangle aOldArea = SfxObjectShell::GetVisArea();
     Rectangle aNewArea = aOldArea;
 
-    BOOL bChange = FALSE;
     BOOL bEmbedded = aDocument.IsEmbedded();
     if (bEmbedded)
         aNewArea = aDocument.GetEmbeddedRect();
@@ -226,10 +225,7 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
     {
         SCTAB nTab = pViewData->GetTabNo();
         if ( nTab != aDocument.GetVisibleTab() )
-        {
             aDocument.SetVisibleTab( nTab );
-            bChange = TRUE;
-        }
 
         BOOL bNegativePage = aDocument.IsNegativePage( nTab );
         SCCOL nX = pViewData->GetPosX(SC_SPLIT_LEFT);
@@ -244,10 +240,7 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, BOOL bSnapSize )
     }
 
     if (aNewArea != aOldArea)
-    {
         SetVisAreaOrSize( aNewArea, TRUE );	// hier muss auch der Start angepasst werden
-        bChange = TRUE;
-    }
 }
 
 //
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 6c8066d..a13766e 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -99,6 +99,7 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB
                 bWasTemp = TRUE;
         }
         DBG_ASSERT(bWasTemp, "Undo: didn't find database range");
+        (void)bWasTemp;
 
         USHORT nIndex;
         ScDBCollection* pColl = pDoc->GetDBCollection();


More information about the Libreoffice-commits mailing list