sw/inc/swabstdlg.hxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 5 -
sw/source/ui/dialog/swdlgfact.hxx | 2
sw/source/ui/table/tabledlg.cxx | 20 +---
sw/source/uibase/inc/tabledlg.hxx | 10 --
sw/source/uibase/shells/tabsh.cxx | 4
sw/uiconfig/swriter/ui/tableproperties.ui | 149 +++++++++++++++++++++++++++---
8 files changed, 157 insertions(+), 39 deletions(-)
New commits:
commit 916260dcbe84fcde76ee66c752391123f44ea4da
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Sep 10 09:04:43 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 10 13:16:13 2018 +0200
weld SwTableTabDlg
Change-Id: I343ddfd5ba1e42711b74815517ab931e0905dd07
Reviewed-on: https://gerrit.libreoffice.org/60243
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index a1b670d2dcbc..c1c735fdb5db 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -417,7 +417,7 @@ public:
virtual VclPtr<SfxAbstractDialog> CreateSwWrapDlg ( vcl::Window* pParent,
SfxItemSet& rSet, SwWrtShell* pSh ) = 0;
virtual VclPtr<VclAbstractDialog> CreateSwTableWidthDlg(weld::Window
*pParent, SwTableFUNC &rFnc) = 0;
- virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(vcl::Window*
pParent,
+ virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(weld::Window*
pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
virtual VclPtr<AbstractSwFieldDlg> CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 3524214b5380..74de0e146404 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -653,7 +653,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, DblClickHdl, ListBox&,
rBox, void )
TableToFromHdl( pButton );
}
-IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, Button*, pButton, void )
+IMPL_LINK_NOARG(SwInsertDBColAutoPilot, TableFormatHdl, Button*, void)
{
SwWrtShell& rSh = pView->GetWrtShell();
bool bNewSet = false;
@@ -761,7 +761,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableFormatHdl, Button*,
pButton, void )
SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- ScopedVclPtr<SfxAbstractTabDialog>
pDlg(pFact->CreateSwTableTabDlg(pButton, pTableSet.get(), &rSh));
+ ScopedVclPtr<SfxAbstractTabDialog>
pDlg(pFact->CreateSwTableTabDlg(GetFrameWeld(), pTableSet.get(), &rSh));
if( RET_OK == pDlg->Execute() )
pTableSet->Put( *pDlg->GetOutputItemSet() );
else if( bNewSet )
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 971fd2a057bb..65969975b8e6 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -892,11 +892,10 @@ VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(we
return
VclPtr<AbstractSwTableWidthDlg_Impl>::Create(o3tl::make_unique<SwTableWidthDlg>(pParent,
rFnc));
}
-VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(vcl::Window* pParent,
+VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(weld::Window* pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh)
{
- VclPtr<SfxTabDialog> pDlg = VclPtr<SwTableTabDlg>::Create(pParent,
pItemSet, pSh);
- return VclPtr<AbstractTabDialog_Impl>::Create(pDlg);
+ return
VclPtr<AbstractTabController_Impl>::Create(o3tl::make_unique<SwTableTabDlg>(pParent,
pItemSet, pSh));
}
VclPtr<AbstractSwFieldDlg>
SwAbstractDialogFactory_Impl::CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, vcl::Window *pParent)
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index ef655833b3fc..eb1fb9993bc6 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -608,7 +608,7 @@ public:
virtual VclPtr<SfxAbstractDialog> CreateSwWrapDlg ( vcl::Window* pParent,
SfxItemSet& rSet, SwWrtShell* pSh ) override;
virtual VclPtr<VclAbstractDialog> CreateSwTableWidthDlg(weld::Window
*pParent, SwTableFUNC &rFnc) override;
- virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(vcl::Window*
pParent,
+ virtual VclPtr<SfxAbstractTabDialog> CreateSwTableTabDlg(weld::Window*
pParent,
const SfxItemSet* pItemSet, SwWrtShell* pSh) override;
virtual VclPtr<AbstractSwFieldDlg> CreateSwFieldDlg(SfxBindings* pB,
SwChildWinWrapper* pCW, vcl::Window *pParent) override;
virtual VclPtr<SfxAbstractDialog> CreateSwFieldEditDlg ( SwView& rVw )
override;
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index ba617f7f8177..7be5d0a313c6 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1150,35 +1150,33 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16
nPos, SwTwips nNewWidth)
}
-SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent,
- const SfxItemSet* pItemSet, SwWrtShell* pSh)
- : SfxTabDialog(pParent, "TablePropertiesDialog",
- "modules/swriter/ui/tableproperties.ui", pItemSet)
+SwTableTabDlg::SwTableTabDlg(weld::Window* pParent, const SfxItemSet*
pItemSet, SwWrtShell* pSh)
+ : SfxTabDialogController(pParent, "modules/swriter/ui/tableproperties.ui",
"TablePropertiesDialog", pItemSet)
, pShell(pSh)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
AddTabPage("table", &SwFormatTablePage::Create, nullptr);
- m_nTextFlowId = AddTabPage("textflow", &SwTextFlowPage::Create, nullptr);
+ AddTabPage("textflow", &SwTextFlowPage::Create, nullptr);
AddTabPage("columns", &SwTableColumnPage::Create, nullptr);
- m_nBackgroundId = AddTabPage("background",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
- m_nBorderId = AddTabPage("borders",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), nullptr);
+ AddTabPage("background", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG),
nullptr);
+ AddTabPage("borders", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER),
nullptr);
}
-void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
+void SwTableTabDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
- if (nId == m_nBackgroundId)
+ if (rId == "background")
{
SvxBackgroundTabFlags const nFlagType =
SvxBackgroundTabFlags::SHOW_TBLCTL;
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,
static_cast<sal_uInt32>(nFlagType)));
rPage.PageCreated(aSet);
}
- else if (nId == m_nBorderId)
+ else if (rId == "borders")
{
aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,
static_cast<sal_uInt16>(SwBorderModes::TABLE)));
rPage.PageCreated(aSet);
}
- else if (nId == m_nTextFlowId)
+ else if (rId == "textflow")
{
static_cast<SwTextFlowPage&>(rPage).SetShell(pShell);
const FrameTypeFlags eType = pShell->GetFrameType(nullptr,true);
diff --git a/sw/source/uibase/inc/tabledlg.hxx
b/sw/source/uibase/inc/tabledlg.hxx
index ea16661dda27..75b555d63ccf 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -28,17 +28,13 @@ class SwWrtShell;
struct TColumn;
// table dialog
-class SwTableTabDlg : public SfxTabDialog
+class SwTableTabDlg : public SfxTabDialogController
{
SwWrtShell* pShell;
- sal_uInt16 m_nTextFlowId;
- sal_uInt16 m_nBackgroundId;
- sal_uInt16 m_nBorderId;
- virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
override;
+ virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
public:
- SwTableTabDlg( vcl::Window* pParent,
- const SfxItemSet* pItemSet, SwWrtShell* pSh );
+ SwTableTabDlg(weld::Window* pParent, const SfxItemSet* pItemSet,
SwWrtShell* pSh);
};
#endif
diff --git a/sw/source/uibase/shells/tabsh.cxx
b/sw/source/uibase/shells/tabsh.cxx
index fecda67dd7cf..4d89ac332d46 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -593,7 +593,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
setSvxBrushItemAsFillAttributesToTargetSet(aBrush, aCoreSet);
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
- VclPtr<SfxAbstractTabDialog>
pDlg(pFact->CreateSwTableTabDlg(GetView().GetWindow(), &aCoreSet, &rSh));
+ VclPtr<SfxAbstractTabDialog>
pDlg(pFact->CreateSwTableTabDlg(GetView().GetFrameWeld(), &aCoreSet, &rSh));
if (pDlg)
{
@@ -619,6 +619,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
rBindings.Update(SID_ATTR_TABSTOP);
rBindings.Update(SID_RULER_BORDERS_VERTICAL);
rBindings.Update(SID_ATTR_TABSTOP_VERTICAL);
+
+ pDlg->disposeOnce();
});
}
else
diff --git a/sw/uiconfig/swriter/ui/tableproperties.ui
b/sw/uiconfig/swriter/ui/tableproperties.ui
index 239a8c46949e..db284a455750 100644
--- a/sw/uiconfig/swriter/ui/tableproperties.ui
+++ b/sw/uiconfig/swriter/ui/tableproperties.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="TablePropertiesDialog">
@@ -8,6 +8,9 @@
<property name="title" translatable="yes"
context="tableproperties|TablePropertiesDialog">Table Properties</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>
@@ -97,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">
@@ -116,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>
@@ -139,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>
@@ -162,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 +284,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 +334,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
