Use text portion's join members without changing font

- The main advantage of avoiding font change and
use join members is that part of the border can be
removed (e.g. right or left border) but shadow won't.
- Other advantage, SwTxtSizeInfo is used for calculate
the length of the specified string and there are some
case when this length have to exclude the border width.
- Add join members to SwDropPortionPart and use these
members to set the whole drop portion's same member.
In general a drop portion' join members are false
and it get true value only temporarly during the actual
part formatting. (maybe it would be better solution to
make distinct drop portions instead of parts)
- Improve line break

Change-Id: I6d11ec7b250c9a8b769cffaf83861f25f0c477a5

1 files changed, 8 insertions, 1 deletions

diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 96c8d98853b7..a462e6bfe839 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -42,10 +42,12 @@ class SwDropPortionPart
     SwFont* pFnt;
     xub_StrLen nLen;
     sal_uInt16 nWidth;
+    bool m_bJoinBorderWithNext;
+    bool m_bJoinBorderWithPrev;
 
 public:
     SwDropPortionPart( SwFont& rFont, const xub_StrLen nL )
-            : pFollow( 0 ), pFnt( &rFont ), nLen( nL ), nWidth( 0 ) {};
+            : pFollow( 0 ), pFnt( &rFont ), nLen( nL ), nWidth( 0 ), m_bJoinBorderWithNext(false), m_bJoinBorderWithPrev(false) {};
     ~SwDropPortionPart();
 
     inline SwDropPortionPart* GetFollow() const { return pFollow; };
@@ -54,6 +56,11 @@ public:
     inline xub_StrLen GetLen() const { return nLen; }
     inline sal_uInt16 GetWidth() const { return nWidth; }
     inline void SetWidth( sal_uInt16 nNew )  { nWidth = nNew; }
+
+    bool GetJoinBorderWithPrev() const { return m_bJoinBorderWithPrev; }
+    bool GetJoinBorderWithNext() const { return m_bJoinBorderWithNext; }
+    void SetJoinBorderWithPrev( const bool bJoinPrev ) { m_bJoinBorderWithPrev = bJoinPrev; }
+    void SetJoinBorderWithNext( const bool bJoinNext ) { m_bJoinBorderWithNext = bJoinNext; }
 };
 
 /*************************************************************************