summaryrefslogtreecommitdiff
path: root/oox/inc/oox/ppt
diff options
context:
space:
mode:
Diffstat (limited to 'oox/inc/oox/ppt')
-rw-r--r--oox/inc/oox/ppt/animationspersist.hxx8
-rw-r--r--oox/inc/oox/ppt/comments.hxx48
-rw-r--r--oox/inc/oox/ppt/customshowlistcontext.hxx6
-rw-r--r--oox/inc/oox/ppt/dgmimport.hxx2
-rw-r--r--oox/inc/oox/ppt/dgmlayout.hxx2
-rw-r--r--oox/inc/oox/ppt/layoutfragmenthandler.hxx2
-rw-r--r--oox/inc/oox/ppt/pptimport.hxx8
-rw-r--r--oox/inc/oox/ppt/presentationfragmenthandler.hxx8
-rw-r--r--oox/inc/oox/ppt/slidefragmenthandler.hxx10
-rw-r--r--oox/inc/oox/ppt/slidepersist.hxx20
-rw-r--r--oox/inc/oox/ppt/slidetransition.hxx2
-rw-r--r--oox/inc/oox/ppt/soundactioncontext.hxx6
-rw-r--r--oox/inc/oox/ppt/timenode.hxx10
13 files changed, 66 insertions, 66 deletions
diff --git a/oox/inc/oox/ppt/animationspersist.hxx b/oox/inc/oox/ppt/animationspersist.hxx
index 50908a7ffd7a..ba63991def2a 100644
--- a/oox/inc/oox/ppt/animationspersist.hxx
+++ b/oox/inc/oox/ppt/animationspersist.hxx
@@ -62,7 +62,7 @@ namespace oox { namespace ppt {
sal_Int32 mnType;
sal_Int32 mnRangeType;
drawingml::IndexRange maRange;
- ::rtl::OUString msSubShapeId;
+ OUString msSubShapeId;
};
@@ -76,7 +76,7 @@ namespace oox { namespace ppt {
::com::sun::star::uno::Any convert(const SlidePersistPtr & pSlide, sal_Int16 & nSubType) const;
sal_Int32 mnType;
- ::rtl::OUString msValue;
+ OUString msValue;
ShapeTargetElement maShapeTarget;
};
@@ -108,8 +108,8 @@ namespace oox { namespace ppt {
struct TimeAnimationValue
{
- ::rtl::OUString msFormula;
- ::rtl::OUString msTime;
+ OUString msFormula;
+ OUString msTime;
::com::sun::star::uno::Any maValue;
};
diff --git a/oox/inc/oox/ppt/comments.hxx b/oox/inc/oox/ppt/comments.hxx
index fe718db36efa..1095cd0223db 100644
--- a/oox/inc/oox/ppt/comments.hxx
+++ b/oox/inc/oox/ppt/comments.hxx
@@ -18,11 +18,11 @@ namespace oox { namespace ppt {
struct CommentAuthor
{
- ::rtl::OUString clrIdx;
- ::rtl::OUString id;
- ::rtl::OUString initials;
- ::rtl::OUString lastIdx;
- ::rtl::OUString name;
+ OUString clrIdx;
+ OUString id;
+ OUString initials;
+ OUString lastIdx;
+ OUString name;
};
class CommentAuthorList
@@ -49,60 +49,60 @@ class CommentAuthorList
class Comment
{
private:
- ::rtl::OUString authorId;
- ::rtl::OUString dt;
- ::rtl::OUString idx;
- ::rtl::OUString x;
- ::rtl::OUString y;
- ::rtl::OUString text;
+ OUString authorId;
+ OUString dt;
+ OUString idx;
+ OUString x;
+ OUString y;
+ OUString text;
::com::sun::star::util::DateTime aDateTime;
- void setDateTime (::rtl::OUString datetime);
+ void setDateTime (OUString datetime);
public:
- void setAuthorId(const ::rtl::OUString& _aId)
+ void setAuthorId(const OUString& _aId)
{
authorId = _aId;
}
- void setdt(const ::rtl::OUString& _dt)
+ void setdt(const OUString& _dt)
{
dt=_dt;
setDateTime(_dt);
}
- void setidx(const ::rtl::OUString& _idx)
+ void setidx(const OUString& _idx)
{
idx=_idx;
}
- void setPoint(const ::rtl::OUString& _x, const ::rtl::OUString& _y)
+ void setPoint(const OUString& _x, const OUString& _y)
{
x=_x;
y=_y;
}
- void setText(const rtl::OUString& _text)
+ void setText(const OUString& _text)
{
text = _text;
}
- ::rtl::OUString getAuthorId()
+ OUString getAuthorId()
{
return authorId;
}
- ::rtl::OUString getdt()
+ OUString getdt()
{
return dt;
}
- ::rtl::OUString getidx()
+ OUString getidx()
{
return idx;
}
- ::rtl::OUString get_X()
+ OUString get_X()
{
return x;
}
- ::rtl::OUString get_Y()
+ OUString get_Y()
{
return y;
}
- ::rtl::OUString get_text()
+ OUString get_text()
{
return text;
}
@@ -118,7 +118,7 @@ class Comment
{
return y.toInt32();
}
- ::rtl::OUString getAuthor ( const CommentAuthorList& list );
+ OUString getAuthor ( const CommentAuthorList& list );
};
class CommentList
diff --git a/oox/inc/oox/ppt/customshowlistcontext.hxx b/oox/inc/oox/ppt/customshowlistcontext.hxx
index 5266c1ba8a45..ed913c8bbe2c 100644
--- a/oox/inc/oox/ppt/customshowlistcontext.hxx
+++ b/oox/inc/oox/ppt/customshowlistcontext.hxx
@@ -28,9 +28,9 @@ namespace oox { namespace ppt {
struct CustomShow
{
- ::rtl::OUString maName;
- ::rtl::OUString mnId;
- std::vector< rtl::OUString >maSldLst;
+ OUString maName;
+ OUString mnId;
+ std::vector< OUString >maSldLst;
};
/** CT_ */
diff --git a/oox/inc/oox/ppt/dgmimport.hxx b/oox/inc/oox/ppt/dgmimport.hxx
index 4881ca14db2f..f369c5e526b8 100644
--- a/oox/inc/oox/ppt/dgmimport.hxx
+++ b/oox/inc/oox/ppt/dgmimport.hxx
@@ -51,7 +51,7 @@ public:
virtual oox::drawingml::chart::ChartConverter* getChartConverter();
private:
- virtual ::rtl::OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const;
virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
};
diff --git a/oox/inc/oox/ppt/dgmlayout.hxx b/oox/inc/oox/ppt/dgmlayout.hxx
index 0657871925fd..bf964fe5d310 100644
--- a/oox/inc/oox/ppt/dgmlayout.hxx
+++ b/oox/inc/oox/ppt/dgmlayout.hxx
@@ -51,7 +51,7 @@ public:
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
private:
- virtual ::rtl::OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const;
virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
drawingml::ThemePtr mpThemePtr;
};
diff --git a/oox/inc/oox/ppt/layoutfragmenthandler.hxx b/oox/inc/oox/ppt/layoutfragmenthandler.hxx
index 8f1ca06677f8..80983182b73d 100644
--- a/oox/inc/oox/ppt/layoutfragmenthandler.hxx
+++ b/oox/inc/oox/ppt/layoutfragmenthandler.hxx
@@ -29,7 +29,7 @@ namespace oox { namespace ppt {
class LayoutFragmentHandler : public SlideFragmentHandler
{
public:
- LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw();
+ LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw();
virtual ~LayoutFragmentHandler() throw();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
diff --git a/oox/inc/oox/ppt/pptimport.hxx b/oox/inc/oox/ppt/pptimport.hxx
index 1a99b6eab046..035ea8cdc5c1 100644
--- a/oox/inc/oox/ppt/pptimport.hxx
+++ b/oox/inc/oox/ppt/pptimport.hxx
@@ -51,7 +51,7 @@ public:
virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; };
- std::map< rtl::OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; };
+ std::map< OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; };
std::vector< SlidePersistPtr >& getDrawPages(){ return maDrawPages; };
std::vector< SlidePersistPtr >& getMasterPages(){ return maMasterPages; };
std::vector< SlidePersistPtr >& getNotesPages(){ return maNotesPages; };
@@ -68,14 +68,14 @@ public:
private:
virtual GraphicHelper* implCreateGraphicHelper() const;
virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
- virtual ::rtl::OUString implGetImplementationName() const;
+ virtual OUString implGetImplementationName() const;
private:
- rtl::OUString maTableStyleListPath;
+ OUString maTableStyleListPath;
oox::drawingml::table::TableStyleListPtr mpTableStyleList;
SlidePersistPtr mpActualSlidePersist;
- std::map< rtl::OUString, oox::drawingml::ThemePtr > maThemes;
+ std::map< OUString, oox::drawingml::ThemePtr > maThemes;
std::vector< SlidePersistPtr > maDrawPages;
std::vector< SlidePersistPtr > maMasterPages;
diff --git a/oox/inc/oox/ppt/presentationfragmenthandler.hxx b/oox/inc/oox/ppt/presentationfragmenthandler.hxx
index f6d0feb0897e..ae26cb233e8c 100644
--- a/oox/inc/oox/ppt/presentationfragmenthandler.hxx
+++ b/oox/inc/oox/ppt/presentationfragmenthandler.hxx
@@ -38,7 +38,7 @@ namespace oox { namespace ppt {
class PresentationFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
- PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath ) throw();
+ PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw();
virtual ~PresentationFragmentHandler() throw();
virtual void finalizeImport();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
@@ -51,9 +51,9 @@ private:
void importSlide(sal_uInt32 nSlide, sal_Bool bFirstSlide, sal_Bool bImportNotes);
- std::vector< rtl::OUString > maSlideMasterVector;
- std::vector< rtl::OUString > maSlidesVector;
- std::vector< rtl::OUString > maNotesMasterVector;
+ std::vector< OUString > maSlideMasterVector;
+ std::vector< OUString > maSlidesVector;
+ std::vector< OUString > maNotesMasterVector;
::oox::drawingml::TextListStylePtr mpTextListStyle;
::com::sun::star::awt::Size maSlideSize;
diff --git a/oox/inc/oox/ppt/slidefragmenthandler.hxx b/oox/inc/oox/ppt/slidefragmenthandler.hxx
index b3a9c6745e87..045f6ff1ccda 100644
--- a/oox/inc/oox/ppt/slidefragmenthandler.hxx
+++ b/oox/inc/oox/ppt/slidefragmenthandler.hxx
@@ -34,23 +34,23 @@ namespace oox { namespace ppt {
class SlideFragmentHandler : public ::oox::core::FragmentHandler2
{
public:
- SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw();
+ SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw();
virtual ~SlideFragmentHandler() throw();
virtual void finalizeImport();
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs );
- virtual void onCharacters( const ::rtl::OUString& rChars );
+ virtual void onCharacters( const OUString& rChars );
- const ::std::vector< rtl::OUString>& getCharVector() { return maCharVector; }
+ const ::std::vector< OUString>& getCharVector() { return maCharVector; }
protected:
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
private:
- ::rtl::OUString maSlideName;
+ OUString maSlideName;
PropertyMap maSlideProperties;
- ::std::vector< rtl::OUString> maCharVector; // handle char in OnCharacters
+ ::std::vector< OUString> maCharVector; // handle char in OnCharacters
};
} }
diff --git a/oox/inc/oox/ppt/slidepersist.hxx b/oox/inc/oox/ppt/slidepersist.hxx
index 10274117b678..6f58d81813c3 100644
--- a/oox/inc/oox/ppt/slidepersist.hxx
+++ b/oox/inc/oox/ppt/slidepersist.hxx
@@ -70,11 +70,11 @@ public:
void setMasterPersist( SlidePersistPtr pMasterPersistPtr ){ mpMasterPagePtr = pMasterPersistPtr; }
SlidePersistPtr getMasterPersist() const { return mpMasterPagePtr; }
- void setPath( const rtl::OUString& rPath ) { maPath = rPath; }
- const rtl::OUString getPath() const { return maPath; }
+ void setPath( const OUString& rPath ) { maPath = rPath; }
+ const OUString getPath() const { return maPath; }
- void setLayoutPath( const rtl::OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; }
- const rtl::OUString getLayoutPath() const { return maLayoutPath; }
+ void setLayoutPath( const OUString& rLayoutPath ) { maLayoutPath = rLayoutPath; }
+ const OUString getLayoutPath() const { return maLayoutPath; }
void setTheme( const oox::drawingml::ThemePtr pThemePtr ){ mpThemePtr = pThemePtr; }
oox::drawingml::ThemePtr getTheme() const { return mpThemePtr; }
@@ -113,16 +113,16 @@ public:
void createBackground( const oox::core::XmlFilterBase& rFilterBase );
void applyTextStyles( const oox::core::XmlFilterBase& rFilterBase );
- std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
- ::oox::drawingml::ShapePtr getShape( const ::rtl::OUString & id ) { return maShapeMap[ id ]; }
+ std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > >& getAnimNodesMap() { return maAnimNodesMap; };
+ ::oox::drawingml::ShapePtr getShape( const OUString & id ) { return maShapeMap[ id ]; }
::oox::drawingml::ShapeIdMap& getShapeMap() { return maShapeMap; }
CommentList& getCommentsList() { return maCommentsList; }
CommentAuthorList& getCommentAuthors() { return maCommentAuthors; }
private:
- rtl::OUString maPath;
- rtl::OUString maLayoutPath;
+ OUString maPath;
+ OUString maLayoutPath;
::boost::shared_ptr< oox::vml::Drawing > mpDrawingPtr;
com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxPage;
oox::drawingml::ThemePtr mpThemePtr; // the theme that is used
@@ -146,8 +146,8 @@ private:
oox::drawingml::TextListStylePtr maNotesTextStylePtr;
oox::drawingml::TextListStylePtr maOtherTextStylePtr;
- std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap;
- std::map< ::rtl::OUString, ::oox::drawingml::ShapePtr > maShapeMap;
+ std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > > maAnimNodesMap;
+ std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
// slide comments
CommentList maCommentsList;
diff --git a/oox/inc/oox/ppt/slidetransition.hxx b/oox/inc/oox/ppt/slidetransition.hxx
index f940b39a68fa..01f701d63dfe 100644
--- a/oox/inc/oox/ppt/slidetransition.hxx
+++ b/oox/inc/oox/ppt/slidetransition.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace ppt {
{
public:
SlideTransition();
- explicit SlideTransition(const ::rtl::OUString & );
+ explicit SlideTransition(const OUString & );
void setSlideProperties( PropertyMap& props );
void setTransitionFilterProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTransitionFilter > & xFilter );
diff --git a/oox/inc/oox/ppt/soundactioncontext.hxx b/oox/inc/oox/ppt/soundactioncontext.hxx
index a393e5857e04..d1f1040c75ba 100644
--- a/oox/inc/oox/ppt/soundactioncontext.hxx
+++ b/oox/inc/oox/ppt/soundactioncontext.hxx
@@ -41,9 +41,9 @@ private:
bool mbHasStartSound;
bool mbLoopSound;
bool mbStopSound;
- ::rtl::OUString msEmbedded;
- ::rtl::OUString msLink;
- ::rtl::OUString msSndName;
+ OUString msEmbedded;
+ OUString msLink;
+ OUString msSndName;
};
} }
diff --git a/oox/inc/oox/ppt/timenode.hxx b/oox/inc/oox/ppt/timenode.hxx
index cd66c234392f..769cc0e03943 100644
--- a/oox/inc/oox/ppt/timenode.hxx
+++ b/oox/inc/oox/ppt/timenode.hxx
@@ -45,7 +45,7 @@ namespace oox { namespace ppt {
class TimeNode
{
public:
- typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > UserDataMap;
+ typedef ::std::map< OUString, ::com::sun::star::uno::Any > UserDataMap;
TimeNode( sal_Int16 nNodeType );
virtual ~TimeNode();
@@ -59,7 +59,7 @@ namespace oox { namespace ppt {
{ return maChildren; }
void setId( sal_Int32 nId );
- const ::rtl::OUString & getId() const { return msId; }
+ const OUString & getId() const { return msId; }
void addNode(
const ::oox::core::XmlFilterBase& rFilter,
@@ -96,12 +96,12 @@ namespace oox { namespace ppt {
{ mbHasEndSyncValue = true; return maEndSyncValue; }
protected:
- static rtl::OUString getServiceName( sal_Int16 nNodeType );
+ static OUString getServiceName( sal_Int16 nNodeType );
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
createAndInsert(
const ::oox::core::XmlFilterBase& rFilter,
- const rtl::OUString& rServiceName,
+ const OUString& rServiceName,
const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rxNode );
private:
@@ -109,7 +109,7 @@ namespace oox { namespace ppt {
TimeNodePtrList maChildren;
- rtl::OUString msId;
+ OUString msId;
NodePropertyMap maNodeProperties;
UserDataMap maUserData; // a sequence to be stored as "UserData" property
SlideTransition maTransitionFilter;