[Libreoffice-commits] core.git: Branch 'feature/gsoc-writer-char-borders' - 2 commits - include/svx sw/source

[Zolnai Tamás]

 include/svx/flagsdef.hxx          |    2 --
 sw/source/core/txtnode/swfont.cxx |    4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3a43ae5da45d500c77ad40bdec93547add422655
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Thu Jul 25 21:22:05 2013 +0200

    Remove some unused comment
    
    Change-Id: I1500b849d2773a62f0e9191f1acd53443867bfc7

diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index e6523dd..1603ee5 100644
--- a/include/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
@@ -26,8 +26,6 @@
 #define SW_BORDER_MODE_PARA     0x01
 #define SW_BORDER_MODE_TABLE    0x02
 #define SW_BORDER_MODE_FRAME    0x04
-//#define SW_BORDER_MODE_PAGE     0x08
-//#define SW_BORDER_MODE_CHAR     0x10
 
 // flags for SvxBackgroundTabPage
 #define SVX_SHOW_SELECTOR       0x01
commit e3021114248118e010243111ea886fce5e603baa
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Thu Jul 25 10:24:57 2013 +0200

    Missing magic in font
    
    Change-Id: Ic3f4d12729c0309e03992c06f8a57da3d004c24a

diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 783524a..7a62c47 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -84,6 +84,7 @@ void SwFont::SetTopBorder( const editeng::SvxBorderLine* pTopBorder )
     else
         m_aTopBorder = boost::none;
     bFntChg = sal_True;
+    aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 void SwFont::SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder )
@@ -93,6 +94,7 @@ void SwFont::SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder )
     else
         m_aBottomBorder = boost::none;
     bFntChg = sal_True;
+    aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 void SwFont::SetRightBorder( const editeng::SvxBorderLine* pRightBorder )
@@ -102,6 +104,7 @@ void SwFont::SetRightBorder( const editeng::SvxBorderLine* pRightBorder )
     else
         m_aRightBorder = boost::none;
     bFntChg = sal_True;
+    aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder )
@@ -111,6 +114,7 @@ void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder )
     else
         m_aLeftBorder = boost::none;
     bFntChg = sal_True;
+    aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 // maps directions for vertical layout