summaryrefslogtreecommitdiff
path: root/include/oox/ppt
diff options
context:
space:
mode:
Diffstat (limited to 'include/oox/ppt')
-rw-r--r--include/oox/ppt/animationspersist.hxx19
-rw-r--r--include/oox/ppt/comments.hxx4
-rw-r--r--include/oox/ppt/dgmimport.hxx2
-rw-r--r--include/oox/ppt/dgmlayout.hxx2
-rw-r--r--include/oox/ppt/pptimport.hxx8
-rw-r--r--include/oox/ppt/pptshape.hxx4
-rw-r--r--include/oox/ppt/presentationfragmenthandler.hxx4
-rw-r--r--include/oox/ppt/slidepersist.hxx22
-rw-r--r--include/oox/ppt/slidetransition.hxx2
-rw-r--r--include/oox/ppt/timenode.hxx16
-rw-r--r--include/oox/ppt/timenodelistcontext.hxx4
11 files changed, 43 insertions, 44 deletions
diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx
index 2b27736b6dc4..72187269c90b 100644
--- a/include/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
@@ -48,7 +48,7 @@ namespace oox { namespace ppt {
_NP_SIZE
};
- typedef boost::array< ::com::sun::star::uno::Any, _NP_SIZE > NodePropertyMap;
+ typedef boost::array< css::uno::Any, _NP_SIZE > NodePropertyMap;
/** data for CT_TLShapeTargetElement */
@@ -60,7 +60,7 @@ namespace oox { namespace ppt {
{
maRange.start = maRange.end = 0;
}
- void convert( ::com::sun::star::uno::Any & aAny, sal_Int16 & rSubType ) const;
+ void convert( css::uno::Any & aAny, sal_Int16 & rSubType ) const;
sal_Int32 mnType;
sal_Int32 mnRangeType;
@@ -76,12 +76,11 @@ namespace oox { namespace ppt {
: mnType( 0 )
{}
/** convert to a set of properties */
- ::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
+ css::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
sal_Int32 mnType;
- OUString msValue;
-
- ShapeTargetElement maShapeTarget;
+ OUString msValue;
+ ShapeTargetElement maShapeTarget;
};
typedef std::shared_ptr< AnimTargetElement > AnimTargetElementPtr;
@@ -97,12 +96,12 @@ namespace oox { namespace ppt {
: mnType( 0 )
{}
- ::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide) const;
- static ::com::sun::star::uno::Any convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l);
+ css::uno::Any convert(const SlidePersistPtr & pSlide) const;
+ static css::uno::Any convertList(const SlidePersistPtr & pSlide, const AnimationConditionList & l);
AnimTargetElementPtr & getTarget()
{ if(!mpTarget) mpTarget.reset( new AnimTargetElement ); return mpTarget; }
- ::com::sun::star::uno::Any maValue;
+ css::uno::Any maValue;
sal_Int32 mnType;
private:
AnimTargetElementPtr mpTarget;
@@ -113,7 +112,7 @@ namespace oox { namespace ppt {
{
OUString msFormula;
OUString msTime;
- ::com::sun::star::uno::Any maValue;
+ css::uno::Any maValue;
};
typedef ::std::list< TimeAnimationValue > TimeAnimationValueList;
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index cf3846bc5063..6766df27870c 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -50,7 +50,7 @@ class Comment
OUString x;
OUString y;
OUString text;
- ::com::sun::star::util::DateTime aDateTime;
+ css::util::DateTime aDateTime;
void setDateTime (const OUString& datetime);
@@ -81,7 +81,7 @@ class Comment
{
return text;
}
- ::com::sun::star::util::DateTime getDateTime()
+ css::util::DateTime getDateTime()
{
return aDateTime;
}
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index cee93767fd68..531ab6c2dea8 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -37,7 +37,7 @@ class QuickDiagrammingImport : public oox::core::XmlFilterBase
{
public:
- QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+ QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// from FilterBase
virtual bool importDocument() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index 4df5c154de22..9dcd8ae6fda9 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -37,7 +37,7 @@ class QuickDiagrammingLayout : public oox::core::XmlFilterBase
{
public:
- QuickDiagrammingLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
+ QuickDiagrammingLayout( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
// from FilterBase
virtual bool importDocument() throw (css::uno::RuntimeException) override;
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 476a402a98f0..9908177ea9f4 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -37,8 +37,8 @@ class PowerPointImport : public oox::core::XmlFilterBase
{
public:
- PowerPointImport( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext )
- throw( ::com::sun::star::uno::RuntimeException );
+ PowerPointImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
+ throw( css::uno::RuntimeException );
virtual ~PowerPointImport();
// from FilterBase
@@ -57,8 +57,8 @@ public:
std::vector< SlidePersistPtr >& getMasterPages(){ return maMasterPages; };
std::vector< SlidePersistPtr >& getNotesPages(){ return maNotesPages; };
- virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& rDescriptor )
+ throw( css::uno::RuntimeException, std::exception ) override;
sal_Int32 getSchemeColor( sal_Int32 nToken ) const;
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index 852b92f36f30..f4d0798257f1 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -44,9 +44,9 @@ public:
oox::core::XmlFilterBase& rFilterBase,
SlidePersist& rPersist,
const oox::drawingml::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,
::oox::drawingml::ShapeIdMap* pShapeMap = 0 );
virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override;
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index c476c67ae091..f745f2eab4d2 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -55,8 +55,8 @@ private:
std::vector< OUString > maNotesMasterVector;
::oox::drawingml::TextListStylePtr mpTextListStyle;
- ::com::sun::star::awt::Size maSlideSize;
- ::com::sun::star::awt::Size maNotesSize;
+ css::awt::Size maSlideSize;
+ css::awt::Size maNotesSize;
std::vector< CustomShow > maCustomShowList;
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index a97ede8906eb..3c08f6865438 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -55,14 +55,14 @@ class SlidePersist : public std::enable_shared_from_this< SlidePersist >
public:
SlidePersist( oox::core::XmlFilterBase& rFilter, bool bMaster, bool bNotes,
- const com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >&,
+ const css::uno::Reference< css::drawing::XDrawPage >&,
oox::drawingml::ShapePtr pShapesPtr, const ::oox::drawingml::TextListStylePtr & );
~SlidePersist();
- com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > getPage() const { return mxPage; };
+ css::uno::Reference< css::drawing::XDrawPage > getPage() const { return mxPage; };
#if OSL_DEBUG_LEVEL > 0
- static com::sun::star::uno::WeakReference< com::sun::star::drawing::XDrawPage > mxDebugPage;
+ static css::uno::WeakReference< css::drawing::XDrawPage > mxDebugPage;
#endif
void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
@@ -109,7 +109,7 @@ public:
void createBackground( const oox::core::XmlFilterBase& rFilterBase );
void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase );
- std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
+ std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
::oox::drawingml::ShapePtr getShape( const OUString & id ) { return maShapeMap[ id ]; }
::oox::drawingml::ShapeIdMap& getShapeMap() { return maShapeMap; }
@@ -117,10 +117,10 @@ public:
CommentAuthorList& getCommentAuthors() { return maCommentAuthors; }
private:
- OUString maPath;
- OUString maLayoutPath;
- std::shared_ptr< oox::vml::Drawing > mpDrawingPtr;
- com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxPage;
+ OUString maPath;
+ OUString maLayoutPath;
+ std::shared_ptr< oox::vml::Drawing > mpDrawingPtr;
+ css::uno::Reference< css::drawing::XDrawPage > mxPage;
oox::drawingml::ThemePtr mpThemePtr; // the theme that is used
oox::drawingml::ClrSchemePtr mpClrSchemePtr; // the local color scheme (if any)
oox::drawingml::ClrMapPtr mpClrMapPtr; // color mapping (if any)
@@ -129,7 +129,7 @@ private:
oox::drawingml::ShapePtr maShapesPtr;
oox::drawingml::Color maBackgroundColor;
oox::drawingml::FillPropertiesPtr mpBackgroundPropertiesPtr;
- ::std::list< std::shared_ptr< TimeNode > > maTimeNodeList;
+ ::std::list< std::shared_ptr< TimeNode > > maTimeNodeList;
oox::ppt::HeaderFooter maHeaderFooter;
sal_Int32 mnLayoutValueToken;
@@ -142,8 +142,8 @@ private:
oox::drawingml::TextListStylePtr maNotesTextStylePtr;
oox::drawingml::TextListStylePtr maOtherTextStylePtr;
- std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap;
- std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
+ std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > > maAnimNodesMap;
+ std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
// slide comments
CommentList maCommentsList;
diff --git a/include/oox/ppt/slidetransition.hxx b/include/oox/ppt/slidetransition.hxx
index 9e48dde82f29..b0e235189af3 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -36,7 +36,7 @@ namespace oox { namespace ppt {
explicit SlideTransition(const OUString & );
void setSlideProperties( PropertyMap& props );
- void setTransitionFilterProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > & xFilter );
+ void setTransitionFilterProperties( const css::uno::Reference< css::animations::XTransitionFilter > & xFilter );
void setOoxTransitionSpeed( sal_Int32 nToken );
void setMode( bool bMode )
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index 9e671c85118e..c04d4f526deb 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -44,7 +44,7 @@ namespace oox { namespace ppt {
class TimeNode
{
public:
- typedef ::std::map< OUString, ::com::sun::star::uno::Any > UserDataMap;
+ typedef ::std::map< OUString, css::uno::Any > UserDataMap;
TimeNode( sal_Int16 nNodeType );
virtual ~TimeNode();
@@ -58,18 +58,18 @@ namespace oox { namespace ppt {
void addNode(
const ::oox::core::XmlFilterBase& rFilter,
- const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode,
+ const css::uno::Reference< css::animations::XAnimationNode >& rxNode,
const SlidePersistPtr & slide);
// data setters
- void setTo( const ::com::sun::star::uno::Any & aTo );
- void setFrom( const ::com::sun::star::uno::Any & aFrom );
- void setBy( const ::com::sun::star::uno::Any & aBy );
+ void setTo( const css::uno::Any & aTo );
+ void setFrom( const css::uno::Any & aFrom );
+ void setBy( const css::uno::Any & aBy );
void setTransitionFilter( const SlideTransition & aTransition)
{ maTransitionFilter = aTransition; }
void setNode(
const ::oox::core::XmlFilterBase& rFilter,
- const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode,
+ const css::uno::Reference< css::animations::XAnimationNode >& xNode,
const SlidePersistPtr & pSlide );
AnimTargetElementPtr getTarget()
@@ -93,11 +93,11 @@ namespace oox { namespace ppt {
static OUString getServiceName( sal_Int16 nNodeType );
- static ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
+ static css::uno::Reference< css::animations::XAnimationNode >
createAndInsert(
const ::oox::core::XmlFilterBase& rFilter,
const OUString& rServiceName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode );
+ const css::uno::Reference< css::animations::XAnimationNode >& rxNode );
private:
const sal_Int16 mnNodeType;
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 1656234c6844..af0d6f6cba07 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -33,10 +33,10 @@ namespace oox { namespace ppt {
public:
virtual ~TimeNodeContext() throw();
- static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
+ static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
protected:
- TimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
+ TimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
sal_Int32 mnElement;
TimeNodePtr mpNode;
generated by cgit (git 2.34.1) at 2024-07-11 08:05:41 +0000