summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZolnai Tamás <zolnaitamas2000@gmail.com>2013-07-11 10:15:44 +0200
committerZolnai Tamás <zolnaitamas2000@gmail.com>2013-07-26 07:16:40 +0200
commite992bd5090226fc4ee43606e0fe37fbbee0ca401 (patch)
tree2821befae6b555c85070541ce81e156884e30b19
parent45519ecc1adb4ca975cac97842c0959677ebc2b1 (diff)
Make some changes in SwFont's borders
Change-Id: I901094a45f339b0702481a3fd60f3b7effc96143
-rw-r--r--sw/source/core/inc/swfont.hxx8
-rw-r--r--sw/source/core/txtnode/swfont.cxx4
2 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index a9c5a98f7484..c2dc2d1c6a30 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -182,10 +182,10 @@ public:
void SetRightBorder( const editeng::SvxBorderLine* pRightBorder );
void SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder );
- const boost::optional<editeng::SvxBorderLine>& GetTopBorder() { return m_aTopBorder; }
- const boost::optional<editeng::SvxBorderLine>& GetBottomBorder() { return m_aBottomBorder; }
- const boost::optional<editeng::SvxBorderLine>& GetRightBorder() { return m_aRightBorder; }
- const boost::optional<editeng::SvxBorderLine>& GetLeftBorder() { return m_aLeftBorder; }
+ const boost::optional<editeng::SvxBorderLine>& GetTopBorder() const { return m_aTopBorder; }
+ const boost::optional<editeng::SvxBorderLine>& GetBottomBorder() const { return m_aBottomBorder; }
+ const boost::optional<editeng::SvxBorderLine>& GetRightBorder() const { return m_aRightBorder; }
+ const boost::optional<editeng::SvxBorderLine>& GetLeftBorder() const { return m_aLeftBorder; }
inline void ChkMagic( ViewShell *pSh, sal_uInt8 nWhich )
{ if( !aSub[ nWhich ].pMagic ) GoMagic( pSh, nWhich ); }
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index a45aa6158b37..783524aa9612 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -452,10 +452,6 @@ void SwFont::SetDiffFnt( const SfxItemSet *pAttrSet,
SwFont::SwFont()
: pBackColor(0)
- , m_aTopBorder(boost::none)
- , m_aBottomBorder(boost::none)
- , m_aRightBorder(boost::none)
- , m_aLeftBorder(boost::none)
, nActual(SW_LATIN)
{
}