diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-28 17:04:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-01 11:41:04 +0100 |
| commit | b54046188c48b7031d0460ebab74125adc97f874 (patch) | |
| tree | 699f9563f7c120350887749277d9c0294a1fa54a /sw/source | |
| parent | c77e01d63b4bd4805c4a499e4e0cab917d0eb403 (diff) | |
weld ScStringInputDlg to native dialog
ScStringInputDlg and SwStringInputDlg do the same thing, but one uses the old
name as the label and leaves the new name blank in the entry. The other puts
the old name into the entry and autoselects it and uses a normal label. Both
are used from the rename button of the shared autoformat dialog.
Change-Id: I2ebf09a79f92c3f9020304e23e8907b67c06cd35
Reviewed-on: https://gerrit.libreoffice.org/50525
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/chrdlg/break.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/break.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index c6b61d34acce..5611fafbe0c5 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -36,7 +36,7 @@ #include <strings.hrc> #include <SwStyleNameMapper.hxx> -short SwBreakDlg::Execute() +short SwBreakDlg::run() { short nRet = m_xDialog->run(); if (nRet == RET_OK) diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 95f0e34a99bc..47acb1cbef8c 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -95,7 +95,7 @@ IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl); short AbstractSwBreakDlg_Impl::Execute() { - return m_xDlg->Execute(); + return m_xDlg->run(); } IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSwConvertTableDlg_Impl); diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 17ac6f34bbc9..58b5faecfe43 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -59,7 +59,7 @@ class SwBreakDlg public: SwBreakDlg(weld::Window *pParent, SwWrtShell &rSh); - short Execute(); + short run(); const OUString& GetTemplateName() const { return aTemplate; } sal_uInt16 GetKind() const { return nKind; } const ::boost::optional<sal_uInt16>& GetPageNumber() const { return oPgNum; } |