[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Szymon Kłos (via logerrit)]

 sw/source/ui/frmdlg/cption.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 4f1527e066d440f2a15c595a38a8fcfe7d8bcfec
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Feb 6 17:27:50 2023 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Feb 9 12:59:19 2023 +0000

    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.k...@collabora.com>
    (cherry picked from commit 6a7b3d59d790cb8ea55353fe4173d71a13931d50)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146694
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>

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