[Libreoffice-commits] core.git: include/sfx2 include/svtools include/svx sd/source sfx2/source svtools/source svx/source sw/inc sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 16 09:26:29 UTC 2020
include/sfx2/charmappopup.hxx | 3 --
include/sfx2/emojipopup.hxx | 3 --
include/svtools/popupwindowcontroller.hxx | 2 -
include/svx/ParaLineSpacingPopup.hxx | 3 --
include/svx/TextCharacterSpacingPopup.hxx | 3 --
include/svx/TextUnderlinePopup.hxx | 3 --
include/svx/layctrl.hxx | 6 +----
include/svx/lboxctrl.hxx | 3 --
include/svx/tbcontrl.hxx | 6 +----
sd/source/ui/controller/displaymodecontroller.cxx | 6 +----
sd/source/ui/controller/slidelayoutcontroller.cxx | 2 -
sd/source/ui/controller/slidelayoutcontroller.hxx | 3 --
sfx2/source/control/emojipopup.cxx | 2 -
sfx2/source/dialog/charmappopup.cxx | 2 -
svtools/source/uno/popupwindowcontroller.cxx | 2 -
svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 2 -
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 2 -
svx/source/sidebar/text/TextUnderlinePopup.cxx | 2 -
svx/source/tbxctrls/bulletsnumbering.cxx | 6 +----
svx/source/tbxctrls/extrusioncontrols.cxx | 10 +++------
svx/source/tbxctrls/extrusioncontrols.hxx | 19 +++---------------
svx/source/tbxctrls/fontworkgallery.cxx | 12 +++--------
svx/source/tbxctrls/layctrl.cxx | 4 +--
svx/source/tbxctrls/lboxctrl.cxx | 2 -
svx/source/tbxctrls/linectrl.cxx | 5 +---
svx/source/tbxctrls/tbcontrl.cxx | 9 +++-----
sw/inc/PageColumnPopup.hxx | 3 --
sw/inc/PageMarginPopup.hxx | 3 --
sw/inc/PageOrientationPopup.hxx | 3 --
sw/inc/PageSizePopup.hxx | 3 --
sw/source/uibase/sidebar/PageColumnPopup.cxx | 2 -
sw/source/uibase/sidebar/PageMarginPopup.cxx | 2 -
sw/source/uibase/sidebar/PageOrientationPopup.cxx | 2 -
sw/source/uibase/sidebar/PageSizePopup.cxx | 2 -
34 files changed, 52 insertions(+), 90 deletions(-)
New commits:
commit edeb04d15b3cc1bd01e869004cc29bba5f4797a2
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 15 20:37:04 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 16 10:25:52 2020 +0100
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
index 4bf25fd674c3..e1b54cb99add 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -29,8 +29,7 @@ public:
CharmapPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
virtual ~CharmapPopup() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
// XServiceInfo
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index a5a9b0934504..f1d04d9e1691 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -29,8 +29,7 @@ public:
EmojiPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext);
virtual ~EmojiPopup() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx
index 88317cb9de3d..7aa1ca08f39a 100644
--- a/include/svtools/popupwindowcontroller.hxx
+++ b/include/svtools/popupwindowcontroller.hxx
@@ -58,7 +58,7 @@ public:
void EndPopupMode();
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) = 0;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) = 0;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow();
// XServiceInfo
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index 4d22cdc8bd2c..b3ee136257dd 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -32,8 +32,7 @@ public:
virtual void SAL_CALL execute(sal_Int16 KeyModifier) override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
// XServiceInfo
diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx
index 2074e468373d..40951daca79b 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/include/svx/TextCharacterSpacingPopup.hxx
@@ -31,8 +31,7 @@ public:
virtual ~TextCharacterSpacingPopup() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
index 2132cbec94a2..ccde9b06fcbb 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -31,8 +31,7 @@ public:
virtual ~TextUnderlinePopup() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index 8c530e2968ca..f6b83f1581e0 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -29,8 +29,7 @@ public:
virtual ~SvxTableToolBoxControl() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
@@ -50,8 +49,7 @@ public:
virtual ~SvxColumnsToolBoxControl() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index 5aeaf54ee4b3..e37d9639843c 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -37,8 +37,7 @@ public:
SvxUndoRedoControl(const css::uno::Reference<css::uno::XComponentContext>& rContext);
virtual ~SvxUndoRedoControl() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 8e5859903878..670ab7107c93 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -228,8 +228,7 @@ public:
// XToolbarController
virtual void SAL_CALL execute( sal_Int16 nSelectModifier ) override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
// XSubToolbarController
@@ -277,8 +276,7 @@ public:
// XToolbarController
virtual void SAL_CALL execute( sal_Int16 nSelectModifier ) override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
// XServiceInfo
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;
};
diff --git a/sfx2/source/control/emojipopup.cxx b/sfx2/source/control/emojipopup.cxx
index f68bab24fb96..513592bf0b92 100644
--- a/sfx2/source/control/emojipopup.cxx
+++ b/sfx2/source/control/emojipopup.cxx
@@ -39,7 +39,7 @@ EmojiPopup::~EmojiPopup()
{
}
-VclPtr<vcl::Window> EmojiPopup::createPopupWindow(vcl::Window* pParent)
+VclPtr<vcl::Window> EmojiPopup::createVclPopupWindow(vcl::Window* pParent)
{
return VclPtr<SfxEmojiControl>::Create(this, pParent);
}
diff --git a/sfx2/source/dialog/charmappopup.cxx b/sfx2/source/dialog/charmappopup.cxx
index 661f7ffb976e..7831d49db35d 100644
--- a/sfx2/source/dialog/charmappopup.cxx
+++ b/sfx2/source/dialog/charmappopup.cxx
@@ -45,7 +45,7 @@ std::unique_ptr<WeldToolbarPopup> CharmapPopup::weldPopupWindow()
return std::make_unique<SfxCharmapCtrl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> CharmapPopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> CharmapPopup::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<SfxCharmapCtrl>(this, pParent->GetFrameWeld()));
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index a60f06daf5ee..fcddc6c872c0 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -226,7 +226,7 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow()
if( pToolBox )
{
vcl::Window* pItemWindow = pToolBox->GetItemWindow( pToolBox->GetDownItemId() );
- VclPtr<vcl::Window> pWin = createPopupWindow( pItemWindow ? pItemWindow : pToolBox );
+ VclPtr<vcl::Window> pWin = createVclPopupWindow( pItemWindow ? pItemWindow : pToolBox );
if( pWin )
{
FloatWinPopupFlags eFloatFlags = FloatWinPopupFlags::GrabFocus |
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 470e5eb7e3fd..867e0846a970 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -69,7 +69,7 @@ std::unique_ptr<WeldToolbarPopup> SvxLineSpacingToolBoxControl::weldPopupWindow(
return std::make_unique<ParaLineSpacingControl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> SvxLineSpacingToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxLineSpacingToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<ParaLineSpacingControl>(this, pParent->GetFrameWeld()));
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index 259fa83fe494..5ae14443e231 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -48,7 +48,7 @@ std::unique_ptr<WeldToolbarPopup> TextCharacterSpacingPopup::weldPopupWindow()
return std::make_unique<TextCharacterSpacingControl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> TextCharacterSpacingPopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> TextCharacterSpacingPopup::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<TextCharacterSpacingControl>(this, pParent->GetFrameWeld()));
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index 4532f09a8a44..8e3169bcd816 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -47,7 +47,7 @@ std::unique_ptr<WeldToolbarPopup> TextUnderlinePopup::weldPopupWindow()
return std::make_unique<TextUnderlineControl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> TextUnderlinePopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> TextUnderlinePopup::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<TextUnderlineControl>(this, pParent->GetFrameWeld()));
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 10e93efc69e2..69bad8a9a01c 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -52,7 +52,7 @@ class NumberingToolBoxControl : public svt::PopupWindowController
public:
explicit NumberingToolBoxControl( 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;
std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
// XInitialization
@@ -61,8 +61,6 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- using svt::ToolboxController::createPopupWindow;
};
}
@@ -190,7 +188,7 @@ std::unique_ptr<WeldToolbarPopup> NumberingToolBoxControl::weldPopupWindow()
return std::make_unique<NumberingPopup>(*this, m_pToolbar, mePageType);
}
-VclPtr<vcl::Window> NumberingToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> NumberingToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<NumberingPopup>(*this, pParent->GetFrameWeld(), mePageType));
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index db308b2e5caa..d81e40d26a53 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -301,7 +301,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl(
}
-VclPtr<vcl::Window> ExtrusionDirectionControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionDirectionControl::createVclPopupWindow( vcl::Window* pParent )
{
return VclPtr<ExtrusionDirectionWindow>::Create( *this, pParent );
}
@@ -538,7 +538,7 @@ ExtrusionDepthController::ExtrusionDepthController(
}
-VclPtr<vcl::Window> ExtrusionDepthController::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionDepthController::createVclPopupWindow( vcl::Window* pParent )
{
return VclPtr<ExtrusionDepthWindow>::Create( *this, pParent );
}
@@ -789,7 +789,7 @@ ExtrusionLightingControl::ExtrusionLightingControl(
}
-VclPtr<vcl::Window> ExtrusionLightingControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionLightingControl::createVclPopupWindow( vcl::Window* pParent )
{
return VclPtr<ExtrusionLightingWindow>::Create( *this, pParent );
}
@@ -902,7 +902,6 @@ IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void)
}
}
-
ExtrusionSurfaceControl::ExtrusionSurfaceControl(
const Reference< XComponentContext >& rxContext
)
@@ -914,8 +913,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl(
{
}
-
-VclPtr<vcl::Window> ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionSurfaceControl::createVclPopupWindow( vcl::Window* pParent )
{
return VclPtr<ExtrusionSurfaceWindow>::Create( *this, pParent );
}
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 4804c56459c5..db901dc82fe7 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -80,7 +80,7 @@ class ExtrusionDirectionControl : public svt::PopupWindowController
public:
explicit ExtrusionDirectionControl( 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;
@@ -88,8 +88,6 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- using svt::PopupWindowController::createPopupWindow;
};
class ExtrusionDepthWindow : public svtools::ToolbarMenu
@@ -115,7 +113,7 @@ class ExtrusionDepthController : public svt::PopupWindowController
public:
explicit ExtrusionDepthController( 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;
@@ -123,11 +121,8 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- using svt::PopupWindowController::createPopupWindow;
};
-
class ExtrusionLightingWindow : public svtools::ToolbarMenu
{
private:
@@ -166,7 +161,7 @@ class ExtrusionLightingControl : public svt::PopupWindowController
public:
explicit ExtrusionLightingControl( 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;
@@ -174,11 +169,8 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- using svt::PopupWindowController::createPopupWindow;
};
-
class ExtrusionSurfaceWindow : public svtools::ToolbarMenu
{
private:
@@ -200,7 +192,7 @@ class ExtrusionSurfaceControl : public svt::PopupWindowController
public:
explicit ExtrusionSurfaceControl( 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;
@@ -208,11 +200,8 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- using svt::PopupWindowController::createPopupWindow;
};
-
}
#endif
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 10b29b7f29d4..b558a49d019a 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -359,7 +359,7 @@ class FontworkAlignmentControl : public svt::PopupWindowController
public:
explicit FontworkAlignmentControl( 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;
@@ -367,8 +367,6 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- using svt::PopupWindowController::createPopupWindow;
};
}
@@ -379,7 +377,7 @@ FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentC
}
-VclPtr<vcl::Window> FontworkAlignmentControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> FontworkAlignmentControl::createVclPopupWindow( vcl::Window* pParent )
{
return VclPtr<FontworkAlignmentWindow>::Create( *this, pParent );
}
@@ -578,7 +576,7 @@ class FontworkCharacterSpacingControl : public svt::PopupWindowController
public:
explicit FontworkCharacterSpacingControl( 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;
@@ -586,8 +584,6 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
- using svt::PopupWindowController::createPopupWindow;
};
}
@@ -598,7 +594,7 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc
}
-VclPtr<vcl::Window> FontworkCharacterSpacingControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> FontworkCharacterSpacingControl::createVclPopupWindow( vcl::Window* pParent )
{
return VclPtr<FontworkCharacterSpacingWindow>::Create( *this, pParent );
}
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 0a07f8dfcb5c..3d7f57d60db9 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -707,7 +707,7 @@ std::unique_ptr<WeldToolbarPopup> SvxTableToolBoxControl::weldPopupWindow()
return std::make_unique<TableWindow>(this, m_pToolbar, m_aCommandURL);
}
-VclPtr<vcl::Window> SvxTableToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxTableToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
{
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
@@ -765,7 +765,7 @@ std::unique_ptr<WeldToolbarPopup> SvxColumnsToolBoxControl::weldPopupWindow()
return std::make_unique<ColumnsWindow>(this, m_pToolbar);
}
-VclPtr<vcl::Window> SvxColumnsToolBoxControl::createPopupWindow(vcl::Window* pParent)
+VclPtr<vcl::Window> SvxColumnsToolBoxControl::createVclPopupWindow(vcl::Window* pParent)
{
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 28c3dc6f4fa3..0527fe0ec125 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -195,7 +195,7 @@ void SAL_CALL SvxUndoRedoControl::statusChanged(const css::frame::FeatureStateEv
pToolBox->SetQuickHelpText(nId, aQuickHelpText);
}
-VclPtr<vcl::Window> SvxUndoRedoControl::createPopupWindow(vcl::Window* pParent)
+VclPtr<vcl::Window> SvxUndoRedoControl::createVclPopupWindow(vcl::Window* pParent)
{
if ( m_aCommandURL == ".uno:Undo" )
updateStatus( ".uno:GetUndoStrings");
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 545c58eda1d1..c6d259fb6567 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -477,8 +477,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
- using svt::ToolboxController::createPopupWindow;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
};
}
@@ -497,7 +496,7 @@ void SvxLineEndToolBoxControl::initialize( const css::uno::Sequence<css::uno::An
pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY );
}
-VclPtr<vcl::Window> SvxLineEndToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxLineEndToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
{
return VclPtr<SvxLineEndWindow>::Create( *this, pParent );
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2a0b85e97c30..e190200810e7 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3456,7 +3456,7 @@ std::unique_ptr<WeldToolbarPopup> SvxColorToolBoxControl::weldPopupWindow()
return xPopover;
}
-VclPtr<vcl::Window> SvxColorToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxColorToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
{
ToolBox* pToolBox = nullptr;
sal_uInt16 nId = 0;
@@ -3623,8 +3623,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
- using svt::ToolboxController::createPopupWindow;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
};
}
@@ -3643,7 +3642,7 @@ void SvxFrameToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any
pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY );
}
-VclPtr<vcl::Window> SvxFrameToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxFrameToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
{
if ( m_aCommandURL == ".uno:LineStyle" )
return VclPtr<SvxLineWindow_Impl>::Create( *this, pParent );
@@ -3844,7 +3843,7 @@ std::unique_ptr<WeldToolbarPopup> SvxCurrencyToolBoxControl::weldPopupWindow()
return std::make_unique<SvxCurrencyList_Impl>(this, m_pToolbar, m_aFormatString, m_eLanguage);
}
-VclPtr<vcl::Window> SvxCurrencyToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxCurrencyToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<SvxCurrencyList_Impl>(this, pParent->GetFrameWeld(), m_aFormatString, m_eLanguage));
diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx
index 18665fef9a50..784f75786cab 100644
--- a/sw/inc/PageColumnPopup.hxx
+++ b/sw/inc/PageColumnPopup.hxx
@@ -29,8 +29,7 @@ public:
virtual ~PageColumnPopup() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx
index c4ec2e634066..160684d69392 100644
--- a/sw/inc/PageMarginPopup.hxx
+++ b/sw/inc/PageMarginPopup.hxx
@@ -29,8 +29,7 @@ public:
virtual ~PageMarginPopup() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx
index 2b97bba36352..a9d2f677f9d6 100644
--- a/sw/inc/PageOrientationPopup.hxx
+++ b/sw/inc/PageOrientationPopup.hxx
@@ -29,8 +29,7 @@ public:
virtual ~PageOrientationPopup() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx
index 497f76dce24a..5b528b1ac862 100644
--- a/sw/inc/PageSizePopup.hxx
+++ b/sw/inc/PageSizePopup.hxx
@@ -29,8 +29,7 @@ public:
virtual ~PageSizePopup() override;
virtual std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
- using svt::ToolboxController::createPopupWindow;
- virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+ virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx b/sw/source/uibase/sidebar/PageColumnPopup.cxx
index 568e7a5d47ae..b0b9e07fc883 100644
--- a/sw/source/uibase/sidebar/PageColumnPopup.cxx
+++ b/sw/source/uibase/sidebar/PageColumnPopup.cxx
@@ -45,7 +45,7 @@ std::unique_ptr<WeldToolbarPopup> PageColumnPopup::weldPopupWindow()
return std::make_unique<sw::sidebar::PageColumnControl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> PageColumnPopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> PageColumnPopup::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<sw::sidebar::PageColumnControl>(this, pParent->GetFrameWeld()));
diff --git a/sw/source/uibase/sidebar/PageMarginPopup.cxx b/sw/source/uibase/sidebar/PageMarginPopup.cxx
index d71aa8c6f09f..8223386c2a48 100644
--- a/sw/source/uibase/sidebar/PageMarginPopup.cxx
+++ b/sw/source/uibase/sidebar/PageMarginPopup.cxx
@@ -44,7 +44,7 @@ std::unique_ptr<WeldToolbarPopup> PageMarginPopup::weldPopupWindow()
return std::make_unique<sw::sidebar::PageMarginControl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> PageMarginPopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> PageMarginPopup::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<sw::sidebar::PageMarginControl>(this, pParent->GetFrameWeld()));
diff --git a/sw/source/uibase/sidebar/PageOrientationPopup.cxx b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
index 1fddd83b9d29..9b34f3c1dee0 100644
--- a/sw/source/uibase/sidebar/PageOrientationPopup.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationPopup.cxx
@@ -45,7 +45,7 @@ std::unique_ptr<WeldToolbarPopup> PageOrientationPopup::weldPopupWindow()
return std::make_unique<sw::sidebar::PageOrientationControl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> PageOrientationPopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> PageOrientationPopup::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<sw::sidebar::PageOrientationControl>(this, pParent->GetFrameWeld()));
diff --git a/sw/source/uibase/sidebar/PageSizePopup.cxx b/sw/source/uibase/sidebar/PageSizePopup.cxx
index 0ff79de5743b..0c69f73ba721 100644
--- a/sw/source/uibase/sidebar/PageSizePopup.cxx
+++ b/sw/source/uibase/sidebar/PageSizePopup.cxx
@@ -45,7 +45,7 @@ std::unique_ptr<WeldToolbarPopup> PageSizePopup::weldPopupWindow()
return std::make_unique<sw::sidebar::PageSizeControl>(this, m_pToolbar);
}
-VclPtr<vcl::Window> PageSizePopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> PageSizePopup::createVclPopupWindow( vcl::Window* pParent )
{
mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
std::make_unique<sw::sidebar::PageSizeControl>(this, pParent->GetFrameWeld()));
More information about the Libreoffice-commits
mailing list