diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-30 14:59:47 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-31 12:56:21 +0000 |
commit | 4530451d40470bf5359645de0c142ddf9dc329b6 (patch) | |
tree | 8b57614e9316685a8178d9d61795932c3e705d45 /svx/source/sdr | |
parent | bd332c2a335b34e209fe2b7fdfb669c855325636 (diff) |
com::sun::star->css in svx
Change-Id: If2c11fa548c5ebef2297d2491edd837b54e3707c
Reviewed-on: https://gerrit.libreoffice.org/19690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/sdr')
9 files changed, 52 insertions, 52 deletions
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index f4d7be6c2339..723986f62ab4 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -52,27 +52,27 @@ namespace { - basegfx::B2DLineJoin impGetB2DLineJoin(com::sun::star::drawing::LineJoint eLineJoint) + basegfx::B2DLineJoin impGetB2DLineJoin(css::drawing::LineJoint eLineJoint) { switch(eLineJoint) { - case com::sun::star::drawing::LineJoint_MIDDLE : + case css::drawing::LineJoint_MIDDLE : { return basegfx::B2DLineJoin::Middle; } - case com::sun::star::drawing::LineJoint_BEVEL : + case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } - case com::sun::star::drawing::LineJoint_MITER : + case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; } - case com::sun::star::drawing::LineJoint_ROUND : + case css::drawing::LineJoint_ROUND : { return basegfx::B2DLineJoin::Round; } - default : // com::sun::star::drawing::LineJoint_NONE + default : // css::drawing::LineJoint_NONE { return basegfx::B2DLineJoin::NONE; // XLINEJOINT_NONE } @@ -111,8 +111,8 @@ namespace } const sal_uInt32 nLineWidth = (static_cast<const XLineWidthItem&>(rSet.Get(XATTR_LINEWIDTH))).GetValue(); - const com::sun::star::drawing::LineJoint eLineJoint = (static_cast<const XLineJointItem&>(rSet.Get(XATTR_LINEJOINT))).GetValue(); - const com::sun::star::drawing::LineCap eLineCap = (static_cast<const XLineCapItem&>(rSet.Get(XATTR_LINECAP))).GetValue(); + const css::drawing::LineJoint eLineJoint = (static_cast<const XLineJointItem&>(rSet.Get(XATTR_LINEJOINT))).GetValue(); + const css::drawing::LineCap eLineCap = (static_cast<const XLineCapItem&>(rSet.Get(XATTR_LINECAP))).GetValue(); return drawinglayer::attribute::LineAttribute( aColorAttribute, @@ -123,11 +123,11 @@ namespace drawinglayer::attribute::StrokeAttribute impGetStrokeAttribute(const SfxItemSet& rSet) { - const com::sun::star::drawing::LineStyle eLineStyle = (static_cast<const XLineStyleItem&>(rSet.Get(XATTR_LINESTYLE))).GetValue(); + const css::drawing::LineStyle eLineStyle = (static_cast<const XLineStyleItem&>(rSet.Get(XATTR_LINESTYLE))).GetValue(); double fFullDotDashLen(0.0); ::std::vector< double > aDotDashArray; - if(com::sun::star::drawing::LineStyle_DASH == eLineStyle) + if(css::drawing::LineStyle_DASH == eLineStyle) { const XDash& rDash = (static_cast<const XLineDashItem&>(rSet.Get(XATTR_LINEDASH))).GetDashValue(); diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 1e35fd3ff23c..6f62f8e670ca 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -99,7 +99,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo) aViewRange, GetXDrawPageForSdrPage(const_cast< SdrPage* >(mpProcessedPage)), 0.0, - com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>()); + css::uno::Sequence<css::beans::PropertyValue>()); updateViewInformation2D(aNewViewInformation2D); // collect primitive data in a sequence; this will already use the updated ViewInformation2D diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 08aa36a5ac6e..7c32e153b4c3 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -195,7 +195,7 @@ void ViewContactOfE3dScene::createViewInformation3D(const basegfx::B3DRange& rCo basegfx::B3DHomMatrix aWorldToDevice(aWorldToCamera); const drawinglayer::attribute::SdrSceneAttribute& rSdrSceneAttribute = getSdrSceneAttribute(); - if(::com::sun::star::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) + if(css::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) { aWorldToDevice.frustum(-1.0, 1.0, -1.0, 1.0, fMinZ, fMaxZ); } @@ -210,7 +210,7 @@ void ViewContactOfE3dScene::createViewInformation3D(const basegfx::B3DRange& rCo aDeviceRange.transform(aWorldToDevice); // set projection - if(::com::sun::star::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) + if(css::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) { aProjection.frustum( aDeviceRange.getMinX(), aDeviceRange.getMaxX(), diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 6542edb71328..169b136f28bf 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -642,9 +642,9 @@ namespace sdr { namespace contact { virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) override; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; private: /** retrieves the SdrPageView which our associated SdrPageViewWindow belongs to diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index f42c1c80efc3..4722122116ea 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -33,9 +33,9 @@ using namespace com::sun::star; namespace { -typedef cppu::WeakComponentImplHelper< ::com::sun::star::graphic::XPrimitiveFactory2D, css::lang::XServiceInfo > PrimitiveFactory2DImplBase; +typedef cppu::WeakComponentImplHelper< css::graphic::XPrimitiveFactory2D, css::lang::XServiceInfo > PrimitiveFactory2DImplBase; -// base class for C++ implementation of com::sun::star::graphic::XPrimitiveFactory2D +// base class for C++ implementation of css::graphic::XPrimitiveFactory2D class PrimitiveFactory2D : protected comphelper::OBaseMutex, public PrimitiveFactory2DImplBase @@ -44,8 +44,8 @@ public: PrimitiveFactory2D(): PrimitiveFactory2DImplBase(m_aMutex) {} // Methods from XPrimitiveFactory2D - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 2ec29edf342f..e25d6346a02d 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -132,27 +132,27 @@ namespace drawinglayer } } - basegfx::B2DLineJoin LineJointToB2DLineJoin(com::sun::star::drawing::LineJoint eLineJoint) + basegfx::B2DLineJoin LineJointToB2DLineJoin(css::drawing::LineJoint eLineJoint) { switch(eLineJoint) { - case com::sun::star::drawing::LineJoint_MIDDLE : + case css::drawing::LineJoint_MIDDLE : { return basegfx::B2DLineJoin::Middle; } - case com::sun::star::drawing::LineJoint_BEVEL : + case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } - case com::sun::star::drawing::LineJoint_MITER : + case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; } - case com::sun::star::drawing::LineJoint_ROUND : + case css::drawing::LineJoint_ROUND : { return basegfx::B2DLineJoin::Round; } - default : // com::sun::star::drawing::LineJoint_NONE + default : // css::drawing::LineJoint_NONE { return basegfx::B2DLineJoin::NONE; } @@ -218,7 +218,7 @@ namespace drawinglayer { attribute::SdrLineAttribute createNewSdrLineAttribute(const SfxItemSet& rSet) { - const com::sun::star::drawing::LineStyle eStyle(static_cast<const XLineStyleItem&>(rSet.Get(XATTR_LINESTYLE)).GetValue()); + const css::drawing::LineStyle eStyle(static_cast<const XLineStyleItem&>(rSet.Get(XATTR_LINESTYLE)).GetValue()); if(drawing::LineStyle_NONE != eStyle) { @@ -233,8 +233,8 @@ namespace drawinglayer { const sal_uInt32 nWidth(static_cast<const XLineWidthItem&>(rSet.Get(XATTR_LINEWIDTH)).GetValue()); const Color aColor(static_cast<const XLineColorItem&>(rSet.Get(XATTR_LINECOLOR)).GetColorValue()); - const com::sun::star::drawing::LineJoint eJoint(static_cast<const XLineJointItem&>(rSet.Get(XATTR_LINEJOINT)).GetValue()); - const com::sun::star::drawing::LineCap eCap(static_cast<const XLineCapItem&>(rSet.Get(XATTR_LINECAP)).GetValue()); + const css::drawing::LineJoint eJoint(static_cast<const XLineJointItem&>(rSet.Get(XATTR_LINEJOINT)).GetValue()); + const css::drawing::LineCap eCap(static_cast<const XLineCapItem&>(rSet.Get(XATTR_LINECAP)).GetValue()); ::std::vector< double > aDotDashArray; double fFullDotDashLen(0.0); @@ -885,12 +885,12 @@ namespace drawinglayer attribute::SdrSceneAttribute createNewSdrSceneAttribute(const SfxItemSet& rSet) { // get perspective - ::com::sun::star::drawing::ProjectionMode aProjectionMode(::com::sun::star::drawing::ProjectionMode_PARALLEL); + css::drawing::ProjectionMode aProjectionMode(css::drawing::ProjectionMode_PARALLEL); const sal_uInt16 nProjectionValue(static_cast<const Svx3DPerspectiveItem&>(rSet.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue()); if(1L == nProjectionValue) { - aProjectionMode = ::com::sun::star::drawing::ProjectionMode_PERSPECTIVE; + aProjectionMode = css::drawing::ProjectionMode_PERSPECTIVE; } // get distance @@ -900,20 +900,20 @@ namespace drawinglayer const double fShadowSlant(F_PI180 * static_cast<const SfxUInt16Item&>(rSet.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue()); // get shade mode - ::com::sun::star::drawing::ShadeMode aShadeMode(::com::sun::star::drawing::ShadeMode_FLAT); + css::drawing::ShadeMode aShadeMode(css::drawing::ShadeMode_FLAT); const sal_uInt16 nShadeValue(static_cast<const Svx3DShadeModeItem&>(rSet.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue()); if(1L == nShadeValue) { - aShadeMode = ::com::sun::star::drawing::ShadeMode_PHONG; + aShadeMode = css::drawing::ShadeMode_PHONG; } else if(2L == nShadeValue) { - aShadeMode = ::com::sun::star::drawing::ShadeMode_SMOOTH; + aShadeMode = css::drawing::ShadeMode_SMOOTH; } else if(3L == nShadeValue) { - aShadeMode = ::com::sun::star::drawing::ShadeMode_DRAFT; + aShadeMode = css::drawing::ShadeMode_DRAFT; } // get two sided lighting diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 54b335b7a013..25ec9740305e 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -37,45 +37,45 @@ namespace drawinglayer attribute::Sdr3DObjectAttribute* createNewSdr3DObjectAttribute(const SfxItemSet& rSet) { // get NormalsKind - ::com::sun::star::drawing::NormalsKind aNormalsKind(::com::sun::star::drawing::NormalsKind_SPECIFIC); + css::drawing::NormalsKind aNormalsKind(css::drawing::NormalsKind_SPECIFIC); const sal_uInt16 nNormalsValue(static_cast<const Svx3DNormalsKindItem&>(rSet.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue()); if(1L == nNormalsValue) { - aNormalsKind = ::com::sun::star::drawing::NormalsKind_FLAT; + aNormalsKind = css::drawing::NormalsKind_FLAT; } else if(2L == nNormalsValue) { - aNormalsKind = ::com::sun::star::drawing::NormalsKind_SPHERE; + aNormalsKind = css::drawing::NormalsKind_SPHERE; } // get NoermalsInvert flag const bool bInvertNormals(static_cast<const SfxBoolItem&>(rSet.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue()); // get TextureProjectionX - ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC); + css::drawing::TextureProjectionMode aTextureProjectionX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC); const sal_uInt16 nTextureValueX(static_cast<const Svx3DTextureProjectionXItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue()); if(1L == nTextureValueX) { - aTextureProjectionX = ::com::sun::star::drawing::TextureProjectionMode_PARALLEL; + aTextureProjectionX = css::drawing::TextureProjectionMode_PARALLEL; } else if(2L == nTextureValueX) { - aTextureProjectionX = ::com::sun::star::drawing::TextureProjectionMode_SPHERE; + aTextureProjectionX = css::drawing::TextureProjectionMode_SPHERE; } // get TextureProjectionY - ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC); + css::drawing::TextureProjectionMode aTextureProjectionY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC); const sal_uInt16 nTextureValueY(static_cast<const Svx3DTextureProjectionYItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue()); if(1L == nTextureValueY) { - aTextureProjectionY = ::com::sun::star::drawing::TextureProjectionMode_PARALLEL; + aTextureProjectionY = css::drawing::TextureProjectionMode_PARALLEL; } else if(2L == nTextureValueY) { - aTextureProjectionY = ::com::sun::star::drawing::TextureProjectionMode_SPHERE; + aTextureProjectionY = css::drawing::TextureProjectionMode_SPHERE; } // get DoubleSided flag @@ -89,30 +89,30 @@ namespace drawinglayer // get texture kind // TextureKind: 1 == Base3DTextureLuminance, 2 == Base3DTextureIntensity, 3 == Base3DTextureColor - ::com::sun::star::drawing::TextureKind2 aTextureKind(::com::sun::star::drawing::TextureKind2_LUMINANCE); + css::drawing::TextureKind2 aTextureKind(css::drawing::TextureKind2_LUMINANCE); const sal_uInt16 nTextureKind(static_cast<const Svx3DTextureKindItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue()); if(2 == nTextureKind) { - aTextureKind = ::com::sun::star::drawing::TextureKind2_INTENSITY; + aTextureKind = css::drawing::TextureKind2_INTENSITY; } else if(3 == nTextureKind) { - aTextureKind = ::com::sun::star::drawing::TextureKind2_COLOR; + aTextureKind = css::drawing::TextureKind2_COLOR; } // get texture mode // TextureMode: 1 == Base3DTextureReplace, 2 == Base3DTextureModulate, 3 == Base3DTextureBlend - ::com::sun::star::drawing::TextureMode aTextureMode(::com::sun::star::drawing::TextureMode_REPLACE); + css::drawing::TextureMode aTextureMode(css::drawing::TextureMode_REPLACE); const sal_uInt16 nTextureMode(static_cast<const Svx3DTextureModeItem&>(rSet.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue()); if(2 == nTextureMode) { - aTextureMode = ::com::sun::star::drawing::TextureMode_MODULATE; + aTextureMode = css::drawing::TextureMode_MODULATE; } else if(3 == nTextureMode) { - aTextureMode = ::com::sun::star::drawing::TextureMode_BLEND; + aTextureMode = css::drawing::TextureMode_BLEND; } // get object color diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index b408b7ec5990..2ae586339f6b 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -120,7 +120,7 @@ namespace sdr mpItemSet->Put(XLineStartWidthItem(200)); mpItemSet->Put(XLineEndItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon))); mpItemSet->Put(XLineEndWidthItem(200)); - mpItemSet->Put(XLineStyleItem(com::sun::star::drawing::LineStyle_SOLID)); + mpItemSet->Put(XLineStyleItem(css::drawing::LineStyle_SOLID)); } } // end of namespace properties } // end of namespace sdr diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 02a6dbf6d9d6..8f68d861da24 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -162,7 +162,7 @@ namespace sdr if(pNewItem && (SDRATTR_TEXTDIRECTION == nWhich)) { - bool bVertical(com::sun::star::text::WritingMode_TB_RL == static_cast<const SvxWritingModeItem*>(pNewItem)->GetValue()); + bool bVertical(css::text::WritingMode_TB_RL == static_cast<const SvxWritingModeItem*>(pNewItem)->GetValue()); rObj.SetVerticalWriting(bVertical); } |