diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/func/fulinend.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsg.cxx | 3 |
6 files changed, 6 insertions, 12 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 4978b4fc1257..7e25077ec85c 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -400,8 +400,6 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) if( nSlot == SID_SD_GRAPHIC_OPTIONS ) eDocType = DOCUMENT_TYPE_DRAW; - ::sd::ViewShell* pViewShell = NULL; - if (pDocSh) { pDoc = pDocSh->GetDoc(); @@ -411,7 +409,7 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) if( pDoc && eDocType == pDoc->GetDocumentType() ) pFrameView = pDocSh->GetFrameView(); - pViewShell = pDocSh->GetViewShell(); + ::sd::ViewShell* pViewShell = pDocSh->GetViewShell(); if (pViewShell != NULL) pViewShell->WriteFrameViewData(); } diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index d933a73b786e..7ea9c52f3a27 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -461,7 +461,6 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) void SdDefineCustomShowDlg::CheckCustomShow() { sal_Bool bDifferent = sal_False; - SdPage* pPage = NULL; SvTreeListEntry* pEntry = NULL; // Anzahl vergleichen @@ -490,6 +489,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() // Seiten-Pointer neu setzen if( bDifferent ) { + SdPage* pPage = NULL; for( pEntry = aLbCustomPages.First(); pEntry != NULL; pEntry = aLbCustomPages.Next( pEntry ) ) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 902001c76ecb..0fb7588a5bff 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1351,7 +1351,6 @@ void SdPageObjsTLB::AddShapeToTransferable ( ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh(); if (bIsDescriptorFillingPending && pDocShell!=NULL) { - bIsDescriptorFillingPending = false; pDocShell->FillTransferableObjectDescriptor(aObjectDescriptor); } @@ -1415,7 +1414,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( return pViewShell.get(); } } - catch (uno::Exception e) + catch (uno::Exception &e) { // When there is an exception then simply use the default value of // bIsEnabled and disable the controls. diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index e8c053a21696..14b2b51f33f4 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -99,7 +99,6 @@ void FuLineEnd::DoExecute( SfxRequest& ) SdrObject::Free( pConvPolyObj ); XLineEndListRef pLineEndList = mpDoc->GetLineEndList(); - XLineEndEntry* pEntry; String aNewName( SdResId( STR_LINEEND ) ); String aDesc( SdResId( STR_DESC_LINEEND ) ); @@ -142,7 +141,7 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( bDifferent ) { - pEntry = new XLineEndEntry( aPolyPolygon, aName ); + XLineEndEntry* pEntry = new XLineEndEntry( aPolyPolygon, aName ); pLineEndList->Insert( pEntry, LIST_APPEND); } else diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 9871c3d5d537..001d5d674a53 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -400,12 +400,11 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const SdrObject* pObj = NULL; sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId(); - SvxBmpMask* pDlg = NULL; sal_Bool bEnable = sal_False; if ( GetViewFrame()->HasChildWindow( nId ) ) { - pDlg = (SvxBmpMask*) ( GetViewFrame()->GetChildWindow( nId )->GetWindow() ); + SvxBmpMask* pDlg = (SvxBmpMask*) ( GetViewFrame()->GetChildWindow( nId )->GetWindow() ); if ( pDlg->NeedsColorList() ) pDlg->SetColorList( GetDoc()->GetColorList() ); diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 6318b10770a3..eee39f0ba3ef 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -84,12 +84,11 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) if( GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); - const SdrObject* pObj = NULL; sal_uLong nMarkCount = rMarkList.GetMarkCount(); if ( nMarkCount == 1 ) { - pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); + const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SvxIMapDlg* pImageMapDialog = ViewShell::Implementation::GetImageMapDialog(); if ( ( pObj->ISA( SdrGrafObj ) /*|| pObj->ISA( SdrOle2Obj )*/ ) |