[Libreoffice-commits] core.git: chart2/source cui/source extensions/source include/sfx2 sd/source sfx2/source svx/source sw/source sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Mar 20 13:22:59 UTC 2019
chart2/source/controller/dialogs/dlg_NumberFormat.cxx | 2
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/options/cuisrchdlg.cxx | 2
cui/source/options/dbregister.cxx | 2
cui/source/tabpages/connect.cxx | 2
cui/source/tabpages/dstribut.cxx | 2
cui/source/tabpages/macroass.cxx | 2
cui/source/tabpages/measure.cxx | 2
extensions/source/propctrlr/formcomponenthandler.cxx | 2
include/sfx2/basedlgs.hxx | 3
sd/source/ui/dlg/tpaction.cxx | 2
sfx2/source/dialog/basedlgs.cxx | 4
svx/source/tbxctrls/grafctrl.cxx | 2
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/chrdlg/tblnumfm.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/optload.cxx | 2
sw/source/ui/dialog/addrdlg.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 5 -
sw/source/ui/fldui/fldedt.cxx | 82 ++++++++----------
sw/source/ui/fldui/fldpage.cxx | 4
sw/source/ui/frmdlg/pattern.cxx | 2
sw/source/ui/frmdlg/uiborder.cxx | 2
sw/source/ui/frmdlg/wrap.cxx | 2
sw/source/uibase/inc/fldedt.hxx | 17 +--
sw/uiconfig/swriter/ui/editfielddialog.ui | 18 ++-
sw/uiconfig/swriter/ui/flddbpage.ui | 46 ++--------
sw/uiconfig/swriter/ui/flddocinfopage.ui | 2
sw/uiconfig/swriter/ui/flddocumentpage.ui | 8 -
sw/uiconfig/swriter/ui/fldfuncpage.ui | 46 +++++++++-
sw/uiconfig/swriter/ui/fldrefpage.ui | 2
sw/uiconfig/swriter/ui/fldvarpage.ui | 27 ++---
33 files changed, 152 insertions(+), 152 deletions(-)
New commits:
commit 9f5cf96bd8b0d33a4505e941025f93af776159a9
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Mar 20 11:18:47 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Mar 20 14:22:32 2019 +0100
weld SwFieldEditDlg
Change-Id: I786944a4bf8979526f0ccae5b00fb42ad5016a66
Reviewed-on: https://gerrit.libreoffice.org/69463
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index fa6f51c0d86b..36b7a21b6b4b 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -29,7 +29,7 @@ namespace chart
using namespace ::com::sun::star;
NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet, "cui/ui/formatnumberdialog.ui", "FormatNumberDialog")
+ : SfxSingleTabDialogController(pParent, &rSet, "cui/ui/formatnumberdialog.ui", "FormatNumberDialog")
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 986909a84d85..0058fbfe635f 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -677,7 +677,7 @@ IMPL_LINK_NOARG(SvxMacroAssignSingleTabDialog, OKHdl_Impl, weld::Button&, void)
SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(weld::Window *pParent,
const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet, "cui/ui/macroassigndialog.ui", "MacroAssignDialog")
+ : SfxSingleTabDialogController(pParent, &rSet, "cui/ui/macroassigndialog.ui", "MacroAssignDialog")
{
GetOKButton().connect_clicked(LINK(this, SvxMacroAssignSingleTabDialog, OKHdl_Impl));
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index cf074e6614b6..0d6c5c961255 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -491,7 +491,7 @@ IMPL_LINK( SpellDialog, CheckGrammarHdl, Button*, pBox, void )
void SpellDialog::StartSpellOptDlg_Impl()
{
SfxItemSet aSet( SfxGetpApp()->GetPool(), svl::Items<SID_AUTOSPELL_CHECK,SID_AUTOSPELL_CHECK>{});
- SfxSingleTabDialogController aDlg(GetFrameWeld(), aSet, "cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
+ SfxSingleTabDialogController aDlg(GetFrameWeld(), &aSet, "cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
TabPageParent aParent(aDlg.get_content_area(), &aDlg);
VclPtr<SfxTabPage> xPage = SvxLinguTabPage::Create(aParent, &aSet);
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 6b030bd70d0e..bdbdc150632b 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -42,7 +42,7 @@
SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(weld::Window *pParent,
const SfxItemSet& rOptionsSet, TransliterationFlags nInitialFlags)
- : SfxSingleTabDialogController(pParent, rOptionsSet)
+ : SfxSingleTabDialogController(pParent, &rOptionsSet)
{
// m_xPage will be implicitly destroyed by the
// SfxSingleTabDialog destructor
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 86f7375c35cd..342a34e066da 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -73,7 +73,7 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder()
DatabaseRegistrationDialog::DatabaseRegistrationDialog(weld::Window* pParent, const SfxItemSet& rInAttrs)
: RegistrationItemSetHolder(rInAttrs)
- , SfxSingleTabDialogController(pParent, getRegistrationItems())
+ , SfxSingleTabDialogController(pParent, &getRegistrationItems())
{
TabPageParent aParent(get_content_area(), this);
SetTabPage(DbRegistrationOptionsPage::Create(aParent, &getRegistrationItems()));
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 98a46c8272f2..49684e249a83 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -50,7 +50,7 @@ const sal_uInt16 SvxConnectionPage::pRanges[] =
\************************************************************************/
SvxConnectionDialog::SvxConnectionDialog(weld::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView)
- : SfxSingleTabDialogController(pParent, rInAttrs)
+ : SfxSingleTabDialogController(pParent, &rInAttrs)
{
TabPageParent pPageParent(get_content_area(), this);
VclPtrInstance<SvxConnectionPage> pPage(pPageParent, rInAttrs);
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 6c15508ee345..1033b92a856a 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -31,7 +31,7 @@
SvxDistributeDialog::SvxDistributeDialog(weld::Window* pParent,
const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
- : SfxSingleTabDialogController(pParent, rInAttrs, "cui/ui/distributiondialog.ui",
+ : SfxSingleTabDialogController(pParent, &rInAttrs, "cui/ui/distributiondialog.ui",
"DistributionDialog")
{
TabPageParent pPageParent(get_content_area(), this);
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index f40f1d33c895..f077c5d2a14f 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -387,7 +387,7 @@ VclPtr<SfxTabPage> SfxMacroTabPage::Create(TabPageParent pParent, const SfxItemS
SfxMacroAssignDlg::SfxMacroAssignDlg(weld::Window* pParent,
const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet,"cui/ui/eventassigndialog.ui",
+ : SfxSingleTabDialogController(pParent, &rSet,"cui/ui/eventassigndialog.ui",
"EventAssignDialog")
{
TabPageParent pPageParent(get_content_area(), this);
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 16585eff9bcd..f710d4176fcc 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -60,7 +60,7 @@ const sal_uInt16 SvxMeasurePage::pRanges[] =
SvxMeasureDialog::SvxMeasureDialog(weld::Window* pParent, const SfxItemSet& rInAttrs,
const SdrView* pSdrView)
- : SfxSingleTabDialogController(pParent, rInAttrs)
+ : SfxSingleTabDialogController(pParent, &rInAttrs)
{
TabPageParent pPageParent(get_content_area(), this);
VclPtrInstance<SvxMeasurePage> pPage(pPageParent, rInAttrs);
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 789d1e9272e1..1437fd36665f 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2671,7 +2671,7 @@ namespace pcr
aCoreSet.Put( aFormatter );
// a tab dialog with a single page
- SfxSingleTabDialogController aDialog(impl_getDefaultDialogFrame_nothrow(), aCoreSet,
+ SfxSingleTabDialogController aDialog(impl_getDefaultDialogFrame_nothrow(), &aCoreSet,
"cui/ui/formatnumberdialog.ui", "FormatNumberDialog");
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 0b3d526888b5..6b86abed0b01 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -243,7 +243,7 @@ private:
const SfxItemSet* m_pInputSet;
public:
- SfxSingleTabDialogController(weld::Widget* pParent, const SfxItemSet& rOptionsSet,
+ SfxSingleTabDialogController(weld::Widget* pParent, const SfxItemSet* pOptionsSet,
const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"),
const OString& rID = OString("SingleTabDialog"));
@@ -252,6 +252,7 @@ public:
virtual ~SfxSingleTabDialogController() override;
void SetTabPage(SfxTabPage* pTabPage);
+ SfxTabPage* GetTabPage() const { return m_xSfxPage.get(); }
virtual weld::Button& GetOKButton() const override { return *m_xOKBtn; }
virtual const SfxItemSet* GetExampleSet() const override { return nullptr; }
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index c581fc3d15e1..5af508c01fa1 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -66,7 +66,7 @@ using namespace com::sun::star::lang;
* Constructor of the Tab dialog: appends the pages to the dialog
*/
SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View const * pView)
- : SfxSingleTabDialogController(pParent, *pAttr, "modules/simpress/ui/interactiondialog.ui",
+ : SfxSingleTabDialogController(pParent, pAttr, "modules/simpress/ui/interactiondialog.ui",
"InteractionDialog")
, rOutAttrs(*pAttr)
{
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 43312afa52aa..b5056df8b1a9 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -844,10 +844,10 @@ IMPL_STATIC_LINK_NOARG(SfxDialogController, InstallLOKNotifierHdl, void*, vcl::I
return SfxViewShell::Current();
}
-SfxSingleTabDialogController::SfxSingleTabDialogController(weld::Widget *pParent, const SfxItemSet& rSet,
+SfxSingleTabDialogController::SfxSingleTabDialogController(weld::Widget *pParent, const SfxItemSet* pSet,
const OUString& rUIXMLDescription, const OString& rID)
: SfxOkDialogController(pParent, rUIXMLDescription, rID)
- , m_pInputSet(&rSet)
+ , m_pInputSet(pSet)
, m_xContainer(m_xDialog->weld_content_area())
, m_xOKBtn(m_xBuilder->weld_button("ok"))
, m_xHelpBtn(m_xBuilder->weld_button("help"))
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 36ac6e4c0e5c..db7a5a3ead5f 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -699,7 +699,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
vcl::Window* pParent(SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : nullptr);
SfxSingleTabDialogController aCropDialog(pParent ? pParent->GetFrameWeld() : nullptr,
- aCropDlgAttr);
+ &aCropDlgAttr);
const OUString aCropStr(SvxResId(RID_SVXSTR_GRAFCROP));
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index da6500ddd642..55b159b3ca2b 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -449,7 +449,7 @@ void SwDropCapsPict::InitPrinter_()
}
SwDropCapsDlg::SwDropCapsDlg(weld::Window *pParent, const SfxItemSet &rSet)
- : SfxSingleTabDialogController(pParent, rSet)
+ : SfxSingleTabDialogController(pParent, &rSet)
{
TabPageParent pPageParent(get_content_area(), this);
VclPtr<SwDropCapsPage> xNewPage(static_cast<SwDropCapsPage*>(SwDropCapsPage::Create(pPageParent, &rSet).get()));
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index 4ac2af9e7883..e6722617176e 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -28,7 +28,7 @@
#include <sfx2/tabdlg.hxx>
SwNumFormatDlg::SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet, "cui/ui/formatnumberdialog.ui", "FormatNumberDialog")
+ : SfxSingleTabDialogController(pParent, &rSet, "cui/ui/formatnumberdialog.ui", "FormatNumberDialog")
{
// Create TabPage
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 7b1131fbfc5c..f0656f6ad481 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -363,7 +363,7 @@ void SwTestAccountSettingsDialog::Test()
}
SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet)
+ : SfxSingleTabDialogController(pParent, &rSet)
{
TabPageParent pPageParent(get_content_area(), this);
// create TabPage
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 7844dc95b3aa..97833bf3d64b 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -394,7 +394,7 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl, ListBox&, void)
}
SwCaptionOptDlg::SwCaptionOptDlg(weld::Window* pParent, const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet, "modules/swriter/ui/captiondialog.ui",
+ : SfxSingleTabDialogController(pParent, &rSet, "modules/swriter/ui/captiondialog.ui",
"CaptionDialog")
{
// create TabPage
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index 81ea6d9d0806..940f7f5d2646 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -22,7 +22,7 @@
#include <svx/svxdlg.hxx>
SwAddrDlg::SwAddrDlg(weld::Window* pParent, const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet)
+ : SfxSingleTabDialogController(pParent, &rSet)
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 1ac4adaadfcb..8a3171c6d198 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -951,10 +951,9 @@ VclPtr<AbstractSwFieldDlg> SwAbstractDialogFactory_Impl::CreateSwFieldDlg(SfxBin
return VclPtr<AbstractSwFieldDlg_Impl>::Create(pDlg);
}
-VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg ( SwView& rVw )
+VclPtr<SfxAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwFieldEditDlg(SwView& rVw)
{
- VclPtr<SfxModalDialog> pDlg = VclPtr<SwFieldEditDlg>::Create( rVw );
- return VclPtr<SwAbstractSfxDialog_Impl>::Create( pDlg );
+ return VclPtr<SwAbstractSfxController_Impl>::Create(std::make_unique<SwFieldEditDlg>(rVw));
}
VclPtr<AbstractSwRenameXNamedDlg> SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(weld::Window* pParent,
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index b13742cb15bc..373c787e4da5 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -86,21 +86,20 @@ void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr)
}
SwFieldEditDlg::SwFieldEditDlg(SwView const & rVw)
- : SfxSingleTabDialog(&rVw.GetViewFrame()->GetWindow(), nullptr,
- "EditFieldDialog", "modules/swriter/ui/editfielddialog.ui")
+ : SfxSingleTabDialogController(rVw.GetViewFrame()->GetWindow().GetFrameWeld(), nullptr,
+ "modules/swriter/ui/editfielddialog.ui", "EditFieldDialog")
, pSh(rVw.GetWrtShellPtr())
+ , m_xPrevBT(m_xBuilder->weld_button("prev"))
+ , m_xNextBT(m_xBuilder->weld_button("next"))
+ , m_xAddressBT(m_xBuilder->weld_button("edit"))
{
- get(m_pPrevBT, "prev");
- get(m_pNextBT, "next");
- get(m_pAddressBT, "edit");
-
SwFieldMgr aMgr(pSh);
SwField *pCurField = aMgr.GetCurField();
if (!pCurField)
return;
- SwViewShell::SetCareWin(this);
+ SwViewShell::SetCareDialog(m_xDialog);
EnsureSelection(pCurField, aMgr);
@@ -108,12 +107,12 @@ SwFieldEditDlg::SwFieldEditDlg(SwView const & rVw)
CreatePage(nGroup);
- GetOKButton()->SetClickHdl(LINK(this, SwFieldEditDlg, OKHdl));
+ GetOKButton().connect_clicked(LINK(this, SwFieldEditDlg, OKHdl));
- m_pPrevBT->SetClickHdl(LINK(this, SwFieldEditDlg, NextPrevHdl));
- m_pNextBT->SetClickHdl(LINK(this, SwFieldEditDlg, NextPrevHdl));
+ m_xPrevBT->connect_clicked(LINK(this, SwFieldEditDlg, NextPrevHdl));
+ m_xNextBT->connect_clicked(LINK(this, SwFieldEditDlg, NextPrevHdl));
- m_pAddressBT->SetClickHdl(LINK(this, SwFieldEditDlg, AddressHdl));
+ m_xAddressBT->connect_clicked(LINK(this, SwFieldEditDlg, AddressHdl));
Init();
}
@@ -140,41 +139,43 @@ void SwFieldEditDlg::Init()
bool bMove = rMgr.GoNext();
if( bMove )
rMgr.GoPrev();
- m_pNextBT->Enable(bMove);
+ m_xNextBT->set_sensitive(bMove);
bMove = rMgr.GoPrev();
if( bMove )
rMgr.GoNext();
- m_pPrevBT->Enable( bMove );
+ m_xPrevBT->set_sensitive( bMove );
if (pCurField->GetTypeId() == TYP_EXTUSERFLD)
- m_pAddressBT->Enable();
+ m_xAddressBT->set_sensitive(true);
else
- m_pAddressBT->Disable();
+ m_xAddressBT->set_sensitive(false);
pSh->DestroyCursor();
pSh->EndAction();
}
- GetOKButton()->Enable( !pSh->IsReadOnlyAvailable() ||
- !pSh->HasReadonlySel() );
+ GetOKButton().set_sensitive(!pSh->IsReadOnlyAvailable() ||
+ !pSh->HasReadonlySel());
}
VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16 nGroup)
{
+ TabPageParent pPageParent(get_content_area(), this);
+
// create TabPage
VclPtr<SfxTabPage> pTabPage;
switch (nGroup)
{
case GRP_DOC:
- pTabPage = SwFieldDokPage::Create(get_content_area(), nullptr);
+ pTabPage = SwFieldDokPage::Create(pPageParent, nullptr);
break;
case GRP_FKT:
- pTabPage = SwFieldFuncPage::Create(get_content_area(), nullptr);
+ pTabPage = SwFieldFuncPage::Create(pPageParent, nullptr);
break;
case GRP_REF:
- pTabPage = SwFieldRefPage::Create(get_content_area(), nullptr);
+ pTabPage = SwFieldRefPage::Create(pPageParent, nullptr);
break;
case GRP_REG:
{
@@ -189,17 +190,17 @@ VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16 nGroup)
xDocProps->getUserDefinedProperties(),
uno::UNO_QUERY_THROW);
pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
- pTabPage = SwFieldDokInfPage::Create(get_content_area(), pSet);
+ pTabPage = SwFieldDokInfPage::Create(pPageParent, pSet);
break;
}
#if HAVE_FEATURE_DBCONNECTIVITY
case GRP_DB:
- pTabPage = SwFieldDBPage::Create(get_content_area(), nullptr);
+ pTabPage = SwFieldDBPage::Create(pPageParent, nullptr);
static_cast<SwFieldDBPage*>(pTabPage.get())->SetWrtShell(*pSh);
break;
#endif
case GRP_VAR:
- pTabPage = SwFieldVarPage::Create(get_content_area(), nullptr);
+ pTabPage = SwFieldVarPage::Create(pPageParent, nullptr);
break;
}
@@ -217,53 +218,44 @@ VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16 nGroup)
SwFieldEditDlg::~SwFieldEditDlg()
{
- disposeOnce();
-}
-
-void SwFieldEditDlg::dispose()
-{
- SwViewShell::SetCareWin(nullptr);
+ SwViewShell::SetCareDialog(nullptr);
pSh->EnterStdMode();
- m_pPrevBT.clear();
- m_pNextBT.clear();
- m_pAddressBT.clear();
- SfxSingleTabDialog::dispose();
}
void SwFieldEditDlg::EnableInsert(bool bEnable)
{
if( bEnable && pSh->IsReadOnlyAvailable() && pSh->HasReadonlySel() )
bEnable = false;
- GetOKButton()->Enable( bEnable );
+ GetOKButton().set_sensitive(bEnable);
}
void SwFieldEditDlg::InsertHdl()
{
- GetOKButton()->Click();
+ GetOKButton().clicked();
}
// kick off changing of the field
-IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl, weld::Button&, void)
{
- if (GetOKButton()->IsEnabled())
+ if (GetOKButton().get_sensitive())
{
VclPtr<SfxTabPage> pTabPage = GetTabPage();
if (pTabPage)
pTabPage->FillItemSet(nullptr);
- EndDialog( RET_OK );
+ m_xDialog->response(RET_OK);
}
}
-short SwFieldEditDlg::Execute()
+short SwFieldEditDlg::run()
{
// without TabPage no dialog
- return GetTabPage() ? Dialog::Execute() : static_cast<short>(RET_CANCEL);
+ return GetTabPage() ? SfxSingleTabDialogController::run() : static_cast<short>(RET_CANCEL);
}
// Traveling between fields of the same type
-IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void )
+IMPL_LINK(SwFieldEditDlg, NextPrevHdl, weld::Button&, rButton, void)
{
- bool bNext = pButton == m_pNextBT;
+ bool bNext = &rButton == m_xNextBT.get();
pSh->EnterStdMode();
@@ -272,7 +264,7 @@ IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void )
//#112462# FillItemSet may delete the current field
//that's why it has to be called before accessing the current field
- if( GetOKButton()->IsEnabled() )
+ if (GetOKButton().get_sensitive())
pTabPage->FillItemSet(nullptr);
SwFieldMgr& rMgr = pTabPage->GetFieldMgr();
@@ -295,7 +287,7 @@ IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void )
Init();
}
-IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, weld::Button&, void)
{
SwFieldPage* pTabPage = static_cast<SwFieldPage*>(GetTabPage());
SwFieldMgr& rMgr = pTabPage->GetFieldMgr();
@@ -330,7 +322,7 @@ IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, Button*, void)
aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, static_cast<sal_uInt16>(nEditPos)));
SwAbstractDialogFactory& rFact = swui::GetFactory();
- ScopedVclPtr<SfxAbstractDialog> pDlg(rFact.CreateSwAddressAbstractDlg(GetFrameWeld(), aSet));
+ ScopedVclPtr<SfxAbstractDialog> pDlg(rFact.CreateSwAddressAbstractDlg(m_xDialog.get(), aSet));
if (RET_OK == pDlg->Execute())
{
pSh->UpdateOneField(*pCurField);
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 76155a46fba0..365df5c361a4 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -317,7 +317,7 @@ void SwFieldPage::InsertHdl(weld::Widget* pBtn)
}
else
{
- SwFieldEditDlg *pEditDlg = static_cast<SwFieldEditDlg *>(GetParentDialog());
+ SwFieldEditDlg *pEditDlg = static_cast<SwFieldEditDlg*>(GetDialogController());
pEditDlg->InsertHdl();
}
}
@@ -333,7 +333,7 @@ void SwFieldPage::EnableInsert(bool bEnable)
}
else
{
- SwFieldEditDlg *pEditDlg = static_cast<SwFieldEditDlg *>(GetParentDialog());
+ SwFieldEditDlg *pEditDlg = static_cast<SwFieldEditDlg*>(GetDialogController());
pEditDlg->EnableInsert(bEnable);
}
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 390166828dd4..5459ff96b1ca 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -24,7 +24,7 @@
#include <strings.hrc>
SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, const SfxItemSet& rSet)
- : SfxSingleTabDialogController(pParent, rSet)
+ : SfxSingleTabDialogController(pParent, &rSet)
{
m_xDialog->set_title(SwResId(STR_FRMUI_PATTERN));
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 412bddd4144d..9db98fd2e483 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -30,7 +30,7 @@
#include <strings.hrc>
SwBorderDlg::SwBorderDlg(weld::Window* pParent, SfxItemSet& rSet, SwBorderModes nType)
- : SfxSingleTabDialogController(pParent, rSet)
+ : SfxSingleTabDialogController(pParent, &rSet)
{
m_xDialog->set_title(SwResId(STR_FRMUI_BORDER));
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 32c16bdac9ab..1ca392a35e07 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -53,7 +53,7 @@ const sal_uInt16 SwWrapTabPage::m_aWrapPageRg[] = {
};
SwWrapDlg::SwWrapDlg(weld::Window* pParent, SfxItemSet& rSet, SwWrtShell* pWrtShell, bool bDrawMode)
- : SfxSingleTabDialogController(pParent, rSet, "modules/swriter/ui/wrapdialog.ui", "WrapDialog")
+ : SfxSingleTabDialogController(pParent, &rSet, "modules/swriter/ui/wrapdialog.ui", "WrapDialog")
{
// create TabPage
TabPageParent pPageParent(get_content_area(), this);
diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx
index c6ddf545cea1..c14a4a171d1f 100644
--- a/sw/source/uibase/inc/fldedt.hxx
+++ b/sw/source/uibase/inc/fldedt.hxx
@@ -25,15 +25,15 @@ class SwView;
class SwWrtShell;
class SwFieldMgr;
-class SwFieldEditDlg : public SfxSingleTabDialog
+class SwFieldEditDlg : public SfxSingleTabDialogController
{
SwWrtShell* pSh;
- VclPtr<PushButton> m_pPrevBT;
- VclPtr<PushButton> m_pNextBT;
- VclPtr<PushButton> m_pAddressBT;
+ std::unique_ptr<weld::Button> m_xPrevBT;
+ std::unique_ptr<weld::Button> m_xNextBT;
+ std::unique_ptr<weld::Button> m_xAddressBT;
- DECL_LINK(AddressHdl, Button *, void);
- DECL_LINK(NextPrevHdl, Button *, void);
+ DECL_LINK(AddressHdl, weld::Button&, void);
+ DECL_LINK(NextPrevHdl, weld::Button&, void);
void Init();
VclPtr<SfxTabPage> CreatePage(sal_uInt16 nGroup);
@@ -43,11 +43,10 @@ public:
SwFieldEditDlg(SwView const & rVw);
virtual ~SwFieldEditDlg() override;
- virtual void dispose() override;
- DECL_LINK(OKHdl, Button*, void);
+ DECL_LINK(OKHdl, weld::Button&, void);
- virtual short Execute() override;
+ virtual short run() override;
void EnableInsert(bool bEnable);
void InsertHdl();
diff --git a/sw/uiconfig/swriter/ui/editfielddialog.ui b/sw/uiconfig/swriter/ui/editfielddialog.ui
index 6f3d73a3170c..922e37d2c2f7 100644
--- a/sw/uiconfig/swriter/ui/editfielddialog.ui
+++ b/sw/uiconfig/swriter/ui/editfielddialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkImage" id="image3">
@@ -16,7 +16,13 @@
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="editfielddialog|EditFieldDialog">Edit Fields</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</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>
@@ -84,6 +90,7 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkButton" id="prev">
<property name="visible">True</property>
@@ -92,7 +99,6 @@
<property name="tooltip_text" translatable="yes" context="editfielddialog|prev_tip">Previous field of same type</property>
<property name="valign">center</property>
<property name="margin_left">8</property>
- <property name="vexpand">True</property>
<property name="image">image3</property>
<property name="image_position">right</property>
</object>
@@ -108,7 +114,6 @@
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes" context="editfielddialog|next_tip">Next field of same type</property>
<property name="valign">center</property>
- <property name="vexpand">True</property>
<property name="image">image4</property>
</object>
<packing>
@@ -124,7 +129,7 @@
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="tooltip_text" translatable="yes" context="editfielddialog|edit_tip">Edit variable field content</property>
- <property name="margin_left">18</property>
+ <property name="margin_left">12</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -135,7 +140,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
@@ -150,8 +155,5 @@
<action-widget response="-5">ok</action-widget>
<action-widget response="-6">cancel</action-widget>
</action-widgets>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/flddbpage.ui b/sw/uiconfig/swriter/ui/flddbpage.ui
index a1d47bce72d3..49672192e0cf 100644
--- a/sw/uiconfig/swriter/ui/flddbpage.ui
+++ b/sw/uiconfig/swriter/ui/flddbpage.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkTreeStore" id="liststore1">
@@ -22,6 +23,8 @@
<object class="GtkBox" id="FieldDbPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
@@ -95,9 +98,9 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="flddbpage|label1">_Type</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -124,16 +127,14 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="flddbpage|label5">_Condition</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">condition</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -145,16 +146,12 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -171,32 +168,26 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="flddbpage|label4">Record number</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">recnumber</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -210,8 +201,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -252,11 +241,10 @@
<property name="vexpand">True</property>
<property name="model">liststore2</property>
<property name="headers_visible">False</property>
- <property name="show_expanders">True</property>
<property name="search_column">1</property>
<property name="enable_tree_lines">True</property>
<child internal-child="selection">
- <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
+ <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn8">
@@ -285,9 +273,9 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="flddbpage|label2">Database s_election</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -310,16 +298,14 @@
<object class="GtkLabel" id="browseft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="flddbpage|browseft">Add database file</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">browse</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -332,8 +318,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -378,7 +362,6 @@
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -398,8 +381,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -410,8 +391,6 @@
<object class="GtkComboBoxText" id="format">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -425,8 +404,6 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<accessibility>
<relation type="labelled-by" target="userdefinedcb"/>
</accessibility>
@@ -441,8 +418,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -453,9 +428,9 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="flddbpage|label3">Format</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -473,7 +448,6 @@
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/flddocinfopage.ui b/sw/uiconfig/swriter/ui/flddocinfopage.ui
index 9354b258e4da..81357bed19ff 100644
--- a/sw/uiconfig/swriter/ui/flddocinfopage.ui
+++ b/sw/uiconfig/swriter/ui/flddocinfopage.ui
@@ -29,6 +29,8 @@
<object class="GtkBox" id="FieldDocInfoPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index b62a505c4f17..906649d07cd2 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -2,7 +2,6 @@
<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">10</property>
@@ -45,6 +44,8 @@
<object class="GtkBox" id="FieldDocumentPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
@@ -453,10 +454,5 @@
<object class="GtkSizeGroup" id="sizegroup1">
<property name="mode">both</property>
<property name="ignore_hidden">True</property>
- <widgets>
- <widget name="type:border"/>
- <widget name="select:border"/>
- <widget name="format:border"/>
- </widgets>
</object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui
index 99fbf069c27e..1fc76b49bde4 100644
--- a/sw/uiconfig/swriter/ui/fldfuncpage.ui
+++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui
@@ -26,9 +26,19 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkTreeStore" id="liststore4">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkBox" id="FieldFuncPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
@@ -37,6 +47,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -106,6 +117,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -175,6 +187,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -244,6 +257,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkButton" id="macro">
@@ -487,13 +501,37 @@
</packing>
</child>
<child>
- <object class="GtkTreeView" id="listitems">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection5"/>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="listitems">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore3</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection4"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
diff --git a/sw/uiconfig/swriter/ui/fldrefpage.ui b/sw/uiconfig/swriter/ui/fldrefpage.ui
index 6344f9013fec..87ff24de6d3f 100644
--- a/sw/uiconfig/swriter/ui/fldrefpage.ui
+++ b/sw/uiconfig/swriter/ui/fldrefpage.ui
@@ -37,6 +37,8 @@
<object class="GtkBox" id="FieldRefPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 6d704b1bfe4d..5036abdae2e4 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -2,6 +2,16 @@
<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">svx/res/nu02.png</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">svx/res/nu01.png</property>
+ </object>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name text -->
@@ -34,26 +44,11 @@
<column type="gchararray"/>
</columns>
</object>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/nu02.png</property>
- </object>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">svx/res/nu01.png</property>
- </object>
- <object class="GtkTreeStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkGrid" id="FieldVarPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
More information about the Libreoffice-commits
mailing list