[Libreoffice-commits] core.git: cui/uiconfig sw/inc sw/source
cui/uiconfig/ui/formatnumberdialog.ui |8 +++-
sw/inc/swabstdlg.hxx |3 +--
sw/source/ui/chrdlg/tblnumfm.cxx | 17 -
sw/source/ui/dialog/swdlgfact.cxx |6 ++
sw/source/ui/dialog/swdlgfact.hxx |2 +-
sw/source/uibase/inc/tblnumfm.hxx |6 +++---
sw/source/uibase/shells/tabsh.cxx |2 +-
sw/source/uibase/utlui/numfmtlb.cxx |2 +-
8 files changed, 24 insertions(+), 22 deletions(-)
New commits:
commit bbeeedbbfa0b7a0d1461c5ff703721bce1b7f80a
Author: Caolán McNamara
AuthorDate: Fri Sep 28 14:54:44 2018 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 29 06:27:33 2018 +0200
weld SwNumFormatDlg
Change-Id: I8f7acf1b662d2357f810ff3c103670df2e58757f
Reviewed-on: https://gerrit.libreoffice.org/61089
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/uiconfig/ui/formatnumberdialog.ui
b/cui/uiconfig/ui/formatnumberdialog.ui
index fd01522e1800..13be59a2c0b6 100644
--- a/cui/uiconfig/ui/formatnumberdialog.ui
+++ b/cui/uiconfig/ui/formatnumberdialog.ui
@@ -1,5 +1,5 @@
-
+
@@ -7,7 +7,13 @@
6
Format Number
False
+True
+0
+0
dialog
+
+
+
False
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index e9f201a35ffb..da2486e48b71 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -359,8 +359,7 @@ class SwAbstractDialogFactory
public:
static SwAbstractDialogFactory* Create();
-virtual VclPtr CreateNumFormatDialog( vcl::Window*
pParent,
- const SfxItemSet& rAttr) = 0;
+virtual VclPtr CreateNumFormatDialog(weld::Window*
pParent, const SfxItemSet& rAttr) = 0;
virtual VclPtr CreateSwDropCapsDialog(weld::Window*
pParent, const SfxItemSet& rSet) = 0;
virtual VclPtr CreateSwBackgroundDialog(weld::Window*
pParent, const SfxItemSet& rSet) = 0;
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index ddcad7961029..46fe5c8455e4 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -27,21 +27,20 @@
#include
#include
-SwNumFormatDlg::SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet)
-: SfxSingleTabDialog(pParent, rSet, "FormatNumberDialog",
-"cui/ui/formatnumberdialog.ui")
+SwNumFormatDlg::SwNumFormatDlg(weld::Window* pParent, const SfxItemSet& rSet)
+: SfxSingleTabDialogController(pParent, rSet,
"cui/ui/formatnumberdialog.ui", "FormatNumberDialog")
{
// Create TabPage
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_NUMBERFORMAT );
-
+::CreateTabPage fnCreatePage =
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_NUMBERFORMAT);
if ( fnCreatePage )
{
-VclPtr pNewPage = (*fnCreatePage)(
TabPageParent(get_content_area()), );
+TabPageParent pPageParent(get_content_area(), this);
+VclPtr xNewPage = (*fnCreatePage)(pPageParent, );
SfxAllItemSet aSet(*(rSet.GetPool()));
-aSet.Put ( SvxNumberInfoItem( pNewPage->GetItemSet().Get(
SID_ATTR_NUMBERFORMAT_INFO ) ));
-pNewPage->PageCreated(aSet);
-SetTabPage(pNewPage);
+aSet.Put(SvxNumberInfoItem(xNewPage->GetItemSet().Get(
SID_ATTR_NUMBERFORMAT_INFO)));
+xNewPage->PageCreated(aSet);
+SetTabPage(xNewPage);
}
}
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 2a5849a1753e..5e1c01acdacc 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -770,11 +770,9 @@ VclPtr
SwAbstractDialogFactory_Impl::CreateSwBackgroundDialog
return
VclPtr::Create(o3tl::make_unique(pParent,
rSet));
}
-VclPtr SwAbstractDialogFactory_Impl::CreateNumFormatDialog(
vcl::Window* pParent,
- const
SfxItemSet& rSet)
+VclPtr
SwAbstractDialogFactory_Impl::CreateNumFormatDialog(weld::Window* pParent,
const SfxItemSet& rSet)
{
-VclPtr pDlg = VclPtr::Create( pParent,
rSet );
-return VclPtr::Create( pDlg );
+return
VclPtr::Create(o3tl::make_unique(pParent,
rSet));
}
VclPtr
SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg(weld::Window* pParent,
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 7cbb22347371..2ad87e1986dc 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -573,7 +573,7 @@ class SwAbstractDialogFactory_Impl : public
SwAbstractDialogFactory
public:
virtual ~SwAbstractDialogFactory_Impl() {}
-virtual VclPtr CreateNumFormatDialog(vcl::Window*
pParent, const SfxItemSet& rAttr) override;
+virtual VclPtr CreateNumFormatDialog(weld::Window*
pParent, const SfxItemSet& rAttr) override;
virtual VclPtr
[Libreoffice-commits] core.git: cui/uiconfig sw/inc sw/source sw/uiconfig
cui/uiconfig/ui/charnamepage.ui |2
cui/uiconfig/ui/positionpage.ui |2
sw/inc/swabstdlg.hxx |2
sw/source/ui/chrdlg/chardlg.cxx | 59 ---
sw/source/ui/dialog/swdlgfact.cxx |5
sw/source/ui/dialog/swdlgfact.hxx |2
sw/source/ui/envelp/envfmt.cxx|3
sw/source/uibase/docvw/PostItMgr.cxx |2
sw/source/uibase/inc/chrdlg.hxx | 14 -
sw/source/uibase/shells/annotsh.cxx |2
sw/source/uibase/shells/drwtxtex.cxx |2
sw/source/uibase/shells/textsh1.cxx |2
sw/uiconfig/swriter/ui/characterproperties.ui | 197 --
sw/uiconfig/swriter/ui/charurlpage.ui |3
14 files changed, 234 insertions(+), 63 deletions(-)
New commits:
commit a4503017dfcf0c919b8f81bd8cdbc44bade3f774
Author: Caolán McNamara
AuthorDate: Wed Sep 12 15:52:35 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Sep 14 14:16:11 2018 +0200
weld SwCharDlg
Change-Id: Ice7c211b10d59ab9d166da6e09662b602debb09d
Reviewed-on: https://gerrit.libreoffice.org/60417
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 8412e41c3af8..3f1087f174ba 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -53,6 +53,8 @@
True
False
+True
+True
6
vertical
12
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 987064ff1dc8..8329705586e8 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -31,6 +31,8 @@
True
False
+True
+True
6
vertical
12
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index c1c735fdb5db..dcb6dd2a4015 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -375,7 +375,7 @@ public:
virtual VclPtr CreateSwBreakDlg(weld::Window *pParent,
SwWrtShell ) = 0;
virtual VclPtr CreateSwChangeDBDlg(SwView& rVw) = 0;
-virtual VclPtr CreateSwCharDlg(vcl::Window*
pParent, SwView& pVw, const SfxItemSet& rCoreSet,
+virtual VclPtr CreateSwCharDlg(weld::Window*
pParent, SwView& pVw, const SfxItemSet& rCoreSet,
SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) = 0;
virtual VclPtr CreateSwConvertTableDlg(SwView&
rView, bool bToTable) = 0;
virtual VclPtr CreateSwCaptionDialog ( vcl::Window
*pParent, SwView ) = 0;
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 9dfa7dd920c8..eb31be2c98ae 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -58,38 +58,41 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::sfx2;
-SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const SfxItemSet&
rCoreSet,
+SwCharDlg::SwCharDlg(weld::Window* pParent, SwView& rVw, const SfxItemSet&
rCoreSet,
SwCharDlgMode nDialogMode, const OUString* pStr)
-: SfxTabDialog(pParent, "CharacterPropertiesDialog",
-"modules/swriter/ui/characterproperties.ui", , pStr !=
nullptr)
+: SfxTabDialogController(pParent,
"modules/swriter/ui/characterproperties.ui",
+ "CharacterPropertiesDialog", , pStr !=
nullptr)
, m_rView(rVw)
, m_nDialogMode(nDialogMode)
{
-if(pStr)
+if (pStr)
{
-SetText(GetText() + SwResId(STR_TEXTCOLL_HEADER) + *pStr + ")");
+m_xDialog->set_title(m_xDialog->get_title() +
SwResId(STR_TEXTCOLL_HEADER) + *pStr + ")");
}
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-m_nCharStdId = AddTabPage("font",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), nullptr);
-m_nCharExtId = AddTabPage("fonteffects",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr);
-m_nCharPosId = AddTabPage("position", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_POSITION ), nullptr );
-m_nCharTwoId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_TWOLINES ), nullptr );
-m_nCharUrlId = AddTabPage("hyperlink", SwCharURLPage::Create, nullptr);
-m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BKG ), nullptr );
-m_nCharBrdId = AddTabPage("borders", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER ), nullptr );
-
-SvtCJKOptions aCJKOptions;
-if(m_nDialogMode == SwCharDlgMode::Draw || m_nDialogMode ==
SwCharDlgMode::Ann)
+AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME),
nullptr);
+AddTabPage("fonteffects",
pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), nullptr);
+AddTabPage("position", pFact->GetTabPageCreatorFunc(
RID_SVXPAGE_CHAR_POSITION ), nullptr );
+AddTabPage("asianlayout",
