com::sun::star->css in svx

Change-Id: If2c11fa548c5ebef2297d2491edd837b54e3707c
Reviewed-on: https://gerrit.libreoffice.org/19690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 104 insertions, 104 deletions

diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index e6cfbe3cdcc5..e9f042ccb02b 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -369,7 +369,7 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic, OUString& rOUString)
 
 sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
                                   GraphicFilter& rFilter, const sal_uInt16 nFormat,
-                                  const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
+                                  const css::uno::Sequence< css::beans::PropertyValue >* pFilterData )
 {
     DBG_ASSERT( rURL.GetProtocol() != INetProtocol::NotValid, "XOutBitmap::ExportGraphic(...): invalid URL" );
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index d83941c95022..eaa7d8cb4851 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -340,13 +340,13 @@ const Color& XColorItem::GetColorValue(const XColorList* pTable) const
 
 }
 
-bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
     return true;
 }
 
-bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -359,7 +359,7 @@ bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*n
 
 TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem);
 
-XLineStyleItem::XLineStyleItem(com::sun::star::drawing::LineStyle eTheLineStyle) :
+XLineStyleItem::XLineStyleItem(css::drawing::LineStyle eTheLineStyle) :
     SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle))
 {
 }
@@ -393,10 +393,10 @@ bool XLineStyleItem::GetPresentation
 
     switch( (sal_uInt16)GetValue() )
     {
-        case com::sun::star::drawing::LineStyle_NONE:
+        case css::drawing::LineStyle_NONE:
             nId = RID_SVXSTR_INVISIBLE;
             break;
-        case com::sun::star::drawing::LineStyle_SOLID:
+        case css::drawing::LineStyle_SOLID:
             nId = RID_SVXSTR_SOLID;
             break;
     }
@@ -406,23 +406,23 @@ bool XLineStyleItem::GetPresentation
     return true;
 }
 
-bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineStyleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
-    ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
+    css::drawing::LineStyle eLS = (css::drawing::LineStyle)GetValue();
     rVal <<= eLS;
     return true;
 }
 
-bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineStyleItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
-    ::com::sun::star::drawing::LineStyle eLS;
+    css::drawing::LineStyle eLS;
     if(!(rVal >>= eLS ))
     {
         // also try an int (for Basic)
         sal_Int32 nLS = 0;
         if(!(rVal >>= nLS))
             return false;
-        eLS = (::com::sun::star::drawing::LineStyle)nLS;
+        eLS = (css::drawing::LineStyle)nLS;
     }
 
     SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) );
@@ -745,7 +745,7 @@ bool XLineDashItem::ScaleMetrics(long nMul, long nDiv)
     return true;
 }
 
-bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool XLineDashItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -755,10 +755,10 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem
         {
             uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
 
-            ::com::sun::star::drawing::LineDash aLineDash;
+            css::drawing::LineDash aLineDash;
 
             const XDash& rXD = GetDashValue();
-            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
+            aLineDash.Style = (css::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
             aLineDash.Dots = rXD.GetDots();
             aLineDash.DotLen = rXD.GetDotLen();
             aLineDash.Dashes = rXD.GetDashes();
@@ -785,9 +785,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem
         {
             const XDash& rXD = GetDashValue();
 
-            ::com::sun::star::drawing::LineDash aLineDash;
+            css::drawing::LineDash aLineDash;
 
-            aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
+            aLineDash.Style = (css::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
             aLineDash.Dots = rXD.GetDots();
             aLineDash.DotLen = rXD.GetDotLen();
             aLineDash.Dashes = rXD.GetDashes();
@@ -801,7 +801,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem
         case MID_LINEDASH_STYLE:
         {
             const XDash& rXD = GetDashValue();
-            rVal <<= (::com::sun::star::drawing::DashStyle)((sal_Int16)rXD.GetDashStyle());
+            rVal <<= (css::drawing::DashStyle)((sal_Int16)rXD.GetDashStyle());
             break;
         }
 
@@ -846,7 +846,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem
     return true;
 }
 
-bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XLineDashItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -907,7 +907,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
 
         case MID_LINEDASH:
         {
-            ::com::sun::star::drawing::LineDash aLineDash;
+            css::drawing::LineDash aLineDash;
             if(!(rVal >>= aLineDash))
                 return false;
 
@@ -1050,7 +1050,7 @@ bool XLineWidthItem::GetPresentation
     return true;
 }
 
-bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool XLineWidthItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Int32 nValue = GetValue();
     if( 0 != (nMemberId&CONVERT_TWIPS) )
@@ -1060,7 +1060,7 @@ bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
     return true;
 }
 
-bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XLineWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -1110,13 +1110,13 @@ bool XLineColorItem::GetPresentation
     return true;
 }
 
-bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
     return true;
 }
 
-bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue))
@@ -1296,7 +1296,7 @@ bool XLineStartItem::GetPresentation
     return true;
 }
 
-bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool XLineStartItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     if( nMemberId == MID_NAME )
@@ -1306,7 +1306,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
     }
     else
     {
-        com::sun::star::drawing::PolyPolygonBezierCoords aBezier;
+        css::drawing::PolyPolygonBezierCoords aBezier;
         basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
         rVal <<= aBezier;
     }
@@ -1314,7 +1314,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
     return true;
 }
 
-bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XLineStartItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     if( nMemberId == MID_NAME )
@@ -1327,10 +1327,10 @@ bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
 
         if( rVal.hasValue() && rVal.getValue() )
         {
-            if( rVal.getValueType() != cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get())
+            if( rVal.getValueType() != cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get())
                 return false;
 
-            com::sun::star::drawing::PolyPolygonBezierCoords const * pCoords = static_cast<com::sun::star::drawing::PolyPolygonBezierCoords const *>(rVal.getValue());
+            css::drawing::PolyPolygonBezierCoords const * pCoords = static_cast<css::drawing::PolyPolygonBezierCoords const *>(rVal.getValue());
             if( pCoords->Coordinates.getLength() > 0 )
             {
                 maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
@@ -1859,7 +1859,7 @@ bool XLineEndItem::GetPresentation
     return true;
 }
 
-bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool XLineEndItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     if( nMemberId == MID_NAME )
@@ -1869,14 +1869,14 @@ bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemb
     }
     else
     {
-        com::sun::star::drawing::PolyPolygonBezierCoords aBezier;
+        css::drawing::PolyPolygonBezierCoords aBezier;
         basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier );
         rVal <<= aBezier;
     }
     return true;
 }
 
-bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XLineEndItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
     if( nMemberId == MID_NAME )
@@ -1889,10 +1889,10 @@ bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 n
 
         if( rVal.hasValue() && rVal.getValue() )
         {
-            if( rVal.getValueType() != cppu::UnoType<com::sun::star::drawing::PolyPolygonBezierCoords>::get())
+            if( rVal.getValueType() != cppu::UnoType<css::drawing::PolyPolygonBezierCoords>::get())
                 return false;
 
-            com::sun::star::drawing::PolyPolygonBezierCoords const * pCoords = static_cast<com::sun::star::drawing::PolyPolygonBezierCoords const *>(rVal.getValue());
+            css::drawing::PolyPolygonBezierCoords const * pCoords = static_cast<css::drawing::PolyPolygonBezierCoords const *>(rVal.getValue());
             if( pCoords->Coordinates.getLength() > 0 )
             {
                 maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords );
@@ -1941,13 +1941,13 @@ bool XLineStartWidthItem::GetPresentation
     return true;
 }
 
-bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineStartWidthItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineStartWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -1991,13 +1991,13 @@ bool XLineEndWidthItem::GetPresentation
     return true;
 }
 
-bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineEndWidthItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetValue();
     return true;
 }
 
-bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineEndWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     rVal >>= nValue;
@@ -2040,14 +2040,14 @@ bool XLineStartCenterItem::GetPresentation
     return true;
 }
 
-bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineStartCenterItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, cppu::UnoType<bool>::get() );
     return true;
 }
 
-bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineStartCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != cppu::UnoType<bool>::get() )
         return false;
@@ -2091,14 +2091,14 @@ bool XLineEndCenterItem::GetPresentation
     return true;
 }
 
-bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineEndCenterItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     sal_Bool bValue = GetValue();
     rVal.setValue( &bValue, cppu::UnoType<bool>::get() );
     return true;
 }
 
-bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineEndCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     if( !rVal.hasValue() || rVal.getValueType() != cppu::UnoType<bool>::get() )
         return false;
@@ -2172,25 +2172,25 @@ sal_uInt16 XFillStyleItem::GetValueCount() const
     return 5;
 }
 
-bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XFillStyleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
-    ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
+    css::drawing::FillStyle eFS = (css::drawing::FillStyle)GetValue();
 
     rVal <<= eFS;
 
     return true;
 }
 
-bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XFillStyleItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
-    ::com::sun::star::drawing::FillStyle eFS;
+    css::drawing::FillStyle eFS;
     if(!(rVal >>= eFS))
     {
         // also try an int (for Basic)
         sal_Int32 nFS = 0;
         if(!(rVal >>= nFS))
             return false;
-        eFS = (::com::sun::star::drawing::FillStyle)nFS;
+        eFS = (css::drawing::FillStyle)nFS;
     }
 
     SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) );
@@ -2250,14 +2250,14 @@ bool XFillColorItem::GetPresentation
     return true;
 }
 
-bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XFillColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
 
     return true;
 }
 
-bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XFillColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     sal_Int32 nValue = 0;
     if(!(rVal >>= nValue ))
@@ -2506,7 +2506,7 @@ bool XFillGradientItem::GetPresentation
     return true;
 }
 
-bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool XFillGradientItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
@@ -2515,10 +2515,10 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
         {
             uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
 
-            ::com::sun::star::awt::Gradient aGradient2;
+            css::awt::Gradient aGradient2;
 
             const XGradient& aXGradient = GetGradientValue();
-            aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
+            aGradient2.Style = (css::awt::GradientStyle) aXGradient.GetGradientStyle();
             aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
             aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
             aGradient2.Angle = (short)aXGradient.GetAngle();
@@ -2541,9 +2541,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
         case MID_FILLGRADIENT:
         {
             const XGradient& aXGradient = GetGradientValue();
-            ::com::sun::star::awt::Gradient aGradient2;
+            css::awt::Gradient aGradient2;
 
-            aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
+            aGradient2.Style = (css::awt::GradientStyle) aXGradient.GetGradientStyle();
             aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
             aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
             aGradient2.Angle = (short)aXGradient.GetAngle();
@@ -2582,7 +2582,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
     return true;
 }
 
-bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XFillGradientItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -2644,7 +2644,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
 
         case MID_FILLGRADIENT:
         {
-            ::com::sun::star::awt::Gradient aGradient2;
+            css::awt::Gradient aGradient2;
             if(!(rVal >>= aGradient2))
                 return false;
 
@@ -2796,12 +2796,12 @@ sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion
     return XFillGradientItem::GetVersion( nFileFormatVersion );
 }
 
-bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool XFillFloatTransparenceItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     return XFillGradientItem::QueryValue( rVal, nMemberId );
 }
 
-bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XFillFloatTransparenceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     return XFillGradientItem::PutValue( rVal, nMemberId );
 }
@@ -2977,7 +2977,7 @@ bool XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
     return true;
 }
 
-bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
+bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -2987,9 +2987,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
         {
             uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
 
-            ::com::sun::star::drawing::Hatch aUnoHatch;
+            css::drawing::Hatch aUnoHatch;
 
-            aUnoHatch.Style = (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle();
+            aUnoHatch.Style = (css::drawing::HatchStyle)aHatch.GetHatchStyle();
             aUnoHatch.Color = aHatch.GetColor().GetColor();
             aUnoHatch.Distance = aHatch.GetDistance();
             aUnoHatch.Angle = aHatch.GetAngle();
@@ -3005,9 +3005,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
 
         case MID_FILLHATCH:
         {
-            ::com::sun::star::drawing::Hatch aUnoHatch;
+            css::drawing::Hatch aUnoHatch;
 
-            aUnoHatch.Style = (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle();
+            aUnoHatch.Style = (css::drawing::HatchStyle)aHatch.GetHatchStyle();
             aUnoHatch.Color = aHatch.GetColor().GetColor();
             aUnoHatch.Distance = aHatch.GetDistance();
             aUnoHatch.Angle = aHatch.GetAngle();
@@ -3023,7 +3023,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
         }
 
         case MID_HATCH_STYLE:
-            rVal <<= (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle(); break;
+            rVal <<= (css::drawing::HatchStyle)aHatch.GetHatchStyle(); break;
         case MID_HATCH_COLOR:
             rVal <<= (sal_Int32)aHatch.GetColor().GetColor(); break;
         case MID_HATCH_DISTANCE:
@@ -3037,7 +3037,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
     return true;
 }
 
-bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XFillHatchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -3079,7 +3079,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
 
         case MID_FILLHATCH:
         {
-            ::com::sun::star::drawing::Hatch aUnoHatch;
+            css::drawing::Hatch aUnoHatch;
             if(!(rVal >>= aUnoHatch))
                 return false;
 
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 0308d87b35e4..5aa7446c19c2 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -81,7 +81,7 @@ bool XLineTransparenceItem::GetPresentation
 
 TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem);
 
-XLineJointItem::XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint ) :
+XLineJointItem::XLineJointItem( css::drawing::LineJoint eLineJoint ) :
     SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint))
 {
 }
@@ -101,7 +101,7 @@ SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
     XLineJointItem* pRet = new XLineJointItem( rIn );
 
     if(nVer < 1)
-        pRet->SetValue(com::sun::star::drawing::LineJoint_ROUND);
+        pRet->SetValue(css::drawing::LineJoint_ROUND);
 
     return pRet;
 }
@@ -120,27 +120,27 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit
 
     switch( GetValue() )
     {
-        case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ):
-        case( com::sun::star::drawing::LineJoint_NONE ):
+        case( css::drawing::LineJoint_MAKE_FIXED_SIZE ):
+        case( css::drawing::LineJoint_NONE ):
             nId = RID_SVXSTR_LINEJOINT_NONE;
         break;
 
-        case( com::sun::star::drawing::LineJoint_MIDDLE ):
+        case( css::drawing::LineJoint_MIDDLE ):
             nId = RID_SVXSTR_LINEJOINT_MIDDLE;
         break;
 
 
-        case( com::sun::star::drawing::LineJoint_BEVEL ):
+        case( css::drawing::LineJoint_BEVEL ):
             nId = RID_SVXSTR_LINEJOINT_BEVEL;
         break;
 
 
-        case( com::sun::star::drawing::LineJoint_MITER ):
+        case( css::drawing::LineJoint_MITER ):
             nId = RID_SVXSTR_LINEJOINT_MITER;
         break;
 
 
-        case( com::sun::star::drawing::LineJoint_ROUND ):
+        case( css::drawing::LineJoint_ROUND ):
             nId = RID_SVXSTR_LINEJOINT_ROUND;
         break;
     }
@@ -151,16 +151,16 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit
     return true;
 }
 
-bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineJointItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
-    const ::com::sun::star::drawing::LineJoint eJoint = GetValue();
+    const css::drawing::LineJoint eJoint = GetValue();
     rVal <<= eJoint;
     return true;
 }
 
-bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineJointItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
-    ::com::sun::star::drawing::LineJoint eUnoJoint;
+    css::drawing::LineJoint eUnoJoint;
 
     if(!(rVal >>= eUnoJoint))
     {
@@ -168,7 +168,7 @@ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
         sal_Int32 nLJ = 0;
         if(!(rVal >>= nLJ))
             return false;
-        eUnoJoint = (::com::sun::star::drawing::LineJoint)nLJ;
+        eUnoJoint = (css::drawing::LineJoint)nLJ;
     }
 
     SetValue( sal::static_int_cast< sal_uInt16 >( eUnoJoint ) );
@@ -184,7 +184,7 @@ sal_uInt16 XLineJointItem::GetValueCount() const
 
 TYPEINIT1_AUTOFACTORY(AffineMatrixItem, SfxPoolItem);
 
-AffineMatrixItem::AffineMatrixItem(const com::sun::star::geometry::AffineMatrix2D* pMatrix)
+AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix)
 :   SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX)
 {
     if(pMatrix)
@@ -266,13 +266,13 @@ SvStream& AffineMatrixItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/
     return rStream;
 }
 
-bool AffineMatrixItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool AffineMatrixItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= maMatrix;
     return true;
 }
 
-bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool AffineMatrixItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     if (rVal >>= maMatrix)
     {
@@ -285,7 +285,7 @@ bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
 
 TYPEINIT1_AUTOFACTORY(XLineCapItem, SfxEnumItem);
 
-XLineCapItem::XLineCapItem(com::sun::star::drawing::LineCap eLineCap)
+XLineCapItem::XLineCapItem(css::drawing::LineCap eLineCap)
 :   SfxEnumItem(XATTR_LINECAP, sal::static_int_cast< sal_uInt16 >(eLineCap))
 {
 }
@@ -305,7 +305,7 @@ SfxPoolItem* XLineCapItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
     XLineCapItem* pRet = new XLineCapItem( rIn );
 
     if(nVer < 1)
-        pRet->SetValue(com::sun::star::drawing::LineCap_BUTT);
+        pRet->SetValue(css::drawing::LineCap_BUTT);
 
     return pRet;
 }
@@ -324,15 +324,15 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*
 
     switch( GetValue() )
     {
-        default: /*com::sun::star::drawing::LineCap_BUTT*/
+        default: /*css::drawing::LineCap_BUTT*/
             nId = RID_SVXSTR_LINECAP_BUTT;
         break;
 
-        case(com::sun::star::drawing::LineCap_ROUND):
+        case(css::drawing::LineCap_ROUND):
             nId = RID_SVXSTR_LINECAP_ROUND;
         break;
 
-        case(com::sun::star::drawing::LineCap_SQUARE):
+        case(css::drawing::LineCap_SQUARE):
             nId = RID_SVXSTR_LINECAP_SQUARE;
         break;
     }
@@ -343,16 +343,16 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /*
     return true;
 }
 
-bool XLineCapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
+bool XLineCapItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
-    const com::sun::star::drawing::LineCap eCap(GetValue());
+    const css::drawing::LineCap eCap(GetValue());
     rVal <<= eCap;
     return true;
 }
 
-bool XLineCapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XLineCapItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
-    com::sun::star::drawing::LineCap eUnoCap;
+    css::drawing::LineCap eUnoCap;
 
     if(!(rVal >>= eUnoCap))
     {
@@ -364,12 +364,12 @@ bool XLineCapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /
             return false;
         }
 
-        eUnoCap = (com::sun::star::drawing::LineCap)nLJ;
+        eUnoCap = (css::drawing::LineCap)nLJ;
     }
 
-    OSL_ENSURE(com::sun::star::drawing::LineCap_BUTT == eUnoCap
-        || com::sun::star::drawing::LineCap_ROUND == eUnoCap
-        || com::sun::star::drawing::LineCap_SQUARE == eUnoCap, "Unknown enum value in XATTR_LINECAP (!)");
+    OSL_ENSURE(css::drawing::LineCap_BUTT == eUnoCap
+        || css::drawing::LineCap_ROUND == eUnoCap
+        || css::drawing::LineCap_SQUARE == eUnoCap, "Unknown enum value in XATTR_LINECAP (!)");
 
     SetValue(sal::static_int_cast< sal_uInt16 >(eUnoCap));
 
@@ -382,12 +382,12 @@ sal_uInt16 XLineCapItem::GetValueCount() const
     return 3;
 }
 
-com::sun::star::drawing::LineCap XLineCapItem::GetValue() const
+css::drawing::LineCap XLineCapItem::GetValue() const
 {
-    const com::sun::star::drawing::LineCap eRetval((com::sun::star::drawing::LineCap)SfxEnumItem::GetValue());
-    OSL_ENSURE(com::sun::star::drawing::LineCap_BUTT == eRetval
-        || com::sun::star::drawing::LineCap_ROUND == eRetval
-        || com::sun::star::drawing::LineCap_SQUARE == eRetval, "Unknown enum value in XATTR_LINECAP (!)");
+    const css::drawing::LineCap eRetval((css::drawing::LineCap)SfxEnumItem::GetValue());
+    OSL_ENSURE(css::drawing::LineCap_BUTT == eRetval
+        || css::drawing::LineCap_ROUND == eRetval
+        || css::drawing::LineCap_SQUARE == eRetval, "Unknown enum value in XATTR_LINECAP (!)");
 
     return eRetval;
 }
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index bfc06ca9d0ac..1393104867c1 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -396,7 +396,7 @@ bool XFillBitmapItem::GetPresentation(
     return true;
 }
 
-bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) const
+bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId) const
 {
     nMemberId &= ~CONVERT_TWIPS;
 
@@ -406,7 +406,7 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
     OUString aInternalName;
 
     OUString aURL;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp;
+    css::uno::Reference< css::awt::XBitmap > xBmp;
 
     if( nMemberId == MID_NAME )
     {
@@ -456,14 +456,14 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe
     return true;
 }
 
-bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
+bool XFillBitmapItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
 
     OUString aName;
     OUString aURL;
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp;
-    ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic;
+    css::uno::Reference< css::awt::XBitmap > xBmp;
+    css::uno::Reference< css::graphic::XGraphic > xGraphic;
 
     bool bSetName   = false;
     bool bSetURL    = false;