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>
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 9da0da2..5671bf9 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 )
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index f1262f6f..f5e4314 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -315,7 +315,7 @@ SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent,
m_nBulletId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET);
m_nNumId = AddTabPage("outline", RID_SVXPAGE_PICK_NUM);
m_nBmpId = AddTabPage("graphics", RID_SVXPAGE_PICK_BMP);
m_nNumOptId = AddTabPage("options", RID_SVXPAGE_NUM_OPTIONS );
m_nNumOptId = AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
m_nNumPosId = AddTabPage("position", RID_SVXPAGE_NUM_POSITION );
}
break;
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index ac2b5ad..ed7c94e 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -960,7 +960,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(vcl::Window* pParent,
m_nBulletPageId = AddTabPage("bullets", RID_SVXPAGE_PICK_BULLET );
AddTabPage("outlinenum", RID_SVXPAGE_PICK_NUM );
AddTabPage("graphics", RID_SVXPAGE_PICK_BMP );
m_nOptionsPageId = AddTabPage("options", RID_SVXPAGE_NUM_OPTIONS );
m_nOptionsPageId = AddTabPage("customize", RID_SVXPAGE_NUM_OPTIONS );
m_nPositionPageId = AddTabPage("position", RID_SVXPAGE_NUM_POSITION );
}
diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index 537e9ff..8d37037 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -177,10 +177,10 @@
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="options">
<object class="GtkLabel" id="customize">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
<property name="label" translatable="yes">Customize</property>
</object>
<packing>
<property name="position">5</property>
diff --git a/sw/uiconfig/swriter/ui/templatedialog16.ui b/sw/uiconfig/swriter/ui/templatedialog16.ui
index 28bf3fb..a9cba6d 100644
--- a/sw/uiconfig/swriter/ui/templatedialog16.ui
+++ b/sw/uiconfig/swriter/ui/templatedialog16.ui
@@ -193,10 +193,10 @@
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="options">
<object class="GtkLabel" id="customize">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Options</property>
<property name="label" translatable="yes">Customize</property>
</object>
<packing>
<property name="position">6</property>
