Skip to content

C
core
Kaydet (Commit) 747d36d2 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:useuniqueptr in OOo2OasisTransformer 

Change-Id: I6c1cabbf233e6d3d9fd37cdb5c66ffa17df2dd9c
Reviewed-on: https://gerrit.libreoffice.org/48425Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ee5882b4
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 84 deletions
xmloff/source/transform/OOo2Oasis.cxx
Dosyayı görüntüle @ 747d36d2
...@@ -1554,171 +1554,171 @@ XMLTransformerActions *OOo2OasisTransformer::GetUserDefinedActions( ...@@ -1554,171 +1554,171 @@ XMLTransformerActions *OOo2OasisTransformer::GetUserDefinedActions(
{ {
if( n<MAX_OOO_PROP_ACTIONS ) if( n<MAX_OOO_PROP_ACTIONS )
{ {
m_aActions[n] = m_aActions[n].reset(
XMLStyleOOoTContext::CreateTransformerActions( n ); XMLStyleOOoTContext::CreateTransformerActions( n ) );
} }
else switch( n ) else switch( n )
{ {
case OOO_STYLE_ACTIONS: case OOO_STYLE_ACTIONS:
m_aActions[OOO_STYLE_ACTIONS] = m_aActions[OOO_STYLE_ACTIONS].reset(
new XMLTransformerActions( aStyleActionTable ); new XMLTransformerActions( aStyleActionTable ) );
break; break;
case OOO_FONT_DECL_ACTIONS: case OOO_FONT_DECL_ACTIONS:
m_aActions[OOO_FONT_DECL_ACTIONS] = m_aActions[OOO_FONT_DECL_ACTIONS].reset(
new XMLTransformerActions( aFontDeclActionTable ); new XMLTransformerActions( aFontDeclActionTable ) );
break; break;
case OOO_SHAPE_ACTIONS: case OOO_SHAPE_ACTIONS:
m_aActions[OOO_SHAPE_ACTIONS] = m_aActions[OOO_SHAPE_ACTIONS].reset(
new XMLTransformerActions( aShapeActionTable ); new XMLTransformerActions( aShapeActionTable ) );
break; break;
case OOO_CONNECTOR_ACTIONS: case OOO_CONNECTOR_ACTIONS:
m_aActions[OOO_CONNECTOR_ACTIONS] = m_aActions[OOO_CONNECTOR_ACTIONS].reset(
new XMLTransformerActions( aConnectorActionTable ); new XMLTransformerActions( aConnectorActionTable ) );
break; break;
case OOO_TAB_STOP_ACTIONS: case OOO_TAB_STOP_ACTIONS:
m_aActions[OOO_TAB_STOP_ACTIONS] = m_aActions[OOO_TAB_STOP_ACTIONS].reset(
new XMLTransformerActions( aTabStopActionTable ); new XMLTransformerActions( aTabStopActionTable ) );
break; break;
case OOO_INDEX_ENTRY_TAB_STOP_ACTIONS: case OOO_INDEX_ENTRY_TAB_STOP_ACTIONS:
m_aActions[OOO_INDEX_ENTRY_TAB_STOP_ACTIONS] = m_aActions[OOO_INDEX_ENTRY_TAB_STOP_ACTIONS].reset(
new XMLTransformerActions( aIndexEntryTabStopActionTable ); new XMLTransformerActions( aIndexEntryTabStopActionTable ) );
break; break;
case OOO_LINENUMBERING_ACTIONS: case OOO_LINENUMBERING_ACTIONS:
m_aActions[OOO_LINENUMBERING_ACTIONS] = m_aActions[OOO_LINENUMBERING_ACTIONS].reset(
new XMLTransformerActions( aLineNumberingActionTable ); new XMLTransformerActions( aLineNumberingActionTable ) );
break; break;
case OOO_FOOTNOTE_SEP_ACTIONS: case OOO_FOOTNOTE_SEP_ACTIONS:
m_aActions[OOO_FOOTNOTE_SEP_ACTIONS] = m_aActions[OOO_FOOTNOTE_SEP_ACTIONS].reset(
new XMLTransformerActions( aFootnoteSepActionTable ); new XMLTransformerActions( aFootnoteSepActionTable ) );
break; break;
case OOO_DROP_CAP_ACTIONS: case OOO_DROP_CAP_ACTIONS:
m_aActions[OOO_DROP_CAP_ACTIONS] = m_aActions[OOO_DROP_CAP_ACTIONS].reset(
new XMLTransformerActions( aDropCapActionTable ); new XMLTransformerActions( aDropCapActionTable ) );
break; break;
case OOO_COLUMNS_ACTIONS: case OOO_COLUMNS_ACTIONS:
m_aActions[OOO_COLUMNS_ACTIONS] = m_aActions[OOO_COLUMNS_ACTIONS].reset(
new XMLTransformerActions( aColumnsActionTable ); new XMLTransformerActions( aColumnsActionTable ) );
break; break;
case OOO_TEXT_VALUE_TYPE_ACTIONS: case OOO_TEXT_VALUE_TYPE_ACTIONS:
m_aActions[OOO_TEXT_VALUE_TYPE_ACTIONS] = m_aActions[OOO_TEXT_VALUE_TYPE_ACTIONS].reset(
new XMLTransformerActions( aTextValueTypeActionTable ); new XMLTransformerActions( aTextValueTypeActionTable ) );
break; break;
case OOO_TABLE_VALUE_TYPE_ACTIONS: case OOO_TABLE_VALUE_TYPE_ACTIONS:
m_aActions[OOO_TABLE_VALUE_TYPE_ACTIONS] = m_aActions[OOO_TABLE_VALUE_TYPE_ACTIONS].reset(
new XMLTransformerActions( aTableValueTypeActionTable ); new XMLTransformerActions( aTableValueTypeActionTable ) );
break; break;
case OOO_PARA_ACTIONS: case OOO_PARA_ACTIONS:
m_aActions[OOO_PARA_ACTIONS] = m_aActions[OOO_PARA_ACTIONS].reset(
new XMLTransformerActions( aParaActionTable ); new XMLTransformerActions( aParaActionTable ) );
break; break;
case OOO_STYLE_REF_ACTIONS: case OOO_STYLE_REF_ACTIONS:
m_aActions[OOO_STYLE_REF_ACTIONS] = m_aActions[OOO_STYLE_REF_ACTIONS].reset(
new XMLTransformerActions( aStyleRefActionTable ); new XMLTransformerActions( aStyleRefActionTable ) );
break; break;
case OOO_MASTER_PAGE_ACTIONS: case OOO_MASTER_PAGE_ACTIONS:
m_aActions[OOO_MASTER_PAGE_ACTIONS] = m_aActions[OOO_MASTER_PAGE_ACTIONS].reset(
new XMLTransformerActions( aMasterPageActionTable ); new XMLTransformerActions( aMasterPageActionTable ) );
break; break;
case OOO_ANNOTATION_ACTIONS: case OOO_ANNOTATION_ACTIONS:
m_aActions[OOO_ANNOTATION_ACTIONS] = m_aActions[OOO_ANNOTATION_ACTIONS].reset(
new XMLTransformerActions( aAnnotationActionTable ); new XMLTransformerActions( aAnnotationActionTable ) );
break; break;
case OOO_CHANGE_INFO_ACTIONS: case OOO_CHANGE_INFO_ACTIONS:
m_aActions[OOO_CHANGE_INFO_ACTIONS] = m_aActions[OOO_CHANGE_INFO_ACTIONS].reset(
new XMLTransformerActions( aChangeInfoActionTable ); new XMLTransformerActions( aChangeInfoActionTable ) );
break; break;
case OOO_FRAME_ELEM_ACTIONS: case OOO_FRAME_ELEM_ACTIONS:
m_aActions[OOO_FRAME_ELEM_ACTIONS] = m_aActions[OOO_FRAME_ELEM_ACTIONS].reset(
new XMLTransformerActions( aFrameElemActionTable ); new XMLTransformerActions( aFrameElemActionTable ) );
break; break;
case OOO_FRAME_ATTR_ACTIONS: case OOO_FRAME_ATTR_ACTIONS:
m_aActions[OOO_FRAME_ATTR_ACTIONS] = m_aActions[OOO_FRAME_ATTR_ACTIONS].reset(
new XMLTransformerActions( aFrameAttrActionTable ); new XMLTransformerActions( aFrameAttrActionTable ) );
break; break;
case OOO_BACKGROUND_IMAGE_ACTIONS: case OOO_BACKGROUND_IMAGE_ACTIONS:
// Use special actions for Writer documents. (#i50322#) // Use special actions for Writer documents. (#i50322#)
m_aActions[OOO_BACKGROUND_IMAGE_ACTIONS] = m_aActions[OOO_BACKGROUND_IMAGE_ACTIONS].reset(
isWriter() isWriter()
? new XMLTransformerActions( aWriterBackgroundImageActionTable ) ? new XMLTransformerActions( aWriterBackgroundImageActionTable )
: new XMLTransformerActions( aBackgroundImageActionTable ); : new XMLTransformerActions( aBackgroundImageActionTable ) );
break; break;
case OOO_DDE_CONNECTION_DECL_ACTIONS: case OOO_DDE_CONNECTION_DECL_ACTIONS:
m_aActions[OOO_DDE_CONNECTION_DECL_ACTIONS] = m_aActions[OOO_DDE_CONNECTION_DECL_ACTIONS].reset(
new XMLTransformerActions( aDDEConnectionDeclActionTable ); new XMLTransformerActions( aDDEConnectionDeclActionTable ) );
break; break;
case OOO_EVENT_ACTIONS: case OOO_EVENT_ACTIONS:
m_aActions[OOO_EVENT_ACTIONS] = m_aActions[OOO_EVENT_ACTIONS].reset(
new XMLTransformerActions( aEventActionTable ); new XMLTransformerActions( aEventActionTable ) );
break; break;
case OOO_FORM_CONTROL_ACTIONS: case OOO_FORM_CONTROL_ACTIONS:
m_aActions[OOO_FORM_CONTROL_ACTIONS] = m_aActions[OOO_FORM_CONTROL_ACTIONS].reset(
new XMLTransformerActions( aFormControlActionTable ); new XMLTransformerActions( aFormControlActionTable ) );
break; break;
case OOO_FORM_COLUMN_ACTIONS: case OOO_FORM_COLUMN_ACTIONS:
m_aActions[OOO_FORM_COLUMN_ACTIONS] = m_aActions[OOO_FORM_COLUMN_ACTIONS].reset(
new XMLTransformerActions( aFormColumnActionTable ); new XMLTransformerActions( aFormColumnActionTable ) );
break; break;
case OOO_FORM_PROP_ACTIONS: case OOO_FORM_PROP_ACTIONS:
m_aActions[OOO_FORM_PROP_ACTIONS] = m_aActions[OOO_FORM_PROP_ACTIONS].reset(
new XMLTransformerActions( aFormPropActionTable ); new XMLTransformerActions( aFormPropActionTable ) );
break; break;
case OOO_XLINK_ACTIONS: case OOO_XLINK_ACTIONS:
m_aActions[OOO_XLINK_ACTIONS] = m_aActions[OOO_XLINK_ACTIONS].reset(
new XMLTransformerActions( aXLinkActionTable ); new XMLTransformerActions( aXLinkActionTable ) );
break; break;
case OOO_CONFIG_ITEM_SET_ACTIONS: case OOO_CONFIG_ITEM_SET_ACTIONS:
m_aActions[OOO_CONFIG_ITEM_SET_ACTIONS] = m_aActions[OOO_CONFIG_ITEM_SET_ACTIONS].reset(
new XMLTransformerActions( aConfigItemSetActionTable ); new XMLTransformerActions( aConfigItemSetActionTable ) );
break; break;
case OOO_FORMULA_ACTIONS: case OOO_FORMULA_ACTIONS:
m_aActions[OOO_FORMULA_ACTIONS] = m_aActions[OOO_FORMULA_ACTIONS].reset(
new XMLTransformerActions( aFormulaActionTable ); new XMLTransformerActions( aFormulaActionTable ) );
break; break;
case OOO_CHART_ACTIONS: case OOO_CHART_ACTIONS:
m_aActions[OOO_CHART_ACTIONS] = m_aActions[OOO_CHART_ACTIONS].reset(
new XMLTransformerActions( aChartActionTable ); new XMLTransformerActions( aChartActionTable ) );
break; break;
case OOO_ERROR_MACRO_ACTIONS: case OOO_ERROR_MACRO_ACTIONS:
m_aActions[OOO_ERROR_MACRO_ACTIONS] = m_aActions[OOO_ERROR_MACRO_ACTIONS].reset(
new XMLTransformerActions( aErrorMacroActionTable ); new XMLTransformerActions( aErrorMacroActionTable ) );
break; break;
case OOO_DDE_CONV_MODE_ACTIONS: case OOO_DDE_CONV_MODE_ACTIONS:
m_aActions[OOO_DDE_CONV_MODE_ACTIONS] = m_aActions[OOO_DDE_CONV_MODE_ACTIONS].reset(
new XMLTransformerActions( aDDEConvModeActionTable ); new XMLTransformerActions( aDDEConvModeActionTable ) );
break; break;
case OOO_ALPHABETICAL_INDEX_MARK_ACTIONS: case OOO_ALPHABETICAL_INDEX_MARK_ACTIONS:
m_aActions[OOO_ALPHABETICAL_INDEX_MARK_ACTIONS] = m_aActions[OOO_ALPHABETICAL_INDEX_MARK_ACTIONS].reset(
new XMLTransformerActions( aAlphabeticalIndexMarkActionTable ); new XMLTransformerActions( aAlphabeticalIndexMarkActionTable ) );
break; break;
case OOO_DATAPILOT_MEMBER_ACTIONS: case OOO_DATAPILOT_MEMBER_ACTIONS:
m_aActions[OOO_DATAPILOT_MEMBER_ACTIONS] = m_aActions[OOO_DATAPILOT_MEMBER_ACTIONS].reset(
new XMLTransformerActions( aDataPilotMemberActionTable ); new XMLTransformerActions( aDataPilotMemberActionTable ) );
break; break;
case OOO_DATAPILOT_LEVEL_ACTIONS: case OOO_DATAPILOT_LEVEL_ACTIONS:
m_aActions[OOO_DATAPILOT_LEVEL_ACTIONS] = m_aActions[OOO_DATAPILOT_LEVEL_ACTIONS].reset(
new XMLTransformerActions( aDataPilotLevelActionTable ); new XMLTransformerActions( aDataPilotLevelActionTable ) );
break; break;
case OOO_SOURCE_SERVICE_ACTIONS: case OOO_SOURCE_SERVICE_ACTIONS:
m_aActions[OOO_SOURCE_SERVICE_ACTIONS] = m_aActions[OOO_SOURCE_SERVICE_ACTIONS].reset(
new XMLTransformerActions( aSourceServiceActionTable ); new XMLTransformerActions( aSourceServiceActionTable ) );
break; break;
case OOO_DRAW_AREA_POLYGON_ACTIONS: case OOO_DRAW_AREA_POLYGON_ACTIONS:
m_aActions[OOO_DRAW_AREA_POLYGON_ACTIONS] = m_aActions[OOO_DRAW_AREA_POLYGON_ACTIONS].reset(
new XMLTransformerActions( aShapeActionTable ); new XMLTransformerActions( aShapeActionTable ) );
m_aActions[OOO_DRAW_AREA_POLYGON_ACTIONS] m_aActions[OOO_DRAW_AREA_POLYGON_ACTIONS]
->Add( aDrawAreaPolygonActionTable ); ->Add( aDrawAreaPolygonActionTable );
break; break;
case OOO_SCRIPT_ACTIONS: case OOO_SCRIPT_ACTIONS:
m_aActions[OOO_SCRIPT_ACTIONS] = m_aActions[OOO_SCRIPT_ACTIONS].reset(
new XMLTransformerActions( aScriptActionTable ); new XMLTransformerActions( aScriptActionTable ) );
break; break;
case OOO_ANIMATION_ACTIONS: case OOO_ANIMATION_ACTIONS:
m_aActions[OOO_ANIMATION_ACTIONS] = m_aActions[OOO_ANIMATION_ACTIONS].reset(
new XMLTransformerActions( aAnimationsActionTable ); new XMLTransformerActions( aAnimationsActionTable ) );
break; break;
} }
} }
pActions = m_aActions[n]; pActions = m_aActions[n].get();
} }
return pActions; return pActions;
...@@ -1798,14 +1798,14 @@ OOo2OasisTransformer::OOo2OasisTransformer( const sal_Char *pImplName, ...@@ -1798,14 +1798,14 @@ OOo2OasisTransformer::OOo2OasisTransformer( const sal_Char *pImplName,
GetNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG ); GetNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG), XML_NAMESPACE_SVG );
GetReplaceNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG_COMPAT), XML_NAMESPACE_SVG ); GetReplaceNamespaceMap().Add( GetXMLToken(XML_NP_SVG), GetXMLToken(XML_N_SVG_COMPAT), XML_NAMESPACE_SVG );
for(XMLTransformerActions*& rp : m_aActions) for(auto & rp : m_aActions)
rp = nullptr; rp.reset();
} }
OOo2OasisTransformer::~OOo2OasisTransformer() throw() OOo2OasisTransformer::~OOo2OasisTransformer() throw()
{ {
for(XMLTransformerActions* p : m_aActions) for(auto & rp : m_aActions)
delete p; rp.reset();
XMLEventOOoTransformerContext::FlushEventMap( m_pEventMap ); XMLEventOOoTransformerContext::FlushEventMap( m_pEventMap );
} }
......
xmloff/source/transform/OOo2Oasis.hxx
Dosyayı görüntüle @ 747d36d2
...@@ -35,7 +35,7 @@ class OOo2OasisTransformer : ...@@ -35,7 +35,7 @@ class OOo2OasisTransformer :
OUString m_aImplName; OUString m_aImplName;
OUString m_aSubServiceName; OUString m_aSubServiceName;
XMLTransformerActions *m_aActions[MAX_OOO_ACTIONS]; std::unique_ptr<XMLTransformerActions> m_aActions[MAX_OOO_ACTIONS];
XMLTransformerOOoEventMap_Impl *m_pEventMap; XMLTransformerOOoEventMap_Impl *m_pEventMap;
protected: protected:
......
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