[Libreoffice-commits] core.git: svx/source sw/source

Justin Luth (via logerrit) logerrit at kemper.freedesktop.org
Tue Feb 18 06:46:10 UTC 2020


 svx/source/svdraw/svdotextdecomposition.cxx     |    2 +-
 sw/source/core/doc/DocumentStylePoolManager.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e8c16d0487e366c31fb07a7503687eab92f0dcc
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Mon Feb 17 12:32:59 2020 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Tue Feb 18 07:45:30 2020 +0100

    NFC tdf#120412 cleanup2: use DFLT_ESC_* more
    
    Found in preparation for tdf#80194.
    Lots of related bugfixes in LO6.4. tdf#99602, tdf#127316
    
    Change-Id: I1effb71d0fceaad45d211ba20529457d3d7406b0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88909
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 8424d21ac6f1..9744d4a524c7 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -196,7 +196,7 @@ namespace
 
             if(DFLT_ESC_AUTO_SUPER == nEsc)
             {
-                nEsc = 33;
+                nEsc = DFLT_ESC_SUPER;
             }
             else if(DFLT_ESC_AUTO_SUB == nEsc)
             {
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 6aab632e2cff..b25a3cd2a6d5 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1514,7 +1514,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
     case RES_POOLCHR_ENDNOTE_ANCHOR:        // Endnote anchor
     case RES_POOLCHR_FOOTNOTE_ANCHOR:       // Footnote anchor
         {
-            aSet.Put( SvxEscapementItem( DFLT_ESC_AUTO_SUPER, 58, RES_CHRATR_ESCAPEMENT ) );
+            aSet.Put( SvxEscapementItem( DFLT_ESC_AUTO_SUPER, DFLT_ESC_PROP, RES_CHRATR_ESCAPEMENT ) );
         }
         break;
 


More information about the Libreoffice-commits mailing list