diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-25 15:51:54 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-28 11:15:52 +0200 |
| commit | 1d21a4249661b1b55cf8fbea67ad47ffb4f813fa (patch) | |
| tree | f5ffda4ae0fd6fd5d4f5f6c5b967b57c678b8371 /sw/source/ui/shells | |
| parent | 969d60a477742d24afe370fae70db057d2db9341 (diff) | |
Moved SvxBorder* into editeng namespace to avoid duplicate DOUBLE on windows
Diffstat (limited to 'sw/source/ui/shells')
| -rw-r--r-- | sw/source/ui/shells/frmsh.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 3 |
2 files changed, 4 insertions, 2 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 diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 73db32260f91..abc579c825d2 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -109,6 +109,7 @@ #include "swabstdlg.hxx" #include <table.hrc> +using ::editeng::SvxBorderLine; using namespace ::com::sun::star; SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE)) @@ -543,7 +544,7 @@ void SwTableShell::Execute(SfxRequest &rReq) if(aBorderLine.GetOutWidth() == 0) { - aBorderLine.SetStyle( SOLID ); + aBorderLine.SetStyle( ::editeng::SOLID ); aBorderLine.SetWidth( DEF_LINE_WIDTH_0 ); } |