diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2013-05-15 09:31:38 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2013-05-15 11:23:06 +0200 |
commit | 732be8f926c2f7f41317b4ce8ff7315ee23e0c40 (patch) | |
tree | 8f973185790ade3f0174157006f1fd88f44f0afb /xmloff | |
parent | 7f8ef6795e57713c802d74b4532f9c0addd9b479 (diff) |
Use upper camel case for class names in xmloff.
Align multiimagehelper with module standard.
Change-Id: I70a4dbc66a0d127b9bf04d1e8db694d3526b21d7
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/xmloff/xmlmultiimagehelper.hxx | 6 | ||||
-rw-r--r-- | xmloff/source/core/xmlmultiimagehelper.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextFrameContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextFrameContext.hxx | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx index c806dd69b8de..3d7d64784e82 100644 --- a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx +++ b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx @@ -25,7 +25,7 @@ ////////////////////////////////////////////////////////////////////////////// -class multiImageImportHelper +class MultiImageImportHelper { private: std::vector< SvXMLImportContextRef* > maImplContextVector; @@ -37,8 +37,8 @@ protected: virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const = 0; public: - multiImageImportHelper(); - virtual ~multiImageImportHelper(); + MultiImageImportHelper(); + virtual ~MultiImageImportHelper(); /// solve multiple imported images. The most valuable one is choosen, /// see imlementation for evtl. changing weights and/or adding filetypes. diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx index 16b930213cff..b8cb4a66eb3b 100644 --- a/xmloff/source/core/xmlmultiimagehelper.cxx +++ b/xmloff/source/core/xmlmultiimagehelper.cxx @@ -74,13 +74,13 @@ namespace ////////////////////////////////////////////////////////////////////////////// -multiImageImportHelper::multiImageImportHelper() +MultiImageImportHelper::MultiImageImportHelper() : maImplContextVector(), mbSupportsMultipleContents(false) { } -multiImageImportHelper::~multiImageImportHelper() +MultiImageImportHelper::~MultiImageImportHelper() { while(!maImplContextVector.empty()) { @@ -89,7 +89,7 @@ multiImageImportHelper::~multiImageImportHelper() } } -const SvXMLImportContext* multiImageImportHelper::solveMultipleImages() +const SvXMLImportContext* MultiImageImportHelper::solveMultipleImages() { const SvXMLImportContext* pContext(0); if(maImplContextVector.size() > 1) @@ -133,7 +133,7 @@ const SvXMLImportContext* multiImageImportHelper::solveMultipleImages() return pContext; } -void multiImageImportHelper::addContent(const SvXMLImportContext& rSvXMLImportContext) +void MultiImageImportHelper::addContent(const SvXMLImportContext& rSvXMLImportContext) { if(dynamic_cast< const SvXMLImportContext* >(&rSvXMLImportContext)) { diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 430a5d2f2872..e4a07c9372e2 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3349,7 +3349,7 @@ SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, sal_Bool bTemporaryShape) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), - multiImageImportHelper(), + MultiImageImportHelper(), mbSupportsReplacement( sal_False ), mxImplContext(), mxReplImplContext() diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 56c428c55188..4fc9120a8cb8 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -569,7 +569,7 @@ public: ////////////////////////////////////////////////////////////////////////////// // draw:-frame -class SdXMLFrameShapeContext : public SdXMLShapeContext, public multiImageImportHelper +class SdXMLFrameShapeContext : public SdXMLShapeContext, public MultiImageImportHelper { private: sal_Bool mbSupportsReplacement; diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 6e8fc2e2eff7..c850e67ca405 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -1342,7 +1342,7 @@ XMLTextFrameContext::XMLTextFrameContext( const Reference< XAttributeList > & xAttrList, TextContentAnchorType eATyp ) : SvXMLImportContext( rImport, nPrfx, rLName ) -, multiImageImportHelper() +, MultiImageImportHelper() , m_xAttrList( new SvXMLAttributeList( xAttrList ) ) , m_pHyperlink( 0 ) // Implement Title/Description Elements UI (#i73249#) diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index 2a4adfb0651a..e3da71b97bff 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { class XMLTextFrameContextHyperlink_Impl; -class XMLTextFrameContext : public SvXMLImportContext, public multiImageImportHelper +class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHelper { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xAttrList; |