summaryrefslogtreecommitdiffstats
path: root/svx/source
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2015-07-05 01:31:02 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2015-07-05 11:50:16 +0000
commitd6794cf0d590dc504fb9245a2930a8433dfe569e (patch)
tree56cf86e4c15ae735d53a7af83d7fcf1dc071483b /svx/source
parentfix typo from 6942e18899756cb49bc17f531c156bf3e6abce03 (diff)
downloadcore-d6794cf0d590dc504fb9245a2930a8433dfe569e.tar.gz
core-d6794cf0d590dc504fb9245a2930a8433dfe569e.zip
SfxToolBoxControl::GetPopupWindowType seems unused, kill it
together with SfxPopupWindowType enum. Change-Id: Ia0b2388b34c96bb044f1bfcc7e89b33ac37d5f95 Reviewed-on: https://gerrit.libreoffice.org/16766 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx6
-rw-r--r--svx/source/form/tbxform.cxx6
-rw-r--r--svx/source/inc/tbxform.hxx1
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx6
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx5
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx7
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx5
-rw-r--r--svx/source/tbxctrls/layctrl.cxx14
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx6
-rw-r--r--svx/source/tbxctrls/linectrl.cxx7
-rw-r--r--svx/source/tbxctrls/subtoolboxcontrol.cxx5
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx15
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx9
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx7
14 files changed, 0 insertions, 99 deletions
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index f80af1e9a548..7042e7024be2 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -94,12 +94,6 @@ void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState,
SfxToolBoxControl::StateChanged( nSID, eState, pState );
}
-// when one wants to create a popup window
-SfxPopupWindowType SvxTbxCtlCustomShapes::GetPopupWindowType() const
-{
- return( m_aCommand.isEmpty() ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT);
-}
-
// Here is the window created
// The location of the Toolbox is queried through GetToolBox()
// rItemRect are the screen coordinates
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 64baa4f85f89..a0835371219b 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -191,12 +191,6 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
}
-SfxPopupWindowType SvxFmTbxCtlConfig::GetPopupWindowType() const
-{
- return( nLastSlot == 0 ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT );
-}
-
-
VclPtr<SfxPopupWindow> SvxFmTbxCtlConfig::CreatePopupWindow()
{
if ( GetSlotId() == SID_FM_CONFIG )
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index cc2ad675712e..0b51c780c8ca 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -57,7 +57,6 @@ public:
virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE;
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
- virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
virtual VclPtr<SfxPopupWindow> CreatePopupWindow() SAL_OVERRIDE;
};
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index a0eb16f61b3c..a76ece6816e3 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -108,12 +108,6 @@ VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
}
-SfxPopupWindowType SvxClipBoardControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONTIMEOUT;
-}
-
-
void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID )
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index ae3eb8458f29..14684e919b29 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -37,11 +37,6 @@ ParaLineSpacingPopup::~ParaLineSpacingPopup()
{
}
-SfxPopupWindowType ParaLineSpacingPopup::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONTIMEOUT;
-}
-
VclPtr<SfxPopupWindow> ParaLineSpacingPopup::CreatePopupWindow()
{
VclPtr<ParaLineSpacingControl> pControl = VclPtr<ParaLineSpacingControl>::Create(GetSlotId());
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index e7672fd69432..bae32a488397 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -276,13 +276,6 @@ FontWorkShapeTypeControl::~FontWorkShapeTypeControl()
-SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK; //( aLastAction.getLength() == 0 ? SfxPopupWindowType::ONCLICK : SfxPopupWindowType::ONTIMEOUT );
-}
-
-
-
VclPtr<SfxPopupWindow> FontWorkShapeTypeControl::CreatePopupWindow()
{
OUString aSubTbxResName( "private:resource/toolbar/fontworkshapetype" );
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 5c1d763988be..1b6a4f2563a1 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -441,11 +441,6 @@ void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState,
GetToolBox().EnableItem( GetId(), ( eState != SfxItemState::DISABLED ) );
}
-SfxPopupWindowType SvxGrafFilterToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK;
-}
-
VclPtr<SfxPopupWindow> SvxGrafFilterToolBoxControl::CreatePopupWindow()
{
OUString aSubTbxResName( "private:resource/toolbar/graffilterbar" );
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index acdfb294aaad..cbb84d2d5621 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -732,13 +732,6 @@ SvxTableToolBoxControl::~SvxTableToolBoxControl()
-SfxPopupWindowType SvxTableToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONTIMEOUTANDMOVE;
-}
-
-
-
VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow()
{
if ( bEnabled )
@@ -786,13 +779,6 @@ SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl()
-SfxPopupWindowType SvxColumnsToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONTIMEOUTANDMOVE;
-}
-
-
-
VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow()
{
ColumnsWindow* pWin = 0;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 505077b8613c..4284a5ff06e9 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -162,12 +162,6 @@ VclPtr<SfxPopupWindow> SvxListBoxControl::CreatePopupWindow()
}
-SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONTIMEOUT;
-}
-
-
void SvxListBoxControl::StateChanged(
sal_uInt16, SfxItemState, const SfxPoolItem* pState )
{
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 101490079bda..903eca98967c 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -622,13 +622,6 @@ SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl()
-SfxPopupWindowType SvxLineEndToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK;
-}
-
-
-
VclPtr<SfxPopupWindow> SvxLineEndToolBoxControl::CreatePopupWindow()
{
SvxLineEndWindow* pLineEndWin =
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index 606debaaa292..95227cad8695 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -52,9 +52,4 @@ VclPtr<SfxPopupWindow> SvxSubToolBoxControl::CreatePopupWindow()
return NULL;
}
-SfxPopupWindowType SvxSubToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index eb96a7640e64..e2268963124d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2618,11 +2618,6 @@ SvxColorToolBoxControl::~SvxColorToolBoxControl()
{
}
-SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONTIMEOUT;
-}
-
VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
{
SvxColorWindow_Impl* pColorWin =
@@ -2808,11 +2803,6 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl(
rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) );
}
-SfxPopupWindowType SvxFrameToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK;
-}
-
VclPtr<SfxPopupWindow> SvxFrameToolBoxControl::CreatePopupWindow()
{
VclPtr<SvxFrameWindow_Impl> pFrameWin = VclPtr<SvxFrameWindow_Impl>::Create(
@@ -2850,11 +2840,6 @@ SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) );
}
-SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK;
-}
-
VclPtr<SfxPopupWindow> SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
{
VclPtr<SvxLineWindow_Impl> pLineWin = VclPtr<SvxLineWindow_Impl>::Create( GetSlotId(), m_xFrame, &GetToolBox() );
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index a4fdb266a15f..def2b2e2b00f 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -47,15 +47,6 @@ SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTb
}
/*
- * Wenn man ein PopupWindow erzeugen will
- */
-
-SfxPopupWindowType SvxTbxCtlAlign::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK;
-}
-
-/*
* Hier wird das Fenster erzeugt
* Lage der Toolbox mit GetToolBox() abfragbar
* rItemRect sind die Screen-Koordinaten
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 6280e1fce9f8..37f18fd839d2 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -68,13 +68,6 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
-SfxPopupWindowType SvxTbxCtlDraw::GetPopupWindowType() const
-{
- return SfxPopupWindowType::ONCLICK;
-}
-
-
-
void SvxTbxCtlDraw::toggleToolbox()
{
Reference< XLayoutManager > xLayoutMgr = getLayoutManager();