summaryrefslogtreecommitdiff
path: root/xmloff/source/draw
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r--xmloff/source/draw/EnhancedCustomShapeToken.cxx4
-rw-r--r--xmloff/source/draw/XMLGraphicsDefaultStyle.cxx4
-rw-r--r--xmloff/source/draw/XMLImageMapContext.cxx9
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx7
-rw-r--r--xmloff/source/draw/animationimport.cxx4
-rw-r--r--xmloff/source/draw/animexp.cxx12
-rw-r--r--xmloff/source/draw/animimp.cxx3
-rw-r--r--xmloff/source/draw/eventimp.cxx3
-rw-r--r--xmloff/source/draw/layerimp.cxx4
-rw-r--r--xmloff/source/draw/sdpropls.cxx19
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx12
-rw-r--r--xmloff/source/draw/shapeimport.cxx12
-rw-r--r--xmloff/source/draw/xexptran.cxx8
-rw-r--r--xmloff/source/draw/ximppage.cxx8
-rw-r--r--xmloff/source/draw/ximpstyl.cxx6
15 files changed, 108 insertions, 7 deletions
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 6e65cabbde7e..3abca04a50db 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -32,12 +32,16 @@ static ::osl::Mutex& getHashMapMutex()
return s_aHashMapProtection;
}
+namespace {
+
struct TokenTable
{
const char* pS;
EnhancedCustomShapeTokenEnum const pE;
};
+}
+
static const TokenTable pTokenTableArray[] =
{
{ "type", EAS_type },
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index e502f4ea1aee..dc0b67f4ad9b 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -84,6 +84,8 @@ SvXMLImportContextRef XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nP
return xContext;
}
+namespace {
+
struct XMLPropertyByIndex {
sal_Int32 const m_nIndex;
explicit XMLPropertyByIndex(sal_Int32 const nIndex) : m_nIndex(nIndex) {}
@@ -92,6 +94,8 @@ struct XMLPropertyByIndex {
}
};
+}
+
// This method is called for every default style
void XMLGraphicsDefaultStyle::SetDefaults()
{
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 40d5a8f0d6db..e40be35d9969 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -94,6 +94,7 @@ static const SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
XML_TOKEN_MAP_END
};
+namespace {
class XMLImageMapObjectContext : public SvXMLImportContext
{
@@ -141,6 +142,7 @@ protected:
css::uno::Reference<css::beans::XPropertySet> & rPropertySet);
};
+}
XMLImageMapObjectContext::XMLImageMapObjectContext(
SvXMLImport& rImport,
@@ -275,6 +277,7 @@ void XMLImageMapObjectContext::Prepare(
rPropertySet->setPropertyValue( "Name", Any( sNam ) );
}
+namespace {
class XMLImageMapRectangleContext : public XMLImageMapObjectContext
{
@@ -302,6 +305,7 @@ protected:
css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override;
};
+}
XMLImageMapRectangleContext::XMLImageMapRectangleContext(
SvXMLImport& rImport,
@@ -372,6 +376,7 @@ void XMLImageMapRectangleContext::Prepare(
XMLImageMapObjectContext::Prepare(rPropertySet);
}
+namespace {
class XMLImageMapPolygonContext : public XMLImageMapObjectContext
{
@@ -398,6 +403,7 @@ protected:
css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override;
};
+}
XMLImageMapPolygonContext::XMLImageMapPolygonContext(
SvXMLImport& rImport,
@@ -455,6 +461,8 @@ void XMLImageMapPolygonContext::Prepare(Reference<XPropertySet> & rPropertySet)
XMLImageMapObjectContext::Prepare(rPropertySet);
}
+namespace {
+
class XMLImageMapCircleContext : public XMLImageMapObjectContext
{
awt::Point aCenter;
@@ -481,6 +489,7 @@ protected:
css::uno::Reference<css::beans::XPropertySet> & rPropertySet) override;
};
+}
XMLImageMapCircleContext::XMLImageMapCircleContext(
SvXMLImport& rImport,
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 79a5c600deb9..98bdeb17ef9e 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -31,6 +31,8 @@
using namespace ::xmloff::token;
+namespace {
+
struct SdXMLDataStyleNumber
{
enum XMLTokenEnum const meNumberStyle;
@@ -38,8 +40,11 @@ struct SdXMLDataStyleNumber
bool const mbTextual;
bool const mbDecimal02;
const char* mpText;
+};
+
}
-const aSdXMLDataStyleNumbers[] =
+
+SdXMLDataStyleNumber const aSdXMLDataStyleNumbers[] =
{
{ XML_DAY, false, false, false, nullptr },
{ XML_DAY, true, false, false, nullptr },
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 082f7ad5153b..d5b2c7d1d3fa 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1205,6 +1205,8 @@ SvXMLImportContextRef AnimationNodeContext::CreateChildContext( sal_uInt16 nPref
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
+namespace {
+
class AnimationsImport: public SvXMLImport, public XAnimationNodeSupplier
{
public:
@@ -1224,6 +1226,8 @@ private:
Reference< XAnimationNode > mxRootNode;
};
+}
+
AnimationsImport::AnimationsImport( const Reference< XComponentContext > & rxContext )
: SvXMLImport( rxContext, AnimationsImport_getImplementationName(), SvXMLImportFlags::META )
//FIXME: the above "IMPORT_META" used to be a nonsensical "true", question
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 2b0071cd1b5b..fbed96791f34 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -47,15 +47,19 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::presentation;
using namespace ::xmloff::token;
+namespace {
-const struct Effect
+struct Effect
{
XMLEffect const meKind;
XMLEffectDirection const meDirection;
sal_Int16 const mnStartScale;
bool const mbIn;
+};
+
}
- AnimationEffectMap[] =
+
+const Effect AnimationEffectMap[] =
{
{ EK_none, ED_none, -1, true }, // AnimationEffect_NONE
{ EK_fade, ED_from_left, -1, true }, // AnimationEffect_FADE_FROM_LEFT
@@ -196,8 +200,6 @@ enum XMLActionKind
XMLE_PLAY
};
-}
-
struct XMLEffectHint
{
XMLActionKind meKind;
@@ -224,6 +226,8 @@ struct XMLEffectHint
{}
};
+}
+
class AnimExpImpl
{
public:
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index f1ad97e5af1f..f2178aeb8454 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -345,8 +345,6 @@ enum XMLActionKind
XMLE_PLAY
};
-}
-
class XMLAnimationsEffectContext : public SvXMLImportContext
{
public:
@@ -387,6 +385,7 @@ public:
XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent );
};
+}
XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent )
: SvXMLImportContext( rImport, nPrfx, rLocalName )
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index f9e10c11cf7d..f88af2fc88b3 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -75,6 +75,8 @@ SdXMLEventContextData::SdXMLEventContextData(const Reference< XShape >& rxShape)
{
}
+namespace {
+
class SdXMLEventContext : public SvXMLImportContext
{
public:
@@ -95,6 +97,7 @@ public:
XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent );
};
+}
XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent )
: SvXMLImportContext( rImp, nPrfx, rLocalName )
diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx
index 80c869da085b..c0826cbec25b 100644
--- a/xmloff/source/draw/layerimp.cxx
+++ b/xmloff/source/draw/layerimp.cxx
@@ -46,6 +46,8 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
using ::xmloff::token::IsXMLToken;
+namespace {
+
class SdXMLLayerContext : public SvXMLImportContext
{
public:
@@ -63,6 +65,8 @@ private:
OUString msProtected;
};
+}
+
SdXMLLayerContext::SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager )
: SvXMLImportContext(rImport, nPrefix, rLocalName)
, mxLayerManager( xLayerManager )
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index de6a5e4655d5..94e976f2fc89 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -752,6 +752,8 @@ static SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Type_Enum[] =
{ XML_TOKEN_INVALID,0 }
};
+namespace {
+
class XMLCaptionEscapeRelative : public XMLPropertyHandler
{
public:
@@ -765,6 +767,8 @@ public:
const SvXMLUnitConverter& rUnitConverter ) const override;
};
+}
+
bool XMLCaptionEscapeRelative::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
sal_Int32 nValue;
@@ -790,6 +794,8 @@ bool XMLCaptionEscapeRelative::exportXML( OUString& rStrExpValue, const Any& rVa
return true;
}
+namespace {
+
class XMLMoveSizeProtectHdl : public XMLPropertyHandler
{
public:
@@ -807,6 +813,8 @@ private:
const sal_Int32 mnType;
};
+}
+
bool XMLMoveSizeProtectHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const
{
const bool bValue = rStrImpValue.indexOf( GetXMLToken( mnType == XML_SD_TYPE_MOVE_PROTECT ? XML_POSITION : XML_SIZE ) ) != -1;
@@ -831,6 +839,8 @@ bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rValue
return true;
}
+namespace {
+
class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler
{
public:
@@ -838,6 +848,8 @@ public:
virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
};
+}
+
bool XMLSdHeaderFooterVisibilityTypeHdl::importXML(
const OUString& rStrImpValue,
css::uno::Any& rValue,
@@ -871,6 +883,8 @@ bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
return bRet;
}
+namespace {
+
class XMLSdRotationAngleTypeHdl : public XMLPropertyHandler
{
public:
@@ -878,6 +892,8 @@ public:
virtual bool exportXML(OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter) const override;
};
+}
+
bool XMLSdRotationAngleTypeHdl::importXML(
const OUString& rStrImpValue,
css::uno::Any& rValue,
@@ -917,6 +933,8 @@ bool XMLSdRotationAngleTypeHdl::exportXML(
return bRet;
}
+namespace {
+
class XMLFitToSizeEnumPropertyHdl : public XMLEnumPropertyHdl
{
public:
@@ -948,6 +966,7 @@ public:
}
};
+}
XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > const & xModel, SvXMLImport& rImport )
: mxModel( xModel ), mpExport(nullptr), mpImport( &rImport )
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 829c0ad16c87..3a7d52b880ab 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -48,6 +48,8 @@
using namespace ::com::sun::star;
using namespace ::xmloff::token;
+namespace {
+
class SdXMLBodyContext_Impl : public SvXMLImportContext
{
SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); }
@@ -63,6 +65,8 @@ public:
const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override;
};
+}
+
SdXMLBodyContext_Impl::SdXMLBodyContext_Impl( SdXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & ) :
@@ -78,6 +82,8 @@ SvXMLImportContextRef SdXMLBodyContext_Impl::CreateChildContext(
return GetSdImport().CreateBodyContext(rLocalName, xAttrList);
}
+namespace {
+
// NB: virtually inherit so we can multiply inherit properly
// in SdXMLFlatDocContext_Impl
class SdXMLDocContext_Impl : public virtual SvXMLImportContext
@@ -103,6 +109,8 @@ public:
virtual void SAL_CALL endFastElement( sal_Int32 /*nElement*/ ) override {}
};
+}
+
SdXMLDocContext_Impl::SdXMLDocContext_Impl(
SdXMLImport& rImport )
: SvXMLImportContext(rImport)
@@ -198,6 +206,8 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SdXMLDocContext_Impl::c
return new SvXMLImportContext( GetImport() );
}
+namespace {
+
// context for flat file xml format
class SdXMLFlatDocContext_Impl
: public SdXMLDocContext_Impl, public SvXMLMetaDocumentContext
@@ -217,6 +227,8 @@ public:
sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override;
};
+}
+
SdXMLFlatDocContext_Impl::SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport,
const uno::Reference<document::XDocumentProperties>& i_xDocProps) :
SvXMLImportContext(i_rImport),
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 59d08cacfed1..856635c09d31 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -47,12 +47,18 @@
#include <map>
#include <vector>
+namespace {
+
class ShapeGroupContext;
+}
+
using namespace ::std;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
+namespace {
+
struct ConnectionHint
{
css::uno::Reference< css::drawing::XShape > mxConnector;
@@ -70,6 +76,8 @@ struct XShapeCompareHelper
}
};
+}
+
/** this map store all glue point id mappings for shapes that had user defined glue points. This
is needed because on insertion the glue points will get a new and unique id */
typedef std::map<sal_Int32,sal_Int32> GluePointIdMap;
@@ -694,6 +702,8 @@ void XMLShapeImportHelper::finishShape(
}
}
+namespace {
+
// helper functions for z-order sorting
struct ZOrderHint
{
@@ -725,6 +735,8 @@ private:
void moveShape( sal_Int32 nSourcePos, sal_Int32 nDestPos );
};
+}
+
ShapeGroupContext::ShapeGroupContext( uno::Reference< drawing::XShapes > const & rShapes, std::shared_ptr<ShapeGroupContext> pParentContext )
: mxShapes( rShapes ), mnCurrentZ( 0 ), mpParentContext( std::move(pParentContext) )
{
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index f0a297c935f3..eb7cb4a634d5 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -178,6 +178,8 @@ struct ImpSdXMLExpTransObj2DBase
// classes of objects, different sizes
+namespace {
+
struct ImpSdXMLExpTransObj2DRotate : public ImpSdXMLExpTransObj2DBase
{
double const mfRotate;
@@ -215,6 +217,8 @@ struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(rNew) {}
};
+}
+
// add members
void SdXMLImExTransform2D::AddRotate(double fNew)
@@ -548,6 +552,8 @@ struct ImpSdXMLExpTransObj3DBase
// classes of objects, different sizes
+namespace {
+
struct ImpSdXMLExpTransObj3DRotateX : public ImpSdXMLExpTransObj3DBase
{
double const mfRotateX;
@@ -585,6 +591,8 @@ struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(rNew) {}
};
+}
+
// add members
void SdXMLImExTransform3D::AddMatrix(const ::basegfx::B3DHomMatrix& rNew)
diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index af7fcdde026c..cd8d2b2a36de 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -53,6 +53,8 @@ using namespace ::com::sun::star::office;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::geometry;
+namespace {
+
class DrawAnnotationContext : public SvXMLImportContext
{
@@ -71,6 +73,8 @@ private:
OUStringBuffer maDateBuffer;
};
+}
+
DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess )
: SvXMLImportContext( rImport, nPrfx, rLocalName )
, mxAnnotation( xAnnotationAccess->createAndInsertAnnotation() )
@@ -510,6 +514,8 @@ void SdXMLGenericPageContext::SetPageMaster( OUString const & rsPageMasterName )
}
}
+namespace {
+
class XoNavigationOrderAccess : public ::cppu::WeakImplHelper< XIndexAccess >
{
public:
@@ -527,6 +533,8 @@ private:
std::vector< Reference< XShape > > maShapes;
};
+}
+
XoNavigationOrderAccess::XoNavigationOrderAccess( std::vector< Reference< XShape > >& rShapes )
{
maShapes.swap( rShapes );
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 929fa5b37aa2..070b9ecad1e3 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -55,6 +55,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::xmloff::token;
+namespace {
+
class SdXMLDrawingPagePropertySetContext : public SvXMLPropertySetContext
{
public:
@@ -74,6 +76,7 @@ public:
const XMLPropertyState& rProp) override;
};
+}
SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext(
SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -124,6 +127,8 @@ SvXMLImportContextRef SdXMLDrawingPagePropertySetContext::CreateChildContext(
return xContext;
}
+namespace {
+
class SdXMLDrawingPageStyleContext : public XMLPropStyleContext
{
public:
@@ -147,6 +152,7 @@ public:
virtual void FillPropertySet( const css::uno::Reference< css::beans::XPropertySet > & rPropSet ) override;
};
+}
SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext(
SvXMLImport& rImport,
generated by cgit (git 2.34.1) at 2025-05-03 01:42:08 +0000