diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-06-09 10:22:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-09 10:22:42 +0100 |
commit | e80486eb27163033eae39cffbcaeeff52902d61d (patch) | |
tree | 0e9367f3c60eab08555760582e1f597ceefaf38f /sd/source/ui | |
parent | 4a09d16972dafb48293a14c3070da610d0c238d1 (diff) |
Resolves: fdo#34723 unused variables and arguments
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/frmview.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 2 |
4 files changed, 0 insertions, 23 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index f86e15ac622b..12396b115852 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -554,7 +554,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) sal_Bool bNewPrintOptions = sal_False; sal_Bool bMiscOptions = sal_False; - ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); SdDrawDocument* pDoc = NULL; // Hier wird der DocType vom Optionsdialog gesetzt (nicht Dokument!) @@ -568,11 +567,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) { pDoc = pDocSh->GetDoc(); - // Wenn der Optionsdialog zum Dokumenttyp identisch ist, - // kann auch die FrameView mit uebergeben werden: - if( pDoc && eDocType == pDoc->GetDocumentType() ) - pFrameView = pDocSh->GetFrameView(); - pViewShell = pDocSh->GetViewShell(); if (pViewShell != NULL) pViewShell->WriteFrameViewData(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index fe631fc3c574..fdd23b247c38 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1545,7 +1545,6 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest) { // Set the visibility state of the toolpanel and one of its top // level panels. - sal_Bool bShowToolPanel = sal_True; toolpanel::PanelId nPanelId ( toolpanel::PID_UNKNOWN); bool bPanelIdGiven = false; @@ -1554,13 +1553,6 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest) const SfxItemSet* pArgs = rRequest.GetArgs(); if (pArgs) { - if ((pArgs->Count() == 1) || (pArgs->Count() == 2)) - { - SFX_REQUEST_ARG (rRequest, pIsPanelVisible, - SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); - if (pIsPanelVisible != NULL) - bShowToolPanel = pIsPanelVisible->GetValue(); - } if (pArgs->Count() == 2) { SFX_REQUEST_ARG (rRequest, pPanelId, SfxUInt32Item, diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 22ef286bbd10..124dd3f95f62 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -643,10 +643,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : sal_Int32 aSnapGridWidthYNum = GetSnapGridWidthY().GetNumerator(); sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator(); - EditMode eStandardEditMode; - EditMode eNotesEditMode; - EditMode eHandoutEditMode; - const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray(); for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ ) { @@ -751,7 +747,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() ); if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) ) SetViewShEditMode( (EditMode)nInt32, PK_STANDARD ); - eStandardEditMode = (EditMode)nInt32; } } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeNotes ) ) ) @@ -761,7 +756,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() ); if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) ) SetViewShEditMode( (EditMode)nInt32, PK_NOTES ); - eNotesEditMode = (EditMode)nInt32; } } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeHandout ) ) ) @@ -771,7 +765,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() ); if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) ) SetViewShEditMode( (EditMode)nInt32, PK_HANDOUT ); - eHandoutEditMode = (EditMode)nInt32; } } else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaTop ) ) ) diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index b063d96eb326..3da99c7e1ef9 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -394,8 +394,6 @@ SdPage* ViewShell::CreateOrDuplicatePage ( ePageKind, aStandardPageName, aNotesPageName, - eStandardLayout, - eNotesLayout, bIsPageBack, bIsPageObj, nInsertPosition); |