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

3 files changed, 29 insertions, 19 deletions

diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index da0ece104f..de24284b92 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -39,6 +39,31 @@
 
 // class SvxBorderLine  --------------------------------------------------
 
+namespace {
+
+    Color lcl_compute3DColor( Color aMain, int nLight, int nMedium, int nDark )
+    {
+        basegfx::BColor color = aMain.getBColor( );
+        basegfx::BColor hsl = basegfx::tools::rgb2hsl( color );
+
+        int nCoef = 0;
+        if ( hsl.getZ( ) >= 0.5 )
+            nCoef = nLight;
+        else if ( 0.5 > hsl.getZ() && hsl.getZ() >= 0.25 )
+            nCoef = nMedium;
+        else
+            nCoef = nDark;
+
+        double L = hsl.getZ() * 255.0 + nCoef;
+        hsl.setZ( L / 255.0 );
+        color = basegfx::tools::hsl2rgb( hsl );
+
+        return Color( color );
+    }
+} // Anonymous namespace
+
+namespace editeng {
+
 Color SvxBorderLine::darkColor( Color aMain )
 {
     return aMain;
@@ -56,25 +81,6 @@ Color SvxBorderLine::lightColor( Color aMain )
     return Color( color );
 }
 
-Color lcl_compute3DColor( Color aMain, int nLight, int nMedium, int nDark )
-{
-    basegfx::BColor color = aMain.getBColor( );
-    basegfx::BColor hsl = basegfx::tools::rgb2hsl( color );
-
-    int nCoef = 0;
-    if ( hsl.getZ( ) >= 0.5 )
-        nCoef = nLight;
-    else if ( 0.5 > hsl.getZ() && hsl.getZ() >= 0.25 )
-        nCoef = nMedium;
-    else
-        nCoef = nDark;
-
-    double L = hsl.getZ() * 255.0 + nCoef;
-    hsl.setZ( L / 255.0 );
-    color = basegfx::tools::hsl2rgb( hsl );
-
-    return Color( color );
-}
 
 Color SvxBorderLine::threeDLightColor( Color aMain )
 {
@@ -484,4 +490,6 @@ bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const
     }
 }
 
+} // namespace editeng
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index b21f8816ec..bda2be744f 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -94,6 +94,7 @@
 #include <editeng/memberids.hrc>
 #include <editeng/editerr.hxx>
 
+using namespace ::editeng;
 using namespace ::rtl;
 using namespace ::com::sun::star;
 
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 5fcfd0981c..f482e560f8 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -95,6 +95,7 @@
 #define BRACELEFT	'{'
 #define BRACERIGHT	'}'
 
+using namespace editeng;
 
 // Some helper functions
 // char