[Libreoffice-commits] .: sd/source

[Caolán McNamara]

 sd/source/filter/eppt/pptx-epptooxml.cxx |    1 -
 sd/source/ui/docshell/docshel2.cxx       |    4 ----
 sd/source/ui/view/drtxtob.cxx            |    2 --
 sd/source/ui/view/drviews8.cxx           |    4 +---
 4 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 9d1e20f627a798c8ff3af63b0a63b1721e5528a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 24 14:49:38 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ce72c44..741ba03 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1384,7 +1384,6 @@ void PowerPointExport::WriteTextStyleLevel( FSHelperPtr pFS, int nInstance, int
     OSL_ASSERT( nLevel >= 0 && nLevel < 5 );
     OSL_ASSERT( nInstance >= 0 && nInstance < 9 );
 
-    PPTExCharLevel rCharLevel = mpStyleSheet->GetCharSheet( nInstance ).maCharLevel[ nLevel ];
     PPTExParaLevel rParaLevel = mpStyleSheet->GetParaSheet( nInstance ).maParaLevel[ nLevel ];
 
     pFS->startElementNS( XML_a, PowerPointExport::nStyleLevelToken[ nLevel ],
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 6e5447a..1499dd0 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -93,7 +93,6 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect)
     if( NULL == pSelectedPage )
     {
         SdPage* pPage = NULL;
-        USHORT nSelectedPage = 0;
         USHORT nPageCnt = (USHORT) mpDoc->GetSdPageCount(PK_STANDARD);
 
         for (USHORT i = 0; i < nPageCnt; i++)
@@ -101,10 +100,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect)
             pPage = mpDoc->GetSdPage(i, PK_STANDARD);
 
             if ( pPage->IsSelected() )
-            {
-                nSelectedPage = i;
                 pSelectedPage = pPage;
-            }
         }
 
         if( NULL == pSelectedPage )
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 6685b61..5ec0aa4 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -168,7 +168,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
 {
     SfxWhichIter	    aIter( rSet );
     USHORT			    nWhich = aIter.FirstWhich();
-    BOOL			    bTemplate = FALSE;
     SfxItemSet 		    aAttrSet( mpView->GetDoc()->GetPool() );
     SvtLanguageOptions  aLangOpt;
     sal_Bool            bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled();
@@ -236,7 +235,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
                 {
                     rSet.Put( SfxTemplateItem( nWhich, String() ) );
                 }
-                bTemplate = TRUE;
             }
             break;
 
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 1d13671..04ad908 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -352,8 +352,6 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
 
         case SID_TWAIN_SELECT:
         {
-            BOOL bDone = FALSE;
-
             if( mxScannerManager.is() )
             {
                 try
@@ -364,7 +362,7 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq)
                     if( aContexts.getLength() )
                     {
                         ::com::sun::star::scanner::ScannerContext aContext( aContexts.getConstArray()[ 0 ] );
-                        bDone = mxScannerManager->configureScanner( aContext );
+                        mxScannerManager->configureScanner( aContext );
                     }
                 }
                 catch(...)