[Libreoffice-commits] core.git: cui/source extensions/source sc/source sfx2/source sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 24 20:14:23 UTC 2018
cui/source/dialogs/hyphen.cxx | 2 +-
extensions/source/bibliography/bibview.cxx | 2 +-
sc/source/filter/oox/workbookfragment.cxx | 2 +-
sc/source/ui/docshell/docsh.cxx | 2 +-
sfx2/source/doc/templatedlg.cxx | 2 +-
sw/source/ui/frmdlg/column.cxx | 2 +-
sw/source/ui/misc/outline.cxx | 2 +-
sw/source/ui/misc/srtdlg.cxx | 2 +-
sw/source/ui/table/instable.cxx | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 8a83a40dc23b1e7c64a34c33a0ca57afc5183f40
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 24 12:46:56 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 24 22:14:00 2018 +0200
make all the related inheritences formatted the same way
Change-Id: I2e0c060a86cd199a640589a7599fa5f01ef77e3b
Reviewed-on: https://gerrit.libreoffice.org/60943
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index c519f755e3d6..d0066803c1c2 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -405,7 +405,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
weld::Window* pParent,
uno::Reference< linguistic2::XHyphenator > const &xHyphen,
SvxSpellWrapper* pWrapper)
- : weld::GenericDialogController(pParent, "cui/ui/hyphenate.ui", "HyphenateDialog")
+ : GenericDialogController(pParent, "cui/ui/hyphenate.ui", "HyphenateDialog")
, m_pHyphWrapper(pWrapper)
, m_aActWord(rWord)
, m_nActLanguage(nLang)
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index c8e87a954dfe..d82c4955cec6 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -49,7 +49,7 @@ namespace
std::unique_ptr<weld::CheckButton> m_xWarningOnBox;
public:
MessageWithCheck(weld::Window *pParent)
- : weld::MessageDialogController(pParent, "modules/sbibliography/ui/querydialog.ui", "QueryDialog", "ask")
+ : MessageDialogController(pParent, "modules/sbibliography/ui/querydialog.ui", "QueryDialog", "ask")
, m_xWarningOnBox(m_xBuilder->weld_check_button("ask"))
{
}
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index fc8873e5ebce..09d9366e5f06 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -529,7 +529,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xWarningOnBox;
public:
MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OString& rDialogId)
- : weld::MessageDialogController(pParent, rUIFile, rDialogId, "ask")
+ : MessageDialogController(pParent, rUIFile, rDialogId, "ask")
, m_xWarningOnBox(m_xBuilder->weld_check_button("ask"))
{
}
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 1b86afbc8496..a1cc279398f7 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -443,7 +443,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xWarningOnBox;
public:
MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OString& rDialogId)
- : weld::MessageDialogController(pParent, rUIFile, rDialogId, "ask")
+ : MessageDialogController(pParent, rUIFile, rDialogId, "ask")
, m_xWarningOnBox(m_xBuilder->weld_check_button("ask"))
{
}
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 894dc8832f21..2a6122c01703 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1319,7 +1319,7 @@ static std::vector<OUString> lcl_getAllFactoryURLs ()
// Class SfxTemplateCategoryDialog --------------------------------------------------
SfxTemplateCategoryDialog::SfxTemplateCategoryDialog(weld::Window* pParent)
- : weld::GenericDialogController(pParent, "sfx/ui/templatecategorydlg.ui", "TemplatesCategoryDialog")
+ : GenericDialogController(pParent, "sfx/ui/templatecategorydlg.ui", "TemplatesCategoryDialog")
, msSelectedCategory(OUString())
, mbIsNewCategory(false)
, mxLBCategory(m_xBuilder->weld_tree_view("categorylb"))
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 8d2c780a0342..4d270ba6b68e 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -84,7 +84,7 @@ static inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSe
}
SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh)
- : weld::GenericDialogController(pParent, "modules/swriter/ui/columndialog.ui", "ColumnDialog")
+ : GenericDialogController(pParent, "modules/swriter/ui/columndialog.ui", "ColumnDialog")
, m_rWrtShell(rSh)
, m_pFrameSet(nullptr)
, m_nOldSelection(0)
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 9c43cab7df68..7b70104318fd 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -113,7 +113,7 @@ IMPL_LINK_NOARG(SwNumNamesDlg, DoubleClickHdl, weld::TreeView&, void)
}
SwNumNamesDlg::SwNumNamesDlg(weld::Window *pParent)
- : weld::GenericDialogController(pParent,
+ : GenericDialogController(pParent,
"modules/swriter/ui/numberingnamedialog.ui",
"NumberingNameDialog")
, m_xFormEdit(m_xBuilder->weld_entry("entry"))
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index ff53d13a30ed..2f2ba79a4c4c 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -98,7 +98,7 @@ static bool lcl_GetSelTable( SwWrtShell const &rSh, sal_uInt16& rX, sal_uInt16&
// init list
SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell)
- : weld::GenericDialogController(pParent, "modules/swriter/ui/sortdialog.ui", "SortDialog")
+ : GenericDialogController(pParent, "modules/swriter/ui/sortdialog.ui", "SortDialog")
, m_pParent(pParent)
, m_xColLbl(m_xBuilder->weld_label("column"))
, m_xKeyCB1(m_xBuilder->weld_check_button("key1"))
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 03935c050586..a964b644f72d 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -60,7 +60,7 @@ IMPL_LINK(SwInsTableDlg, TextFilterHdl, OUString&, rTest, bool)
}
SwInsTableDlg::SwInsTableDlg(SwView& rView)
- : weld::GenericDialogController(rView.GetFrameWeld(), "modules/swriter/ui/inserttable.ui", "InsertTableDialog")
+ : GenericDialogController(rView.GetFrameWeld(), "modules/swriter/ui/inserttable.ui", "InsertTableDialog")
, m_aTextFilter(" .<>")
, pShell(&rView.GetWrtShell())
, pTAutoFormat(nullptr)
More information about the Libreoffice-commits
mailing list