sd/inc/sdabstdlg.hxx | 2
sd/qa/unit/dialogs-test.cxx | 2
sd/source/ui/dlg/paragr.cxx | 14 +--
sd/source/ui/dlg/sddlgfact.cxx | 4
sd/source/ui/dlg/sddlgfact.hxx | 2
sd/source/ui/func/fuparagr.cxx | 2
sd/source/ui/inc/paragr.hxx | 8 -
sd/uiconfig/sdraw/ui/drawparadialog.ui | 152 +++++++++++++++++++++++++++++----
8 files changed, 153 insertions(+), 33 deletions(-)
New commits:
commit feadf8387fb215ad0e126139c7b32af11ea2e194
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 17 11:56:49 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Sep 18 21:58:49 2018 +0200
weld SdParagraphDlg
Change-Id: I936b8b52c36f4e91a330020badf5ae4d7a4393da
Reviewed-on: https://gerrit.libreoffice.org/60582
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index e8b1ed936ce1..44b6376dfed9 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -178,7 +178,7 @@ public:
virtual VclPtr<AbstractSdInsertPagesObjsDlg>
CreateSdInsertPagesObjsDlg(vcl::Window* pParent, const SdDrawDocument* pDoc,
SfxMedium* pSfxMedium, const OUString& rFileName) = 0;
virtual VclPtr<AbstractMorphDlg> CreateMorphDlg(weld::Window*
pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0;
virtual VclPtr<SfxAbstractTabDialog>
CreateSdOutlineBulletTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr,
::sd::View* pView) = 0;
- virtual VclPtr<SfxAbstractTabDialog>
CreateSdParagraphTabDlg(vcl::Window* pWindow, const SfxItemSet* pAttr) = 0;
+ virtual VclPtr<SfxAbstractTabDialog>
CreateSdParagraphTabDlg(weld::Window* pWindow, const SfxItemSet* pAttr) = 0;
virtual VclPtr<AbstractSdStartPresDlg>
CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs,
const
std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0;
virtual VclPtr<VclAbstractDialog> CreateRemoteDialog(
vcl::Window* pWindow ) = 0;
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 0988949f415d..b4bd349e7e31 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -419,7 +419,7 @@ VclPtr<VclAbstractDialog>
SdDialogsTest::createDialogByID(sal_uInt32 nID)
{
// CreateSdParagraphTabDlg(const SfxItemSet* pAttr) override;
pRetval = getSdAbstractDialogFactory()->CreateSdParagraphTabDlg(
- getViewShell()->GetActiveWindow(),
+ getViewShell()->GetFrameWeld(),
&getEmptySfxItemSet());
break;
}
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 3b7aa7698cc6..b6eb3583cbcc 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -160,13 +160,11 @@ IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl,
Button*, void)
m_pNewStartNF->Enable(bEnable && m_pNewStartNumberCB->IsChecked());
}
-SdParagraphDlg::SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr )
- : SfxTabDialog( pParent,
- "DrawParagraphPropertiesDialog",
- "modules/sdraw/ui/drawparadialog.ui",
- pAttr )
+SdParagraphDlg::SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr)
+ : SfxTabDialogController(pParent, "modules/sdraw/ui/drawparadialog.ui",
+ "DrawParagraphPropertiesDialog", pAttr)
{
- m_nParaStd = AddTabPage( "labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH);
+ AddTabPage( "labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH);
SvtCJKOptions aCJKOptions;
if( aCJKOptions.IsAsianTypographyEnabled() )
@@ -185,10 +183,10 @@ SdParagraphDlg::SdParagraphDlg( vcl::Window* pParent,
const SfxItemSet* pAttr )
AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
}
-void SdParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
+void SdParagraphDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if (m_nParaStd == nId)
+ if (rId == "labelTP_PARA_STD")
{
aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,
MM50/2));
rPage.PageCreated(aSet);
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index f6640e06d42b..871ec0d51f80 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -424,9 +424,9 @@ VclPtr<SfxAbstractTabDialog>
SdAbstractDialogFactory_Impl::CreateSdOutlineBulle
return VclPtr<AbstractBulletDialog_Impl>::Create(
VclPtr<::sd::OutlineBulletDlg>::Create( pParent, pAttr, pView ) );
}
-VclPtr<SfxAbstractTabDialog>
SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg(vcl::Window* pParent,
const SfxItemSet* pAttr )
+VclPtr<SfxAbstractTabDialog>
SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg(weld::Window* pParent,
const SfxItemSet* pAttr )
{
- return VclPtr<SdAbstractTabDialog_Impl>::Create(
VclPtr<SdParagraphDlg>::Create( pParent, pAttr ) );
+ return
VclPtr<SdAbstractTabController_Impl>::Create(o3tl::make_unique<SdParagraphDlg>(pParent,
pAttr));
}
VclPtr<AbstractSdStartPresDlg>
SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg(weld::Window*
pParent,
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 706bedb9854e..5f8665da184a 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -318,7 +318,7 @@ public:
virtual VclPtr<AbstractSdInsertPagesObjsDlg>
CreateSdInsertPagesObjsDlg(vcl::Window* pParent, const SdDrawDocument* pDoc,
SfxMedium* pSfxMedium, const OUString& rFileName ) override;
virtual VclPtr<AbstractMorphDlg> CreateMorphDlg(weld::Window*
pParent, const SdrObject* pObj1, const SdrObject* pObj2) override;
virtual VclPtr<SfxAbstractTabDialog>
CreateSdOutlineBulletTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr,
::sd::View* pView) override;
- virtual VclPtr<SfxAbstractTabDialog>
CreateSdParagraphTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr) override;
+ virtual VclPtr<SfxAbstractTabDialog>
CreateSdParagraphTabDlg(weld::Window* pParent, const SfxItemSet* pAttr)
override;
virtual VclPtr<AbstractSdStartPresDlg>
CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs,
const
std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) override;
virtual VclPtr<VclAbstractDialog> CreateRemoteDialog(
vcl::Window* pWindow ) override; // ad for RemoteDialog
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index a2c2ceb9f8d0..703d3cf87558 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -90,7 +90,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
}
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
- ScopedVclPtr<SfxAbstractTabDialog>
pDlg(pFact->CreateSdParagraphTabDlg(mpViewShell->GetActiveWindow(), &aNewAttr));
+ ScopedVclPtr<SfxAbstractTabDialog>
pDlg(pFact->CreateSdParagraphTabDlg(mpViewShell->GetFrameWeld(), &aNewAttr));
sal_uInt16 nResult = pDlg->Execute();
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index 9389fedbf6fd..29cbf9b0c7e8 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -25,15 +25,13 @@
/**
* Paragraph-Tab-Dialog
*/
-class SdParagraphDlg : public SfxTabDialog
+class SdParagraphDlg : public SfxTabDialogController
{
- sal_uInt16 m_nParaStd;
-
private:
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) override;
+ virtual void PageCreated(const OString& rId, SfxTabPage &rPage)
override;
public:
- SdParagraphDlg( vcl::Window* pParent, const SfxItemSet*
pAttr );
+ SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr);
};
#endif // INCLUDED_SD_SOURCE_UI_INC_PARAGR_HXX
diff --git a/sd/uiconfig/sdraw/ui/drawparadialog.ui
b/sd/uiconfig/sdraw/ui/drawparadialog.ui
index 9fc6fc332418..2357d21558f5 100644
--- a/sd/uiconfig/sdraw/ui/drawparadialog.ui
+++ b/sd/uiconfig/sdraw/ui/drawparadialog.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="sd">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="DrawParagraphPropertiesDialog">
@@ -7,6 +7,9 @@
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="drawparadialog|DrawParagraphPropertiesDialog">Paragraph</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>
@@ -17,12 +20,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>
@@ -33,10 +34,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>
@@ -47,8 +50,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>
@@ -58,12 +61,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>
@@ -73,6 +75,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
+ <property name="secondary">True</property>
</packing>
</child>
</object>
@@ -86,9 +89,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>
@@ -96,6 +100,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">
@@ -115,6 +143,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>
@@ -138,6 +190,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>
@@ -161,6 +237,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>
@@ -185,6 +285,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">4</property>
@@ -211,10 +335,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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
