drawinglayer: com::sun::star->css

Change-Id: I65706e3e87c1ce287020c90a89f7dc00866bef64
Reviewed-on: https://gerrit.libreoffice.org/18501
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 58 insertions, 58 deletions

diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx
index c5c4cf486b7d..1548dbf2c073 100644
--- a/drawinglayer/source/attribute/lineattribute.cxx
+++ b/drawinglayer/source/attribute/lineattribute.cxx
@@ -34,13 +34,13 @@ namespace drawinglayer
             basegfx::BColor                         maColor;                // color
             double                                  mfWidth;                // absolute line width
             basegfx::B2DLineJoin                    meLineJoin;             // type of LineJoin
-            com::sun::star::drawing::LineCap        meLineCap;              // BUTT, ROUND, or SQUARE
+            css::drawing::LineCap                   meLineCap;              // BUTT, ROUND, or SQUARE
 
             ImpLineAttribute(
                 const basegfx::BColor& rColor,
                 double fWidth,
                 basegfx::B2DLineJoin aB2DLineJoin,
-                com::sun::star::drawing::LineCap aLineCap)
+                css::drawing::LineCap aLineCap)
             :   maColor(rColor),
                 mfWidth(fWidth),
                 meLineJoin(aB2DLineJoin),
@@ -52,7 +52,7 @@ namespace drawinglayer
             :   maColor(basegfx::BColor()),
                 mfWidth(0.0),
                 meLineJoin(basegfx::B2DLineJoin::Round),
-                meLineCap(com::sun::star::drawing::LineCap_BUTT)
+                meLineCap(css::drawing::LineCap_BUTT)
             {
             }
 
@@ -60,7 +60,7 @@ namespace drawinglayer
             const basegfx::BColor& getColor() const { return maColor; }
             double getWidth() const { return mfWidth; }
             basegfx::B2DLineJoin getLineJoin() const { return meLineJoin; }
-            com::sun::star::drawing::LineCap getLineCap() const { return meLineCap; }
+            css::drawing::LineCap getLineCap() const { return meLineCap; }
 
             bool operator==(const ImpLineAttribute& rCandidate) const
             {
@@ -81,7 +81,7 @@ namespace drawinglayer
             const basegfx::BColor& rColor,
             double fWidth,
             basegfx::B2DLineJoin aB2DLineJoin,
-            com::sun::star::drawing::LineCap aLineCap)
+            css::drawing::LineCap aLineCap)
         :   mpLineAttribute(
                 ImpLineAttribute(
                     rColor,
@@ -140,7 +140,7 @@ namespace drawinglayer
             return mpLineAttribute->getLineJoin();
         }
 
-        com::sun::star::drawing::LineCap LineAttribute::getLineCap() const
+        css::drawing::LineCap LineAttribute::getLineCap() const
         {
             return mpLineAttribute->getLineCap();
         }
diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx
index 778f24257212..e3d49cb1ae00 100644
--- a/drawinglayer/source/attribute/sdrlineattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlineattribute.cxx
@@ -35,7 +35,7 @@ namespace drawinglayer
             double                                  mfWidth;            // 1/100th mm, 0.0==hair
             double                                  mfTransparence;     // [0.0 .. 1.0], 0.0==no transp.
             basegfx::BColor                         maColor;            // color of line
-            com::sun::star::drawing::LineCap        meCap;              // BUTT, ROUND, or SQUARE
+            css::drawing::LineCap                   meCap;              // BUTT, ROUND, or SQUARE
             ::std::vector< double >                 maDotDashArray;     // array of double which defines the dot-dash pattern
             double                                  mfFullDotDashLen;   // sum of maDotDashArray (for convenience)
 
@@ -44,7 +44,7 @@ namespace drawinglayer
                 double fWidth,
                 double fTransparence,
                 const basegfx::BColor& rColor,
-                com::sun::star::drawing::LineCap eCap,
+                css::drawing::LineCap eCap,
                 const ::std::vector< double >& rDotDashArray,
                 double fFullDotDashLen)
             :   meJoin(eJoin),
@@ -62,7 +62,7 @@ namespace drawinglayer
                 mfWidth(0.0),
                 mfTransparence(0.0),
                 maColor(basegfx::BColor()),
-                meCap(com::sun::star::drawing::LineCap_BUTT),
+                meCap(css::drawing::LineCap_BUTT),
                 maDotDashArray(std::vector< double >()),
                 mfFullDotDashLen(0.0)
             {
@@ -73,7 +73,7 @@ namespace drawinglayer
             double getWidth() const { return mfWidth; }
             double getTransparence() const { return mfTransparence; }
             const basegfx::BColor& getColor() const { return maColor; }
-            com::sun::star::drawing::LineCap getCap() const { return meCap; }
+            css::drawing::LineCap getCap() const { return meCap; }
             const ::std::vector< double >& getDotDashArray() const { return maDotDashArray; }
             double getFullDotDashLen() const { return mfFullDotDashLen; }
 
@@ -99,7 +99,7 @@ namespace drawinglayer
             double fWidth,
             double fTransparence,
             const basegfx::BColor& rColor,
-            com::sun::star::drawing::LineCap eCap,
+            css::drawing::LineCap eCap,
             const ::std::vector< double >& rDotDashArray,
             double fFullDotDashLen)
         :   mpSdrLineAttribute(
@@ -179,7 +179,7 @@ namespace drawinglayer
             return mpSdrLineAttribute->getFullDotDashLen();
         }
 
-        com::sun::star::drawing::LineCap SdrLineAttribute::getCap() const
+        css::drawing::LineCap SdrLineAttribute::getCap() const
         {
             return mpSdrLineAttribute->getCap();
         }
diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
index b0d9abb8d285..512895a2c048 100644
--- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx
@@ -31,26 +31,26 @@ namespace drawinglayer
         {
         public:
             // 3D object attribute definitions
-            ::com::sun::star::drawing::NormalsKind              maNormalsKind;              // normals type (0..2)
-            ::com::sun::star::drawing::TextureProjectionMode    maTextureProjectionX;       // texture projection type X (0..2)
-            ::com::sun::star::drawing::TextureProjectionMode    maTextureProjectionY;       // texture projection type Y (0..2)
-            ::com::sun::star::drawing::TextureKind2             maTextureKind;              // texture kind (see uno API)
-            ::com::sun::star::drawing::TextureMode              maTextureMode;              // texture kind (see uno API)
-            MaterialAttribute3D                                 maMaterial;                 // object, specular and emissive colors, SpecularIntensity
+            css::drawing::NormalsKind              maNormalsKind;              // normals type (0..2)
+            css::drawing::TextureProjectionMode    maTextureProjectionX;       // texture projection type X (0..2)
+            css::drawing::TextureProjectionMode    maTextureProjectionY;       // texture projection type Y (0..2)
+            css::drawing::TextureKind2             maTextureKind;              // texture kind (see uno API)
+            css::drawing::TextureMode              maTextureMode;              // texture kind (see uno API)
+            MaterialAttribute3D                    maMaterial;                 // object, specular and emissive colors, SpecularIntensity
 
             // bitfield
-            bool                                                mbNormalsInvert : 1;        // invert normals
-            bool                                                mbDoubleSided : 1;          // surfaces are double sided
-            bool                                                mbShadow3D : 1;             // display shadow in 3D (if on), params for that are at scene
-            bool                                                mbTextureFilter : 1;        // filter texture to make more smooth
-            bool                                                mbReducedLineGeometry : 1;  // use reduced line geometry (object specific)
+            bool                                   mbNormalsInvert : 1;        // invert normals
+            bool                                   mbDoubleSided : 1;          // surfaces are double sided
+            bool                                   mbShadow3D : 1;             // display shadow in 3D (if on), params for that are at scene
+            bool                                   mbTextureFilter : 1;        // filter texture to make more smooth
+            bool                                   mbReducedLineGeometry : 1;  // use reduced line geometry (object specific)
 
             ImpSdr3DObjectAttribute(
-                ::com::sun::star::drawing::NormalsKind  aNormalsKind,
-                ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX,
-                ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY,
-                ::com::sun::star::drawing::TextureKind2 aTextureKind,
-                ::com::sun::star::drawing::TextureMode aTextureMode,
+                css::drawing::NormalsKind  aNormalsKind,
+                css::drawing::TextureProjectionMode aTextureProjectionX,
+                css::drawing::TextureProjectionMode aTextureProjectionY,
+                css::drawing::TextureKind2 aTextureKind,
+                css::drawing::TextureMode aTextureMode,
                 const MaterialAttribute3D& rMaterial,
                 bool bNormalsInvert,
                 bool bDoubleSided,
@@ -72,11 +72,11 @@ namespace drawinglayer
             }
 
             // data read access
-            ::com::sun::star::drawing::NormalsKind getNormalsKind() const { return maNormalsKind; }
-            ::com::sun::star::drawing::TextureProjectionMode getTextureProjectionX() const { return maTextureProjectionX; }
-            ::com::sun::star::drawing::TextureProjectionMode getTextureProjectionY() const { return maTextureProjectionY; }
-            ::com::sun::star::drawing::TextureKind2 getTextureKind() const { return maTextureKind; }
-            ::com::sun::star::drawing::TextureMode getTextureMode() const { return maTextureMode; }
+            css::drawing::NormalsKind getNormalsKind() const { return maNormalsKind; }
+            css::drawing::TextureProjectionMode getTextureProjectionX() const { return maTextureProjectionX; }
+            css::drawing::TextureProjectionMode getTextureProjectionY() const { return maTextureProjectionY; }
+            css::drawing::TextureKind2 getTextureKind() const { return maTextureKind; }
+            css::drawing::TextureMode getTextureMode() const { return maTextureMode; }
             const MaterialAttribute3D& getMaterial() const { return maMaterial; }
             bool getNormalsInvert() const { return mbNormalsInvert; }
             bool getDoubleSided() const { return mbDoubleSided; }
@@ -107,11 +107,11 @@ namespace drawinglayer
         }
 
         Sdr3DObjectAttribute::Sdr3DObjectAttribute(
-            ::com::sun::star::drawing::NormalsKind  aNormalsKind,
-            ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX,
-            ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY,
-            ::com::sun::star::drawing::TextureKind2 aTextureKind,
-            ::com::sun::star::drawing::TextureMode aTextureMode,
+            css::drawing::NormalsKind  aNormalsKind,
+            css::drawing::TextureProjectionMode aTextureProjectionX,
+            css::drawing::TextureProjectionMode aTextureProjectionY,
+            css::drawing::TextureKind2 aTextureKind,
+            css::drawing::TextureMode aTextureMode,
             const MaterialAttribute3D& rMaterial,
             bool bNormalsInvert,
             bool bDoubleSided,
@@ -144,27 +144,27 @@ namespace drawinglayer
             return rCandidate.mpSdr3DObjectAttribute == mpSdr3DObjectAttribute;
         }
 
-        ::com::sun::star::drawing::NormalsKind Sdr3DObjectAttribute::getNormalsKind() const
+        css::drawing::NormalsKind Sdr3DObjectAttribute::getNormalsKind() const
         {
             return mpSdr3DObjectAttribute->getNormalsKind();
         }
 
-        ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionX() const
+        css::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionX() const
         {
             return mpSdr3DObjectAttribute->getTextureProjectionX();
         }
 
-        ::com::sun::star::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionY() const
+        css::drawing::TextureProjectionMode Sdr3DObjectAttribute::getTextureProjectionY() const
         {
             return mpSdr3DObjectAttribute->getTextureProjectionY();
         }
 
-        ::com::sun::star::drawing::TextureKind2 Sdr3DObjectAttribute::getTextureKind() const
+        css::drawing::TextureKind2 Sdr3DObjectAttribute::getTextureKind() const
         {
             return mpSdr3DObjectAttribute->getTextureKind();
         }
 
-        ::com::sun::star::drawing::TextureMode Sdr3DObjectAttribute::getTextureMode() const
+        css::drawing::TextureMode Sdr3DObjectAttribute::getTextureMode() const
         {
             return mpSdr3DObjectAttribute->getTextureMode();
         }
diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
index a8734406220c..be683da700b0 100644
--- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx
@@ -30,20 +30,20 @@ namespace drawinglayer
         {
         public:
             // 3D scene attribute definitions
-            double                                      mfDistance;
-            double                                      mfShadowSlant;
-            ::com::sun::star::drawing::ProjectionMode   maProjectionMode;
-            ::com::sun::star::drawing::ShadeMode        maShadeMode;
+            double                         mfDistance;
+            double                         mfShadowSlant;
+            css::drawing::ProjectionMode   maProjectionMode;
+            css::drawing::ShadeMode        maShadeMode;
 
             // bitfield
-            bool                                        mbTwoSidedLighting : 1;
+            bool                           mbTwoSidedLighting : 1;
 
         public:
             ImpSdrSceneAttribute(
                 double fDistance,
                 double fShadowSlant,
-                ::com::sun::star::drawing::ProjectionMode aProjectionMode,
-                ::com::sun::star::drawing::ShadeMode aShadeMode,
+                css::drawing::ProjectionMode aProjectionMode,
+                css::drawing::ShadeMode aShadeMode,
                 bool bTwoSidedLighting)
             :   mfDistance(fDistance),
                 mfShadowSlant(fShadowSlant),
@@ -56,8 +56,8 @@ namespace drawinglayer
             ImpSdrSceneAttribute()
             :   mfDistance(0.0),
                 mfShadowSlant(0.0),
-                maProjectionMode(::com::sun::star::drawing::ProjectionMode_PARALLEL),
-                maShadeMode(::com::sun::star::drawing::ShadeMode_FLAT),
+                maProjectionMode(css::drawing::ProjectionMode_PARALLEL),
+                maShadeMode(css::drawing::ShadeMode_FLAT),
                 mbTwoSidedLighting(false)
             {
             }
@@ -65,8 +65,8 @@ namespace drawinglayer
             // data read access
             double getDistance() const { return mfDistance; }
             double getShadowSlant() const { return mfShadowSlant; }
-            ::com::sun::star::drawing::ProjectionMode getProjectionMode() const { return maProjectionMode; }
-            ::com::sun::star::drawing::ShadeMode getShadeMode() const { return maShadeMode; }
+            css::drawing::ProjectionMode getProjectionMode() const { return maProjectionMode; }
+            css::drawing::ShadeMode getShadeMode() const { return maShadeMode; }
             bool getTwoSidedLighting() const { return mbTwoSidedLighting; }
 
             bool operator==(const ImpSdrSceneAttribute& rCandidate) const
@@ -88,8 +88,8 @@ namespace drawinglayer
         SdrSceneAttribute::SdrSceneAttribute(
             double fDistance,
             double fShadowSlant,
-            ::com::sun::star::drawing::ProjectionMode aProjectionMode,
-            ::com::sun::star::drawing::ShadeMode aShadeMode,
+            css::drawing::ProjectionMode aProjectionMode,
+            css::drawing::ShadeMode aShadeMode,
             bool bTwoSidedLighting)
         :   mpSdrSceneAttribute(ImpSdrSceneAttribute(
                 fDistance, fShadowSlant, aProjectionMode, aShadeMode, bTwoSidedLighting))
@@ -135,12 +135,12 @@ namespace drawinglayer
             return mpSdrSceneAttribute->getShadowSlant();
         }
 
-        ::com::sun::star::drawing::ProjectionMode SdrSceneAttribute::getProjectionMode() const
+        css::drawing::ProjectionMode SdrSceneAttribute::getProjectionMode() const
         {
             return mpSdrSceneAttribute->getProjectionMode();
         }
 
-        ::com::sun::star::drawing::ShadeMode SdrSceneAttribute::getShadeMode() const
+        css::drawing::ShadeMode SdrSceneAttribute::getShadeMode() const
         {
             return mpSdrSceneAttribute->getShadeMode();
         }