diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-02 23:16:41 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-05 10:54:19 +0100 |
commit | af60795f76f04e5a0315eeaa4cb9c5a90f4ae90c (patch) | |
tree | 529f6d32a19fc394afec567ad246dfb3f5522538 /xmloff | |
parent | bIsCompressed is always false (diff) | |
download | core-af60795f76f04e5a0315eeaa4cb9c5a90f4ae90c.tar.gz core-af60795f76f04e5a0315eeaa4cb9c5a90f4ae90c.zip |
callcatcher: some more unused code
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/xmloff/shapeimport.hxx | 7 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 83 |
3 files changed, 2 insertions, 90 deletions
diff --git a/xmloff/inc/xmloff/shapeimport.hxx b/xmloff/inc/xmloff/shapeimport.hxx index 80e4f861cfbe..564abd460b87 100644 --- a/xmloff/inc/xmloff/shapeimport.hxx +++ b/xmloff/inc/xmloff/shapeimport.hxx @@ -353,10 +353,7 @@ public: const SvXMLTokenMap& Get3DPolygonBasedAttrTokenMap(); const SvXMLTokenMap& Get3DCubeObjectAttrTokenMap(); const SvXMLTokenMap& Get3DSphereObjectAttrTokenMap(); - const SvXMLTokenMap& Get3DSceneShapeAttrTokenMap(); const SvXMLTokenMap& Get3DLightAttrTokenMap(); - const SvXMLTokenMap& GetPathShapeAttrTokenMap(); - const SvXMLTokenMap& GetPolygonShapeAttrTokenMap(); // Styles and AutoStyles contexts SvXMLStylesContext* GetStylesContext() const { return mpStylesContext; } @@ -421,10 +418,6 @@ public: static SvXMLImportPropertyMapper* CreateShapePropMapper( const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel, SvXMLImport& rImport ); - /** creates a shape property set mapper that can be used for non shape elements */ - static SvXMLImportPropertyMapper* CreateExternalShapePropMapper( - const com::sun::star::uno::Reference< com::sun::star::frame::XModel>& rModel, SvXMLImport& rImport ); - // #88546# /** defines if the import should increment the progress bar or not */ void enableHandleProgressBar( sal_Bool bEnable = sal_True ); diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index d70b6cf9221e..77c54eefe100 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -99,6 +99,8 @@ using namespace ::xmloff::token; const XMLPropertyMapEntry aXMLSDProperties[] = { // this entry must be first! this is needed for XMLShapeImportHelper::CreateExternalShapePropMapper + // + // ^^^though CreateExternalShapePropMapper is gone now, hmm^^^ GMAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ), // stroke attributes diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index e16392568151..e1afa5b78e2a 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -424,76 +424,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() ////////////////////////////////////////////////////////////////////////////// - -const SvXMLTokenMap& XMLShapeImportHelper::GetPolygonShapeAttrTokenMap() -{ - if(!mpPolygonShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aPolygonShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_POLYGONSHAPE_VIEWBOX }, - { XML_NAMESPACE_DRAW, XML_POINTS, XML_TOK_POLYGONSHAPE_POINTS }, - XML_TOKEN_MAP_END -}; - - mpPolygonShapeAttrTokenMap = new SvXMLTokenMap(aPolygonShapeAttrTokenMap); - } // if(!mpPolygonShapeAttrTokenMap) - - return *mpPolygonShapeAttrTokenMap; -} - -////////////////////////////////////////////////////////////////////////////// - - -const SvXMLTokenMap& XMLShapeImportHelper::GetPathShapeAttrTokenMap() -{ - if(!mpPathShapeAttrTokenMap) - { - static SvXMLTokenMapEntry aPathShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_PATHSHAPE_VIEWBOX }, - { XML_NAMESPACE_SVG, XML_D, XML_TOK_PATHSHAPE_D }, - XML_TOKEN_MAP_END -}; - - mpPathShapeAttrTokenMap = new SvXMLTokenMap(aPathShapeAttrTokenMap); - } // if(!mpPathShapeAttrTokenMap) - - return *mpPathShapeAttrTokenMap; -} - -////////////////////////////////////////////////////////////////////////////// - - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeAttrTokenMap() -{ - if(!mp3DSceneShapeAttrTokenMap) - { - static SvXMLTokenMapEntry a3DSceneShapeAttrTokenMap[] = -{ - { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DSCENESHAPE_TRANSFORM }, - { XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_3DSCENESHAPE_VRP }, - { XML_NAMESPACE_DR3D, XML_VPN, XML_TOK_3DSCENESHAPE_VPN }, - { XML_NAMESPACE_DR3D, XML_VUP, XML_TOK_3DSCENESHAPE_VUP }, - { XML_NAMESPACE_DR3D, XML_PROJECTION, XML_TOK_3DSCENESHAPE_PROJECTION }, - { XML_NAMESPACE_DR3D, XML_DISTANCE, XML_TOK_3DSCENESHAPE_DISTANCE }, - { XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, XML_TOK_3DSCENESHAPE_FOCAL_LENGTH }, - { XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, XML_TOK_3DSCENESHAPE_SHADOW_SLANT }, - { XML_NAMESPACE_DR3D, XML_SHADE_MODE, XML_TOK_3DSCENESHAPE_SHADE_MODE }, - { XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, XML_TOK_3DSCENESHAPE_AMBIENT_COLOR }, - { XML_NAMESPACE_DR3D, XML_LIGHTING_MODE, XML_TOK_3DSCENESHAPE_LIGHTING_MODE }, - XML_TOKEN_MAP_END -}; - - mp3DSceneShapeAttrTokenMap = new SvXMLTokenMap(a3DSceneShapeAttrTokenMap); - } // if(!mp3DSceneShapeAttrTokenMap) - - return *mp3DSceneShapeAttrTokenMap; -} - -////////////////////////////////////////////////////////////////////////////// - - const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() { if(!mp3DLightAttrTokenMap) @@ -1146,19 +1076,6 @@ SvXMLImportPropertyMapper* XMLShapeImportHelper::CreateShapePropMapper( const un return pResult; } -/** creates a shape property set mapper that can be used for non shape elements. - Only current feature is that the ShapeUserDefinedAttributes property is not included in this one. */ -SvXMLImportPropertyMapper* XMLShapeImportHelper::CreateExternalShapePropMapper( const uno::Reference< frame::XModel>& rModel, SvXMLImport& rImport ) -{ - UniReference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rModel, rImport ); - UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory, 1 ); - SvXMLImportPropertyMapper* pResult = new SvXMLImportPropertyMapper( xMapper, rImport ); - - // chain text attributes - pResult->ChainImportMapper( XMLTextImportHelper::CreateParaExtPropMapper( rImport ) ); - return pResult; -} - /** adds a mapping for a glue point identifier from an xml file to the identifier created after inserting the new glue point into the core. The saved mappings can be retrieved by getGluePointId() */ void XMLShapeImportHelper::addGluePointMapping( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape, |