summaryrefslogtreecommitdiff
path: root/sw/source/ui/shells/frmsh.cxx
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-25 15:51:54 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-28 11:15:52 +0200
commit1d21a4249661b1b55cf8fbea67ad47ffb4f813fa (patch)
treef5ffda4ae0fd6fd5d4f5f6c5b967b57c678b8371 /sw/source/ui/shells/frmsh.cxx
parent969d60a477742d24afe370fae70db057d2db9341 (diff)
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'sw/source/ui/shells/frmsh.cxx')
-rw-r--r--sw/source/ui/shells/frmsh.cxx3
1 files changed, 2 insertions, 1 deletions
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