From b541cd9a8038810ce449f8c49ae179d9d6eaa7e8 Mon Sep 17 00:00:00 2001 From: Noel Date: Mon, 7 Dec 2020 16:06:50 +0200 Subject: loplugin:unusedmethods Change-Id: Ib51fd610c5188fe95872d509f004ae88f38c5417 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107351 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmloff/inc/txtfldi.hxx | 1 - xmloff/source/chart/SchXMLImport.cxx | 238 ----------------------------- xmloff/source/core/xmlimp.cxx | 12 -- xmloff/source/draw/shapeimport.cxx | 168 -------------------- xmloff/source/forms/property_meta_data.cxx | 29 ---- xmloff/source/forms/property_meta_data.hxx | 5 - xmloff/source/text/txtfldi.cxx | 140 ----------------- xmloff/source/text/txtimp.cxx | 99 ------------ 8 files changed, 692 deletions(-) (limited to 'xmloff') diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 2a694423b640..736fa5bbd87d 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -953,7 +953,6 @@ private: virtual void PrepareField( const css::uno::Reference & xPropertySet) override; - static const char* MapBibliographyFieldName(const OUString& sName); static const char* MapBibliographyFieldName(sal_Int32 nElement); }; diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 53d10e349756..893e83fa3a95 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -120,244 +120,6 @@ void SchXMLImportHelper::FillAutoStyle(const OUString& rAutoStyleName, const uno // get various token maps -const SvXMLTokenMap& SchXMLImportHelper::GetDocElemTokenMap() -{ - if( ! mpChartDocElemTokenMap ) - { - static const SvXMLTokenMapEntry aDocElemTokenMap[] = - { - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - XML_TOKEN_MAP_END - }; - - mpChartDocElemTokenMap = std::make_unique( aDocElemTokenMap ); - } // if( ! mpChartDocElemTokenMap ) - - return *mpChartDocElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetTableElemTokenMap() -{ - if( ! mpTableElemTokenMap ) - { - static const SvXMLTokenMapEntry aTableElemTokenMap[] = - { - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLUMNS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLUMN }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, - XML_TOKEN_MAP_END - }; - - mpTableElemTokenMap = std::make_unique( aTableElemTokenMap ); - } // if( ! mpTableElemTokenMap ) - - return *mpTableElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetChartElemTokenMap() -{ - if( ! mpChartElemTokenMap ) - { - static const SvXMLTokenMapEntry aChartElemTokenMap[] = - { - { XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_TOK_CHART_PLOT_AREA }, - { XML_NAMESPACE_CHART, XML_TITLE, XML_TOK_CHART_TITLE }, - { XML_NAMESPACE_CHART, XML_SUBTITLE, XML_TOK_CHART_SUBTITLE }, - { XML_NAMESPACE_CHART, XML_LEGEND, XML_TOK_CHART_LEGEND }, - { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_CHART_TABLE }, - XML_TOKEN_MAP_END - }; - - mpChartElemTokenMap = std::make_unique( aChartElemTokenMap ); - } // if( ! mpChartElemTokenMap ) - - return *mpChartElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaElemTokenMap() -{ - if( ! mpPlotAreaElemTokenMap ) - { - static const SvXMLTokenMapEntry aPlotAreaElemTokenMap[] = -{ - { XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION_EXT }, - { XML_NAMESPACE_CHART, XML_COORDINATE_REGION, XML_TOK_PA_COORDINATE_REGION }, - { XML_NAMESPACE_CHART, XML_AXIS, XML_TOK_PA_AXIS }, - { XML_NAMESPACE_CHART, XML_SERIES, XML_TOK_PA_SERIES }, - { XML_NAMESPACE_CHART, XML_WALL, XML_TOK_PA_WALL }, - { XML_NAMESPACE_CHART, XML_FLOOR, XML_TOK_PA_FLOOR }, - { XML_NAMESPACE_DR3D, XML_LIGHT, XML_TOK_PA_LIGHT_SOURCE }, - { XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, XML_TOK_PA_STOCK_GAIN }, - { XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, XML_TOK_PA_STOCK_LOSS }, - { XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, XML_TOK_PA_STOCK_RANGE }, - XML_TOKEN_MAP_END -}; - - mpPlotAreaElemTokenMap = std::make_unique( aPlotAreaElemTokenMap ); - } // if( ! mpPlotAreaElemTokenMap ) - - return *mpPlotAreaElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetSeriesElemTokenMap() -{ - if( ! mpSeriesElemTokenMap ) - { - static const SvXMLTokenMapEntry aSeriesElemTokenMap[] = -{ - { XML_NAMESPACE_CHART, XML_DATA_POINT, XML_TOK_SERIES_DATA_POINT }, - { XML_NAMESPACE_CHART, XML_DOMAIN, XML_TOK_SERIES_DOMAIN }, - { XML_NAMESPACE_CHART, XML_MEAN_VALUE, XML_TOK_SERIES_MEAN_VALUE_LINE }, - { XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, XML_TOK_SERIES_REGRESSION_CURVE }, - { XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, XML_TOK_SERIES_ERROR_INDICATOR }, - { XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, XML_TOK_SERIES_PROPERTY_MAPPING }, - { XML_NAMESPACE_CHART, XML_DATA_LABEL, XML_TOK_SERIES_DATA_LABEL }, - XML_TOKEN_MAP_END -}; - - mpSeriesElemTokenMap = std::make_unique( aSeriesElemTokenMap ); - } // if( ! mpSeriesElemTokenMap ) - - return *mpSeriesElemTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetChartAttrTokenMap() -{ - if( ! mpChartAttrTokenMap ) - { - static const SvXMLTokenMapEntry aChartAttrTokenMap[] = -{ - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CHART_HREF }, - { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_CHART_CLASS }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_CHART_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_CHART_HEIGHT }, - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_CHART_STYLE_NAME }, - { XML_NAMESPACE_CHART, XML_COLUMN_MAPPING, XML_TOK_CHART_COL_MAPPING }, - { XML_NAMESPACE_CHART, XML_ROW_MAPPING, XML_TOK_CHART_ROW_MAPPING }, - { XML_NAMESPACE_LO_EXT, XML_DATA_PILOT_SOURCE, XML_TOK_CHART_DATA_PILOT_SOURCE }, - XML_TOKEN_MAP_END -}; - - mpChartAttrTokenMap = std::make_unique( aChartAttrTokenMap ); - } // if( ! mpChartAttrTokenMap ) - - return *mpChartAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap() -{ - if( ! mpPlotAreaAttrTokenMap ) - { - static const SvXMLTokenMapEntry aPlotAreaAttrTokenMap[] = -{ - { XML_NAMESPACE_SVG, XML_X, XML_TOK_PA_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_PA_Y }, - { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_PA_WIDTH }, - { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_PA_HEIGHT }, - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_PA_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_PA_CHART_ADDRESS }, - { XML_NAMESPACE_CHART, XML_DATA_SOURCE_HAS_LABELS, XML_TOK_PA_DS_HAS_LABELS }, - { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_PA_TRANSFORM }, - { XML_NAMESPACE_DR3D, XML_VRP, XML_TOK_PA_VRP }, - { XML_NAMESPACE_DR3D, XML_VPN, XML_TOK_PA_VPN }, - { XML_NAMESPACE_DR3D, XML_VUP, XML_TOK_PA_VUP }, - { XML_NAMESPACE_DR3D, XML_PROJECTION, XML_TOK_PA_PROJECTION }, - { XML_NAMESPACE_DR3D, XML_DISTANCE, XML_TOK_PA_DISTANCE }, - { XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, XML_TOK_PA_FOCAL_LENGTH }, - { XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, XML_TOK_PA_SHADOW_SLANT }, - { XML_NAMESPACE_DR3D, XML_SHADE_MODE, XML_TOK_PA_SHADE_MODE }, - { XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, XML_TOK_PA_AMBIENT_COLOR }, - { XML_NAMESPACE_DR3D, XML_LIGHTING_MODE, XML_TOK_PA_LIGHTING_MODE }, - XML_TOKEN_MAP_END -}; - - mpPlotAreaAttrTokenMap = std::make_unique( aPlotAreaAttrTokenMap ); - } // if( ! mpPlotAreaAttrTokenMap ) - - return *mpPlotAreaAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap() -{ - if( ! mpCellAttrTokenMap ) - { - static const SvXMLTokenMapEntry aCellAttrTokenMap[] = -{ - { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_CELL_VAL_TYPE }, - { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_CELL_VALUE }, - XML_TOKEN_MAP_END -}; - - mpCellAttrTokenMap = std::make_unique( aCellAttrTokenMap ); - } // if( ! mpCellAttrTokenMap ) - - return *mpCellAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetSeriesAttrTokenMap() -{ - if( ! mpSeriesAttrTokenMap ) - { - static const SvXMLTokenMapEntry aSeriesAttrTokenMap[] = -{ - { XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, XML_TOK_SERIES_CELL_RANGE }, - { XML_NAMESPACE_CHART, XML_LABEL_CELL_ADDRESS, XML_TOK_SERIES_LABEL_ADDRESS }, - { XML_NAMESPACE_LO_EXT, XML_LABEL_STRING, XML_TOK_SERIES_LABEL_STRING }, - { XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_TOK_SERIES_ATTACHED_AXIS }, - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_SERIES_STYLE_NAME }, - { XML_NAMESPACE_CHART, XML_CLASS, XML_TOK_SERIES_CHART_CLASS }, - { XML_NAMESPACE_LO_EXT, XML_HIDE_LEGEND, XML_TOK_SERIES_HIDE_LEGEND }, - XML_TOKEN_MAP_END -}; - - mpSeriesAttrTokenMap = std::make_unique( aSeriesAttrTokenMap ); - } // if( ! mpSeriesAttrTokenMap ) - - return *mpSeriesAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetPropMappingAttrTokenMap() -{ - if( !mpPropMappingAttrTokenMap ) - { - static const SvXMLTokenMapEntry aPropMappingAttrTokenMap[] = - { - { XML_NAMESPACE_LO_EXT, XML_PROPERTY, XML_TOK_PROPERTY_MAPPING_PROPERTY }, - { XML_NAMESPACE_LO_EXT, XML_CELL_RANGE_ADDRESS, XML_TOK_PROPERTY_MAPPING_RANGE }, - XML_TOKEN_MAP_END - }; - - mpPropMappingAttrTokenMap = std::make_unique( aPropMappingAttrTokenMap ); - } - - return *mpPropMappingAttrTokenMap; -} - -const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap() -{ - if( ! mpRegEquationAttrTokenMap ) - { - static const SvXMLTokenMapEntry aRegressionEquationAttrTokenMap[] = -{ - { XML_NAMESPACE_CHART, XML_STYLE_NAME, XML_TOK_REGEQ_STYLE_NAME }, - { XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_TOK_REGEQ_DISPLAY_EQUATION }, - { XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, XML_TOK_REGEQ_DISPLAY_R_SQUARE }, - { XML_NAMESPACE_SVG, XML_X, XML_TOK_REGEQ_POS_X }, - { XML_NAMESPACE_SVG, XML_Y, XML_TOK_REGEQ_POS_Y }, - XML_TOKEN_MAP_END -}; - - mpRegEquationAttrTokenMap = std::make_unique( aRegressionEquationAttrTokenMap ); - } // if( ! mpRegEquationAttrTokenMap ) - - return *mpRegEquationAttrTokenMap; -} //static void SchXMLImportHelper::DeleteDataSeries( diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index a96836829318..94eafa9f8ab2 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1747,18 +1747,6 @@ void SvXMLImport::SetError( SetError( nId, aSeq ); } -void SvXMLImport::SetError( - sal_Int32 nId, - const OUString& rMsg1, - const OUString& rMsg2) -{ - Sequence aSeq(2); - OUString* pSeq = aSeq.getArray(); - pSeq[0] = rMsg1; - pSeq[1] = rMsg2; - SetError( nId, aSeq ); -} - void SvXMLImport::DisposingModel() { if( mxFontDecls.is() ) diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index e3fcfd70fd56..9bd4b3b9dd35 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -174,174 +174,6 @@ XMLShapeImportHelper::~XMLShapeImportHelper() mxAutoStylesContext->dispose(); } -const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap() -{ - if(!mpGroupShapeElemTokenMap) - { - static const SvXMLTokenMapEntry aGroupShapeElemTokenMap[] = - { - { XML_NAMESPACE_DRAW, XML_G, XML_TOK_GROUP_GROUP }, - { XML_NAMESPACE_DRAW, XML_RECT, XML_TOK_GROUP_RECT }, - { XML_NAMESPACE_DRAW, XML_LINE, XML_TOK_GROUP_LINE }, - { XML_NAMESPACE_DRAW, XML_CIRCLE, XML_TOK_GROUP_CIRCLE }, - { XML_NAMESPACE_DRAW, XML_ELLIPSE, XML_TOK_GROUP_ELLIPSE }, - { XML_NAMESPACE_DRAW, XML_POLYGON, XML_TOK_GROUP_POLYGON }, - { XML_NAMESPACE_DRAW, XML_POLYLINE, XML_TOK_GROUP_POLYLINE }, - { XML_NAMESPACE_DRAW, XML_PATH, XML_TOK_GROUP_PATH }, - - { XML_NAMESPACE_DRAW, XML_CONTROL, XML_TOK_GROUP_CONTROL }, - { XML_NAMESPACE_DRAW, XML_CONNECTOR, XML_TOK_GROUP_CONNECTOR }, - { XML_NAMESPACE_DRAW, XML_MEASURE, XML_TOK_GROUP_MEASURE }, - { XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, XML_TOK_GROUP_PAGE }, - { XML_NAMESPACE_DRAW, XML_CAPTION, XML_TOK_GROUP_CAPTION }, - - { XML_NAMESPACE_CHART, XML_CHART, XML_TOK_GROUP_CHART }, - { XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_GROUP_3DSCENE }, - - { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_GROUP_FRAME }, - - { XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE, XML_TOK_GROUP_CUSTOM_SHAPE }, - { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_GROUP_ANNOTATION }, - { XML_NAMESPACE_DRAW, XML_A, XML_TOK_GROUP_A }, - - XML_TOKEN_MAP_END - }; - - mpGroupShapeElemTokenMap = std::make_unique(aGroupShapeElemTokenMap); - } - - return *mpGroupShapeElemTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap() -{ - if(!mpFrameShapeElemTokenMap) - { - static const SvXMLTokenMapEntry aFrameShapeElemTokenMap[] = - { - { XML_NAMESPACE_DRAW, XML_TEXT_BOX, XML_TOK_FRAME_TEXT_BOX }, - { XML_NAMESPACE_DRAW, XML_IMAGE, XML_TOK_FRAME_IMAGE }, - { XML_NAMESPACE_DRAW, XML_OBJECT, XML_TOK_FRAME_OBJECT }, - { XML_NAMESPACE_DRAW, XML_OBJECT_OLE, XML_TOK_FRAME_OBJECT_OLE }, - { XML_NAMESPACE_DRAW, XML_PLUGIN, XML_TOK_FRAME_PLUGIN }, - { XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, XML_TOK_FRAME_FLOATING_FRAME}, - { XML_NAMESPACE_DRAW, XML_APPLET, XML_TOK_FRAME_APPLET }, - { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_FRAME_TABLE }, - XML_TOKEN_MAP_END - }; - - mpFrameShapeElemTokenMap = std::make_unique(aFrameShapeElemTokenMap); - } - - return *mpFrameShapeElemTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() -{ - if(!mp3DSceneShapeElemTokenMap) - { - static const SvXMLTokenMapEntry a3DSceneShapeElemTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_SCENE, XML_TOK_3DSCENE_3DSCENE }, - { XML_NAMESPACE_DR3D, XML_CUBE, XML_TOK_3DSCENE_3DCUBE }, - { XML_NAMESPACE_DR3D, XML_SPHERE, XML_TOK_3DSCENE_3DSPHERE }, - { XML_NAMESPACE_DR3D, XML_ROTATE, XML_TOK_3DSCENE_3DLATHE }, - { XML_NAMESPACE_DR3D, XML_EXTRUDE, XML_TOK_3DSCENE_3DEXTRUDE }, - XML_TOKEN_MAP_END - }; - - mp3DSceneShapeElemTokenMap = std::make_unique(a3DSceneShapeElemTokenMap); - } - - return *mp3DSceneShapeElemTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap() -{ - if(!mp3DObjectAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DObjectAttrTokenMap[] = - { - { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_3DOBJECT_DRAWSTYLE_NAME }, - { XML_NAMESPACE_DR3D, XML_TRANSFORM, XML_TOK_3DOBJECT_TRANSFORM }, - XML_TOKEN_MAP_END - }; - - mp3DObjectAttrTokenMap = std::make_unique(a3DObjectAttrTokenMap); - } - - return *mp3DObjectAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap() -{ - if(!mp3DPolygonBasedAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DPolygonBasedAttrTokenMap[] = - { - { XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_3DPOLYGONBASED_VIEWBOX }, - { XML_NAMESPACE_SVG, XML_D, XML_TOK_3DPOLYGONBASED_D }, - XML_TOKEN_MAP_END - }; - - mp3DPolygonBasedAttrTokenMap = std::make_unique(a3DPolygonBasedAttrTokenMap); - } - - return *mp3DPolygonBasedAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap() -{ - if(!mp3DCubeObjectAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DCubeObjectAttrTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_MIN_EDGE, XML_TOK_3DCUBEOBJ_MINEDGE }, - { XML_NAMESPACE_DR3D, XML_MAX_EDGE, XML_TOK_3DCUBEOBJ_MAXEDGE }, - XML_TOKEN_MAP_END - }; - - mp3DCubeObjectAttrTokenMap = std::make_unique(a3DCubeObjectAttrTokenMap); - } - - return *mp3DCubeObjectAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() -{ - if(!mp3DSphereObjectAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DSphereObjectAttrTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_CENTER, XML_TOK_3DSPHEREOBJ_CENTER }, - { XML_NAMESPACE_DR3D, XML_SIZE, XML_TOK_3DSPHEREOBJ_SIZE }, - XML_TOKEN_MAP_END - }; - - mp3DSphereObjectAttrTokenMap = std::make_unique(a3DSphereObjectAttrTokenMap); - } - - return *mp3DSphereObjectAttrTokenMap; -} - -const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() -{ - if(!mp3DLightAttrTokenMap) - { - static const SvXMLTokenMapEntry a3DLightAttrTokenMap[] = - { - { XML_NAMESPACE_DR3D, XML_DIFFUSE_COLOR, XML_TOK_3DLIGHT_DIFFUSE_COLOR }, - { XML_NAMESPACE_DR3D, XML_DIRECTION, XML_TOK_3DLIGHT_DIRECTION }, - { XML_NAMESPACE_DR3D, XML_ENABLED, XML_TOK_3DLIGHT_ENABLED }, - { XML_NAMESPACE_DR3D, XML_SPECULAR, XML_TOK_3DLIGHT_SPECULAR }, - XML_TOKEN_MAP_END - }; - - mp3DLightAttrTokenMap = std::make_unique(a3DLightAttrTokenMap); - } - - return *mp3DLightAttrTokenMap; -} SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext( SvXMLImport& rImport, diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index 16307b395646..f957121daa2f 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -91,22 +91,6 @@ namespace xmloff::metadata typedef std::unordered_map< OUString, XMLTokenEnum > ReverseTokenLookup; - const ReverseTokenLookup& getReverseTokenLookup() - { - DBG_TESTSOLARMUTEX(); - static ReverseTokenLookup s_reverseTokenLookup; - if ( s_reverseTokenLookup.empty() ) - { - const PropertyDescription* desc = lcl_getPropertyMetaData(); - while ( !desc->propertyName.isEmpty() ) - { - s_reverseTokenLookup[ token::GetXMLToken( desc->attribute.attributeToken ) ] = desc->attribute.attributeToken; - ++desc; - } - } - return s_reverseTokenLookup; - } - struct AttributeHash { size_t operator()( const AttributeDescription& i_attribute ) const @@ -159,19 +143,6 @@ namespace xmloff::metadata o_propertyGroups = pos->second; } - AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ) - { - AttributeDescription attribute; - const ReverseTokenLookup& rTokenLookup( getReverseTokenLookup() ); - const ReverseTokenLookup::const_iterator pos = rTokenLookup.find( i_attributeName ); - if ( pos != rTokenLookup.end() ) - { - attribute.namespacePrefix = i_namespacePrefix; - attribute.attributeToken = pos->second; - } - return attribute; - } - AttributeDescription getAttributeDescription( sal_Int32 nAttributeToken ) { AttributeDescription attribute; diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx index b61a1878b745..71236d33d948 100644 --- a/xmloff/source/forms/property_meta_data.hxx +++ b/xmloff/source/forms/property_meta_data.hxx @@ -34,11 +34,6 @@ namespace xmloff::metadata PropertyGroups& o_propertyGroups ); - /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name - */ - AttributeDescription - getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ); - /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name */ AttributeDescription getAttributeDescription( sal_Int32 nElement ); diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 084a19e0f05b..f7cb315896fb 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3032,146 +3032,6 @@ void XMLBibliographyFieldImportContext::PrepareField( xPropertySet->setPropertyValue("Fields", Any(aValueSequence)); } -const char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( - const OUString& sName) -{ - const char* pName = nullptr; - - if (IsXMLToken(sName, XML_IDENTIFIER)) - { - pName = "Identifier"; - } - else if (IsXMLToken(sName, XML_BIBILIOGRAPHIC_TYPE) || - IsXMLToken(sName, XML_BIBLIOGRAPHY_TYPE) ) - { - // biblio... vs bibilio...: #96658#: also read old documents - pName = "BibiliographicType"; - } - else if (IsXMLToken(sName, XML_ADDRESS)) - { - pName = "Address"; - } - else if (IsXMLToken(sName, XML_ANNOTE)) - { - pName = "Annote"; - } - else if (IsXMLToken(sName, XML_AUTHOR)) - { - pName = "Author"; - } - else if (IsXMLToken(sName, XML_BOOKTITLE)) - { - pName = "Booktitle"; - } - else if (IsXMLToken(sName, XML_CHAPTER)) - { - pName = "Chapter"; - } - else if (IsXMLToken(sName, XML_EDITION)) - { - pName = "Edition"; - } - else if (IsXMLToken(sName, XML_EDITOR)) - { - pName = "Editor"; - } - else if (IsXMLToken(sName, XML_HOWPUBLISHED)) - { - pName = "Howpublished"; - } - else if (IsXMLToken(sName, XML_INSTITUTION)) - { - pName = "Institution"; - } - else if (IsXMLToken(sName, XML_JOURNAL)) - { - pName = "Journal"; - } - else if (IsXMLToken(sName, XML_MONTH)) - { - pName = "Month"; - } - else if (IsXMLToken(sName, XML_NOTE)) - { - pName = "Note"; - } - else if (IsXMLToken(sName, XML_NUMBER)) - { - pName = "Number"; - } - else if (IsXMLToken(sName, XML_ORGANIZATIONS)) - { - pName = "Organizations"; - } - else if (IsXMLToken(sName, XML_PAGES)) - { - pName = "Pages"; - } - else if (IsXMLToken(sName, XML_PUBLISHER)) - { - pName = "Publisher"; - } - else if (IsXMLToken(sName, XML_SCHOOL)) - { - pName = "School"; - } - else if (IsXMLToken(sName, XML_SERIES)) - { - pName = "Series"; - } - else if (IsXMLToken(sName, XML_TITLE)) - { - pName = "Title"; - } - else if (IsXMLToken(sName, XML_REPORT_TYPE)) - { - pName = "Report_Type"; - } - else if (IsXMLToken(sName, XML_VOLUME)) - { - pName = "Volume"; - } - else if (IsXMLToken(sName, XML_YEAR)) - { - pName = "Year"; - } - else if (IsXMLToken(sName, XML_URL)) - { - pName = "URL"; - } - else if (IsXMLToken(sName, XML_CUSTOM1)) - { - pName = "Custom1"; - } - else if (IsXMLToken(sName, XML_CUSTOM2)) - { - pName = "Custom2"; - } - else if (IsXMLToken(sName, XML_CUSTOM3)) - { - pName = "Custom3"; - } - else if (IsXMLToken(sName, XML_CUSTOM4)) - { - pName = "Custom4"; - } - else if (IsXMLToken(sName, XML_CUSTOM5)) - { - pName = "Custom5"; - } - else if (IsXMLToken(sName, XML_ISBN)) - { - pName = "ISBN"; - } - else - { - OSL_FAIL("Unknown bibliography info data"); - pName = nullptr; - } - - return pName; -} - const char* XMLBibliographyFieldImportContext::MapBibliographyFieldName( sal_Int32 nElement) { diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index fea37cb2ba50..5380cd2491fb 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -417,15 +417,6 @@ const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] = struct XMLTextImportHelper::Impl { - std::unique_ptr m_xTextElemTokenMap; - std::unique_ptr m_xTextPElemTokenMap; - std::unique_ptr m_xTextPAttrTokenMap; - std::unique_ptr m_xTextNumberedParagraphAttrTokenMap; - std::unique_ptr m_xTextListBlockAttrTokenMap; - std::unique_ptr m_xTextListBlockElemTokenMap; - std::unique_ptr m_xTextFrameAttrTokenMap; - std::unique_ptr m_xTextContourAttrTokenMap; - std::unique_ptr m_xTextHyperlinkAttrTokenMap; std::unique_ptr< std::vector > m_xPrevFrmNames; std::unique_ptr< std::vector > m_xNextFrmNames; std::unique_ptr m_xTextListsHelper; @@ -667,66 +658,6 @@ XMLTextListsHelper & XMLTextImportHelper::GetTextListHelper() return *m_xImpl->m_xTextListsHelper; } -const SvXMLTokenMap& XMLTextImportHelper::GetTextElemTokenMap() -{ - if (!m_xImpl->m_xTextElemTokenMap) - { - m_xImpl->m_xTextElemTokenMap.reset( - new SvXMLTokenMap( aTextElemTokenMap )); - } - return *m_xImpl->m_xTextElemTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextPElemTokenMap() -{ - if (!m_xImpl->m_xTextPElemTokenMap) - { - m_xImpl->m_xTextPElemTokenMap.reset( - new SvXMLTokenMap( aTextPElemTokenMap )); - } - return *m_xImpl->m_xTextPElemTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextPAttrTokenMap() -{ - if (!m_xImpl->m_xTextPAttrTokenMap) - { - m_xImpl->m_xTextPAttrTokenMap.reset( - new SvXMLTokenMap( aTextPAttrTokenMap )); - } - return *m_xImpl->m_xTextPAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextFrameAttrTokenMap() -{ - if (!m_xImpl->m_xTextFrameAttrTokenMap) - { - m_xImpl->m_xTextFrameAttrTokenMap.reset( - new SvXMLTokenMap( aTextFrameAttrTokenMap )); - } - return *m_xImpl->m_xTextFrameAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextContourAttrTokenMap() -{ - if (!m_xImpl->m_xTextContourAttrTokenMap) - { - m_xImpl->m_xTextContourAttrTokenMap.reset( - new SvXMLTokenMap( aTextContourAttrTokenMap )); - } - return *m_xImpl->m_xTextContourAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextHyperlinkAttrTokenMap() -{ - if (!m_xImpl->m_xTextHyperlinkAttrTokenMap) - { - m_xImpl->m_xTextHyperlinkAttrTokenMap.reset( - new SvXMLTokenMap( aTextHyperlinkAttrTokenMap )); - } - return *m_xImpl->m_xTextHyperlinkAttrTokenMap; -} - namespace { class FieldParamImporter @@ -2446,36 +2377,6 @@ void XMLTextImportHelper::PopListContext() } -const SvXMLTokenMap& XMLTextImportHelper::GetTextNumberedParagraphAttrTokenMap() -{ - if (!m_xImpl->m_xTextNumberedParagraphAttrTokenMap) - { - m_xImpl->m_xTextNumberedParagraphAttrTokenMap.reset( - new SvXMLTokenMap( aTextNumberedParagraphAttrTokenMap ) ); - } - return *m_xImpl->m_xTextNumberedParagraphAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextListBlockAttrTokenMap() -{ - if (!m_xImpl->m_xTextListBlockAttrTokenMap) - { - m_xImpl->m_xTextListBlockAttrTokenMap.reset( - new SvXMLTokenMap( aTextListBlockAttrTokenMap ) ); - } - return *m_xImpl->m_xTextListBlockAttrTokenMap; -} - -const SvXMLTokenMap& XMLTextImportHelper::GetTextListBlockElemTokenMap() -{ - if (!m_xImpl->m_xTextListBlockElemTokenMap) - { - m_xImpl->m_xTextListBlockElemTokenMap.reset( - new SvXMLTokenMap( aTextListBlockElemTokenMap ) ); - } - return *m_xImpl->m_xTextListBlockElemTokenMap; -} - SvI18NMap& XMLTextImportHelper::GetRenameMap() { if (!m_xImpl->m_xRenameMap) -- cgit