diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-11 14:46:52 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-12 19:53:35 +0000 |
| commit | 47283424b1df542b4894a164bc895858427d1a62 (patch) | |
| tree | 0c8e8a8935a97782332c033309cf027aa694dd79 /drawinglayer | |
| parent | 4a9b401f9877b348a0e716e79cb8cc41645ceba3 (diff) | |
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>
Diffstat (limited to 'drawinglayer')
30 files changed, 227 insertions, 227 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(); } diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx index ed5a73043b15..889fac4eab40 100644 --- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx +++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx @@ -62,7 +62,7 @@ namespace drawinglayer const uno::Sequence< beans::PropertyValue >& aViewInformationSequence, ::sal_uInt32 DPI_X, ::sal_uInt32 DPI_Y, - const ::com::sun::star::geometry::RealRectangle2D& Range, + const css::geometry::RealRectangle2D& Range, ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo @@ -118,7 +118,7 @@ namespace drawinglayer const uno::Sequence< beans::PropertyValue >& aViewInformationSequence, ::sal_uInt32 DPI_X, ::sal_uInt32 DPI_Y, - const ::com::sun::star::geometry::RealRectangle2D& Range, + const css::geometry::RealRectangle2D& Range, ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException, std::exception) { uno::Reference< rendering::XBitmap > XBitmap; diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx index 7d17c9a893ca..4413d1754e3c 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx @@ -40,16 +40,16 @@ public: } // auxiliary functions - void dumpEnhancedCustomShapeParameterPair(com::sun::star::drawing::EnhancedCustomShapeParameterPair aParameterPair); - void dumpDirection3D(com::sun::star::drawing::Direction3D aDirection3D); - void dumpPropertyValueAsElement(com::sun::star::beans::PropertyValue aPropertyValue); - void dumpEnhancedCustomShapeParameter(com::sun::star::drawing::EnhancedCustomShapeParameter aParameter); + void dumpEnhancedCustomShapeParameterPair(css::drawing::EnhancedCustomShapeParameterPair aParameterPair); + void dumpDirection3D(css::drawing::Direction3D aDirection3D); + void dumpPropertyValueAsElement(css::beans::PropertyValue aPropertyValue); + void dumpEnhancedCustomShapeParameter(css::drawing::EnhancedCustomShapeParameter aParameter); // EnhancedCustomShapeExtrusion.idl - void dumpEnhancedCustomShapeExtrusionService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet); + void dumpEnhancedCustomShapeExtrusionService(css::uno::Reference< css::beans::XPropertySet > xPropSet); void dumpExtrusionAsAttribute(bool bExtrusion); void dumpBrightnessAsAttribute(double aBrightness); - void dumpDepthAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepth); + void dumpDepthAsElement(css::drawing::EnhancedCustomShapeParameterPair aDepth); void dumpDiffusionAsAttribute(double aDiffusion); void dumpNumberOfLineSegmentsAsAttribute(sal_Int32 aNumberOfLineSegments); void dumpLightFaceAsAttribute(bool bLightFace); @@ -57,69 +57,69 @@ public: void dumpSecondLightHarshAsAttribute(bool bSecondLightHarsh); void dumpFirstLightLevelAsAttribute(double aFirstLightLevel); void dumpSecondLightLevelAsAttribute(double aSecondLightLevel); - void dumpFirstLightDirectionAsElement(com::sun::star::drawing::Direction3D aFirstLightDirection); - void dumpSecondLightDirectionAsElement(com::sun::star::drawing::Direction3D aSecondLightDirection); + void dumpFirstLightDirectionAsElement(css::drawing::Direction3D aFirstLightDirection); + void dumpSecondLightDirectionAsElement(css::drawing::Direction3D aSecondLightDirection); void dumpMetalAsAttribute(bool bMetal); - void dumpShadeModeAsAttribute(com::sun::star::drawing::ShadeMode eShadeMode); - void dumpRotateAngleAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngle); - void dumpRotationCenterAsElement(com::sun::star::drawing::Direction3D aRotationCenter); + void dumpShadeModeAsAttribute(css::drawing::ShadeMode eShadeMode); + void dumpRotateAngleAsElement(css::drawing::EnhancedCustomShapeParameterPair aRotateAngle); + void dumpRotationCenterAsElement(css::drawing::Direction3D aRotationCenter); void dumpShininessAsAttribute(double aShininess); - void dumpSkewAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkew); + void dumpSkewAsElement(css::drawing::EnhancedCustomShapeParameterPair aSkew); void dumpSpecularityAsAttribute(double aSpecularity); - void dumpProjectionModeAsAttribute(com::sun::star::drawing::ProjectionMode eProjectionMode); - void dumpViewPointAsElement(com::sun::star::drawing::Position3D aViewPoint); - void dumpOriginAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aOrigin); + void dumpProjectionModeAsAttribute(css::drawing::ProjectionMode eProjectionMode); + void dumpViewPointAsElement(css::drawing::Position3D aViewPoint); + void dumpOriginAsElement(css::drawing::EnhancedCustomShapeParameterPair aOrigin); void dumpExtrusionColorAsAttribute(bool bExtrusionColor); // EnhancedCustomShapeGeometry.idl - void dumpEnhancedCustomShapeGeometryService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet); + void dumpEnhancedCustomShapeGeometryService(css::uno::Reference< css::beans::XPropertySet > xPropSet); void dumpTypeAsAttribute(const OUString& sType); - void dumpViewBoxAsElement(com::sun::star::awt::Rectangle aViewBox); + void dumpViewBoxAsElement(css::awt::Rectangle aViewBox); void dumpMirroredXAsAttribute(bool bMirroredX); // also used in EnhancedCustomShapeHandle void dumpMirroredYAsAttribute(bool bMirroredY); // also used in EnhancedCustomShapeHandle void dumpTextRotateAngleAsAttribute(double aTextRotateAngle); - void dumpAdjustmentValuesAsElement(const com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue>& aAdjustmentValues); - void dumpExtrusionAsElement(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aExtrusion); - void dumpPathAsElement(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aPath); - void dumpTextPathAsElement(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aTextPath); - void dumpEquationsAsElement(const com::sun::star::uno::Sequence< OUString >& aEquations); - void dumpHandlesAsElement(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues >& aHandles); + void dumpAdjustmentValuesAsElement(const css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue>& aAdjustmentValues); + void dumpExtrusionAsElement(const css::uno::Sequence< css::beans::PropertyValue >& aExtrusion); + void dumpPathAsElement(const css::uno::Sequence< css::beans::PropertyValue >& aPath); + void dumpTextPathAsElement(const css::uno::Sequence< css::beans::PropertyValue >& aTextPath); + void dumpEquationsAsElement(const css::uno::Sequence< OUString >& aEquations); + void dumpHandlesAsElement(const css::uno::Sequence< css::beans::PropertyValues >& aHandles); // EnhancedCustomShapeHandle.idl - void dumpEnhancedCustomShapeHandleService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet); + void dumpEnhancedCustomShapeHandleService(css::uno::Reference< css::beans::XPropertySet > xPropSet); void dumpSwitchedAsAttribute(bool bSwitched); - void dumpPositionAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition); - void dumpPolarAsElement(com::sun::star::drawing::EnhancedCustomShapeParameterPair aPolar); + void dumpPositionAsElement(css::drawing::EnhancedCustomShapeParameterPair aPosition); + void dumpPolarAsElement(css::drawing::EnhancedCustomShapeParameterPair aPolar); void dumpRefXAsAttribute(sal_Int32 aRefX); void dumpRefYAsAttribute(sal_Int32 aRefY); void dumpRefAngleAsAttribute(sal_Int32 aRefAngle); void dumpRefRAsAttribute(sal_Int32 aRefR); - void dumpRangeXMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum); - void dumpRangeXMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum); - void dumpRangeYMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum); - void dumpRangeYMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum); - void dumpRadiusRangeMinimumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum); - void dumpRadiusRangeMaximumAsElement(com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum); + void dumpRangeXMinimumAsElement(css::drawing::EnhancedCustomShapeParameter aRangeXMinimum); + void dumpRangeXMaximumAsElement(css::drawing::EnhancedCustomShapeParameter aRangeXMaximum); + void dumpRangeYMinimumAsElement(css::drawing::EnhancedCustomShapeParameter aRangeYMinimum); + void dumpRangeYMaximumAsElement(css::drawing::EnhancedCustomShapeParameter aRangeXMaximum); + void dumpRadiusRangeMinimumAsElement(css::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum); + void dumpRadiusRangeMaximumAsElement(css::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum); // EnhancedCustomShapePath.idl - void dumpEnhancedCustomShapePathService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet); - void dumpCoordinatesAsElement(const com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >& aCoordinates); - void dumpSegmentsAsElement(const com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment >& aSegments); + void dumpEnhancedCustomShapePathService(css::uno::Reference< css::beans::XPropertySet > xPropSet); + void dumpCoordinatesAsElement(const css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair >& aCoordinates); + void dumpSegmentsAsElement(const css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment >& aSegments); void dumpStretchXAsAttribute(sal_Int32 aStretchX); void dumpStretchYAsAttribute(sal_Int32 aStretchY); - void dumpTextFramesAsElement(const com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame >& aTextFrames); - void dumpGluePointsAsElement(const com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair >& aGluePoints); - void dumpGluePointLeavingDirectionsAsElement(const com::sun::star::uno::Sequence< double >& aGluePointLeavingDirections); + void dumpTextFramesAsElement(const css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame >& aTextFrames); + void dumpGluePointsAsElement(const css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair >& aGluePoints); + void dumpGluePointLeavingDirectionsAsElement(const css::uno::Sequence< double >& aGluePointLeavingDirections); void dumpGluePointTypeAsAttribute(sal_Int32 aGluePointType); void dumpExtrusionAllowedAsAttribute(bool bExtrusionAllowed); void dumpConcentricGradientFillAllowedAsAttribute(bool bConcentricGradientFillAllowed); void dumpTextPathAllowedAsAttribute(bool bTextPathAllowed); - void dumpSubViewSizeAsElement(const com::sun::star::uno::Sequence< com::sun::star::awt::Size >& aSubViewSize); + void dumpSubViewSizeAsElement(const css::uno::Sequence< css::awt::Size >& aSubViewSize); // EnhancedCustomShapePath.idl - void dumpEnhancedCustomShapeTextPathService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet); + void dumpEnhancedCustomShapeTextPathService(css::uno::Reference< css::beans::XPropertySet > xPropSet); void dumpTextPathAsAttribute(bool bTextPath); - void dumpTextPathModeAsAttribute(com::sun::star::drawing::EnhancedCustomShapeTextPathMode eTextPathMode); + void dumpTextPathModeAsAttribute(css::drawing::EnhancedCustomShapeTextPathMode eTextPathMode); void dumpScaleXAsAttribute(bool bScaleX); private: diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index d4d7f2559078..bd489027cb5e 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -36,11 +36,11 @@ namespace { // auxiliary functions void dumpGradientProperty(const css::awt::Gradient& rGradient, xmlTextWriterPtr xmlWriter); void dumpPolyPolygonBezierCoords(const css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter); -void dumpPointSequenceSequence(const com::sun::star::drawing::PointSequenceSequence& rPointSequenceSequence, const uno::Sequence<uno::Sequence<drawing::PolygonFlags> >*, xmlTextWriterPtr xmlWriter); +void dumpPointSequenceSequence(const css::drawing::PointSequenceSequence& rPointSequenceSequence, const uno::Sequence<uno::Sequence<drawing::PolygonFlags> >*, xmlTextWriterPtr xmlWriter); void dumpPropertyValueAsElement(const beans::PropertyValue& rPropertyValue, xmlTextWriterPtr xmlWriter); // FillProperties.idl -void dumpFillStyleAsAttribute(com::sun::star::drawing::FillStyle eFillStyle, xmlTextWriterPtr xmlWriter); +void dumpFillStyleAsAttribute(css::drawing::FillStyle eFillStyle, xmlTextWriterPtr xmlWriter); void dumpFillColorAsAttribute(sal_Int32 aColor, xmlTextWriterPtr xmlWriter); void dumpFillTransparenceAsAttribute(sal_Int32 aTransparence, xmlTextWriterPtr xmlWriter); void dumpFillTransparenceGradientNameAsAttribute(const OUString& sTranspGradName, xmlTextWriterPtr xmlWriter); @@ -49,28 +49,28 @@ void dumpFillGradientNameAsAttribute(const OUString& sGradName, xmlTextWriterPtr void dumpFillGradientAsElement(const css::awt::Gradient& rGradient, xmlTextWriterPtr xmlWriter); void dumpFillHatchAsElement(const css::drawing::Hatch& rHatch, xmlTextWriterPtr xmlWriter); void dumpFillBackgroundAsAttribute(bool bBackground, xmlTextWriterPtr xmlWriter); -void dumpFillBitmapAsElement(com::sun::star::uno::Reference<com::sun::star::awt::XBitmap> xBitmap, xmlTextWriterPtr xmlWriter); +void dumpFillBitmapAsElement(css::uno::Reference<css::awt::XBitmap> xBitmap, xmlTextWriterPtr xmlWriter); void dumpFillBitmapURLAsAttribute(const OUString& sBitmapURL, xmlTextWriterPtr xmlWriter); void dumpFillBitmapPositionOffsetXAsAttribute(sal_Int32 aBitmapPositionOffsetX, xmlTextWriterPtr xmlWriter); void dumpFillBitmapPositionOffsetYAsAttribute(sal_Int32 aBitmapPositionOffsetY, xmlTextWriterPtr xmlWriter); void dumpFillBitmapOffsetXAsAttribute(sal_Int32 aBitmapOffsetX, xmlTextWriterPtr xmlWriter); void dumpFillBitmapOffsetYAsAttribute(sal_Int32 aBitmapOffsetY, xmlTextWriterPtr xmlWriter); -void dumpFillBitmapRectanglePointAsAttribute(com::sun::star::drawing::RectanglePoint eBitmapRectanglePoint, xmlTextWriterPtr xmlWriter); +void dumpFillBitmapRectanglePointAsAttribute(css::drawing::RectanglePoint eBitmapRectanglePoint, xmlTextWriterPtr xmlWriter); void dumpFillBitmapLogicalSizeAsAttribute(bool bBitmapLogicalSize, xmlTextWriterPtr xmlWriter); void dumpFillBitmapSizeXAsAttribute(sal_Int32 aBitmapSizeX, xmlTextWriterPtr xmlWriter); void dumpFillBitmapSizeYAsAttribute(sal_Int32 aBitmapSizeY, xmlTextWriterPtr xmlWriter); -void dumpFillBitmapModeAsAttribute(com::sun::star::drawing::BitmapMode eBitmapMode, xmlTextWriterPtr xmlWriter); +void dumpFillBitmapModeAsAttribute(css::drawing::BitmapMode eBitmapMode, xmlTextWriterPtr xmlWriter); void dumpFillBitmapStretchAsAttribute(bool bBitmapStretch, xmlTextWriterPtr xmlWriter); void dumpFillBitmapTileAsAttribute(bool bBitmapTile, xmlTextWriterPtr xmlWriter); // LineProperties.idl -void dumpLineStyleAsAttribute(com::sun::star::drawing::LineStyle eLineStyle, xmlTextWriterPtr xmlWriter); +void dumpLineStyleAsAttribute(css::drawing::LineStyle eLineStyle, xmlTextWriterPtr xmlWriter); void dumpLineDashAsElement(const css::drawing::LineDash& rLineDash, xmlTextWriterPtr xmlWriter); void dumpLineDashNameAsAttribute(const OUString& sLineDashName, xmlTextWriterPtr xmlWriter); void dumpLineColorAsAttribute(sal_Int32 aLineColor, xmlTextWriterPtr xmlWriter); void dumpLineTransparenceAsAttribute(sal_Int32 aLineTransparence, xmlTextWriterPtr xmlWriter); void dumpLineWidthAsAttribute(sal_Int32 aLineWidth, xmlTextWriterPtr xmlWriter); -void dumpLineJointAsAttribute(com::sun::star::drawing::LineJoint eLineJoint, xmlTextWriterPtr xmlWriter); +void dumpLineJointAsAttribute(css::drawing::LineJoint eLineJoint, xmlTextWriterPtr xmlWriter); void dumpLineStartNameAsAttribute(const OUString& sLineStartName, xmlTextWriterPtr xmlWriter); void dumpLineEndNameAsAttribute(const OUString& sLineEndName, xmlTextWriterPtr xmlWriter); void dumpLineStartAsElement(const css::drawing::PolyPolygonBezierCoords& rLineStart, xmlTextWriterPtr xmlWriter); @@ -81,9 +81,9 @@ void dumpLineEndCenterAsAttribute(bool bLineEndCenter, xmlTextWriterPtr xmlWrite void dumpLineEndWidthAsAttribute(sal_Int32 aLineEndWidth, xmlTextWriterPtr xmlWriter); // PolyPolygonDescriptor.idl -void dumpPolygonKindAsAttribute(com::sun::star::drawing::PolygonKind ePolygonKind, xmlTextWriterPtr xmlWriter); -void dumpPolyPolygonAsElement(const com::sun::star::drawing::PointSequenceSequence& rPolyPolygon, xmlTextWriterPtr xmlWriter); -void dumpGeometryAsElement(const com::sun::star::drawing::PointSequenceSequence& rGeometry, xmlTextWriterPtr xmlWriter); +void dumpPolygonKindAsAttribute(css::drawing::PolygonKind ePolygonKind, xmlTextWriterPtr xmlWriter); +void dumpPolyPolygonAsElement(const css::drawing::PointSequenceSequence& rPolyPolygon, xmlTextWriterPtr xmlWriter); +void dumpGeometryAsElement(const css::drawing::PointSequenceSequence& rGeometry, xmlTextWriterPtr xmlWriter); // CharacterProperties.idl void dumpCharHeightAsAttribute(float fHeight, xmlTextWriterPtr xmlWriter); @@ -94,9 +94,9 @@ void dumpIsNumberingAsAttribute(bool bIsNumbering, xmlTextWriterPtr xmlWriter); void dumpTextAutoGrowHeightAsAttribute(bool bTextAutoGrowHeight, xmlTextWriterPtr xmlWriter); void dumpTextAutoGrowWidthAsAttribute(bool bTextAutoGrowWidth, xmlTextWriterPtr xmlWriter); void dumpTextContourFrameAsAttribute(bool bTextContourFrame, xmlTextWriterPtr xmlWriter); -void dumpTextFitToSizeAsAttribute(com::sun::star::drawing::TextFitToSizeType eTextFitToSize, xmlTextWriterPtr xmlWriter); -void dumpTextHorizontalAdjustAsAttribute(com::sun::star::drawing::TextHorizontalAdjust eTextHorizontalAdjust, xmlTextWriterPtr xmlWriter); -void dumpTextVerticalAdjustAsAttribute(com::sun::star::drawing::TextVerticalAdjust eTextVerticalAdjust, xmlTextWriterPtr xmlWriter); +void dumpTextFitToSizeAsAttribute(css::drawing::TextFitToSizeType eTextFitToSize, xmlTextWriterPtr xmlWriter); +void dumpTextHorizontalAdjustAsAttribute(css::drawing::TextHorizontalAdjust eTextHorizontalAdjust, xmlTextWriterPtr xmlWriter); +void dumpTextVerticalAdjustAsAttribute(css::drawing::TextVerticalAdjust eTextVerticalAdjust, xmlTextWriterPtr xmlWriter); void dumpTextLeftDistanceAsAttribute(sal_Int32 aTextLeftDistance, xmlTextWriterPtr xmlWriter); void dumpTextRightDistanceAsAttribute(sal_Int32 aTextRightDistance, xmlTextWriterPtr xmlWriter); void dumpTextUpperDistanceAsAttribute(sal_Int32 aTextUpperDistance, xmlTextWriterPtr xmlWriter); @@ -108,11 +108,11 @@ void dumpTextMinimumFrameWidthAsAttribute(sal_Int32 aTextMinimumFrameWidth, xmlT void dumpTextAnimationAmountAsAttribute(sal_Int32 aTextAnimationAmount, xmlTextWriterPtr xmlWriter); void dumpTextAnimationCountAsAttribute(sal_Int32 aTextAnimationCount, xmlTextWriterPtr xmlWriter); void dumpTextAnimationDelayAsAttribute(sal_Int32 aTextAnimationDelay, xmlTextWriterPtr xmlWriter); -void dumpTextAnimationDirectionAsAttribute(com::sun::star::drawing::TextAnimationDirection eTextAnimationDirection, xmlTextWriterPtr xmlWriter); -void dumpTextAnimationKindAsAttribute(com::sun::star::drawing::TextAnimationKind eTextAnimationKind, xmlTextWriterPtr xmlWriter); +void dumpTextAnimationDirectionAsAttribute(css::drawing::TextAnimationDirection eTextAnimationDirection, xmlTextWriterPtr xmlWriter); +void dumpTextAnimationKindAsAttribute(css::drawing::TextAnimationKind eTextAnimationKind, xmlTextWriterPtr xmlWriter); void dumpTextAnimationStartInsideAsAttribute(bool bTextAnimationStartInside, xmlTextWriterPtr xmlWriter); void dumpTextAnimationStopInsideAsAttribute(bool bTextAnimationStopInside, xmlTextWriterPtr xmlWriter); -void dumpTextWritingModeAsAttribute(com::sun::star::text::WritingMode eWritingMode, xmlTextWriterPtr xmlWriter); +void dumpTextWritingModeAsAttribute(css::text::WritingMode eWritingMode, xmlTextWriterPtr xmlWriter); // ShadowProperties.idl void dumpShadowAsAttribute(bool bShadow, xmlTextWriterPtr xmlWriter); @@ -139,25 +139,25 @@ void dumpInteropGrabBagAsElement(const uno::Sequence< beans::PropertyValue>& aIn // CustomShape.idl void dumpCustomShapeEngineAsAttribute(const OUString& sCustomShapeEngine, xmlTextWriterPtr xmlWriter); void dumpCustomShapeDataAsAttribute(const OUString& sCustomShapeData, xmlTextWriterPtr xmlWriter); -void dumpCustomShapeGeometryAsElement(const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue>& aCustomShapeGeometry, xmlTextWriterPtr xmlWriter); +void dumpCustomShapeGeometryAsElement(const css::uno::Sequence< css::beans::PropertyValue>& aCustomShapeGeometry, xmlTextWriterPtr xmlWriter); void dumpCustomShapeReplacementURLAsAttribute(const OUString& sCustomShapeReplacementURL, xmlTextWriterPtr xmlWriter); // XShape.idl -void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, xmlTextWriterPtr xmlWriter); -void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize, xmlTextWriterPtr xmlWriter); +void dumpPositionAsAttribute(const css::awt::Point& rPoint, xmlTextWriterPtr xmlWriter); +void dumpSizeAsAttribute(const css::awt::Size& rSize, xmlTextWriterPtr xmlWriter); // the rest -void dumpShapeDescriptorAsAttribute( com::sun::star::uno::Reference< com::sun::star::drawing::XShapeDescriptor > xDescr, xmlTextWriterPtr xmlWriter ); -void dumpXShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape, xmlTextWriterPtr xmlWriter, bool bDumpInteropProperties); -void dumpXShapes( com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xShapes, xmlTextWriterPtr xmlWriter, bool bDumpInteropProperties ); -void dumpTextPropertiesService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); -void dumpFillPropertiesService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); -void dumpLinePropertiesService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); -void dumpShadowPropertiesService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); -void dumpPolyPolygonDescriptorService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); -void dumpShapeService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter, bool bDumpInteropProperties); -void dumpPolyPolygonBezierDescriptorService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); -void dumpCustomShapeService(com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); +void dumpShapeDescriptorAsAttribute( css::uno::Reference< css::drawing::XShapeDescriptor > xDescr, xmlTextWriterPtr xmlWriter ); +void dumpXShape(css::uno::Reference< css::drawing::XShape > xShape, xmlTextWriterPtr xmlWriter, bool bDumpInteropProperties); +void dumpXShapes( css::uno::Reference< css::drawing::XShapes > xShapes, xmlTextWriterPtr xmlWriter, bool bDumpInteropProperties ); +void dumpTextPropertiesService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); +void dumpFillPropertiesService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); +void dumpLinePropertiesService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); +void dumpShadowPropertiesService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); +void dumpPolyPolygonDescriptorService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); +void dumpShapeService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter, bool bDumpInteropProperties); +void dumpPolyPolygonBezierDescriptorService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); +void dumpCustomShapeService(css::uno::Reference< css::beans::XPropertySet > xPropSet, xmlTextWriterPtr xmlWriter); int writeCallback(void* pContext, const char* sBuffer, int nLen) diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 9a6ef5276847..c161c097273a 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -135,19 +135,19 @@ namespace drawinglayer } else if(rProp.Name == getNamePropertyObjectTransformation()) { - com::sun::star::geometry::AffineMatrix2D aAffineMatrix2D; + css::geometry::AffineMatrix2D aAffineMatrix2D; rProp.Value >>= aAffineMatrix2D; basegfx::unotools::homMatrixFromAffineMatrix(maObjectTransformation, aAffineMatrix2D); } else if(rProp.Name == getNamePropertyViewTransformation()) { - com::sun::star::geometry::AffineMatrix2D aAffineMatrix2D; + css::geometry::AffineMatrix2D aAffineMatrix2D; rProp.Value >>= aAffineMatrix2D; basegfx::unotools::homMatrixFromAffineMatrix(maViewTransformation, aAffineMatrix2D); } else if(rProp.Name == getNamePropertyViewport()) { - com::sun::star::geometry::RealRectangle2D aViewport; + css::geometry::RealRectangle2D aViewport; rProp.Value >>= aViewport; maViewport = basegfx::unotools::b2DRectangleFromRealRectangle2D(aViewport); } @@ -194,7 +194,7 @@ namespace drawinglayer if(bObjectTransformationUsed) { - com::sun::star::geometry::AffineMatrix2D aAffineMatrix2D; + css::geometry::AffineMatrix2D aAffineMatrix2D; basegfx::unotools::affineMatrixFromHomMatrix(aAffineMatrix2D, maObjectTransformation); mxViewInformation[nIndex].Name = getNamePropertyObjectTransformation(); mxViewInformation[nIndex].Value <<= aAffineMatrix2D; @@ -203,7 +203,7 @@ namespace drawinglayer if(bViewTransformationUsed) { - com::sun::star::geometry::AffineMatrix2D aAffineMatrix2D; + css::geometry::AffineMatrix2D aAffineMatrix2D; basegfx::unotools::affineMatrixFromHomMatrix(aAffineMatrix2D, maViewTransformation); mxViewInformation[nIndex].Name = getNamePropertyViewTransformation(); mxViewInformation[nIndex].Value <<= aAffineMatrix2D; @@ -212,7 +212,7 @@ namespace drawinglayer if(bViewportUsed) { - const com::sun::star::geometry::RealRectangle2D aViewport(basegfx::unotools::rectangle2DFromB2DRectangle(maViewport)); + const css::geometry::RealRectangle2D aViewport(basegfx::unotools::rectangle2DFromB2DRectangle(maViewport)); mxViewInformation[nIndex].Name = getNamePropertyViewport(); mxViewInformation[nIndex].Value <<= aViewport; nIndex++; diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index 78e5017d788d..303a06c05d78 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -140,13 +140,13 @@ namespace drawinglayer if(rProp.Name == getNamePropertyObjectTransformation()) { - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; rProp.Value >>= aAffineMatrix3D; maObjectTransformation = basegfx::unotools::homMatrixFromAffineMatrix3D(aAffineMatrix3D); } else if(rProp.Name == getNamePropertyOrientation()) { - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; rProp.Value >>= aAffineMatrix3D; maOrientation = basegfx::unotools::homMatrixFromAffineMatrix3D(aAffineMatrix3D); } @@ -160,7 +160,7 @@ namespace drawinglayer const double f_32(maProjection.get(3, 2)); const double f_33(maProjection.get(3, 3)); - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; rProp.Value >>= aAffineMatrix3D; maProjection = basegfx::unotools::homMatrixFromAffineMatrix3D(aAffineMatrix3D); @@ -195,7 +195,7 @@ namespace drawinglayer } else if(rProp.Name == getNamePropertyDeviceToView()) { - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; rProp.Value >>= aAffineMatrix3D; maDeviceToView = basegfx::unotools::homMatrixFromAffineMatrix3D(aAffineMatrix3D); } @@ -251,7 +251,7 @@ namespace drawinglayer if(bObjectTransformationUsed) { - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; basegfx::unotools::affineMatrixFromHomMatrix3D(aAffineMatrix3D, maObjectTransformation); mxViewInformation[nIndex].Name = getNamePropertyObjectTransformation(); mxViewInformation[nIndex].Value <<= aAffineMatrix3D; @@ -260,7 +260,7 @@ namespace drawinglayer if(bOrientationUsed) { - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; basegfx::unotools::affineMatrixFromHomMatrix3D(aAffineMatrix3D, maOrientation); mxViewInformation[nIndex].Name = getNamePropertyOrientation(); mxViewInformation[nIndex].Value <<= aAffineMatrix3D; @@ -269,7 +269,7 @@ namespace drawinglayer if(bProjectionUsed) { - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; basegfx::unotools::affineMatrixFromHomMatrix3D(aAffineMatrix3D, maProjection); mxViewInformation[nIndex].Name = getNamePropertyProjection(); mxViewInformation[nIndex].Value <<= aAffineMatrix3D; @@ -306,7 +306,7 @@ namespace drawinglayer if(bDeviceToViewUsed) { - com::sun::star::geometry::AffineMatrix3D aAffineMatrix3D; + css::geometry::AffineMatrix3D aAffineMatrix3D; basegfx::unotools::affineMatrixFromHomMatrix3D(aAffineMatrix3D, maDeviceToView); mxViewInformation[nIndex].Name = getNamePropertyDeviceToView(); mxViewInformation[nIndex].Value <<= aAffineMatrix3D; diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 83c8108df8b6..9200113bf57d 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -62,7 +62,7 @@ namespace drawinglayer return get2DDecomposition(aViewInformation); } - com::sun::star::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception ) + css::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception ) { const geometry::ViewInformation2D aViewInformation(rViewParameters); return basegfx::unotools::rectangle2DFromB2DRectangle(getB2DRange(aViewInformation)); diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 564c6e83a86b..e27a5383c0cd 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1295,7 +1295,7 @@ namespace // prepare FontColor and Locale const basegfx::BColor aFontColor(rProperty.getTextColor()); const Color aFillColor(rFont.GetFillColor()); - const com::sun::star::lang::Locale aLocale(LanguageTag(rProperty.getLanguageType()).getLocale()); + const css::lang::Locale aLocale(LanguageTag(rProperty.getLanguageType()).getLocale()); const bool bWordLineMode(rFont.IsWordLineMode()); const bool bDecoratedIsNeeded( @@ -1536,7 +1536,7 @@ namespace // strikeout with character const sal_Unicode aStrikeoutChar( drawinglayer::primitive2d::TEXT_STRIKEOUT_SLASH == aTextStrikeout ? '/' : 'X'); - const com::sun::star::lang::Locale aLocale(LanguageTag( + const css::lang::Locale aLocale(LanguageTag( rProperty.getLanguageType()).getLocale()); aTargetVector.push_back( diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index c3ea338ccbf3..ac0f751f4546 100644 --- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx @@ -120,7 +120,7 @@ namespace drawinglayer } PagePreviewPrimitive2D::PagePreviewPrimitive2D( - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage, + const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage, const basegfx::B2DHomMatrix& rTransform, double fContentWidth, double fContentHeight, diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 92e48b1df690..c92d5c5b0db4 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -251,7 +251,7 @@ namespace drawinglayer // create fat line data const double fHalfLineWidth(getLineAttribute().getWidth() / 2.0); const basegfx::B2DLineJoin aLineJoin(getLineAttribute().getLineJoin()); - const com::sun::star::drawing::LineCap aLineCap(getLineAttribute().getLineCap()); + const css::drawing::LineCap aLineCap(getLineAttribute().getLineCap()); basegfx::B2DPolyPolygon aAreaPolyPolygon; for(sal_uInt32 a(0L); a < nCount; a++) @@ -351,7 +351,7 @@ namespace drawinglayer bUseDecomposition = true; } - if(!bUseDecomposition && com::sun::star::drawing::LineCap_SQUARE == getLineAttribute().getLineCap()) + if(!bUseDecomposition && css::drawing::LineCap_SQUARE == getLineAttribute().getLineCap()) { // when drawing::LineCap_SQUARE is used the below method to grow the polygon // range by half line width will not work, so use decomposition. Interestingly, diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index 43df7f5d146f..b3dfbeee09d5 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -190,17 +190,17 @@ namespace drawinglayer if(mrSource.getTextLength()) { Primitive2DVector aTempResult; - static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBreakIterator; + static css::uno::Reference< css::i18n::XBreakIterator > xBreakIterator; if(!xBreakIterator.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); - xBreakIterator = ::com::sun::star::i18n::BreakIterator::create(xContext); + css::uno::Reference< css::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + xBreakIterator = css::i18n::BreakIterator::create(xContext); } const OUString& rTxt = mrSource.getText(); const sal_Int32 nTextLength(mrSource.getTextLength()); - const ::com::sun::star::lang::Locale& rLocale = mrSource.getLocale(); + const css::lang::Locale& rLocale = mrSource.getLocale(); const sal_Int32 nTextPosition(mrSource.getTextPosition()); sal_Int32 nCurrent(nTextPosition); @@ -209,7 +209,7 @@ namespace drawinglayer case BreakupUnit_character: { sal_Int32 nDone; - sal_Int32 nNextCellBreak(xBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone)); + sal_Int32 nNextCellBreak(xBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, css::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone)); sal_Int32 a(nTextPosition); for(; a < nTextPosition + nTextLength; a++) @@ -218,7 +218,7 @@ namespace drawinglayer { breakupPortion(aTempResult, nCurrent, a - nCurrent, false); nCurrent = a; - nNextCellBreak = xBreakIterator->nextCharacters(rTxt, a, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone); + nNextCellBreak = xBreakIterator->nextCharacters(rTxt, a, rLocale, css::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone); } } @@ -227,7 +227,7 @@ namespace drawinglayer } case BreakupUnit_word: { - ::com::sun::star::i18n::Boundary nNextWordBoundary(xBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True)); + css::i18n::Boundary nNextWordBoundary(xBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, css::i18n::WordType::ANY_WORD, sal_True)); sal_Int32 a(nTextPosition); for(; a < nTextPosition + nTextLength; a++) @@ -243,7 +243,7 @@ namespace drawinglayer // skip spaces (maybe enhanced with a bool later if needed) { - const sal_Int32 nEndOfSpaces(xBreakIterator->endOfCharBlock(rTxt, a, rLocale, ::com::sun::star::i18n::CharType::SPACE_SEPARATOR)); + const sal_Int32 nEndOfSpaces(xBreakIterator->endOfCharBlock(rTxt, a, rLocale, css::i18n::CharType::SPACE_SEPARATOR)); if(nEndOfSpaces > a) { @@ -251,7 +251,7 @@ namespace drawinglayer } } - nNextWordBoundary = xBreakIterator->getWordBoundary(rTxt, a + 1, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True); + nNextWordBoundary = xBreakIterator->getWordBoundary(rTxt, a + 1, rLocale, css::i18n::WordType::ANY_WORD, sal_True); } } diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index b309b3f63056..eeb04d02f024 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -315,7 +315,7 @@ namespace drawinglayer sal_Int32 nTextLength, const ::std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute, - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, const basegfx::BColor& rFontColor, const Color& rFillColor, diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 2eefc3fe55c8..18510c178801 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -49,7 +49,7 @@ namespace class scoped_timed_RefDev : public comphelper::unique_disposing_ptr<ImpTimedRefDev> { public: - scoped_timed_RefDev() : comphelper::unique_disposing_ptr<ImpTimedRefDev>((::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW))) + scoped_timed_RefDev() : comphelper::unique_disposing_ptr<ImpTimedRefDev>((css::uno::Reference<css::lang::XComponent>(::comphelper::getProcessComponentContext(), css::uno::UNO_QUERY_THROW))) { } }; @@ -168,7 +168,7 @@ namespace drawinglayer const attribute::FontAttribute& rFontAttribute, double fFontScaleX, double fFontScaleY, - const ::com::sun::star::lang::Locale& rLocale) + const css::lang::Locale& rLocale) { setFont(getVclFontFromFontAttribute( rFontAttribute, @@ -374,7 +374,7 @@ namespace drawinglayer double fFontScaleX, double fFontScaleY, double fFontRotation, - const ::com::sun::star::lang::Locale& rLocale) + const css::lang::Locale& rLocale) { // detect FontScaling const sal_uInt32 nHeight(basegfx::fround(fabs(fFontScaleY))); diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index 7751aba3c37a..43aaa2bc0758 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -225,7 +225,7 @@ namespace drawinglayer sal_Int32 nTextLength, const ::std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute, - const ::com::sun::star::lang::Locale& rLocale, + const css::lang::Locale& rLocale, const basegfx::BColor& rFontColor, bool bFilled, long nWidthToFill, @@ -251,7 +251,7 @@ namespace drawinglayer #endif } - bool LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB) + bool LocalesAreEqual(const css::lang::Locale& rA, const css::lang::Locale& rB) { return (rA.Language == rB.Language && rA.Country == rB.Country diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 13e937efd09d..b65c54cbc6bc 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -117,7 +117,7 @@ namespace drawinglayer const basegfx::BColor& rFontColor, sal_Unicode aStrikeoutChar, const attribute::FontAttribute& rFontAttribute, - const ::com::sun::star::lang::Locale& rLocale) + const css::lang::Locale& rLocale) : BaseTextStrikeoutPrimitive2D(rObjectTransformation, fWidth, rFontColor), maStrikeoutChar(aStrikeoutChar), maFontAttribute(rFontAttribute), diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx index dab2c2e11f3a..6f4c5b43bd65 100644 --- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx @@ -61,7 +61,7 @@ namespace drawinglayer return get3DDecomposition(aViewInformation); } - com::sun::star::geometry::RealRectangle3D SAL_CALL BasePrimitive3D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception ) + css::geometry::RealRectangle3D SAL_CALL BasePrimitive3D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception ) { const geometry::ViewInformation3D aViewInformation(rViewParameters); return basegfx::unotools::rectangle3DFromB3DRectangle(getB3DRange(aViewInformation)); diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index 94ca04c207ca..fc3b9bff7d74 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx @@ -99,7 +99,7 @@ namespace drawinglayer // create fat line data const double fRadius(getLineAttribute().getWidth() / 2.0); const basegfx::B2DLineJoin aLineJoin(getLineAttribute().getLineJoin()); - const com::sun::star::drawing::LineCap aLineCap(getLineAttribute().getLineCap()); + const css::drawing::LineCap aLineCap(getLineAttribute().getLineCap()); for(sal_uInt32 a(0L); a < aHairLinePolyPolygon.count(); a++) { diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 464f4e86c1a2..bbef152697d9 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -565,8 +565,8 @@ namespace drawinglayer const bool bFirst(!a); const bool bLast(a + 1 == nLoopCount); const bool bLineCapPossible(!bClosed && (bFirst || bLast)); - const bool bLineCapRound(bLineCapPossible && com::sun::star::drawing::LineCap_ROUND == getLineCap()); - const bool bLineCapSquare(bLineCapPossible && com::sun::star::drawing::LineCap_SQUARE == getLineCap()); + const bool bLineCapRound(bLineCapPossible && css::drawing::LineCap_ROUND == getLineCap()); + const bool bLineCapSquare(bLineCapPossible && css::drawing::LineCap_SQUARE == getLineCap()); // get rotation from vector, this describes rotation from (1, 0, 0) to aForw basegfx::B3DHomMatrix aRotVector(getRotationFromVector(aForw)); @@ -744,7 +744,7 @@ namespace drawinglayer const basegfx::B3DPolygon& rPolygon, const basegfx::BColor& rBColor, double fRadius, basegfx::B2DLineJoin aLineJoin, - com::sun::star::drawing::LineCap aLineCap, + css::drawing::LineCap aLineCap, double fDegreeStepWidth, double fMiterMinimumAngle) : PolygonHairlinePrimitive3D(rPolygon, rBColor), diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 4fbd849bf003..86a8b2454df6 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -47,8 +47,8 @@ namespace drawinglayer // normal creation if(!getSdrLFSAttribute().getFill().isDefault()) { - if(::com::sun::star::drawing::NormalsKind_SPECIFIC == getSdr3DObjectAttribute().getNormalsKind() - || ::com::sun::star::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()) + if(css::drawing::NormalsKind_SPECIFIC == getSdr3DObjectAttribute().getNormalsKind() + || css::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()) { // create sphere normals const basegfx::B3DPoint aCenter(basegfx::tools::getRange(aFill).getCenter()); @@ -66,14 +66,14 @@ namespace drawinglayer if(!getSdrLFSAttribute().getFill().isDefault()) { // handle texture coordinates X - const bool bParallelX(::com::sun::star::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bObjectSpecificX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bSphereX(!bParallelX && (::com::sun::star::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionX())); + const bool bParallelX(css::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bObjectSpecificX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bSphereX(!bParallelX && (css::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionX())); // handle texture coordinates Y - const bool bParallelY(::com::sun::star::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionY()); - const bool bObjectSpecificY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); - const bool bSphereY(!bParallelY && (::com::sun::star::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionY())); + const bool bParallelY(css::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionY()); + const bool bObjectSpecificY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); + const bool bSphereY(!bParallelY && (css::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionY())); if(bParallelX || bParallelY) { diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index 95b992c3769f..ae58b63e3103 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx @@ -87,8 +87,8 @@ namespace drawinglayer } void applyTextureTo3DGeometry( - ::com::sun::star::drawing::TextureProjectionMode eModeX, - ::com::sun::star::drawing::TextureProjectionMode eModeY, + css::drawing::TextureProjectionMode eModeX, + css::drawing::TextureProjectionMode eModeY, ::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange, const basegfx::B2DVector& rTextureSize) @@ -96,12 +96,12 @@ namespace drawinglayer sal_uInt32 a; // handle texture coordinates X - const bool bParallelX(::com::sun::star::drawing::TextureProjectionMode_PARALLEL == eModeX); - const bool bSphereX(!bParallelX && (::com::sun::star::drawing::TextureProjectionMode_SPHERE == eModeX)); + const bool bParallelX(css::drawing::TextureProjectionMode_PARALLEL == eModeX); + const bool bSphereX(!bParallelX && (css::drawing::TextureProjectionMode_SPHERE == eModeX)); // handle texture coordinates Y - const bool bParallelY(::com::sun::star::drawing::TextureProjectionMode_PARALLEL == eModeY); - const bool bSphereY(!bParallelY && (::com::sun::star::drawing::TextureProjectionMode_SPHERE == eModeY)); + const bool bParallelY(css::drawing::TextureProjectionMode_PARALLEL == eModeY); + const bool bSphereY(!bParallelY && (css::drawing::TextureProjectionMode_SPHERE == eModeY)); if(bParallelX || bParallelY) { @@ -203,7 +203,7 @@ namespace drawinglayer || !rFill.getHatch().isDefault() || !rFill.getFillGraphic().isDefault()) { - bool bModulate(::com::sun::star::drawing::TextureMode_MODULATE == aSdr3DObjectAttribute.getTextureMode()); + bool bModulate(css::drawing::TextureMode_MODULATE == aSdr3DObjectAttribute.getTextureMode()); bool bFilter(aSdr3DObjectAttribute.getTextureFilter()); BasePrimitive3D* pNewTexturePrimitive3D = 0; @@ -244,7 +244,7 @@ namespace drawinglayer const Primitive3DReference xRef(pNewTexturePrimitive3D); aRetval = Primitive3DSequence(&xRef, 1L); - if(::com::sun::star::drawing::TextureKind2_LUMINANCE == aSdr3DObjectAttribute.getTextureKind()) + if(css::drawing::TextureKind2_LUMINANCE == aSdr3DObjectAttribute.getTextureKind()) { // use modified color primitive to force textures to gray const basegfx::BColorModifierSharedPtr aBColorModifier( diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index a7ea6e224724..a013328cab46 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -51,10 +51,10 @@ namespace drawinglayer sal_uInt32 a; // decide what to create - const ::com::sun::star::drawing::NormalsKind eNormalsKind(getSdr3DObjectAttribute().getNormalsKind()); - const bool bCreateNormals(::com::sun::star::drawing::NormalsKind_SPECIFIC == eNormalsKind); - const bool bCreateTextureCoordinatesX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bCreateTextureCoordinatesY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); + const css::drawing::NormalsKind eNormalsKind(getSdr3DObjectAttribute().getNormalsKind()); + const bool bCreateNormals(css::drawing::NormalsKind_SPECIFIC == eNormalsKind); + const bool bCreateTextureCoordinatesX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bCreateTextureCoordinatesY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); basegfx::B2DHomMatrix aTexTransform; if(!getSdrLFSAttribute().getFill().isDefault() && (bCreateTextureCoordinatesX || bCreateTextureCoordinatesY)) @@ -89,11 +89,11 @@ namespace drawinglayer // normal creation if(!getSdrLFSAttribute().getFill().isDefault()) { - if(::com::sun::star::drawing::NormalsKind_SPHERE == eNormalsKind) + if(css::drawing::NormalsKind_SPHERE == eNormalsKind) { applyNormalsKindSphereTo3DGeometry(aFill, aRange); } - else if(::com::sun::star::drawing::NormalsKind_FLAT == eNormalsKind) + else if(css::drawing::NormalsKind_FLAT == eNormalsKind) { applyNormalsKindFlatTo3DGeometry(aFill); } diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index b12413f5d7b1..2cedbe0cfc12 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -53,10 +53,10 @@ namespace drawinglayer sal_uInt32 a; // decide what to create - const ::com::sun::star::drawing::NormalsKind eNormalsKind(getSdr3DObjectAttribute().getNormalsKind()); - const bool bCreateNormals(::com::sun::star::drawing::NormalsKind_SPECIFIC == eNormalsKind); - const bool bCreateTextureCoordinatesX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bCreateTextureCoordinatesY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); + const css::drawing::NormalsKind eNormalsKind(getSdr3DObjectAttribute().getNormalsKind()); + const bool bCreateNormals(css::drawing::NormalsKind_SPECIFIC == eNormalsKind); + const bool bCreateTextureCoordinatesX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bCreateTextureCoordinatesY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); basegfx::B2DHomMatrix aTexTransform; if(!getSdrLFSAttribute().getFill().isDefault() @@ -84,11 +84,11 @@ namespace drawinglayer // normal creation if(!getSdrLFSAttribute().getFill().isDefault()) { - if(::com::sun::star::drawing::NormalsKind_SPHERE == eNormalsKind) + if(css::drawing::NormalsKind_SPHERE == eNormalsKind) { applyNormalsKindSphereTo3DGeometry(aFill, aRange); } - else if(::com::sun::star::drawing::NormalsKind_FLAT == eNormalsKind) + else if(css::drawing::NormalsKind_FLAT == eNormalsKind) { applyNormalsKindFlatTo3DGeometry(aFill); } diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx index 26c46aa25178..285de36f55a9 100644 --- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx @@ -50,11 +50,11 @@ namespace drawinglayer // #i98295# normal creation if(!getSdrLFSAttribute().getFill().isDefault()) { - if(::com::sun::star::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()) + if(css::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()) { applyNormalsKindSphereTo3DGeometry(aFill, aRange); } - else if(::com::sun::star::drawing::NormalsKind_FLAT == getSdr3DObjectAttribute().getNormalsKind()) + else if(css::drawing::NormalsKind_FLAT == getSdr3DObjectAttribute().getNormalsKind()) { applyNormalsKindFlatTo3DGeometry(aFill); } diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index 0e2c1431cd79..e9d39e48f922 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -42,8 +42,8 @@ namespace drawinglayer { Primitive3DSequence aRetval; const basegfx::B3DRange aUnitRange(0.0, 0.0, 0.0, 1.0, 1.0, 1.0); - const bool bCreateNormals(::com::sun::star::drawing::NormalsKind_SPECIFIC == getSdr3DObjectAttribute().getNormalsKind() - || ::com::sun::star::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()); + const bool bCreateNormals(css::drawing::NormalsKind_SPECIFIC == getSdr3DObjectAttribute().getNormalsKind() + || css::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind()); // create unit geometry basegfx::B3DPolyPolygon aFill(basegfx::tools::createSphereFillPolyPolygonFromB3DRange(aUnitRange, @@ -63,14 +63,14 @@ namespace drawinglayer if(!getSdrLFSAttribute().getFill().isDefault()) { // handle texture coordinates X - const bool bParallelX(::com::sun::star::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bObjectSpecificX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); - const bool bSphereX(::com::sun::star::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bParallelX(css::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bObjectSpecificX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionX()); + const bool bSphereX(css::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionX()); // handle texture coordinates Y - const bool bParallelY(::com::sun::star::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionY()); - const bool bObjectSpecificY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); - const bool bSphereY(::com::sun::star::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionY()); + const bool bParallelY(css::drawing::TextureProjectionMode_PARALLEL == getSdr3DObjectAttribute().getTextureProjectionY()); + const bool bObjectSpecificY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC == getSdr3DObjectAttribute().getTextureProjectionY()); + const bool bSphereY(css::drawing::TextureProjectionMode_SPHERE == getSdr3DObjectAttribute().getTextureProjectionY()); if(bParallelX || bParallelY) { diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 22d3c61d22cd..24c92622b120 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -483,17 +483,17 @@ namespace drawinglayer // get stroke switch(pLineAttribute->getLineCap()) { - default: /* com::sun::star::drawing::LineCap_BUTT */ + default: /* css::drawing::LineCap_BUTT */ { eCap = SvtGraphicStroke::capButt; break; } - case com::sun::star::drawing::LineCap_ROUND: + case css::drawing::LineCap_ROUND: { eCap = SvtGraphicStroke::capRound; break; } - case com::sun::star::drawing::LineCap_SQUARE: + case css::drawing::LineCap_SQUARE: { eCap = SvtGraphicStroke::capSquare; break; @@ -556,7 +556,7 @@ namespace drawinglayer } // init static break iterator - uno::Reference< ::com::sun::star::i18n::XBreakIterator > VclMetafileProcessor2D::mxBreakIterator; + uno::Reference< css::i18n::XBreakIterator > VclMetafileProcessor2D::mxBreakIterator; VclMetafileProcessor2D::VclMetafileProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev) : VclProcessor2D(rViewInformation, rOutDev), @@ -1119,12 +1119,12 @@ namespace drawinglayer if(nTextLength) { - const ::com::sun::star::lang::Locale& rLocale = rTextCandidate.getLocale(); + const css::lang::Locale& rLocale = rTextCandidate.getLocale(); const sal_Int32 nTextPosition(rTextCandidate.getTextPosition()); sal_Int32 nDone; - sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone)); - ::com::sun::star::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True)); + sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, css::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone)); + css::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, css::i18n::WordType::ANY_WORD, sal_True)); sal_Int32 nNextSentenceBreak(mxBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale)); const OString aCommentStringA("XTEXT_EOC"); const OString aCommentStringB("XTEXT_EOW"); @@ -1136,12 +1136,12 @@ namespace drawinglayer if(i == nNextCellBreak) { mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA, i - nTextPosition)); - nNextCellBreak = mxBreakIterator->nextCharacters(rTxt, i, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone); + nNextCellBreak = mxBreakIterator->nextCharacters(rTxt, i, rLocale, css::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone); } if(i == nNextWordBoundary.endPos) { mpMetaFile->AddAction(new MetaCommentAction(aCommentStringB, i - nTextPosition)); - nNextWordBoundary = mxBreakIterator->getWordBoundary(rTxt, i + 1, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True); + nNextWordBoundary = mxBreakIterator->getWordBoundary(rTxt, i + 1, rLocale, css::i18n::WordType::ANY_WORD, sal_True); } if(i == nNextSentenceBreak) { diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx index 95ff674980d9..01407cd48552 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx @@ -119,7 +119,7 @@ namespace drawinglayer constructed VclMetafileProcessor2D. It's still incarnated on demand, but exists for OOo runtime now by purpose. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIterator; + static css::uno::Reference< css::i18n::XBreakIterator > mxBreakIterator; /* vcl::PDFExtOutDevData support For the first step, some extra actions at vcl::PDFExtOutDevData need to diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 38028b27f71e..7d38304f4bd3 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -351,9 +351,9 @@ namespace drawinglayer bool bPaintIt(aFill.count()); // #i98295# get ShadeMode. Correct early when only flat is possible due to missing normals - const ::com::sun::star::drawing::ShadeMode aShadeMode( + const css::drawing::ShadeMode aShadeMode( aFill.areNormalsUsed() ? - getSdrSceneAttribute().getShadeMode() : ::com::sun::star::drawing::ShadeMode_FLAT); + getSdrSceneAttribute().getShadeMode() : css::drawing::ShadeMode_FLAT); if(bPaintIt) { @@ -364,7 +364,7 @@ namespace drawinglayer } // #i98295# get rid of normals and color early when not needed - if(::com::sun::star::drawing::ShadeMode_FLAT == aShadeMode) + if(css::drawing::ShadeMode_FLAT == aShadeMode) { aFill.clearNormals(); aFill.clearBColors(); @@ -411,13 +411,13 @@ namespace drawinglayer switch(aShadeMode) { - case ::com::sun::star::drawing::ShadeMode_PHONG: + case css::drawing::ShadeMode_PHONG: { // phong shading. Transform normals to eye coor aFill.transformNormals(aNormalTransform); break; } - case ::com::sun::star::drawing::ShadeMode_SMOOTH: + case css::drawing::ShadeMode_SMOOTH: { // gouraud shading. Transform normals to eye coor aFill.transformNormals(aNormalTransform); @@ -447,7 +447,7 @@ namespace drawinglayer } break; } - case ::com::sun::star::drawing::ShadeMode_FLAT: + case css::drawing::ShadeMode_FLAT: { // flat shading. Get plane vector in eye coordinates const basegfx::B3DVector aPlaneEyeNormal(aNormalTransform * rPrimitive.getB3DPolyPolygon().getB3DPolygon(0L).getNormal()); @@ -462,7 +462,7 @@ namespace drawinglayer aObjectColor = getSdrLightingAttribute().solveColorModel(aPlaneEyeNormal, aColor, rSpecular, rEmission, nSpecularIntensity); break; } - default: // case ::com::sun::star::drawing::ShadeMode_DRAFT: + default: // case css::drawing::ShadeMode_DRAFT: { // draft, just use object color which is already set. Delete all other infos aFill.clearNormals(); |