Kaydet (Commit) c6747ee3 authored tarafından Thorsten Behrens's avatar Thorsten Behrens

Use upper camel case for class names in xmloff.

Align multiimagehelper with module standard.

Change-Id: I70a4dbc66a0d127b9bf04d1e8db694d3526b21d7
üst a94dc220
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
class multiImageImportHelper class MultiImageImportHelper
{ {
private: private:
std::vector< SvXMLImportContextRef* > maImplContextVector; std::vector< SvXMLImportContextRef* > maImplContextVector;
...@@ -37,8 +37,8 @@ protected: ...@@ -37,8 +37,8 @@ protected:
virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const = 0; virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const = 0;
public: public:
multiImageImportHelper(); MultiImageImportHelper();
virtual ~multiImageImportHelper(); virtual ~MultiImageImportHelper();
/// solve multiple imported images. The most valuable one is choosen, /// solve multiple imported images. The most valuable one is choosen,
/// see imlementation for evtl. changing weights and/or adding filetypes. /// see imlementation for evtl. changing weights and/or adding filetypes.
......
...@@ -74,13 +74,13 @@ namespace ...@@ -74,13 +74,13 @@ namespace
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
multiImageImportHelper::multiImageImportHelper() MultiImageImportHelper::MultiImageImportHelper()
: maImplContextVector(), : maImplContextVector(),
mbSupportsMultipleContents(false) mbSupportsMultipleContents(false)
{ {
} }
multiImageImportHelper::~multiImageImportHelper() MultiImageImportHelper::~MultiImageImportHelper()
{ {
while(!maImplContextVector.empty()) while(!maImplContextVector.empty())
{ {
...@@ -89,7 +89,7 @@ multiImageImportHelper::~multiImageImportHelper() ...@@ -89,7 +89,7 @@ multiImageImportHelper::~multiImageImportHelper()
} }
} }
const SvXMLImportContext* multiImageImportHelper::solveMultipleImages() const SvXMLImportContext* MultiImageImportHelper::solveMultipleImages()
{ {
const SvXMLImportContext* pContext(0); const SvXMLImportContext* pContext(0);
if(maImplContextVector.size() > 1) if(maImplContextVector.size() > 1)
...@@ -137,7 +137,7 @@ const SvXMLImportContext* multiImageImportHelper::solveMultipleImages() ...@@ -137,7 +137,7 @@ const SvXMLImportContext* multiImageImportHelper::solveMultipleImages()
return pContext; return pContext;
} }
void multiImageImportHelper::addContent(const SvXMLImportContext& rSvXMLImportContext) void MultiImageImportHelper::addContent(const SvXMLImportContext& rSvXMLImportContext)
{ {
if(dynamic_cast< const SvXMLImportContext* >(&rSvXMLImportContext)) if(dynamic_cast< const SvXMLImportContext* >(&rSvXMLImportContext))
{ {
......
...@@ -3347,7 +3347,7 @@ SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 ...@@ -3347,7 +3347,7 @@ SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes,
sal_Bool bTemporaryShape) sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ), : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
multiImageImportHelper(), MultiImageImportHelper(),
mbSupportsReplacement( sal_False ), mbSupportsReplacement( sal_False ),
mxImplContext(), mxImplContext(),
mxReplImplContext() mxReplImplContext()
......
...@@ -570,7 +570,7 @@ public: ...@@ -570,7 +570,7 @@ public:
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// draw:-frame // draw:-frame
class SdXMLFrameShapeContext : public SdXMLShapeContext, public multiImageImportHelper class SdXMLFrameShapeContext : public SdXMLShapeContext, public MultiImageImportHelper
{ {
private: private:
sal_Bool mbSupportsReplacement; sal_Bool mbSupportsReplacement;
......
...@@ -1333,7 +1333,7 @@ XMLTextFrameContext::XMLTextFrameContext( ...@@ -1333,7 +1333,7 @@ XMLTextFrameContext::XMLTextFrameContext(
const Reference< XAttributeList > & xAttrList, const Reference< XAttributeList > & xAttrList,
TextContentAnchorType eATyp ) TextContentAnchorType eATyp )
: SvXMLImportContext( rImport, nPrfx, rLName ) : SvXMLImportContext( rImport, nPrfx, rLName )
, multiImageImportHelper() , MultiImageImportHelper()
, m_xAttrList( new SvXMLAttributeList( xAttrList ) ) , m_xAttrList( new SvXMLAttributeList( xAttrList ) )
, m_pHyperlink( 0 ) , m_pHyperlink( 0 )
// Implement Title/Description Elements UI (#i73249#) // Implement Title/Description Elements UI (#i73249#)
......
...@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { ...@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star {
class XMLTextFrameContextHyperlink_Impl; class XMLTextFrameContextHyperlink_Impl;
class XMLTextFrameContext : public SvXMLImportContext, public multiImageImportHelper class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHelper
{ {
::com::sun::star::uno::Reference< ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > m_xAttrList; ::com::sun::star::xml::sax::XAttributeList > m_xAttrList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment