summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2023-02-06 17:27:50 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2023-02-09 13:04:01 +0000
commitefbf1fad61882a52e92b9c4d9d277a5e8c7750ab (patch)
tree5522f1a715773f700f284c45308928b4d982b246 /sw
parentf7f465eab1aee31e3cd1f863208becec0c288106 (diff)
tdf#153244 apply caption options
Change-Id: I2aa53a85ab9f38ddf74caac85047235ea85a40af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146590 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 6a7b3d59d790cb8ea55353fe4173d71a13931d50) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146630 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/frmdlg/cption.cxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ab23c1f09987..e6b387a42910 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -72,14 +72,6 @@ public:
void SetCharacterStyle(const OUString& rStyle);
OUString GetCharacterStyle() const;
-
- virtual short run() override
- {
- int nRet = GenericDialogController::run();
- if (nRet == RET_OK)
- Apply();
- return nRet;
- }
};
}
@@ -319,6 +311,7 @@ IMPL_LINK_NOARG(SwCaptionDialog, OptionHdl, weld::Button&, void)
GenericDialogController::runAsync(pDlg, [pDlg, this](sal_Int32 nResult){
if (nResult == RET_OK) {
+ pDlg->Apply();
m_bCopyAttributes = pDlg->IsApplyBorderAndShadow();
m_sCharacterStyle = pDlg->GetCharacterStyle();
//#i61007# order of captions