diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/inc/PresentationViewShell.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/fuformatpaintbrush.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/unoaprms.hxx | 10 | ||||
-rw-r--r-- | sd/source/ui/presenter/PresenterCanvas.hxx | 13 | ||||
-rw-r--r-- | sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/IDisposable.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/sidebar/ISidebarReceiver.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPageContainer.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.hxx | 15 | ||||
-rw-r--r-- | sd/source/ui/sidebar/PanelBase.cxx | 13 | ||||
-rw-r--r-- | sd/source/ui/sidebar/PanelBase.hxx | 6 |
11 files changed, 0 insertions, 68 deletions
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index e91ae3de7ad6..7a837567c778 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -32,7 +32,6 @@ class PresentationViewShell : public DrawViewShell public: TYPEINFO_OVERRIDE(); - SFX_DECL_VIEWFACTORY(PresViewShell); SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL ) private: diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 13ec578608a2..46622c6cfd55 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -45,7 +45,6 @@ public: virtual void Deactivate() SAL_OVERRIDE; static void GetMenuState( DrawViewShell& rDrawViewShell, SfxItemSet &rSet ); - static bool CanCopyThisType( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ); private: FuFormatPaintBrush ( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index ee53ca82e434..375bb4b2fbca 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -69,8 +69,6 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::ClickAction eNewClickAction; OUString aOldBookmark; OUString aNewBookmark; - bool bOldInvisibleInPres; - bool bNewInvisibleInPres; sal_uInt16 nOldVerb; sal_uInt16 nNewVerb; sal_uLong nOldPresOrder; @@ -112,8 +110,6 @@ public: , pNewPathObj(NULL) , eOldClickAction(css::presentation::ClickAction_NONE) , eNewClickAction(css::presentation::ClickAction_NONE) - , bOldInvisibleInPres(false) - , bNewInvisibleInPres(false) , nOldVerb(0) , nNewVerb(0) , nOldPresOrder(0) @@ -140,8 +136,6 @@ public: { bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; } void SetSound(const OUString& aTheOldSound, const OUString& aTheNewSound) { aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; } - void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen) - { aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; } void SetPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldPlayFull = bTheOldPlayFull; bNewPlayFull = bTheNewPlayFull; } void SetPathObj(SdrPathObj* pTheOldPath, SdrPathObj* pTheNewPath) @@ -150,8 +144,6 @@ public: { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; } void SetBookmark(const OUString& aTheOldBookmark, const OUString& aTheNewBookmark) { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; } - void SetInvisibleInPres(bool bTheOldInvisibleInPres, bool bTheNewInvisibleInPres) - { bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; } void SetVerb(sal_uInt16 nTheOldVerb, sal_uInt16 nTheNewVerb) { nOldVerb = nTheOldVerb; nNewVerb = nTheNewVerb; } void SetSecondEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) @@ -162,8 +154,6 @@ public: { bOldSecondSoundOn = bTheOldSoundOn; bNewSecondSoundOn = bTheNewSoundOn; } void SetSecondPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldSecondPlayFull = bTheOldPlayFull; bNewSecondPlayFull = bTheNewPlayFull; } - void SetPresOrder(sal_uLong nTheOldPresOrder, sal_uLong nTheNewPresOrder) - { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } virtual ~SdAnimationPrmsUndoAction(); virtual void Undo() SAL_OVERRIDE; diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index 606117caca4e..af3b06d718f9 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -119,19 +119,6 @@ public: const css::rendering::ViewState& rViewState, const css::awt::Point& raOffset); - css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas() const; - - /** This method is typically called by CanvasPane objects to set the - repaint rectangle of a windowPaint() call as clip rectangle. When - no or an empty rectangle is given then the window bounds are used - instead. - @param rClipRectangle - A valid rectangle is used to clip the view state clip polygon. - When an empty rectangle is given then the view state clip - polygons are clipped against the window bounds. - */ - void SetClip (const css::awt::Rectangle& rClipRectangle); - /** Called by custom sprites to update their clip polygon so that they are clipped at the borders of the canvas. This method has to be called after each change of the sprite location so that the bounds diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index e63e00c5b76c..96130c6f6efe 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -65,8 +65,6 @@ private: const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~AllMasterPagesSelector(); - void AddTemplate (const TemplateEntry& rEntry); - void AddItem (MasterPageContainer::Token aToken); /** Add all items in the internal master page list into the given list. diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index 3bad77980735..ee4424f3000c 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -29,7 +29,6 @@ namespace sd { namespace sidebar { class IDisposable { public: - virtual void Dispose() = 0; virtual ~IDisposable(); }; diff --git a/sd/source/ui/sidebar/ISidebarReceiver.hxx b/sd/source/ui/sidebar/ISidebarReceiver.hxx index 2c5867391981..4e6b8de1d29b 100644 --- a/sd/source/ui/sidebar/ISidebarReceiver.hxx +++ b/sd/source/ui/sidebar/ISidebarReceiver.hxx @@ -26,8 +26,6 @@ namespace sd { namespace sidebar { class ISidebarReceiver { public: - virtual void SetSidebar (const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XSidebar>& rxSidebar) = 0; virtual ~ISidebarReceiver(); }; diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index b1db0558dc41..9b28bef0e152 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -158,10 +158,6 @@ private: class Implementation; ::boost::shared_ptr<Implementation> mpImpl; PreviewSize mePreviewSize; - - /** Retrieve the preview of the document specified by the given URL. - */ - static BitmapEx LoadPreviewFromURL (const OUString& aURL); }; /** For some changes to the set of master pages in a MasterPageContainer or diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 179f57a4089d..801254b0ead5 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -67,19 +67,6 @@ public: virtual void LateInit(); - /** Return the height that this control needs to show all of its lines. - */ - long GetRequiredHeight (int nWidth) const; - - /** The given master page, either the master page of a slide or a notes - page, is cloned and inserted into mrDocument. The necessary styles - are copied as well. - */ - static SdPage* AddMasterPage ( - SdDrawDocument* pTargetDocument, - SdPage* pMasterPage, - sal_uInt16 nInsertionIndex); - sal_Int32 GetPreferredHeight (sal_Int32 nWidth); /** Update the selection of previews according to whatever @@ -96,8 +83,6 @@ public: */ virtual void UpdateSelection(); - void FillPageSet(); - /** Make the selector empty. This method clear the value set from any entries. Override this method to add functionality, especially to destroy objects set as data items at the value set. diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index c7bcde32e36a..3aaa0b2cd90f 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -47,12 +47,6 @@ void PanelBase::dispose() Control::dispose(); } -void PanelBase::Dispose() -{ - OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); - mpWrappedControl.disposeAndClear(); -} - css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) { sal_Int32 nHeight (0); @@ -70,13 +64,6 @@ void PanelBase::Resize() } } -void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) -{ - mxSidebar = rxSidebar; - if (mxSidebar.is() && mpWrappedControl!=nullptr) - mxSidebar->requestLayout(); -} - bool PanelBase::ProvideWrappedControl() { if ( ! mpWrappedControl) diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index a9971fc5d9f6..b05e1a7a77fb 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -49,15 +49,9 @@ public: virtual void Resize() SAL_OVERRIDE; - // IDisposable - virtual void Dispose() SAL_OVERRIDE; - // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; - // ISidebarReceiver - virtual void SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSidebar) SAL_OVERRIDE; - protected: VclPtr<vcl::Window> mpWrappedControl; virtual vcl::Window* CreateWrappedControl ( |