diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-15 20:37:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-16 10:25:52 +0100 |
| commit | edeb04d15b3cc1bd01e869004cc29bba5f4797a2 (patch) | |
| tree | 2d1a3aaf82411f00452e1dce6a3f251ed3d1d9ab /sd | |
| parent | 6efe229c46ac9d66a141e36647aecaa7adaaa790 (diff) | |
rename a createPopupWindow so we can remove 'using createPopupWindow'
Change-Id: I6e24d3f796b4b958513166ba2fd9e63239729375
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86886
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/controller/displaymodecontroller.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.hxx | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index 8706e506472a..7fc63d053e4d 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -36,7 +36,7 @@ class DisplayModeController : public svt::PopupWindowController public: explicit DisplayModeController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; @@ -46,8 +46,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void setToolboxItemImage(const OUString& rImage); - - using svt::PopupWindowController::createPopupWindow; }; class DisplayModeToolbarMenu : public svtools::ToolbarMenu @@ -240,7 +238,7 @@ void SAL_CALL DisplayModeController::initialize( const css::uno::Sequence< css:: setToolboxItemImage(BMP_DISPLAYMODE_SLIDE); } -VclPtr<vcl::Window> DisplayModeController::createPopupWindow( vcl::Window* pParent ) +VclPtr<vcl::Window> DisplayModeController::createVclPopupWindow( vcl::Window* pParent ) { return VclPtr<sd::DisplayModeToolbarMenu>::Create( *this, pParent ); } diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 2b884dd5085d..4b06d78c73af 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -346,7 +346,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css:: } } -VclPtr<vcl::Window> SlideLayoutController::createPopupWindow( vcl::Window* pParent ) +VclPtr<vcl::Window> SlideLayoutController::createVclPopupWindow( vcl::Window* pParent ) { return VclPtr<sd::LayoutToolbarMenu>::Create( *this, pParent, mbInsertPage ); } diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index b81e30af6dcb..c5f6cbf189f1 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -32,7 +32,7 @@ public: const OUString& sCommandURL, bool bInsertPage ); - virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override; + virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; @@ -41,7 +41,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - using svt::PopupWindowController::createPopupWindow; private: bool mbInsertPage; }; |