Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows

11 files changed, 38 insertions, 25 deletions

diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx
index a2cd8e514c..b7e08fa637 100755
--- a/svx/inc/svx/framelink.hxx
+++ b/svx/inc/svx/framelink.hxx
@@ -116,21 +116,21 @@ class SVX_DLLPUBLIC Style
 {
 public:
     /** Constructs an invisible frame style. */
-    inline explicit     Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mnType( SOLID ) {}
+    inline explicit     Style() : meRefMode( REFMODE_CENTERED ), mnPrim( 0 ), mnDist( 0 ), mnSecn( 0 ), mnType( editeng::SOLID ) {}
     /** Constructs a frame style with passed line widths. */
-    inline explicit     Style( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, SvxBorderStyle nType ) :
+    inline explicit     Style( sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, editeng::SvxBorderStyle nType ) :
                             meRefMode( REFMODE_CENTERED ), mnType( nType )
                             { Set( nP, nD, nS ); }
     /** Constructs a frame style with passed color and line widths. */
     inline explicit     Style( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor,
-                            sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, SvxBorderStyle nType ) :
+                            sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS, editeng::SvxBorderStyle nType ) :
                             meRefMode( REFMODE_CENTERED ), mnType( nType )
                             { Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS ); }
     /** Constructs a frame style from the passed SvxBorderLine struct. */
-    inline explicit     Style( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
+    inline explicit     Style( const editeng::SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
                             meRefMode( REFMODE_CENTERED ) { Set( rBorder, fScale, nMaxWidth ); }
     /** Constructs a frame style from the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */
-    inline explicit     Style( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
+    inline explicit     Style( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 ) :
                             meRefMode( REFMODE_CENTERED ) { Set( pBorder, fScale, nMaxWidth ); }
 
     inline RefMode      GetRefMode() const { return meRefMode; }
@@ -141,7 +141,7 @@ public:
     inline sal_uInt16   Prim() const { return mnPrim; }
     inline sal_uInt16   Dist() const { return mnDist; }
     inline sal_uInt16   Secn() const { return mnSecn; }
-    inline SvxBorderStyle Type() const { return mnType; }
+    inline editeng::SvxBorderStyle Type() const { return mnType; }
 
     /** Returns the total width of this frame style. */
     inline sal_uInt16   GetWidth() const { return mnPrim + mnDist + mnSecn; }
@@ -154,9 +154,9 @@ public:
     void                Set( const Color& rColorPrim, const Color& rColorSecn, const Color& rColorGap, bool bUseGapColor,
                             sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS );
     /** Sets the frame style to the passed SvxBorderLine struct. */
-    void                Set( const SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
+    void                Set( const editeng::SvxBorderLine& rBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
     /** Sets the frame style to the passed SvxBorderLine struct. Clears the style, if pBorder is 0. */
-    void                Set( const SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
+    void                Set( const editeng::SvxBorderLine* pBorder, double fScale = 1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
 
     /** Sets a new reference point handling mode, does not modify other settings. */
     inline void         SetRefMode( RefMode eRefMode ) { meRefMode = eRefMode; }
@@ -165,7 +165,7 @@ public:
     inline void         SetColorSecn( const Color& rColor ) { maColorSecn = rColor; }
     inline void         SetColorGap( bool bUseIt, const Color& rColor ) { maColorGap = rColor; mbUseGapColor = bUseIt; }
     /** Sets whether to use dotted style for single hair lines. */
-    inline void         SetType( SvxBorderStyle nType ) { mnType = nType; }
+    inline void         SetType( editeng::SvxBorderStyle nType ) { mnType = nType; }
 
     /** Scales the style by the specified scaling factor. Ensures that visible lines keep visible. */
     Style&              ScaleSelf( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
@@ -186,7 +186,7 @@ private:
     sal_uInt16          mnPrim;     /// Width of primary (single, left, or top) line.
     sal_uInt16          mnDist;     /// Distance between primary and secondary line.
     sal_uInt16          mnSecn;     /// Width of secondary (right or bottom) line.
-    SvxBorderStyle      mnType;
+    editeng::SvxBorderStyle      mnType;
 };
 
 bool operator==( const Style& rL, const Style& rR );
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index 81d2946e7c..9a5ab6717f 100755
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -37,7 +37,9 @@
 #include <svx/framebordertype.hxx>
 #include "svx/svxdllapi.h"
 
-class SvxBorderLine;
+namespace editeng {
+    class SvxBorderLine;
+}
 
 namespace svx {
 
@@ -115,10 +117,10 @@ public:
     /** Returns the state (visible/hidden/don't care) of the specified frame border. */
     FrameBorderState    GetFrameBorderState( FrameBorderType eBorder ) const;
     /** Returns the style of the specified frame border, if it is visible. */
-    const SvxBorderLine* GetFrameBorderStyle( FrameBorderType eBorder ) const;
+    const editeng::SvxBorderLine* GetFrameBorderStyle( FrameBorderType eBorder ) const;
 
     /** Shows the specified frame border using the passed style, or hides it, if pStyle is 0. */
-    void                ShowBorder( FrameBorderType eBorder, const SvxBorderLine* pStyle );
+    void                ShowBorder( FrameBorderType eBorder, const editeng::SvxBorderLine* pStyle );
     /** Sets the specified frame border to "don't care" state. */
     void                SetBorderDontCare( FrameBorderType eBorder );
 
@@ -130,7 +132,7 @@ public:
     /** Returns true, if all visible frame borders have equal widths.
         @descr  Ignores hidden and "don't care" frame borders. On success,
         returns the width in the passed parameter. */
-    bool                GetVisibleWidth( long& rnWidth, SvxBorderStyle& rnStyle ) const;
+    bool                GetVisibleWidth( long& rnWidth, editeng::SvxBorderStyle& rnStyle ) const;
     /** Returns true, if all visible frame borders have equal color.
         @descr  Ignores hidden and "don't care" frame borders. On success,
         returns the color in the passed parameter. */
@@ -161,7 +163,7 @@ public:
     void                SelectAllVisibleBorders( bool bSelect = true );
 
     /** Sets the passed line widths to all selected frame borders (in twips). */
-    void                SetStyleToSelection( long nWidth, SvxBorderStyle nStyle );
+    void                SetStyleToSelection( long nWidth, editeng::SvxBorderStyle nStyle );
     /** Sets the passed color to all selected frame borders. */
     void                SetColorToSelection( const Color& rColor );
 
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 9dfa353ca6..5d2a9005d3 100755
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -58,6 +58,8 @@
 #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx>
 
+using namespace editeng;
+
 namespace svx {
 namespace frame {
 
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index c0badf2276..14d2ccef22 100755
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -41,6 +41,8 @@
 
 #include <tools/rcid.h>
 
+using namespace ::editeng;
+
 namespace svx {
 
 using ::com::sun::star::uno::Reference;
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index ab1c5d06c4..fd36b53be8 100755
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -57,8 +57,8 @@ public:
     inline bool         IsSelected() const { return mbSelected; }
     inline void         Select( bool bSelect ) { mbSelected = bSelect; }
 
-    const SvxBorderLine& GetCoreStyle() const { return maCoreStyle; }
-    void                SetCoreStyle( const SvxBorderLine* pStyle );
+    const editeng::SvxBorderLine& GetCoreStyle() const { return maCoreStyle; }
+    void                SetCoreStyle( const editeng::SvxBorderLine* pStyle );
 
     inline void         SetUIColorPrim( const Color& rColor ) {maUIStyle.SetColorPrim( rColor ); }
     inline void         SetUIColorSecn( const Color& rColor ) {maUIStyle.SetColorSecn( rColor ); }
@@ -83,7 +83,7 @@ public:
 private:
     const FrameBorderType meType;       /// Frame border type (position in control).
     FrameBorderState    meState;        /// Frame border state (on/off/don't care).
-    SvxBorderLine       maCoreStyle;    /// Core style from application.
+    editeng::SvxBorderLine       maCoreStyle;    /// Core style from application.
     frame::Style        maUIStyle;      /// Internal style to draw lines.
     FrameBorderType     meKeyLeft;      /// Left neighbor for keyboard control.
     FrameBorderType     meKeyRight;     /// Right neighbor for keyboard control.
@@ -124,7 +124,7 @@ struct FrameSelectorImpl : public Resource
     FrameBorder         maVer;          /// All data of inner vertical frame border.
     FrameBorder         maTLBR;         /// All data of top-left to bottom-right frame border.
     FrameBorder         maBLTR;         /// All data of bottom-left to top-right frame border.
-    SvxBorderLine       maCurrStyle;    /// Current style and color for new borders.
+    editeng::SvxBorderLine       maCurrStyle;    /// Current style and color for new borders.
     frame::Array        maArray;        /// Frame link array to draw an array of frame borders.
 
     FrameSelFlags       mnFlags;        /// Flags for enabled frame borders.
@@ -216,7 +216,7 @@ struct FrameSelectorImpl : public Resource
     /** Sets the state of the specified frame border. */
     void                SetBorderState( FrameBorder& rBorder, FrameBorderState eState );
     /** Sets the core style of the specified frame border, or hides the frame border, if pStyle is 0. */
-    void                SetBorderCoreStyle( FrameBorder& rBorder, const SvxBorderLine* pStyle );
+    void                SetBorderCoreStyle( FrameBorder& rBorder, const editeng::SvxBorderLine* pStyle );
     /** Sets the color of the specified frame border. */
     void                SetBorderColor( FrameBorder& rBorder, const Color& rColor );
 
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 9eb36e7db7..61755b4036 100755
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -65,6 +65,7 @@
 
 // -----------------------------------------------------------------------------
 
+using ::editeng::SvxBorderLine;
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 355072bcfe..58835d4b84 100755
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -73,6 +73,7 @@
 #include "tableundo.hxx"
 #include "tablelayouter.hxx"
 
+using ::editeng::SvxBorderLine;
 using ::rtl::OUString;
 using namespace ::sdr::table;
 using namespace ::com::sun::star;
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 8334a46961..519a77edee 100755
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -48,6 +48,7 @@
 #include "svx/svdstr.hrc"
 #include "svx/svdglob.hxx"
 
+using ::editeng::SvxBorderLine;
 using ::rtl::OUString;
 using ::com::sun::star::awt::XLayoutConstrains;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index 1bbe0c474d..2405287d74 100755
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -43,7 +43,9 @@
 
 // -----------------------------------------------------------------------------
 
-class SvxBorderLine;
+namespace editeng {
+    class SvxBorderLine;
+}
 
 namespace sdr { namespace table {
 
@@ -52,7 +54,7 @@ namespace sdr { namespace table {
 */
 bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedCol, sal_Int32 nMergedRow, sal_Int32& rOriginCol, sal_Int32& rOriginRow );
 
-typedef std::vector< SvxBorderLine* > BorderLineVector;
+typedef std::vector< editeng::SvxBorderLine* > BorderLineVector;
 typedef std::vector< BorderLineVector > BorderLineMap;
 
 // -----------------------------------------------------------------------------
@@ -116,7 +118,7 @@ public:
     bool isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const;
 
     /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */
-    SvxBorderLine* getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const;
+    editeng::SvxBorderLine* getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const;
 
     void updateCells( ::Rectangle& rRectangle );
 
@@ -144,9 +146,9 @@ private:
     void ResizeBorderLayout();
     void ResizeBorderLayout( BorderLineMap& rMap );
 
-    void SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine );
+    void SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const editeng::SvxBorderLine* pLine );
 
-    static bool HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther );
+    static bool HasPriority( const editeng::SvxBorderLine* pThis, const editeng::SvxBorderLine* pOther );
 
     struct Layout
     {
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index e0baafa34a..ac9918426e 100755
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -55,6 +55,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+using editeng::SvxBorderLine;
 using namespace com::sun::star;
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 180f3cb6a1..488ef01bee 100755
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -115,6 +115,7 @@ sal_Bool lcl_FontChangedHint( const SfxHint &rHint );
 
 // namespaces
 using ::rtl::OUString;
+using namespace ::editeng;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;