summaryrefslogtreecommitdiff
path: root/include/oox/drawingml
diff options
context:
space:
mode:
Diffstat (limited to 'include/oox/drawingml')
-rw-r--r--include/oox/drawingml/chart/chartconverter.hxx10
-rw-r--r--include/oox/drawingml/chart/datasourcemodel.hxx2
-rw-r--r--include/oox/drawingml/color.hxx4
-rw-r--r--include/oox/drawingml/drawingmltypes.hxx16
-rw-r--r--include/oox/drawingml/fillproperties.hxx24
-rw-r--r--include/oox/drawingml/lineproperties.hxx4
-rw-r--r--include/oox/drawingml/shape.hxx80
-rw-r--r--include/oox/drawingml/shapepropertymap.hxx20
-rw-r--r--include/oox/drawingml/theme.hxx8
9 files changed, 83 insertions, 85 deletions
diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx
index d459f54bc428..ebce01a4006d 100644
--- a/include/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
@@ -71,15 +71,15 @@ public:
void convertFromModel(
::oox::core::XmlFilterBase& rFilter,
ChartSpaceModel& rChartModel,
- const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxExternalPage,
- const ::com::sun::star::awt::Point& rChartPos,
- const ::com::sun::star::awt::Size& rChartSize );
+ const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc,
+ const css::uno::Reference< css::drawing::XShapes >& rxExternalPage,
+ const css::awt::Point& rChartPos,
+ const css::awt::Size& rChartSize );
/** Creates an internal data provider. Derived classes may override this
function to create an external data provider. */
virtual void createDataProvider(
- const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc );
+ const css::uno::Reference< css::chart2::XChartDocument >& rxChartDoc );
/** Creates a data sequence from a formula. Dummy implementation. Derived
classes have to override this function to actually parse the formula. */
diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx
index 75a5d012f82b..e6539cae744c 100644
--- a/include/oox/drawingml/chart/datasourcemodel.hxx
+++ b/include/oox/drawingml/chart/datasourcemodel.hxx
@@ -31,7 +31,7 @@ namespace chart {
struct DataSequenceModel
{
- typedef ::std::map< sal_Int32, ::com::sun::star::uno::Any > AnyMap;
+ typedef ::std::map< sal_Int32, css::uno::Any > AnyMap;
AnyMap maData; /// Map of values, indexed by point identifier.
OUString maFormula; /// Formula reference, e.g. into a spreadsheet.
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index e84628917757..110b0d6e36f3 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -97,7 +97,7 @@ public:
/** Returns the scheme name from the a:schemeClr element for interoperability purposes */
OUString getSchemeName() const { return msSchemeName; }
/** Returns the unaltered list of transformations for interoperability purposes */
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getTransformations() const { return maInteropTransformations;}
+ css::uno::Sequence< css::beans::PropertyValue > getTransformations() const { return maInteropTransformations;}
/** Translates between color transformation tokens and their names */
static OUString getColorTransformationName( sal_Int32 nElement );
@@ -146,7 +146,7 @@ private:
sal_Int32 mnAlpha; /// Alpha value (color opacity).
OUString msSchemeName; /// Scheme name from the a:schemeClr element for interoperability purposes
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+ css::uno::Sequence< css::beans::PropertyValue >
maInteropTransformations; /// Unaltered list of transformations for interoperability purposes
};
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index 621695b550d9..6fa8261e7956 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -89,14 +89,14 @@ typedef std::shared_ptr< TableProperties > TablePropertiesPtr;
/** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
-com::sun::star::awt::Point GetPointPercent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs );
+css::awt::Point GetPointPercent( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs );
/** converts the attributes from an CT_Size2D into an awt Size with 1/100th mm */
-com::sun::star::awt::Size GetSize2D( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+css::awt::Size GetSize2D( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
/** converts the attributes from a CT_RelativeRect to an IntegerRectangle2D */
-com::sun::star::geometry::IntegerRectangle2D GetRelativeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+css::geometry::IntegerRectangle2D GetRelativeRect( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
/** converts EMUs into 1/100th mmm */
sal_Int32 GetCoordinate( sal_Int32 nValue );
@@ -118,7 +118,7 @@ sal_Int32 GetTextSpacingPoint( const OUString& sValue );
sal_Int32 GetTextSpacingPoint( const sal_Int32 nValue );
/** */
-::com::sun::star::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
+css::style::TabAlign GetTabAlign( ::sal_Int32 aToken );
float GetFontHeight( sal_Int32 nHeight );
@@ -132,13 +132,13 @@ sal_Int16 GetCaseMap( sal_Int32 nToken );
sal_Int16 GetParaAdjust( sal_Int32 nAlign );
// Converts vertical adjust tokens to a TextVerticalAdjust item
-::com::sun::star::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
+css::drawing::TextVerticalAdjust GetTextVerticalAdjust( sal_Int32 nToken );
// Converts a TextVerticalAdjust item to string value appearing in ooxml
-OOX_DLLPUBLIC const char* GetTextVerticalAdjust( ::com::sun::star::drawing::TextVerticalAdjust eAdjust );
+OOX_DLLPUBLIC const char* GetTextVerticalAdjust( css::drawing::TextVerticalAdjust eAdjust );
// Converts a Hatch object to an ooxml pattern.
-const char* GetHatchPattern( const ::com::sun::star::drawing::Hatch& rHatch );
+const char* GetHatchPattern( const css::drawing::Hatch& rHatch );
@@ -149,7 +149,7 @@ struct IndexRange {
};
/** retrieve the content of CT_IndexRange */
-IndexRange GetIndexRange( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes );
+IndexRange GetIndexRange( const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes );
diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx
index 815881a52c28..0fa28adeaaea 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
@@ -41,8 +41,8 @@ struct GradientFillProperties
typedef ::std::map< double, Color > GradientStopMap;
GradientStopMap maGradientStops; /// Gradient stops (colors/transparence).
- OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moFillToRect;
- OptValue< ::com::sun::star::geometry::IntegerRectangle2D > moTileRect;
+ OptValue< css::geometry::IntegerRectangle2D > moFillToRect;
+ OptValue< css::geometry::IntegerRectangle2D > moTileRect;
OptValue< sal_Int32 > moGradientPath; /// If set, gradient follows rectangle, circle, or shape.
OptValue< sal_Int32 > moShadeAngle; /// Rotation angle of linear gradients.
OptValue< sal_Int32 > moShadeFlip; /// Flip mode of gradient, if not stretched to shape.
@@ -88,27 +88,27 @@ struct ArtisticEffectProperties
struct BlipFillProperties
{
- ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
- mxGraphic; /// The fill graphic.
+ css::uno::Reference< css::graphic::XGraphic >
+ mxGraphic; /// The fill graphic.
OptValue< sal_Int32 > moBitmapMode; /// Bitmap tile or stretch.
- OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
- moFillRect; /// Stretch fill offsets.
- OptValue< ::com::sun::star::geometry::IntegerRectangle2D >
- moClipRect;
+ OptValue< css::geometry::IntegerRectangle2D >
+ moFillRect; /// Stretch fill offsets.
+ OptValue< css::geometry::IntegerRectangle2D >
+ moClipRect;
OptValue< sal_Int32 > moTileOffsetX; /// Width of bitmap tiles (EMUs).
OptValue< sal_Int32 > moTileOffsetY; /// Height of bitmap tiles (EMUs).
OptValue< sal_Int32 > moTileScaleX; /// Horizontal scaling of bitmap tiles (1/1000 percent).
OptValue< sal_Int32 > moTileScaleY; /// Vertical scaling of bitmap tiles (1/1000 percent).
OptValue< sal_Int32 > moTileAlign; /// Anchor point inside bitmap.
OptValue< sal_Int32 > moTileFlip; /// Flip mode of bitmap tiles.
- OptValue< bool > moRotateWithShape; /// True = rotate bitmap with shape.
+ OptValue< bool > moRotateWithShape; /// True = rotate bitmap with shape.
// effects
OptValue< sal_Int32 > moColorEffect; /// XML token for a color effect.
OptValue< sal_Int32 > moBrightness; /// Brightness in the range [-100000,100000].
OptValue< sal_Int32 > moContrast; /// Contrast in the range [-100000,100000].
- Color maColorChangeFrom; /// Start color of color transformation.
- Color maColorChangeTo; /// Destination color of color transformation.
- Color maDuotoneColors[2]; /// Duotone Colors
+ Color maColorChangeFrom; /// Start color of color transformation.
+ Color maColorChangeTo; /// Destination color of color transformation.
+ Color maDuotoneColors[2]; /// Duotone Colors
ArtisticEffectProperties maEffect; /// Artistic effect, not supported by core.
diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx
index c38c7e14a0e4..bc1793dcdcd5 100644
--- a/include/oox/drawingml/lineproperties.hxx
+++ b/include/oox/drawingml/lineproperties.hxx
@@ -62,9 +62,9 @@ struct OOX_DLLPUBLIC LineProperties
sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
/** Calculates the line style attribute from the internal state of the object */
- ::com::sun::star::drawing::LineStyle getLineStyle() const;
+ css::drawing::LineStyle getLineStyle() const;
/** Calculates the line joint attribute from the internal state of the object */
- ::com::sun::star::drawing::LineJoint getLineJoint() const;
+ css::drawing::LineJoint getLineJoint() const;
/** Calculates the line width attribute from the internal state of the object */
sal_Int32 getLineWidth() const;
};
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index ba5e89b8edff..486cd6c4f44e 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -103,14 +103,14 @@ public:
EffectProperties& getEffectProperties() { return *mpEffectPropertiesPtr; }
- void setChildPosition( com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
- void setChildSize( com::sun::star::awt::Size aSize ){ maChSize = aSize; }
+ void setChildPosition( css::awt::Point nPosition ){ maChPosition = nPosition; }
+ void setChildSize( css::awt::Size aSize ){ maChSize = aSize; }
- void setPosition( com::sun::star::awt::Point nPosition ){ maPosition = nPosition; }
- const com::sun::star::awt::Point& getPosition() const { return maPosition; }
+ void setPosition( css::awt::Point nPosition ){ maPosition = nPosition; }
+ const css::awt::Point& getPosition() const { return maPosition; }
- void setSize( com::sun::star::awt::Size aSize ){ maSize = aSize; }
- const com::sun::star::awt::Size& getSize() const { return maSize; }
+ void setSize( css::awt::Size aSize ){ maSize = aSize; }
+ const css::awt::Size& getSize() const { return maSize; }
void setRotation( sal_Int32 nRotation ) { mnRotation = nRotation; }
void setFlip( bool bFlipH, bool bFlipV ) { mbFlipH = bFlipH; mbFlipV = bFlipV; }
@@ -149,23 +149,23 @@ public:
void addShape(
::oox::core::XmlFilterBase& rFilterBase,
const Theme* pTheme,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+ const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const basegfx::B2DHomMatrix& aTransformation,
FillProperties& rShapeOrParentShapeFillProps,
- const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
+ const css::awt::Rectangle* pShapeRect = 0,
ShapeIdMap* pShapeMap = 0 );
void addChildren(
::oox::core::XmlFilterBase& rFilterBase,
const Theme* pTheme,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
+ const css::uno::Reference< css::drawing::XShapes >& rxShapes,
basegfx::B2DHomMatrix& aTransformation,
- const ::com::sun::star::awt::Rectangle* pShapeRect = 0,
+ const css::awt::Rectangle* pShapeRect = 0,
ShapeIdMap* pShapeMap = 0 );
- void setXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rXShape )
+ void setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape )
{ mxShape = rXShape; };
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &
+ const css::uno::Reference< css::drawing::XShape > &
getXShape() const { return mxShape; }
virtual void applyShapeReference( const Shape& rReferencedShape, bool bUseText = true );
@@ -180,10 +180,10 @@ public:
void setWps(bool bWps);
bool getWps() { return mbWps;}
void setTextBox(bool bTextBox);
- const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> &
+ const css::uno::Sequence<css::beans::PropertyValue> &
getDiagramDoms() { return maDiagramDoms; }
- void setDiagramDoms(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
- com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
+ void setDiagramDoms(const css::uno::Sequence<css::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
+ css::uno::Sequence< css::uno::Sequence< css::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
core::XmlFilterBase& rFilter, const OUString& sFragment, const OUString& sType );
void setLinkedTxbxAttributes(const LinkedTxbxAttr& rhs){ maLinkedTxbxAttr = rhs; };
void setTxbxHasLinkedTxtBox( const bool rhs){ mbHasLinkedTxbx = rhs; };
@@ -192,13 +192,13 @@ public:
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+ css::uno::Reference< css::drawing::XShape >
createAndInsert(
::oox::core::XmlFilterBase& rFilterBase,
const OUString& rServiceName,
const Theme* pTheme,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle* pShapeRect,
+ const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+ const css::awt::Rectangle* pShapeRect,
bool bClearText,
bool bDoNotInsertEmptyTextBody,
basegfx::B2DHomMatrix& aTransformation,
@@ -209,35 +209,35 @@ protected:
::oox::core::XmlFilterBase& rFilterBase,
Shape& rMaster,
const Theme* pTheme,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rClientRect,
+ const css::uno::Reference< css::drawing::XShapes >& rxShapes,
+ const css::awt::Rectangle& rClientRect,
ShapeIdMap* pShapeMap,
const basegfx::B2DHomMatrix& aTransformation );
void keepDiagramCompatibilityInfo( ::oox::core::XmlFilterBase& rFilterBase );
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+ css::uno::Reference< css::drawing::XShape >
renderDiagramToGraphic( ::oox::core::XmlFilterBase& rFilterBase );
OUString finalizeServiceName(
::oox::core::XmlFilterBase& rFilter,
const OUString& rServiceName,
- const ::com::sun::star::awt::Rectangle& rShapeRect );
+ const css::awt::Rectangle& rShapeRect );
virtual void finalizeXShape(
::oox::core::XmlFilterBase& rFilter,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes );
+ const css::uno::Reference< css::drawing::XShapes >& rxShapes );
void putPropertyToGrabBag(
- const OUString& sPropertyName, const ::com::sun::star::uno::Any& aPropertyValue );
+ const OUString& sPropertyName, const css::uno::Any& aPropertyValue );
void putPropertyToGrabBag(
- const ::com::sun::star::beans::PropertyValue& pProperty );
+ const css::beans::PropertyValue& pProperty );
void putPropertiesToGrabBag(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties );
+ const css::uno::Sequence< css::beans::PropertyValue >& aProperties );
std::vector< ShapePtr > maChildren; // only used for group shapes
- com::sun::star::awt::Size maChSize; // only used for group shapes
- com::sun::star::awt::Point maChPosition; // only used for group shapes
+ css::awt::Size maChSize; // only used for group shapes
+ css::awt::Point maChPosition; // only used for group shapes
bool mbIsChild;
TextBodyPtr mpTextBody;
@@ -254,20 +254,20 @@ protected:
PropertyMap maShapeProperties;
PropertyMap maDefaultShapeProperties;
TextListStylePtr mpMasterTextListStyle;
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
+ css::uno::Reference< css::drawing::XShape > mxShape;
- OUString msServiceName;
- OUString msName;
- OUString msId;
- sal_Int32 mnSubType; // if this type is not zero, then the shape is a placeholder
- OptValue< sal_Int32 > moSubTypeIndex;
+ OUString msServiceName;
+ OUString msName;
+ OUString msId;
+ sal_Int32 mnSubType; // if this type is not zero, then the shape is a placeholder
+ OptValue< sal_Int32 > moSubTypeIndex;
- ShapeStyleRefMap maShapeStyleRefs;
+ ShapeStyleRefMap maShapeStyleRefs;
- com::sun::star::awt::Size maSize;
- com::sun::star::awt::Point maPosition;
- ::std::vector<OUString> maExtDrawings;
- Color maFontRefColorForNodes;
+ css::awt::Size maSize;
+ css::awt::Point maPosition;
+ ::std::vector<OUString> maExtDrawings;
+ Color maFontRefColorForNodes;
private:
enum FrameType
@@ -299,7 +299,7 @@ private:
LinkedTxbxAttr maLinkedTxbxAttr;
bool mbHasLinkedTxbx; // this text box has linked text box ?
- com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maDiagramDoms;
+ css::uno::Sequence<css::beans::PropertyValue> maDiagramDoms;
};
} }
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index 13e8e507a7a9..abe5505d1740 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -109,33 +109,33 @@ public:
bool hasNamedLineMarkerInTable( const OUString& rMarkerName ) const;
/** Sets the specified shape property to the passed value. */
- bool setAnyProperty( ShapePropertyId ePropId, const ::com::sun::star::uno::Any& rValue );
+ bool setAnyProperty( ShapePropertyId ePropId, const css::uno::Any& rValue );
/** Sets the specified shape property to the passed value. */
template< typename Type >
bool setProperty( ShapePropertyId ePropId, const Type& rValue )
- { return setAnyProperty( ePropId, ::com::sun::star::uno::Any( rValue ) ); }
+ { return setAnyProperty( ePropId, css::uno::Any( rValue ) ); }
using PropertyMap::setAnyProperty;
using PropertyMap::setProperty;
private:
/** Sets an explicit line marker, or creates a named line marker. */
- bool setLineMarker( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+ bool setLineMarker( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit line dash, or creates a named line dash. */
- bool setLineDash( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+ bool setLineDash( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit fill gradient, or creates a named fill gradient. */
- bool setFillGradient( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+ bool setFillGradient( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Creates a named transparency gradient. */
- bool setGradientTrans( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+ bool setGradientTrans( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit fill bitmap URL, or creates a named fill bitmap URL. */
- bool setFillBitmapUrl( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+ bool setFillBitmapUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
/** Sets an explicit fill bitmap URL and pushes the name to FillBitmapName */
- bool setFillBitmapNameFromUrl( sal_Int32 nPropId, const ::com::sun::star::uno::Any& rValue );
+ bool setFillBitmapNameFromUrl( sal_Int32 nPropId, const css::uno::Any& rValue );
// not implemented, to prevent implicit conversion from enum to int
- ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId );
- const ::com::sun::star::uno::Any& operator[]( ShapePropertyId ePropId ) const;
+ css::uno::Any& operator[]( ShapePropertyId ePropId );
+ const css::uno::Any& operator[]( ShapePropertyId ePropId ) const;
private:
ModelObjectHelper& mrModelObjHelper;
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index f97a821ab919..557e9a16248e 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -85,11 +85,10 @@ public:
Shape& getTxDef() { return maTxDef; }
const Shape& getTxDef() const { return maTxDef; }
- void setFragment( const ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
+ void setFragment( const css::uno::Reference< css::xml::dom::XDocument>& xRef ) { mxFragment=xRef; }
private:
- OUString maStyleName;
+ OUString maStyleName;
ClrScheme maClrScheme;
FillStyleList maFillStyleList;
FillStyleList maBgFillStyleList;
@@ -99,8 +98,7 @@ private:
Shape maSpDef;
Shape maLnDef;
Shape maTxDef;
- ::com::sun::star::uno::Reference<
- ::com::sun::star::xml::dom::XDocument> mxFragment;
+ css::uno::Reference< css::xml::dom::XDocument> mxFragment;
};