diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-12-21 01:15:45 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2016-12-22 02:24:29 +0000 |
| commit | 51cb1ebcc46030ed9526d18a0e2e9279a4edf438 (patch) | |
| tree | 227d5d505f392f4549aa98674b71aac2fd70bfdc /svx | |
| parent | eb319362c94f1c17beb355a53f392a9bcf939822 (diff) | |
tdf#104737: Bullets and Numbering: inconsistent naming of last tab page
Change-Id: Id1d1d92933c110942fd232067620e8224686a915
Reviewed-on: https://gerrit.libreoffice.org/32256
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 584c745ea484e1f8047278fc83b41b30a90f884d)
Reviewed-on: https://gerrit.libreoffice.org/32321
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/bulletsnumbering.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 9da0da285a05..5671bf97ace7 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -48,7 +48,6 @@ 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; - bool IsInImpressDraw(); // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) @@ -189,14 +188,7 @@ void NumberingPopup::VSSelectHdl(void* pControl) } else if ( getSelectedEntryId() == 1 ) { - OUString aPageName; - if ( mrController.IsInImpressDraw() ) - aPageName = "customize"; - else - // Writer variants - aPageName = "options"; - - auto aArgs( comphelper::InitPropertySequence( { { "Page", css::uno::makeAny( aPageName ) } } ) ); + auto aArgs( comphelper::InitPropertySequence( { { "Page", css::uno::makeAny( OUString("customize") ) } } ) ); mrController.dispatchCommand( ".uno:OutlineBullet", aArgs ); } } @@ -214,11 +206,6 @@ VclPtr<vcl::Window> NumberingToolBoxControl::createPopupWindow( vcl::Window* pPa return VclPtr<NumberingPopup>::Create( *this, pParent, mePageType ); } -bool NumberingToolBoxControl::IsInImpressDraw() -{ - return ( m_sModuleName == "com.sun.star.presentation.PresentationDocument" || - m_sModuleName == "com.sun.star.drawing.DrawingDocument" ); -} void SAL_CALL NumberingToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) |