diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/inc/PreviewRenderer.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/headerfooterdlg.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 7 |
5 files changed, 3 insertions, 20 deletions
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 14c1966b3626..0230762706b5 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -274,7 +274,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl, Button*, void) IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl, Button*, void) { - Cancel(); + EndDialog(); } short HeaderFooterDialog::Execute() @@ -299,11 +299,6 @@ void HeaderFooterDialog::Apply() EndDialog(1); } -void HeaderFooterDialog::Cancel() -{ - EndDialog(); -} - void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides ) { SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc); diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index fb3c4bd83211..7cccf318e29f 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -127,7 +127,6 @@ private: const SdPage* pPage, const Size& rPixelSize, const bool bObeyHighContrastMode); - void Cleanup(); void PaintPage ( const SdPage* pPage, const bool bDisplayPresentationObjects); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 77a932fca101..f26fc24a4571 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -71,7 +71,6 @@ public: void ApplyToAll(); void Apply(); - void Cancel(); virtual short Execute() override; }; diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 8a2cf3f8d3d7..9a761123cba2 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -127,7 +127,7 @@ Image PreviewRenderer::RenderPage ( mpPreviewDevice->PixelToLogic(Point(0,0)), mpPreviewDevice->PixelToLogic(aSize))); - Cleanup(); + mpView->HideSdrPage(); } } catch (const css::uno::Exception&) @@ -272,11 +272,6 @@ bool PreviewRenderer::Initialize ( return true; } -void PreviewRenderer::Cleanup() -{ - mpView->HideSdrPage(); -} - void PreviewRenderer::PaintPage ( const SdPage* pPage, const bool bDisplayPresentationObjects) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 1db185a8f82d..5eb778bf92af 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1182,7 +1182,7 @@ public: if (rHint.GetId() == SFX_HINT_DYING) { - Dispose(); + mbIsDisposed = true; } } @@ -1352,11 +1352,6 @@ private: std::vector<sal_Int32> maSlidesPerPage; awt::Size maPrintSize; - void Dispose() - { - mbIsDisposed = true; - } - sal_Int32 GetCurrentPageIndex() const { const ViewShell *pShell = mrBase.GetMainViewShell().get(); |