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

---
 sw/source/ui/shells/frmsh.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sw/source/ui/shells/frmsh.cxx')

diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 0415bfa8e642..3c9ef5b11193 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -97,6 +97,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/uno/Any.h>
 
+using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
@@ -1105,7 +1106,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
 
                     if(aBorderLine.GetOutWidth() == 0)
                     {
-                        aBorderLine.SetStyle( SOLID );
+                        aBorderLine.SetStyle( ::editeng::SOLID );
                         aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
                     }
                     //Distance nur setzen, wenn der Request vom Controller kommt
-- 
cgit v1.2.3