From 7d34d4b5d23d7c29a22c9e79322dea0dad36096a Mon Sep 17 00:00:00 2001
From: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Fri, 25 Mar 2011 15:51:46 +0100
Subject: Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on
 windows

---
 sc/inc/cellsuno.hxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sc/inc/cellsuno.hxx')

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 01a2ff592d2e..b1f703f39b9f 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -108,11 +108,12 @@ class ScCellRangeObj;
 class SvxUnoText;
 class ScLinkListener;
 class ScPatternAttr;
-class SvxBorderLine;
 class SvxBoxItem;
 class SvxBoxInfoItem;
 class SvxItemPropertySet;
 
+namespace editeng { class SvxBorderLine; }
+
 class ScLinkListener : public SvtListener
 {
     Link    aLink;
@@ -139,9 +140,9 @@ SV_DECL_PTRARR_DEL( ScNamedEntryArr_Impl, ScNamedEntryPtr, 4, 4 )
 class ScHelperFunctions
 {
 public:
-    static const SvxBorderLine* GetBorderLine( SvxBorderLine& rLine, const com::sun::star::table::BorderLine& rStruct );
+    static const ::editeng::SvxBorderLine* GetBorderLine( ::editeng::SvxBorderLine& rLine, const com::sun::star::table::BorderLine& rStruct );
     static void FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const com::sun::star::table::TableBorder& rBorder );
-    static void FillBorderLine( com::sun::star::table::BorderLine& rStruct, const SvxBorderLine* pLine );
+    static void FillBorderLine( com::sun::star::table::BorderLine& rStruct, const ::editeng::SvxBorderLine* pLine );
     static void FillTableBorder( com::sun::star::table::TableBorder& rBorder,
                             const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner );
     static void ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges,
-- 
cgit