diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/scabstdlg.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/drtxtob1.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/textdlgs.hxx | 9 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/textdlgs.cxx | 12 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/paradialog.ui | 128 |
7 files changed, 127 insertions, 33 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index d87563051ab8..1e9ab755223e 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -534,7 +534,7 @@ public: virtual VclPtr<SfxAbstractTabDialog> CreateScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0; - virtual VclPtr<SfxAbstractTabDialog> CreateScParagraphDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet) = 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 3e5e79fe5361..af98d3d92e46 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -1044,10 +1044,9 @@ VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScCharDlg( } VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScParagraphDlg( - vcl::Window* pParent, const SfxItemSet* pAttr) + weld::Window* pParent, const SfxItemSet* pAttr) { - VclPtr<SfxTabDialog> pDlg = VclPtr<ScParagraphDlg>::Create(pParent, pAttr); - return VclPtr<ScAbstractTabDialog_Impl>::Create(pDlg); + return VclPtr<ScAbstractTabController_Impl>::Create(o3tl::make_unique<ScParagraphDlg>(pParent, pAttr)); } VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet) diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 3f8675b56f52..43b14a02d0d8 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -680,7 +680,7 @@ public: virtual VclPtr<SfxAbstractTabDialog> CreateScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) override; - virtual VclPtr<SfxAbstractTabDialog> CreateScParagraphDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) override; virtual VclPtr<SfxAbstractTabDialog> CreateScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet) override; diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index 4c935934d22e..d0a93a4001e9 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -86,7 +86,7 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs, ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateScParagraphDlg( - pViewData->GetDialogParent(), &aNewAttr)); + pViewData->GetFrameWeld(), &aNewAttr)); bool bRet = ( pDlg->Execute() == RET_OK ); if ( bRet ) diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index 2e4fc68ff472..b9b06002aebf 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -34,15 +34,12 @@ public: ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); }; -class ScParagraphDlg : public SfxTabDialog +class ScParagraphDlg : public SfxTabDialogController { private: - sal_uInt16 m_nTabPageId; - - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) override; - + virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override; public: - ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr); + ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr); }; #endif diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 56d804a57c6e..02c67a80cfcd 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -58,10 +58,8 @@ void ScCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage) } } -ScParagraphDlg::ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) - : SfxTabDialog(pParent, "ParagraphDialog", - "modules/scalc/ui/paradialog.ui", pAttr) - , m_nTabPageId(0) +ScParagraphDlg::ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr) + : SfxTabDialogController(pParent, "modules/scalc/ui/paradialog.ui", "ParagraphDialog", pAttr) { AddTabPage("labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH); AddTabPage("labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH); @@ -70,12 +68,12 @@ ScParagraphDlg::ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) AddTabPage("labelTP_PARA_ASIAN", RID_SVXPAGE_PARA_ASIAN); else RemoveTabPage("labelTP_PARA_ASIAN"); - m_nTabPageId = AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); + AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } -void ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) +void ScParagraphDlg::PageCreated(const OString& rId, SfxTabPage &rPage) { - if (nId == m_nTabPageId) + if (rId == "labelTP_TABULATOR") { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); TabulatorDisableFlags const nFlags((TabulatorDisableFlags::TypeMask &~TabulatorDisableFlags::TypeLeft) | diff --git a/sc/uiconfig/scalc/ui/paradialog.ui b/sc/uiconfig/scalc/ui/paradialog.ui index 5a95c22e2c45..918b52628310 100644 --- a/sc/uiconfig/scalc/ui/paradialog.ui +++ b/sc/uiconfig/scalc/ui/paradialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 --> +<!-- Generated with glade 3.22.1 --> <interface domain="sc"> <requires lib="gtk+" version="3.18"/> <object class="GtkDialog" id="ParagraphDialog"> @@ -8,6 +8,9 @@ <property name="title" translatable="yes" context="paradialog|ParagraphDialog">Paragraph</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -18,12 +21,10 @@ <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="ok"> - <property name="label">gtk-ok</property> + <object class="GtkButton" id="reset"> + <property name="label">gtk-revert-to-saved</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> </object> @@ -34,10 +35,12 @@ </packing> </child> <child> - <object class="GtkButton" id="cancel"> - <property name="label">gtk-cancel</property> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> </object> @@ -48,8 +51,8 @@ </packing> </child> <child> - <object class="GtkButton" id="help"> - <property name="label">gtk-help</property> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -59,12 +62,11 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> - <property name="secondary">True</property> </packing> </child> <child> - <object class="GtkButton" id="reset"> - <property name="label">gtk-revert-to-saved</property> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -74,6 +76,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">3</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -87,9 +90,10 @@ <child> <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="scrollable">True</property> <child> <object class="GtkGrid"> <property name="visible">True</property> @@ -97,6 +101,30 @@ <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> <child type="tab"> @@ -116,6 +144,30 @@ <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">1</property> @@ -140,6 +192,30 @@ <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">2</property> @@ -163,6 +239,30 @@ <child> <placeholder/> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">3</property> @@ -189,10 +289,10 @@ </object> </child> <action-widgets> + <action-widget response="0">reset</action-widget> <action-widget response="-5">ok</action-widget> <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> - <action-widget response="0">reset</action-widget> </action-widgets> </object> </interface> |