summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-24 14:49:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-24 14:49:47 +0000
commit81770a7f5459700fed2e25d8943d2af02e41217c (patch)
tree8dd6aae5115e85748c3de850a977a9c9527ef064 /sd
parent2b803d5c6f93637239d6ea3fcff2ad47cd3e2dc2 (diff)
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx1
-rw-r--r--sd/source/ui/docshell/docshel2.cxx4
-rw-r--r--sd/source/ui/view/drtxtob.cxx2
-rw-r--r--sd/source/ui/view/drviews8.cxx4
4 files changed, 1 insertions, 10 deletions
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ce72c44b1979..741ba037ebd5 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 b2f71e8ddf1e..fdc7cae539c7 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 2d9a593462a9..dd6f9ec20a92 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 ea63e37bf0c8..c79dcb0d5172 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(...)