From 4ff115b3e7ff9c73dcc98fc6e7109f499ea81cfe Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 30 Jun 2014 09:53:06 +0200 Subject: drop UniReference in favour of rtl::Reference since they're doing the same thing. Change-Id: I76134b6b848db8628f315fe5bd9eb972a6bf0cb6 --- xmloff/source/chart/PropertyMaps.cxx | 4 +-- xmloff/source/chart/SchXMLAutoStylePoolP.cxx | 2 +- xmloff/source/chart/SchXMLExport.cxx | 18 ++++++------ xmloff/source/chart/SchXMLTools.cxx | 2 +- xmloff/source/chart/XMLChartPropertyContext.cxx | 2 +- xmloff/source/chart/XMLChartPropertyContext.hxx | 2 +- xmloff/source/chart/XMLChartStyleContext.cxx | 2 +- xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 4 +-- xmloff/source/draw/XMLReplacementImageContext.cxx | 4 +-- xmloff/source/draw/XMLShapePropertySetContext.cxx | 2 +- xmloff/source/draw/XMLShapeStyleContext.cxx | 12 ++++---- xmloff/source/draw/animexp.cxx | 2 +- xmloff/source/draw/animimp.cxx | 2 +- xmloff/source/draw/sdpropls.cxx | 6 ++-- xmloff/source/draw/sdpropls.hxx | 6 ++-- xmloff/source/draw/sdxmlexp.cxx | 18 ++++++------ xmloff/source/draw/shapeexport.cxx | 10 +++---- xmloff/source/draw/shapeimport.cxx | 8 +++--- xmloff/source/draw/ximppage.cxx | 2 +- xmloff/source/draw/ximpshap.cxx | 6 ++-- xmloff/source/draw/ximpstyl.cxx | 24 ++++++++-------- xmloff/source/draw/ximpstyl.hxx | 4 +-- xmloff/source/forms/controlpropertymap.cxx | 2 +- xmloff/source/forms/controlpropertymap.hxx | 2 +- xmloff/source/forms/elementimport.cxx | 4 +-- xmloff/source/forms/propertyexport.cxx | 2 +- xmloff/source/style/PageHeaderFooterContext.cxx | 2 +- xmloff/source/style/PageHeaderFooterContext.hxx | 4 +-- xmloff/source/style/PageMasterExportPropMapper.cxx | 4 +-- xmloff/source/style/PageMasterExportPropMapper.hxx | 2 +- xmloff/source/style/PageMasterImportContext.cxx | 12 ++++---- xmloff/source/style/PageMasterImportPropMapper.cxx | 2 +- xmloff/source/style/PageMasterImportPropMapper.hxx | 2 +- xmloff/source/style/PageMasterPropMapper.cxx | 2 +- xmloff/source/style/PageMasterPropMapper.hxx | 2 +- xmloff/source/style/PagePropertySetContext.cxx | 2 +- xmloff/source/style/PagePropertySetContext.hxx | 2 +- xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 2 +- xmloff/source/style/XMLFootnoteSeparatorExport.hxx | 11 ++++---- xmloff/source/style/XMLFootnoteSeparatorImport.cxx | 2 +- xmloff/source/style/XMLFootnoteSeparatorImport.hxx | 9 ++---- xmloff/source/style/XMLPageExport.cxx | 2 +- xmloff/source/style/impastpl.cxx | 8 +++--- xmloff/source/style/impastpl.hxx | 8 +++--- xmloff/source/style/prstylei.cxx | 14 +++++----- xmloff/source/style/styleexp.cxx | 8 +++--- xmloff/source/style/uniref.cxx | 32 ---------------------- xmloff/source/style/xmlaustp.cxx | 16 +++++------ xmloff/source/style/xmlexppr.cxx | 16 +++++------ xmloff/source/style/xmlimppr.cxx | 14 +++++----- xmloff/source/style/xmlprcon.cxx | 4 +-- xmloff/source/style/xmlprmap.cxx | 8 +++--- xmloff/source/style/xmlstyle.cxx | 6 ++-- xmloff/source/table/XMLTableImport.cxx | 6 ++-- xmloff/source/text/XMLChangeImportContext.cxx | 2 +- .../source/text/XMLChangedRegionImportContext.cxx | 4 +-- xmloff/source/text/XMLIndexTOCContext.cxx | 4 +-- .../source/text/XMLSectionFootnoteConfigExport.cxx | 2 +- .../source/text/XMLSectionFootnoteConfigExport.hxx | 6 ++-- .../source/text/XMLSectionFootnoteConfigImport.cxx | 2 +- .../source/text/XMLSectionFootnoteConfigImport.hxx | 8 ++---- xmloff/source/text/XMLSectionImportContext.cxx | 4 +-- xmloff/source/text/XMLTextFrameContext.cxx | 10 +++---- xmloff/source/text/XMLTextHeaderFooterContext.cxx | 2 +- xmloff/source/text/XMLTextPropertySetContext.cxx | 2 +- xmloff/source/text/XMLTextPropertySetContext.hxx | 2 +- xmloff/source/text/XMLTextShapeImportHelper.cxx | 2 +- xmloff/source/text/XMLTextShapeStyleContext.cxx | 6 ++-- xmloff/source/text/txtexppr.cxx | 2 +- xmloff/source/text/txtexppr.hxx | 2 +- xmloff/source/text/txtfldi.cxx | 2 +- xmloff/source/text/txtimp.cxx | 22 +++++++-------- xmloff/source/text/txtimppr.cxx | 6 ++-- xmloff/source/text/txtparae.cxx | 18 ++++++------ xmloff/source/text/txtparai.cxx | 4 +-- xmloff/source/text/txtstyli.cxx | 8 +++--- 76 files changed, 218 insertions(+), 256 deletions(-) delete mode 100644 xmloff/source/style/uniref.cxx (limited to 'xmloff/source') diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 564241479bb5..cedcc8dfe752 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -171,7 +171,7 @@ XMLChartPropertySetMapper::~XMLChartPropertySetMapper() { } -XMLChartExportPropertyMapper::XMLChartExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, +XMLChartExportPropertyMapper::XMLChartExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport) : SvXMLExportPropertyMapper( rMapper ), msTrue( GetXMLToken( XML_TRUE )), @@ -499,7 +499,7 @@ void XMLChartExportPropertyMapper::setChartDoc( uno::Reference< chart2::XChartDo mxChartDoc = xChartDoc; } -XMLChartImportPropertyMapper::XMLChartImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, +XMLChartImportPropertyMapper::XMLChartImportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, const SvXMLImport& _rImport ) : SvXMLImportPropertyMapper( rMapper, const_cast< SvXMLImport & >( _rImport )), mrImport( const_cast< SvXMLImport & > ( _rImport )) diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx index 5ea101713c01..a2c250e66c5e 100644 --- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx +++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx @@ -56,7 +56,7 @@ void SchXMLAutoStylePoolP::exportStyleAttributes( if( iter->mnIndex == -1 ) continue; - UniReference< XMLPropertySetMapper > aPropMapper = + rtl::Reference< XMLPropertySetMapper > aPropMapper = mrSchXMLExport.GetPropertySetMapper(); sal_Int16 nContextID = aPropMapper->GetEntryContextId( iter->mnIndex ); if( nContextID == XML_SCH_CONTEXT_SPECIAL_NUMBER_FORMAT ) diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 5bda8cc55707..743db2a36d18 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -154,7 +154,7 @@ public: com::sun::star::chart::XChartDocument > rChartDoc, bool bIncludeTable ); - UniReference GetPropertySetMapper() const; + rtl::Reference GetPropertySetMapper() const; void SetChartRangeAddress( const OUString& rAddress ) { msChartAddress = rAddress; } @@ -252,8 +252,8 @@ public: public: SvXMLExport& mrExport; SvXMLAutoStylePoolP& mrAutoStylePool; - UniReference< XMLPropertySetMapper > mxPropertySetMapper; - UniReference< XMLChartExportPropertyMapper > mxExpPropMapper; + rtl::Reference< XMLPropertySetMapper > mxPropertySetMapper; + rtl::Reference< XMLChartExportPropertyMapper > mxExpPropMapper; OUString msTableName; OUStringBuffer msStringBuffer; @@ -1023,7 +1023,7 @@ void SchXMLExportHelper::SetDestinationShellID( const OUString& rShellID ) m_pImpl->maDestShellID = rShellID; } -UniReference< XMLPropertySetMapper > SchXMLExportHelper_Impl::GetPropertySetMapper() const +rtl::Reference< XMLPropertySetMapper > SchXMLExportHelper_Impl::GetPropertySetMapper() const { return mxPropertySetMapper; } @@ -1481,7 +1481,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& // initialisation happened with the complete draw page and not // the XShapes object used here. Thus the shapes have to be // exported one by one - UniReference< XMLShapeExport > rShapeExport = mrExport.GetShapeExport(); + rtl::Reference< XMLShapeExport > rShapeExport = mrExport.GetShapeExport(); Reference< drawing::XShape > xShape; const sal_Int32 nShapeCount( mxAdditionalShapes->getCount()); for( sal_Int32 nShapeId = 0; nShapeId < nShapeCount; nShapeId++ ) @@ -1530,7 +1530,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& // the initialisation happened with the complete draw page and // not the XShapes object used here. Thus the shapes have to be // exported one by one - UniReference< XMLShapeExport > rShapeExport = mrExport.GetShapeExport(); + rtl::Reference< XMLShapeExport > rShapeExport = mrExport.GetShapeExport(); Reference< drawing::XShape > xShape; const sal_Int32 nShapeCount( mxAdditionalShapes->getCount()); for( sal_Int32 nShapeId = 0; nShapeId < nShapeCount; nShapeId++ ) @@ -1885,7 +1885,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( } if( bExportContent ) { - UniReference< XMLShapeExport > rShapeExport; + rtl::Reference< XMLShapeExport > rShapeExport; // write style name AddAutoStyleAttribute( aPropertyStates ); @@ -2280,7 +2280,7 @@ bool lcl_exportAxisType( const Reference< chart2::XAxis > xChart2Axis, SvXMLExpo } void disableLinkedNumberFormat( - std::vector& rPropStates, const UniReference& rMapper ) + std::vector& rPropStates, const rtl::Reference& rMapper ) { for (size_t i = 0; i < rPropStates.size(); ++i) { @@ -3711,7 +3711,7 @@ void SchXMLExport::_ExportContent() } } -UniReference< XMLPropertySetMapper > SchXMLExport::GetPropertySetMapper() const +rtl::Reference< XMLPropertySetMapper > SchXMLExport::GetPropertySetMapper() const { return maExportHelper.m_pImpl->GetPropertySetMapper(); } diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index c9d3d9b1512c..05acf10f4607 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -538,7 +538,7 @@ uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropSty if( !pPropStyleContext || !pStylesCtxt ) return aRet; const ::std::vector< XMLPropertyState >& rProperties = pPropStyleContext->GetProperties(); - const UniReference< XMLPropertySetMapper >& rMapper = pStylesCtxt->GetImportPropertyMapper( pPropStyleContext->GetFamily()/*XML_STYLE_FAMILY_SCH_CHART_ID*/ )->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rMapper = pStylesCtxt->GetImportPropertyMapper( pPropStyleContext->GetFamily()/*XML_STYLE_FAMILY_SCH_CHART_ID*/ )->getPropertySetMapper(); ::std::vector< XMLPropertyState >::const_iterator aEnd( rProperties.end() ); ::std::vector< XMLPropertyState >::const_iterator aPropIter( rProperties.begin() ); for( aPropIter = rProperties.begin(); aPropIter != aEnd; ++aPropIter ) diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx index a1290e557289..ce1b2ea5a22c 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.cxx +++ b/xmloff/source/chart/XMLChartPropertyContext.cxx @@ -34,7 +34,7 @@ XMLChartPropertyContext::XMLChartPropertyContext( const uno::Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState >& rProps, - const UniReference< SvXMLImportPropertyMapper >& rMapper ) : + const rtl::Reference< SvXMLImportPropertyMapper >& rMapper ) : SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, nFamily, rProps, rMapper ) { } diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index f662c9f062a4..9144e494cb3f 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -32,7 +32,7 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState >& rProps, - const UniReference< SvXMLImportPropertyMapper >& rMapper ); + const rtl::Reference< SvXMLImportPropertyMapper >& rMapper ); virtual ~XMLChartPropertyContext(); using SvXMLPropertySetContext::CreateChildContext; diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index 837d85298d43..7f33644dbbac 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -128,7 +128,7 @@ SvXMLImportContext *XMLChartStyleContext::CreateChildContext( nFamily = XML_TYPE_PROP_CHART; if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) pContext = new XMLChartPropertyContext( diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 9753a3fe0b8a..f7731dbd0850 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -68,7 +68,7 @@ SvXMLImportContext *XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nPre nFamily = XML_TYPE_PROP_GRAPHIC; if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) pContext = new XMLShapePropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, GetProperties(), xImpPrMap ); } @@ -142,7 +142,7 @@ void XMLGraphicsDefaultStyle::SetDefaults() // special handling since AOO still does _not_ write it into the file || bIsAOO4) { - UniReference const pImpPrMap( + rtl::Reference const pImpPrMap( GetStyles()->GetImportPropertyMapper(GetFamily()) ->getPropertySetMapper()); sal_Int32 const nStrokeIndex( diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index 8361fd2a76de..fb55d36fbd06 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -42,7 +42,7 @@ XMLReplacementImageContext::XMLReplacementImageContext( m_xPropSet( rPropSet ), m_sGraphicURL("GraphicURL") { - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); const SvXMLTokenMap& rTokenMap = xTxtImport->GetTextFrameAttrTokenMap(); @@ -74,7 +74,7 @@ void XMLReplacementImageContext::EndElement() { OSL_ENSURE( !m_sHRef.isEmpty() || m_xBase64Stream.is(), "neither URL nor base64 image data given" ); - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); OUString sHRef; if( !m_sHRef.isEmpty() ) diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index b8a1e8a5a39c..1aec8f5a6df3 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -36,7 +36,7 @@ XMLShapePropertySetContext::XMLShapePropertySetContext( const Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFam, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap ) : + const rtl::Reference < SvXMLImportPropertyMapper > &rMap ) : SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, nFam, rProps, rMap ), mnBulletIndex(-1) diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 5ee61370ebff..9068ceb42a8f 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -106,7 +106,7 @@ SvXMLImportContext *XMLShapeStyleContext::CreateChildContext( nFamily = XML_TYPE_PROP_GRAPHIC; if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) pContext = new XMLShapePropertySetContext( GetImport(), nPrefix, @@ -132,7 +132,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet // for compatibility to beta files, search for CTF_SD_NUMBERINGRULES_NAME to // import numbering rules from the style:properties element - const UniReference< XMLPropertySetMapper >&rMapper = GetStyles()->GetImportPropertyMapper( GetFamily() )->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >&rMapper = GetStyles()->GetImportPropertyMapper( GetFamily() )->getPropertySetMapper(); ::std::vector< XMLPropertyState > &rProperties = GetProperties(); ::std::vector< XMLPropertyState >::iterator end( rProperties.end() ); @@ -190,9 +190,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet // ones are used when a FillStyle is defined if(!m_bIsFillStyleAlreadyConverted && GetProperties().size()) { - static ::rtl::OUString s_FillStyle(RTL_CONSTASCII_USTRINGPARAM("FillStyle")); - - if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle)) + if(doNewDrawingLayerFillStyleDefinitionsExist(OUString("FillStyle"))) { deactivateOldFillStyleDefinitions(getStandardSet()); } @@ -226,7 +224,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet XML_STYLE_FAMILY_SD_FILL_IMAGE_ID }; - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" ); if( xImpPrMap.is() ) @@ -234,7 +232,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet Reference< XPropertySetInfo > xInfo; // get property set mapper - UniReference xPropMapper( xImpPrMap->getPropertySetMapper() ); + rtl::Reference xPropMapper( xImpPrMap->getPropertySetMapper() ); for( sal_uInt16 i=0; aContextIDs[i].nContextID != -1; i++ ) { diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 0bc68d3ea400..05c12cbb4d1a 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -225,7 +225,7 @@ class AnimExpImpl { public: list maEffects; - UniReference< XMLShapeExport > mxShapeExp; + rtl::Reference< XMLShapeExport > mxShapeExp; OUString msDimColor; OUString msDimHide; diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 00862123e194..d3c7e2b86c1c 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -554,7 +554,7 @@ void XMLAnimationsEffectContext::EndElement() try { - UniReference< XMLShapeImportHelper > xShapeImport( GetImport().GetShapeImport() ); + rtl::Reference< XMLShapeImportHelper > xShapeImport( GetImport().GetShapeImport() ); Any aAny; if( !maShapeId.isEmpty() ) diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index bf15e56a88e9..f24bd7e61b42 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -1167,7 +1167,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy return pHdl; } -XMLShapePropertySetMapper::XMLShapePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef, +XMLShapePropertySetMapper::XMLShapePropertySetMapper(const rtl::Reference< XMLPropertyHandlerFactory >& rFactoryRef, bool bForExport) : XMLPropertySetMapper( aXMLSDProperties, rFactoryRef, bForExport ) { @@ -1177,7 +1177,7 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper() { } -XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) +XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ) , maNumRuleExp( rExport ) , mbIsInAutoStyles( true ) @@ -1562,7 +1562,7 @@ void XMLShapeExportPropertyMapper::handleElementItem( } } -XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : +XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ), mrExport( rExport ), msCDATA( GetXMLToken(XML_CDATA)) diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index d784a2f4c5c3..0293eec88952 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -69,7 +69,7 @@ public: class XMLShapePropertySetMapper : public XMLPropertySetMapper { public: - XMLShapePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef, bool bForExport); + XMLShapePropertySetMapper(const rtl::Reference< XMLPropertyHandlerFactory >& rFactoryRef, bool bForExport); virtual ~XMLShapePropertySetMapper(); }; @@ -90,7 +90,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; public: - XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); + XMLShapeExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); virtual ~XMLShapeExportPropertyMapper(); virtual void handleElementItem( @@ -128,7 +128,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; public: - XMLPageExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); + XMLPageExportPropertyMapper( const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); virtual ~XMLPageExportPropertyMapper(); virtual void handleElementItem( diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 90b7642a9339..607913500266 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -436,10 +436,10 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent mpSdPropHdlFactory->acquire(); // build one ref - const UniReference< XMLPropertyHandlerFactory > aFactoryRef = mpSdPropHdlFactory; + const rtl::Reference< XMLPropertyHandlerFactory > aFactoryRef = mpSdPropHdlFactory; // construct PropertySetMapper - UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( aFactoryRef, true); + rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( aFactoryRef, true); // get or create text paragraph export GetTextParagraphExport(); @@ -1659,7 +1659,7 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( Reference xDrawPage xPropSet = xPropSet1; } - const UniReference< SvXMLExportPropertyMapper > aMapperRef( GetPresPagePropsMapper() ); + const rtl::Reference< SvXMLExportPropertyMapper > aMapperRef( GetPresPagePropsMapper() ); std::vector< XMLPropertyState > xPropStates( aMapperRef->Filter( xPropSet ) ); @@ -1724,7 +1724,7 @@ void SdXMLExport::ImpWritePresentationStyles() if(IsImpress() && mxDocStyleFamilies.is() && xNamed.is()) { XMLStyleExport aStEx(*this, OUString(), GetAutoStylePool().get()); - const UniReference< SvXMLExportPropertyMapper > aMapperRef( GetPropertySetMapper() ); + const rtl::Reference< SvXMLExportPropertyMapper > aMapperRef( GetPropertySetMapper() ); OUString aPrefix( xNamed->getName() ); @@ -1857,7 +1857,7 @@ void SdXMLExport::_ExportContent() if( !sNavigationOrder.isEmpty() ) AddAttribute ( XML_NAMESPACE_DRAW, XML_NAV_ORDER, sNavigationOrder ); - UniReference< xmloff::AnimationsExporter > xAnimationsExporter; + rtl::Reference< xmloff::AnimationsExporter > xAnimationsExporter; uno::Reference< ::com::sun::star::animations::XAnimationNodeSupplier > xAnimNodeSupplier; // prepare animation export @@ -1878,7 +1878,7 @@ void SdXMLExport::_ExportContent() else { // export old animations for ooo format - UniReference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter( GetShapeExport().get() ); + rtl::Reference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter( GetShapeExport().get() ); GetShapeExport()->setAnimationsExporter( xAnimExport ); } } @@ -1911,7 +1911,7 @@ void SdXMLExport::_ExportContent() else { // animations - UniReference< XMLAnimationsExporter > xAnimExport( GetShapeExport()->getAnimationsExporter() ); + rtl::Reference< XMLAnimationsExporter > xAnimExport( GetShapeExport()->getAnimationsExporter() ); if( xAnimExport.is() ) xAnimExport->exportAnimations( *this ); @@ -2291,7 +2291,7 @@ void SdXMLExport::_ExportAutoStyles() // prepare animations exporter if impress if(IsImpress() && ((getExportFlags() & EXPORT_OASIS) == 0) ) { - UniReference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter( GetShapeExport().get() ); + rtl::Reference< XMLAnimationsExporter > xAnimExport = new XMLAnimationsExporter( GetShapeExport().get() ); GetShapeExport()->setAnimationsExporter( xAnimExport ); } @@ -2355,7 +2355,7 @@ void SdXMLExport::_ExportAutoStyles() } if(IsImpress()) { - UniReference< XMLAnimationsExporter > xAnimExport; + rtl::Reference< XMLAnimationsExporter > xAnimExport; GetShapeExport()->setAnimationsExporter( xAnimExport ); } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index fff8f4a07825..7f33e5828a88 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -156,7 +156,7 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, mxPropertySetMapper = CreateShapePropMapper( mrExport ); if( pExtMapper ) { - UniReference < SvXMLExportPropertyMapper > xExtMapper( pExtMapper ); + rtl::Reference < SvXMLExportPropertyMapper > xExtMapper( pExtMapper ); mxPropertySetMapper->ChainExportMapper( xExtMapper ); } @@ -1026,8 +1026,8 @@ void XMLShapeExport::exportAutoStyles() SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper( SvXMLExport& rExport ) { - UniReference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rExport.GetModel(), rExport ); - UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory, true ); + rtl::Reference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rExport.GetModel(), rExport ); + rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory, true ); rExport.GetTextParagraphExport(); // get or create text paragraph export SvXMLExportPropertyMapper* pResult = new XMLShapeExportPropertyMapper( xMapper, rExport ); @@ -1229,7 +1229,7 @@ void XMLShapeExport::ExportGraphicDefaults() XMLStyleExport aStEx(mrExport, OUString(), mrExport.GetAutoStylePool().get()); // construct PropertySetMapper - UniReference< SvXMLExportPropertyMapper > xPropertySetMapper( CreateShapePropMapper( mrExport ) ); + rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( CreateShapePropMapper( mrExport ) ); ((XMLShapeExportPropertyMapper*)xPropertySetMapper.get())->SetAutoStyles( false ); // chain text attributes @@ -1268,7 +1268,7 @@ const rtl::Reference< XMLTableExport >& XMLShapeExport::GetShapeTableExport() if( !mxShapeTableExport.is() ) { rtl::Reference< XMLPropertyHandlerFactory > xFactory( new XMLSdPropHdlFactory( mrExport.GetModel(), mrExport ) ); - UniReference < XMLPropertySetMapper > xMapper( new XMLShapePropertySetMapper( xFactory.get(), true ) ); + rtl::Reference < XMLPropertySetMapper > xMapper( new XMLShapePropertySetMapper( xFactory.get(), true ) ); mrExport.GetTextParagraphExport(); // get or create text paragraph export rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( new XMLShapeExportPropertyMapper( xMapper, mrExport ) ); mxShapeTableExport = new XMLTableExport( mrExport, xPropertySetMapper, xFactory ); diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index b220c22eae6f..d552b3f09800 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -148,14 +148,14 @@ XMLShapeImportHelper::XMLShapeImportHelper( mpSdPropHdlFactory->acquire(); // construct PropertySetMapper - UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper(mpSdPropHdlFactory, false); + rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper(mpSdPropHdlFactory, false); mpPropertySetMapper = new SvXMLImportPropertyMapper( xMapper, rImporter ); // set lock to avoid deletion mpPropertySetMapper->acquire(); if( pExtMapper ) { - UniReference < SvXMLImportPropertyMapper > xExtMapper( pExtMapper ); + rtl::Reference < SvXMLImportPropertyMapper > xExtMapper( pExtMapper ); mpPropertySetMapper->ChainImportMapper( xExtMapper ); } @@ -1015,8 +1015,8 @@ void XMLShapeImportHelper::restoreConnections() SvXMLImportPropertyMapper* XMLShapeImportHelper::CreateShapePropMapper( const uno::Reference< frame::XModel>& rModel, SvXMLImport& rImport ) { - UniReference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rModel, rImport ); - UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory, false ); + rtl::Reference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rModel, rImport ); + rtl::Reference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory, false ); SvXMLImportPropertyMapper* pResult = new SvXMLImportPropertyMapper( xMapper, rImport ); // chain text attributes diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index ec1a144ac331..11a5a166b05f 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -147,7 +147,7 @@ SvXMLImportContext * DrawAnnotationContext::CreateChildContext( sal_uInt16 nPref uno::Reference< text::XText > xText( mxAnnotation->getTextRange() ); if( xText.is() ) { - UniReference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); mxCursor = xText->createTextCursor(); if( mxCursor.is() ) xTxtImport->SetCursor( mxCursor ); diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index dee14cef6625..dc2d886bbeaf 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -216,7 +216,7 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, uno::Reference< text::XText > xText( mxShape, uno::UNO_QUERY ); if( xText.is() ) { - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); mxOldCursor = xTxtImport->GetCursor(); mxCursor = xText->createTextCursor(); @@ -438,7 +438,7 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) xNamed->setName( maShapeName ); } - UniReference< XMLShapeImportHelper > xImp( GetImport().GetShapeImport() ); + rtl::Reference< XMLShapeImportHelper > xImp( GetImport().GetShapeImport() ); xImp->addShape( xShape, mxAttrList, mxShapes ); if( mbClearDefaultAttributes ) @@ -973,7 +973,7 @@ void SdXMLShapeContext::onDemandRescueUsefulDataFromTemporary( const SvXMLImport uno::Sequence< sal_Int32 > aSourceIdSequence( xSourceGluePoints->getIdentifiers() ); const sal_Int32 nSourceCount(aSourceIdSequence.getLength()); - UniReference< XMLShapeImportHelper > xSourceShapeImportHelper(const_cast< SdXMLShapeContext* >(pCandidate)->GetImport().GetShapeImport()); + rtl::Reference< XMLShapeImportHelper > xSourceShapeImportHelper(const_cast< SdXMLShapeContext* >(pCandidate)->GetImport().GetShapeImport()); if(nSourceCount) { diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index d26b0b5e0164..b1e4c03bf473 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -61,7 +61,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap ); + const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); virtual ~SdXMLDrawingPagePropertySetContext(); @@ -80,7 +80,7 @@ SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext( const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap ) : + const rtl::Reference < SvXMLImportPropertyMapper > &rMap ) : SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, XML_TYPE_PROP_DRAWING_PAGE, rProps, rMap ) { @@ -182,7 +182,7 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext( if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_DRAWING_PAGE_PROPERTIES ) ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) pContext = new SdXMLDrawingPagePropertySetContext( GetImport(), nPrefix, @@ -204,7 +204,7 @@ void SdXMLDrawingPageStyleContext::Finish( bool bOverwrite ) ::std::vector< XMLPropertyState > &rProperties = GetProperties(); - const UniReference< XMLPropertySetMapper >& rImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() )->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() )->getPropertySetMapper(); ::std::vector< XMLPropertyState >::iterator property = rProperties.begin(); for(; property != rProperties.end(); ++property) @@ -264,7 +264,7 @@ void SdXMLDrawingPageStyleContext::FillPropertySet( XML_STYLE_FAMILY_SD_FILL_IMAGE_ID }; - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" ); if( xImpPrMap.is() ) @@ -282,7 +282,7 @@ void SdXMLDrawingPageStyleContext::FillPropertySet( sStyleName = GetImport().GetStyleDisplayName( aFamilies[i], sStyleName ); // get property set mapper - UniReference rPropMapper = + rtl::Reference rPropMapper = xImpPrMap->getPropertySetMapper(); // set property @@ -1098,10 +1098,10 @@ sal_uInt16 SdXMLStylesContext::GetFamily( const OUString& rFamily ) const return SvXMLStylesContext::GetFamily(rFamily); } -UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyMapper( +rtl::Reference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyMapper( sal_uInt16 nFamily) const { - UniReference < SvXMLImportPropertyMapper > xMapper; + rtl::Reference < SvXMLImportPropertyMapper > xMapper; switch( nFamily ) { @@ -1109,7 +1109,7 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM { if(!xPresImpPropMapper.is()) { - UniReference< XMLShapeImportHelper > aImpHelper = ((SvXMLImport&)GetImport()).GetShapeImport(); + rtl::Reference< XMLShapeImportHelper > aImpHelper = ((SvXMLImport&)GetImport()).GetShapeImport(); ((SdXMLStylesContext*)this)->xPresImpPropMapper = aImpHelper->GetPresPagePropsMapper(); } @@ -1268,7 +1268,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const //enabled before having autoheight turned off again and getting stuck on that //autosized height static bool canSkipReset(const OUString &rName, const XMLPropStyleContext* pPropStyle, - const uno::Reference< beans::XPropertySet > &rPropSet, const UniReference < XMLPropertySetMapper >& rPrMap) + const uno::Reference< beans::XPropertySet > &rPropSet, const rtl::Reference < XMLPropertySetMapper >& rPrMap) { bool bCanSkipReset = false; if (pPropStyle && rName == "TextAutoGrowHeight") @@ -1353,8 +1353,8 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc if( xPropState.is() ) { - UniReference < XMLPropertySetMapper > xPrMap; - UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetImportPropertyMapper( nFamily ); + rtl::Reference < XMLPropertySetMapper > xPrMap; + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetImportPropertyMapper( nFamily ); DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" ); if( xImpPrMap.is() ) xPrMap = xImpPrMap->getPropertySetMapper(); diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 2fcea98f1c64..6f88a0aed7c6 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -187,7 +187,7 @@ public: class SdXMLStylesContext : public SvXMLStylesContext { - UniReference< SvXMLImportPropertyMapper > xPresImpPropMapper; + rtl::Reference< SvXMLImportPropertyMapper > xPresImpPropMapper; bool mbIsAutoStyle; SvXMLNumFmtHelper* mpNumFmtHelper; SvNumberFormatter* mpNumFormatter; @@ -230,7 +230,7 @@ public: virtual sal_uInt16 GetFamily( const OUString& rFamily ) const SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; - virtual UniReference< SvXMLImportPropertyMapper > GetImportPropertyMapper(sal_uInt16 nFamily) const SAL_OVERRIDE; + virtual rtl::Reference< SvXMLImportPropertyMapper > GetImportPropertyMapper(sal_uInt16 nFamily) const SAL_OVERRIDE; void SetMasterPageStyles(SdXMLMasterPageContext& rMaster) const; diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index 66f690e8bf1b..916b97e1e0fa 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -113,7 +113,7 @@ namespace xmloff } //= OFormComponentStyleExportMapper - OFormComponentStyleExportMapper::OFormComponentStyleExportMapper( const UniReference< XMLPropertySetMapper >& _rMapper ) + OFormComponentStyleExportMapper::OFormComponentStyleExportMapper( const rtl::Reference< XMLPropertySetMapper >& _rMapper ) :SvXMLExportPropertyMapper( _rMapper ) { } diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx index 9fc871dfd6b8..bd9d258c612d 100644 --- a/xmloff/source/forms/controlpropertymap.hxx +++ b/xmloff/source/forms/controlpropertymap.hxx @@ -35,7 +35,7 @@ namespace xmloff class OFormComponentStyleExportMapper : public SvXMLExportPropertyMapper { public: - OFormComponentStyleExportMapper( const UniReference< XMLPropertySetMapper >& _rMapper ); + OFormComponentStyleExportMapper( const rtl::Reference< XMLPropertySetMapper >& _rMapper ); void handleSpecialItem( SvXMLAttributeList& _rAttrList, diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 1d1dc065a0b7..dc461e8df8f8 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1370,7 +1370,7 @@ namespace xmloff Reference< XText > xTextElement( m_xElement, UNO_QUERY ); if ( xTextElement.is() ) { - UniReference < XMLTextImportHelper > xTextImportHelper( m_rContext.getGlobalContext().GetTextImport() ); + rtl::Reference < XMLTextImportHelper > xTextImportHelper( m_rContext.getGlobalContext().GetTextImport() ); if ( !m_xCursor.is() ) { @@ -1510,7 +1510,7 @@ namespace xmloff OControlImport::EndElement(); // some cleanups - UniReference < XMLTextImportHelper > xTextImportHelper( m_rContext.getGlobalContext().GetTextImport() ); + rtl::Reference < XMLTextImportHelper > xTextImportHelper( m_rContext.getGlobalContext().GetTextImport() ); if ( m_xCursor.is() ) { // delete the newline which has been imported errornously diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 5fca30d844ed..9693e7db6087 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -423,7 +423,7 @@ namespace xmloff void OPropertyExport::flagStyleProperties() { // flag all the properties which are part of the style as "handled" - UniReference< XMLPropertySetMapper > xStylePropertiesSupplier = m_rContext.getStylePropertyMapper()->getPropertySetMapper(); + rtl::Reference< XMLPropertySetMapper > xStylePropertiesSupplier = m_rContext.getStylePropertyMapper()->getPropertySetMapper(); for (sal_Int32 i=0; iGetEntryCount(); ++i) exportedProperty(xStylePropertiesSupplier->GetEntryAPIName(i)); diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 542cf91bd9df..8cb1e2f32189 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -32,7 +32,7 @@ PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, ::std::vector< XMLPropertyState > & rTempProperties, - const UniReference < SvXMLImportPropertyMapper > &rTempMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rTempMap, sal_Int32 nStart, sal_Int32 nEnd, const bool bTempHeader ) : SvXMLImportContext( rImport, nPrfx, rLName ), diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index d369b0433985..11b86f75025d 100644 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -27,7 +27,7 @@ class PageHeaderFooterContext : public SvXMLImportContext sal_Int32 nStartIndex; sal_Int32 nEndIndex; bool bHeader; - const UniReference < SvXMLImportPropertyMapper > rMap; + const rtl::Reference < SvXMLImportPropertyMapper > rMap; public: @@ -36,7 +36,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ::std::vector< XMLPropertyState > & rProperties, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nStartIndex, sal_Int32 nEndIndex, const bool bHeader); diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 17a9522a817d..6c67709529b7 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -214,7 +214,7 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& ) } XMLPageMasterExportPropMapper::XMLPageMasterExportPropMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ), aBackgroundImageExport( rExport ), @@ -343,7 +343,7 @@ void XMLPageMasterExportPropMapper::ContextFilter( XMLPropertyState* pFooterRepeatOffsetX = NULL; XMLPropertyState* pFooterRepeatOffsetY = NULL; - UniReference < XMLPropertySetMapper > aPropMapper(getPropertySetMapper()); + rtl::Reference < XMLPropertySetMapper > aPropMapper(getPropertySetMapper()); for( ::std::vector< XMLPropertyState >::iterator aIter = rPropState.begin(); aIter != rPropState.end(); ++aIter ) { diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index 1a11e840ba82..a06cb48135d3 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx @@ -40,7 +40,7 @@ protected: public: XMLPageMasterExportPropMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ); virtual ~XMLPageMasterExportPropMapper(); diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index a88d204462ef..283075cdebcd 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -85,11 +85,11 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( (IsXMLToken(rLocalName, XML_FOOTER_STYLE )) ) ) { bool bHeader = IsXMLToken(rLocalName, XML_HEADER_STYLE); - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) { - const UniReference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); sal_Int32 nFlag; if (bHeader) nFlag = CTF_PM_HEADERFLAG; @@ -126,11 +126,11 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken(rLocalName, XML_PAGE_LAYOUT_PROPERTIES) ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) { - const UniReference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); sal_Int32 nEndIndex (-1); bool bEnd(false); sal_Int32 nIndex = 0; @@ -193,7 +193,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference xImpPrMap = GetStyles()->GetImportPropertyMapper(GetFamily()); + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper(GetFamily()); if(xImpPrMap.is()) { @@ -233,7 +233,7 @@ void PageStyleContext::FillPropertySet(const uno::ReferenceFillPropertySet(GetProperties(), rPropSet, aContextIDs); // get property set mapper - const UniReference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); Reference< XPropertySetInfo > xInfo; //UUUU handle special attributes which have MID_FLAG_NO_PROPERTY_IMPORT set diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index 3de0721da47b..46a52639e938 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; PageMasterImportPropertyMapper::PageMasterImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImp ) : SvXMLImportPropertyMapper( rMapper, rImp ), rImport( rImp ) diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx index 01b245fbbd20..fcccc99e164f 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.hxx +++ b/xmloff/source/style/PageMasterImportPropMapper.hxx @@ -33,7 +33,7 @@ protected: public: PageMasterImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImp); virtual ~PageMasterImportPropertyMapper(); diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx index 0a031364bb14..de1fecfc9917 100644 --- a/xmloff/source/style/PageMasterPropMapper.cxx +++ b/xmloff/source/style/PageMasterPropMapper.cxx @@ -33,7 +33,7 @@ XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper( bool bForExport ): XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper( const XMLPropertyMapEntry* pEntries, - const UniReference< XMLPropertyHandlerFactory >& rFactory, + const rtl::Reference< XMLPropertyHandlerFactory >& rFactory, bool bForExport ) : XMLPropertySetMapper( pEntries, rFactory, bForExport ) { diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx index f93431517a5d..8a3814ba77b1 100644 --- a/xmloff/source/style/PageMasterPropMapper.hxx +++ b/xmloff/source/style/PageMasterPropMapper.hxx @@ -28,7 +28,7 @@ public: XMLPageMasterPropSetMapper( bool bForExport ); XMLPageMasterPropSetMapper( const XMLPropertyMapEntry* pEntries, - const UniReference< XMLPropertyHandlerFactory >& rFactory, + const rtl::Reference< XMLPropertyHandlerFactory >& rFactory, bool bForExport ); virtual ~XMLPageMasterPropSetMapper(); }; diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx index 7fa21ce6ccc6..c8d6e4dec8cf 100644 --- a/xmloff/source/style/PagePropertySetContext.cxx +++ b/xmloff/source/style/PagePropertySetContext.cxx @@ -34,7 +34,7 @@ PagePropertySetContext::PagePropertySetContext( const Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFam, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nStartIndex, sal_Int32 nEndIndex, const PageContextType aTempType ) : SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, nFam, diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx index 09c551e99e2b..20262e9529dc 100644 --- a/xmloff/source/style/PagePropertySetContext.hxx +++ b/xmloff/source/style/PagePropertySetContext.hxx @@ -40,7 +40,7 @@ public: ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nStartIndex, sal_Int32 nEndIndex, const PageContextType aType ); diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 9aaf8583daa2..b551194e65d8 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -56,7 +56,7 @@ void XMLFootnoteSeparatorExport::exportXML( nIdx #endif , - const UniReference & rMapper) + const rtl::Reference & rMapper) { DBG_ASSERT(NULL != pProperties, "Need property states"); diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx index 6b53c5974757..539d4221d034 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx @@ -21,15 +21,14 @@ #define INCLUDED_XMLOFF_SOURCE_STYLE_XMLFOOTNOTESEPARATOREXPORT_HXX #include +#include class SvXMLExport; class XMLPropertySetMapper; struct XMLPropertyState; -template class UniReference; - - -#include - +namespace rtl { + template class Reference; +} /** * export footnote separator element in page styles @@ -48,7 +47,7 @@ public: const ::std::vector * pProperties, sal_uInt32 nIdx, /// used only for debugging - const UniReference & rMapper); + const rtl::Reference & rMapper); }; #endif diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 6fc1c21dfff7..0c0e1bd068ba 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -60,7 +60,7 @@ XMLFootnoteSeparatorImport::XMLFootnoteSeparatorImport( sal_uInt16 nPrefix, const OUString& rLocalName, vector & rProps, - const UniReference & rMapperRef, + const rtl::Reference & rMapperRef, sal_Int32 nIndex) : SvXMLImportContext(rImport, nPrefix, rLocalName), rProperties(rProps), diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx index 46da74cd3111..84b9724ef31d 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx @@ -20,11 +20,8 @@ #ifndef INCLUDED_XMLOFF_SOURCE_STYLE_XMLFOOTNOTESEPARATORIMPORT_HXX #define INCLUDED_XMLOFF_SOURCE_STYLE_XMLFOOTNOTESEPARATORIMPORT_HXX - - #include -#include - +#include #include @@ -43,7 +40,7 @@ namespace com { namespace sun { namespace star { class XMLFootnoteSeparatorImport : public SvXMLImportContext { ::std::vector & rProperties; - UniReference rMapper; + rtl::Reference rMapper; sal_Int32 nPropIndex; public: @@ -55,7 +52,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, ::std::vector & rProperties, - const UniReference & rMapperRef, + const rtl::Reference & rMapperRef, sal_Int32 nIndex); virtual ~XMLFootnoteSeparatorImport(); diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 4cc26f994ad2..4522b2fc92b2 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -232,7 +232,7 @@ void XMLPageExport::exportDefaultStyle() xPageMasterExportPropMapper->FilterDefaults( xPropSet ); bool bExport = false; - UniReference < XMLPropertySetMapper > aPropMapper(xPageMasterExportPropMapper->getPropertySetMapper()); + rtl::Reference < XMLPropertySetMapper > aPropMapper(xPageMasterExportPropMapper->getPropertySetMapper()); for( ::std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); aIter != xPropStates.end(); ++aIter ) { XMLPropertyState *pProp = &(*aIter); diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index eabd3f05917a..1f0c4fb0c7f8 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -45,7 +45,7 @@ using namespace ::xmloff::token; XMLAutoStyleFamily::XMLAutoStyleFamily( sal_Int32 nFamily, const OUString& rStrName, - const UniReference < SvXMLExportPropertyMapper > &rMapper, + const rtl::Reference < SvXMLExportPropertyMapper > &rMapper, const OUString& rStrPrefix, bool bAsFamily ) : mnFamily( nFamily ), maStrFamilyName( rStrName), mxMapper( rMapper ), @@ -389,7 +389,7 @@ SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl() void SvXMLAutoStylePoolP_Impl::AddFamily( sal_Int32 nFamily, const OUString& rStrName, - const UniReference < SvXMLExportPropertyMapper > & rMapper, + const rtl::Reference < SvXMLExportPropertyMapper > & rMapper, const OUString& rStrPrefix, bool bAsFamily ) { @@ -425,7 +425,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily( void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper( sal_Int32 nFamily, - const UniReference < SvXMLExportPropertyMapper > & rMapper ) + const rtl::Reference < SvXMLExportPropertyMapper > & rMapper ) { XMLAutoStyleFamily aTemporary( nFamily ); @@ -724,7 +724,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML( { nStart = 0; sal_Int32 nIndex = 0; - UniReference< XMLPropertySetMapper > aPropMapper = + rtl::Reference< XMLPropertySetMapper > aPropMapper = rFamily.mxMapper->getPropertySetMapper(); sal_Int16 nContextID; while(nIndex < aPropMapper->GetEntryCount() && nEnd == -1) diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index a2d0ea28cf23..dda0e92e8a01 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -48,7 +48,7 @@ struct XMLAutoStyleFamily : boost::noncopyable sal_uInt32 mnFamily; OUString maStrFamilyName; - UniReference < SvXMLExportPropertyMapper > mxMapper; + rtl::Reference < SvXMLExportPropertyMapper > mxMapper; ParentSetType maParentSet; NameSetType maNameSet; @@ -58,7 +58,7 @@ struct XMLAutoStyleFamily : boost::noncopyable bool mbAsFamily; XMLAutoStyleFamily( sal_Int32 nFamily, const OUString& rStrName, - const UniReference& rMapper, + const rtl::Reference& rMapper, const OUString& rStrPrefix, bool bAsFamily = true ); XMLAutoStyleFamily( sal_Int32 nFamily ); @@ -145,10 +145,10 @@ public: SvXMLExport& GetExport() const { return rExport; } void AddFamily( sal_Int32 nFamily, const OUString& rStrName, - const UniReference < SvXMLExportPropertyMapper > & rMapper, + const rtl::Reference < SvXMLExportPropertyMapper > & rMapper, const OUString& rStrPrefix, bool bAsFamily = true ); void SetFamilyPropSetMapper( sal_Int32 nFamily, - const UniReference < SvXMLExportPropertyMapper > & rMapper ); + const rtl::Reference < SvXMLExportPropertyMapper > & rMapper ); void RegisterName( sal_Int32 nFamily, const OUString& rName ); void GetRegisteredNames( com::sun::star::uno::Sequence& aFamilies, diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 828b4a45f31b..5397ce9a20d9 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -190,7 +190,7 @@ SvXMLImportContext *XMLPropStyleContext::CreateChildContext( } if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = ((SvXMLStylesContext *)&mxStyles)->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) @@ -211,7 +211,7 @@ SvXMLImportContext *XMLPropStyleContext::CreateChildContext( void XMLPropStyleContext::FillPropertySet( const Reference< XPropertySet > & rPropSet ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = ((SvXMLStylesContext *)&mxStyles)->GetImportPropertyMapper( GetFamily() ); DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" ); @@ -250,7 +250,7 @@ typedef ::std::set < OUString > PropertyNameSet; void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) { SvXMLStylesContext* pSvXMLStylesContext = static_cast< SvXMLStylesContext* >(&mxStyles); - UniReference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily()); + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily()); OSL_ENSURE(xImpPrMap.is(), "There is no import prop mapper"); //UUUU need to filter out old fill definitions when the new ones are used. The new @@ -375,7 +375,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite ) { Reference< XPropertyState > xPropState( xPropSet, uno::UNO_QUERY ); - UniReference < XMLPropertySetMapper > xPrMap; + rtl::Reference < XMLPropertySetMapper > xPrMap; if( xImpPrMap.is() ) xPrMap = xImpPrMap->getPropertySetMapper(); if( xPrMap.is() ) @@ -515,7 +515,7 @@ bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist( { if(maProperties.size() && rFillStyleTag.getLength()) { - const UniReference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); if(rMapper.is()) { @@ -563,7 +563,7 @@ bool XMLPropStyleContext::deactivateOldFillStyleDefinitions( if(!rHashSetOfTags.empty() && maProperties.size()) { - const UniReference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); if(rMapper.is()) { @@ -594,7 +594,7 @@ bool XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToSt if(maProperties.size()) { - const UniReference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); + const rtl::Reference< XMLPropertySetMapper >& rMapper = GetStyles()->GetImportPropertyMapper(GetFamily())->getPropertySetMapper(); if(rMapper.is()) { diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index a8166c58cbd8..03ac10749ed7 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -81,7 +81,7 @@ void XMLStyleExport::exportStyleContent( const Reference< XStyle >& ) bool XMLStyleExport::exportStyle( const Reference< XStyle >& rStyle, const OUString& rXMLFamily, - const UniReference < SvXMLExportPropertyMapper >& rPropMapper, + const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, const Reference< XNameAccess >& xStyles, const OUString* pPrefix ) { @@ -336,7 +336,7 @@ bool XMLStyleExport::exportStyle( bool XMLStyleExport::exportDefaultStyle( const Reference< XPropertySet >& xPropSet, const OUString& rXMLFamily, - const UniReference < SvXMLExportPropertyMapper >& rPropMapper ) + const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper ) { Reference< XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); @@ -365,7 +365,7 @@ bool XMLStyleExport::exportDefaultStyle( void XMLStyleExport::exportStyleFamily( const sal_Char *pFamily, const OUString& rXMLFamily, - const UniReference < SvXMLExportPropertyMapper >& rPropMapper, + const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix) { const OUString sFamily(OUString::createFromAscii(pFamily )); @@ -375,7 +375,7 @@ void XMLStyleExport::exportStyleFamily( void XMLStyleExport::exportStyleFamily( const OUString& rFamily, const OUString& rXMLFamily, - const UniReference < SvXMLExportPropertyMapper >& rPropMapper, + const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper, bool bUsed, sal_uInt16 nFamily, const OUString* pPrefix) { DBG_ASSERT( GetExport().GetModel().is(), "There is the model?" ); diff --git a/xmloff/source/style/uniref.cxx b/xmloff/source/style/uniref.cxx deleted file mode 100644 index 18f85c7f4343..000000000000 --- a/xmloff/source/style/uniref.cxx +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include - -UniRefBase::~UniRefBase() -{ -} - -void UniRefBase::release() -{ - if( !osl_atomic_decrement( &m_refCount ) ) - delete this; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index ec8e95a81166..67f26ec4a556 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -40,7 +40,7 @@ using namespace ::xmloff::token; namespace { - static void lcl_exportDataStyle( SvXMLExport& _rExport, const UniReference< XMLPropertySetMapper >& _rxMapper, + static void lcl_exportDataStyle( SvXMLExport& _rExport, const rtl::Reference< XMLPropertySetMapper >& _rxMapper, const XMLPropertyState& _rProperty ) { DBG_ASSERT( _rxMapper.is(), "xmloff::lcl_exportDataStyle: invalid property mapper!" ); @@ -68,7 +68,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( { if ( XML_STYLE_FAMILY_CONTROL_ID == nFamily ) { // it's a control-related style - UniReference< XMLPropertySetMapper > aPropertyMapper = rPropExp.getPropertySetMapper(); + rtl::Reference< XMLPropertySetMapper > aPropertyMapper = rPropExp.getPropertySetMapper(); for ( vector< XMLPropertyState >::const_iterator pProp = rProperties.begin(); pProp != rProperties.end(); @@ -86,7 +86,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( if( (XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily) || (XML_STYLE_FAMILY_SD_PRESENTATION_ID == nFamily) ) { // it's a graphics style - UniReference< XMLPropertySetMapper > aPropertyMapper = rPropExp.getPropertySetMapper(); + rtl::Reference< XMLPropertySetMapper > aPropertyMapper = rPropExp.getPropertySetMapper(); DBG_ASSERT(aPropertyMapper.is(), "SvXMLAutoStylePoolP::exportStyleAttributes: invalid property set mapper!"); bool bFoundControlShapeDataStyle = false; @@ -149,7 +149,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( { if (pProp->mnIndex > -1) { - UniReference< XMLPropertySetMapper > aPropMapper = rPropExp.getPropertySetMapper(); + rtl::Reference< XMLPropertySetMapper > aPropMapper = rPropExp.getPropertySetMapper(); sal_Int32 nIndex = pProp->mnIndex; sal_Int16 nContextID = aPropMapper->GetEntryContextId( nIndex ); switch( nContextID ) @@ -193,7 +193,7 @@ void SvXMLAutoStylePoolP::exportStyleContent( bool bFooterStartIndex(false); bool bFooterEndIndex(false); - UniReference< XMLPropertySetMapper > aPropMapper = rPropExp.getPropertySetMapper(); + rtl::Reference< XMLPropertySetMapper > aPropMapper = rPropExp.getPropertySetMapper(); sal_Int32 nIndex(0); while(nIndex < aPropMapper->GetEntryCount()) @@ -283,14 +283,14 @@ void SvXMLAutoStylePoolP::AddFamily( const OUString& aStrPrefix, bool bAsFamily ) { - UniReference xTmp = pMapper; + rtl::Reference xTmp = pMapper; AddFamily( nFamily, rStrName, xTmp, aStrPrefix, bAsFamily ); } void SvXMLAutoStylePoolP::AddFamily( sal_Int32 nFamily, const OUString& rStrName, - const UniReference < SvXMLExportPropertyMapper > & rMapper, + const rtl::Reference < SvXMLExportPropertyMapper > & rMapper, const OUString& rStrPrefix, bool bAsFamily ) { @@ -299,7 +299,7 @@ void SvXMLAutoStylePoolP::AddFamily( void SvXMLAutoStylePoolP::SetFamilyPropSetMapper( sal_Int32 nFamily, - const UniReference < SvXMLExportPropertyMapper > & rMapper ) + const rtl::Reference < SvXMLExportPropertyMapper > & rMapper ) { pImpl->SetFamilyPropSetMapper( nFamily, rMapper ); } diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 224729cedc72..bf0f968cc62c 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -189,7 +189,7 @@ public: void FillPropertyStateArray( vector< XMLPropertyState >& rPropStates, const Reference< XPropertySet >& xPropSet, - const UniReference< XMLPropertySetMapper >& maPropMapper, + const rtl::Reference< XMLPropertySetMapper >& maPropMapper, const bool bDefault = false); sal_uInt32 GetPropertyCount() const { return nCount; } }; @@ -277,7 +277,7 @@ const uno::Sequence& FilterPropertiesInfo_Impl::GetApiNames() void FilterPropertiesInfo_Impl::FillPropertyStateArray( vector< XMLPropertyState >& rPropStates, const Reference< XPropertySet >& rPropSet, - const UniReference< XMLPropertySetMapper >& rPropMapper, + const rtl::Reference< XMLPropertySetMapper >& rPropMapper, const bool bDefault ) { XMLPropertyStates_Impl aPropStates; @@ -511,8 +511,8 @@ struct SvXMLExportPropertyMapper::Impl typedef std::map, FilterPropertiesInfo_Impl*> CacheType; CacheType maCache; - UniReference mxNextMapper; - UniReference mxPropMapper; + rtl::Reference mxNextMapper; + rtl::Reference mxPropMapper; OUString maStyleName; @@ -527,7 +527,7 @@ struct SvXMLExportPropertyMapper::Impl // ctor/dtor , class SvXMLExportPropertyMapper SvXMLExportPropertyMapper::SvXMLExportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper ) : + const rtl::Reference< XMLPropertySetMapper >& rMapper ) : mpImpl(new Impl) { mpImpl->mxPropMapper = rMapper; @@ -539,7 +539,7 @@ SvXMLExportPropertyMapper::~SvXMLExportPropertyMapper() } void SvXMLExportPropertyMapper::ChainExportMapper( - const UniReference< SvXMLExportPropertyMapper>& rMapper ) + const rtl::Reference< SvXMLExportPropertyMapper>& rMapper ) { // add map entries from rMapper to current map mpImpl->mxPropMapper->AddMapperEntry( rMapper->getPropertySetMapper() ); @@ -547,7 +547,7 @@ void SvXMLExportPropertyMapper::ChainExportMapper( rMapper->mpImpl->mxPropMapper = mpImpl->mxPropMapper; // set rMapper as last mapper in current chain - UniReference< SvXMLExportPropertyMapper > xNext = mpImpl->mxNextMapper; + rtl::Reference< SvXMLExportPropertyMapper > xNext = mpImpl->mxNextMapper; if( xNext.is()) { while (xNext->mpImpl->mxNextMapper.is()) @@ -1027,7 +1027,7 @@ void SvXMLExportPropertyMapper::exportElementItems( rExport.IgnorableWhitespace(); } -const UniReference& SvXMLExportPropertyMapper::getPropertySetMapper() const +const rtl::Reference& SvXMLExportPropertyMapper::getPropertySetMapper() const { return mpImpl->mxPropMapper; } diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 6be3360e402c..9b7f11a76251 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -56,7 +56,7 @@ using ::com::sun::star::beans::PropertyVetoException; SvXMLImportPropertyMapper::SvXMLImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImp ): rImport(rImp), maPropMapper ( rMapper ) @@ -69,7 +69,7 @@ SvXMLImportPropertyMapper::~SvXMLImportPropertyMapper() } void SvXMLImportPropertyMapper::ChainImportMapper( - const UniReference< SvXMLImportPropertyMapper>& rMapper ) + const rtl::Reference< SvXMLImportPropertyMapper>& rMapper ) { // add map entries from rMapper to current map maPropMapper->AddMapperEntry( rMapper->getPropertySetMapper() ); @@ -77,7 +77,7 @@ void SvXMLImportPropertyMapper::ChainImportMapper( rMapper->maPropMapper = maPropMapper; // set rMapper as last mapper in current chain - UniReference< SvXMLImportPropertyMapper > xNext = mxNextMapper; + rtl::Reference< SvXMLImportPropertyMapper > xNext = mxNextMapper; if( xNext.is()) { while( xNext->mxNextMapper.is()) @@ -449,7 +449,7 @@ bool SvXMLImportPropertyMapper::_FillPropertySet( const vector & rProperties, const Reference & rPropSet, const Reference & rPropSetInfo, - const UniReference & rPropMapper, + const rtl::Reference & rPropMapper, SvXMLImport& rImport, _ContextID_Index_Pair* pSpecialContextIds ) { @@ -567,7 +567,7 @@ struct PropertyPairLessFunctor : void SvXMLImportPropertyMapper::_PrepareForMultiPropertySet( const vector & rProperties, const Reference & rPropSetInfo, - const UniReference & rPropMapper, + const rtl::Reference & rPropMapper, _ContextID_Index_Pair* pSpecialContextIds, Sequence& rNames, Sequence& rValues) @@ -650,7 +650,7 @@ bool SvXMLImportPropertyMapper::_FillMultiPropertySet( const vector & rProperties, const Reference & rMultiPropSet, const Reference & rPropSetInfo, - const UniReference & rPropMapper, + const rtl::Reference & rPropMapper, _ContextID_Index_Pair* pSpecialContextIds ) { OSL_ENSURE( rMultiPropSet.is(), "Need multi property set. "); @@ -681,7 +681,7 @@ bool SvXMLImportPropertyMapper::_FillMultiPropertySet( bool SvXMLImportPropertyMapper::_FillTolerantMultiPropertySet( const vector & rProperties, const Reference & rTolMultiPropSet, - const UniReference & rPropMapper, + const rtl::Reference & rPropMapper, SvXMLImport& rImport, _ContextID_Index_Pair* pSpecialContextIds ) { diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index 7c0594ad0831..f8b12df73a54 100644 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -32,7 +32,7 @@ SvXMLPropertySetContext::SvXMLPropertySetContext( const uno::Reference< xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, sal_Int32 nSIdx, sal_Int32 nEIdx ) : SvXMLImportContext( rImp, nPrfx, rLName ) , mnStartIdx( nSIdx ) @@ -56,7 +56,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - UniReference< XMLPropertySetMapper > aSetMapper( + rtl::Reference< XMLPropertySetMapper > aSetMapper( mxMapper->getPropertySetMapper() ); sal_Int32 nEntryIndex = aSetMapper->GetEntryIndex( nPrefix, rLocalName, mnFamily, mnStartIdx ); diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index 08f6a346dfcc..c0d98b6cc96e 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -35,7 +35,7 @@ using ::xmloff::token::GetXMLToken; XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl( const XMLPropertyMapEntry& rMapEntry, - const UniReference< XMLPropertyHandlerFactory >& rFactory ) : + const rtl::Reference< XMLPropertyHandlerFactory >& rFactory ) : sXMLAttributeName( GetXMLToken(rMapEntry.meXMLName) ), sAPIPropertyName( OUString(rMapEntry.msApiName, rMapEntry.nApiNameLength, RTL_TEXTENCODING_ASCII_US ) ), @@ -65,7 +65,7 @@ XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl( // Ctor XMLPropertySetMapper::XMLPropertySetMapper( const XMLPropertyMapEntry* pEntries, - const UniReference< XMLPropertyHandlerFactory >& rFactory, + const rtl::Reference< XMLPropertyHandlerFactory >& rFactory, bool bForExport ) : mbOnlyExportMappings( bForExport) @@ -104,9 +104,9 @@ XMLPropertySetMapper::~XMLPropertySetMapper() } void XMLPropertySetMapper::AddMapperEntry( - const UniReference < XMLPropertySetMapper >& rMapper ) + const rtl::Reference < XMLPropertySetMapper >& rMapper ) { - for( vector < UniReference < XMLPropertyHandlerFactory > >::iterator + for( vector < rtl::Reference < XMLPropertyHandlerFactory > >::iterator aFIter = rMapper->aHdlFactories.begin(); aFIter != rMapper->aHdlFactories.end(); ++aFIter ) diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 84f5425de3f7..c0a5f8682ce9 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -603,10 +603,10 @@ sal_uInt16 SvXMLStylesContext::GetFamily( const OUString& rValue ) const return nFamily; } -UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportPropertyMapper( +rtl::Reference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportPropertyMapper( sal_uInt16 nFamily ) const { - UniReference < SvXMLImportPropertyMapper > xMapper; + rtl::Reference < SvXMLImportPropertyMapper > xMapper; switch( nFamily ) { @@ -652,7 +652,7 @@ UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProperty case XML_STYLE_FAMILY_SD_POOL_ID: if(!mxShapeImpPropMapper.is()) { - UniReference< XMLShapeImportHelper > aImpHelper = ((SvXMLImport&)GetImport()).GetShapeImport(); + rtl::Reference< XMLShapeImportHelper > aImpHelper = ((SvXMLImport&)GetImport()).GetShapeImport(); ((SvXMLStylesContext*)this)->mxShapeImpPropMapper = aImpHelper->GetPropertySetMapper(); } diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 015f2b2d3479..798a9e3f438f 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -184,10 +184,10 @@ XMLTableImport::XMLTableImport( SvXMLImport& rImport, const rtl::Reference< XMLP mxCellImportPropertySetMapper = new SvXMLImportPropertyMapper( xCellPropertySetMapper.get(), rImport ); mxCellImportPropertySetMapper->ChainImportMapper(XMLTextImportHelper::CreateParaExtPropMapper(rImport)); - UniReference < XMLPropertySetMapper > xRowMapper( new XMLPropertySetMapper( getRowPropertiesMap(), xFactoryRef.get(), false ) ); + rtl::Reference < XMLPropertySetMapper > xRowMapper( new XMLPropertySetMapper( getRowPropertiesMap(), xFactoryRef.get(), false ) ); mxRowImportPropertySetMapper = new SvXMLImportPropertyMapper( xRowMapper, rImport ); - UniReference < XMLPropertySetMapper > xColMapper( new XMLPropertySetMapper( getColumnPropertiesMap(), xFactoryRef.get(), false ) ); + rtl::Reference < XMLPropertySetMapper > xColMapper( new XMLPropertySetMapper( getColumnPropertiesMap(), xFactoryRef.get(), false ) ); mxColumnImportPropertySetMapper = new SvXMLImportPropertyMapper( xColMapper, rImport ); } @@ -624,7 +624,7 @@ SvXMLImportContext * XMLCellImportContext::CreateChildContext( sal_uInt16 nPrefi Reference< XText > xText( mxCell, UNO_QUERY ); if( xText.is() ) { - UniReference < XMLTextImportHelper > xTxtImport( GetImport().GetTextImport() ); + rtl::Reference < XMLTextImportHelper > xTxtImport( GetImport().GetTextImport() ); mxOldCursor = xTxtImport->GetCursor(); mxCursor = xText->createTextCursor(); if( mxCursor.is() ) diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index a706ec20fb26..857809f0f24c 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -68,7 +68,7 @@ void XMLChangeImportContext::StartElement( // Id found! Now call RedlineImportHelper // prepare parameters - UniReference rHelper = + rtl::Reference rHelper = GetImport().GetTextImport(); OUString sID = xAttrList->getValueByIndex(nAttr); diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index 856ee7f2a30c..0914e05c6a42 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -146,7 +146,7 @@ void XMLChangedRegionImportContext::EndElement() { // delete last paragraph // (one extra paragraph was inserted in the beginning) - UniReference rHelper = + rtl::Reference rHelper = GetImport().GetTextImport(); rHelper->DeleteParagraph(); @@ -175,7 +175,7 @@ void XMLChangedRegionImportContext::UseRedlineText() if (! xOldCursor.is()) { // get TextImportHelper and old Cursor - UniReference rHelper(GetImport().GetTextImport()); + rtl::Reference rHelper(GetImport().GetTextImport()); Reference xCursor( rHelper->GetCursor() ); // create Redline and new Cursor diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index b7a2c902e268..0054d6e04d71 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -200,7 +200,7 @@ void XMLIndexTOCContext::StartElement( #else OUString sMarker("Y"); #endif - UniReference rImport = + rtl::Reference rImport = GetImport().GetTextImport(); // a) insert index @@ -263,7 +263,7 @@ void XMLIndexTOCContext::EndElement() { // preliminaries OUString sEmpty; - UniReference rHelper= GetImport().GetTextImport(); + rtl::Reference rHelper= GetImport().GetTextImport(); // get rid of last paragraph (unless it's the only paragraph) rHelper->GetCursor()->goRight(1, sal_False); diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 16f0f7e37299..18c4194a31a3 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -52,7 +52,7 @@ void XMLSectionFootnoteConfigExport::exportXML( nIdx #endif , - const UniReference & rMapper) + const rtl::Reference & rMapper) { // store and initialize the values bool bNumOwn = false; diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx index 6935bcad4eff..985f7c70a3c5 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx @@ -28,7 +28,9 @@ class SvXMLExport; class XMLPropertySetMapper; struct XMLPropertyState; -template class UniReference; +namespace rtl { + template class Reference; +} /** * Export the footnote-/endnote-configuration element in section styles. @@ -45,7 +47,7 @@ public: bool bEndnote, const ::std::vector * pProperties, sal_uInt32 nIdx, - const UniReference & rMapper); /// used only for debugging + const rtl::Reference & rMapper); /// used only for debugging }; #endif diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index a280dd9ab7a8..1ddce2b57cfe 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -54,7 +54,7 @@ XMLSectionFootnoteConfigImport::XMLSectionFootnoteConfigImport( sal_uInt16 nPrefix, const OUString& rLocalName, vector & rProps, - const UniReference & rMapperRef) : + const rtl::Reference & rMapperRef) : SvXMLImportContext(rImport, nPrefix, rLocalName), rProperties(rProps), rMapper(rMapperRef) diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index bed2993bf4aa..5eab5365648c 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -21,10 +21,8 @@ #ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX - #include -#include - +#include #include @@ -43,7 +41,7 @@ namespace com { namespace sun { namespace star { class XMLSectionFootnoteConfigImport : public SvXMLImportContext { ::std::vector & rProperties; - UniReference rMapper; + rtl::Reference rMapper; public: @@ -54,7 +52,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, ::std::vector & rProperties, - const UniReference & rMapperRef); + const rtl::Reference & rMapperRef); virtual ~XMLSectionFootnoteConfigImport(); diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 88a5e488310c..ea8ed959435a 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -130,7 +130,7 @@ void XMLSectionImportContext::StartElement( bValid = true; } - UniReference rHelper = GetImport().GetTextImport(); + rtl::Reference rHelper = GetImport().GetTextImport(); // valid? if (bValid) @@ -333,7 +333,7 @@ void XMLSectionImportContext::EndElement() { // get rid of last paragraph // (unless it's the only paragraph in the section) - UniReference rHelper = GetImport().GetTextImport(); + rtl::Reference rHelper = GetImport().GetTextImport(); rHelper->GetCursor()->goRight(1, sal_False); if (bHasContent) { diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index c16c38b23b49..62ea125e1253 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -477,7 +477,7 @@ TYPEINIT1( XMLTextFrameContext_Impl, SvXMLImportContext ); void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) { - UniReference < XMLTextImportHelper > xTextImportHelper = + rtl::Reference < XMLTextImportHelper > xTextImportHelper = GetImport().GetTextImport(); switch ( nType) @@ -717,7 +717,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) // URL OSL_ENSURE( !sHRef.isEmpty() || xBase64Stream.is(), "neither URL nor base64 image data given" ); - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); if( !sHRef.isEmpty() ) { @@ -895,7 +895,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( bCreateFailed = false; bOwnBase64Stream = false; - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); const SvXMLTokenMap& rTokenMap = xTxtImport->GetTextFrameAttrTokenMap(); @@ -1273,7 +1273,7 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef, if( !xPropSet.is() ) return; - UniReference< XMLTextImportHelper > xTxtImp = GetImport().GetTextImport(); + rtl::Reference< XMLTextImportHelper > xTxtImp = GetImport().GetTextImport(); Reference < XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); if( !xPropSetInfo.is() || @@ -1398,7 +1398,7 @@ XMLTextFrameContext::XMLTextFrameContext( OUString aStyleName = xAttrList->getValueByIndex( i ); if( !aStyleName.isEmpty() ) { - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); XMLPropStyleContext* pStyle( 0L ); pStyle = xTxtImport->FindAutoFrameStyle( aStyleName ); diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index ca59d826c79a..81c12bceb92a 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -162,7 +162,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext( xText->setString( aText ); } - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); xOldTextCursor = xTxtImport->GetCursor(); diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx index 33cb64542399..2afbd9635c24 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.cxx +++ b/xmloff/source/text/XMLTextPropertySetContext.cxx @@ -37,7 +37,7 @@ XMLTextPropertySetContext::XMLTextPropertySetContext( const Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, OUString& rDCTextStyleName ) : SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, nFamily, rProps, rMap ), diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index b66408e7e431..d7e15ed393bc 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -37,7 +37,7 @@ public: ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, OUString& rDopCapTextStyleName ); virtual ~XMLTextPropertySetContext(); diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 701cf1df920d..60aae4701189 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -79,7 +79,7 @@ void XMLTextShapeImportHelper::addShape( sal_Int16 nPage = 0; sal_Int32 nY = 0; - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = rImport.GetTextImport(); const SvXMLTokenMap& rTokenMap = xTxtImport->GetTextFrameAttrTokenMap(); diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 25d9a4ad2c6f..9a51d82b5b4f 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -46,7 +46,7 @@ public: const Reference< XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap ); + const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); virtual ~XMLTextShapePropertySetContext_Impl(); @@ -64,7 +64,7 @@ XMLTextShapePropertySetContext_Impl::XMLTextShapePropertySetContext_Impl( const Reference< XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap ) : + const rtl::Reference < SvXMLImportPropertyMapper > &rMap ) : XMLShapePropertySetContext( rImport, nPrfx, rLName, xAttrList, nFamily, rProps, rMap ) { @@ -172,7 +172,7 @@ SvXMLImportContext *XMLTextShapeStyleContext::CreateChildContext( nFamily = XML_TYPE_PROP_GRAPHIC; if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) { diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 0cd2bb72f0e1..edc98a8fe57c 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -173,7 +173,7 @@ void XMLTextExportPropertySetMapper::handleSpecialItem( } XMLTextExportPropertySetMapper::XMLTextExportPropertySetMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExp ) : SvXMLExportPropertyMapper( rMapper ), rExport( rExp ), diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index 008b169f3866..209914fa92e8 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -66,7 +66,7 @@ protected: public: XMLTextExportPropertySetMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExt ); virtual ~XMLTextExportPropertySetMapper(); diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 3e8a8e718d5a..dbf3f0942d63 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3664,7 +3664,7 @@ SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext( aAny >>= xText; if( xText.is() ) { - UniReference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); if( !mxCursor.is() ) { mxOldCursor = xTxtImport->GetCursor(); diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 5c5e17e09026..ebefde2cfcae 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -502,11 +502,11 @@ struct XMLTextImportHelper::Impl SvXMLImportContextRef m_xAutoStyles; SvXMLImportContextRef m_xFontDecls; - UniReference< SvXMLImportPropertyMapper > m_xParaImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xTextImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xFrameImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xSectionImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xRubyImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xParaImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xTextImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xFrameImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xSectionImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xRubyImpPrMap; boost::scoped_ptr m_pRenameMap; @@ -693,25 +693,25 @@ XMLTextImportHelper::GetChapterNumbering() const return m_pImpl->m_xChapterNumbering; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetParaImportPropertySetMapper() const { return m_pImpl->m_xParaImpPrMap; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetTextImportPropertySetMapper() const { return m_pImpl->m_xTextImpPrMap; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetSectionImportPropertySetMapper() const { return m_pImpl->m_xSectionImpPrMap; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetRubyImportPropertySetMapper() const { return m_pImpl->m_xRubyImpPrMap; @@ -1230,12 +1230,12 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, sal_Int32 nCount = pStyle->_GetProperties().size(); if( nCount ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles) ->GetImportPropertyMapper(nFamily); if( xImpPrMap.is() ) { - UniReference rPropMapper = + rtl::Reference rPropMapper = xImpPrMap->getPropertySetMapper(); for( sal_Int32 i=0; i < nCount; i++ ) { diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 7ac8db5815da..36fb328eabc7 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -131,7 +131,7 @@ bool XMLTextImportPropertyMapper::handleSpecialItem( } XMLTextImportPropertyMapper::XMLTextImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImp ) : SvXMLImportPropertyMapper( rMapper, rImp ), nSizeTypeIndex( -2 ), @@ -257,7 +257,7 @@ namespace { //On import clear 100% all-margins relative sizes. static bool -isNotDefaultRelSize(const XMLPropertyState* pRelState, const UniReference& rPrMap) +isNotDefaultRelSize(const XMLPropertyState* pRelState, const rtl::Reference& rPrMap) { if (rPrMap->GetEntryContextId(pRelState->mnIndex) == CTF_PARAMARGINALL_REL) { @@ -281,7 +281,7 @@ static void lcl_SeparateBorder( XMLPropertyState* pNewBorders[4], XMLPropertyState* pAllBorderWidth, XMLPropertyState* pBorderWidths[4] #ifdef DBG_UTIL - , const UniReference< XMLPropertySetMapper >& rMapper + , const rtl::Reference< XMLPropertySetMapper >& rMapper #endif ) { diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 4475819a2acb..30f3f303ebc2 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -448,7 +448,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, const Reference < XPropertySet > & rPropSet, const XMLPropertyState** ppAddStates, bool bDontSeek ) { - UniReference < SvXMLExportPropertyMapper > xPropMapper; + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper; switch( nFamily ) { case XML_STYLE_FAMILY_TEXT_PARAGRAPH: @@ -539,7 +539,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, case XML_STYLE_FAMILY_TEXT_TEXT: { // Get parent and remove hyperlinks (they aren't of interest) - UniReference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); + rtl::Reference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); for( ::std::vector< XMLPropertyState >::iterator i(xPropStates.begin()); nIgnoreProps < 2 && i != xPropStates.end(); ) { @@ -594,7 +594,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, const Reference < XPropertySet > & rPropSet, const XMLPropertyState** ppAddStates) { - UniReference < SvXMLExportPropertyMapper > xPropMapper; + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper; switch( nFamily ) { case XML_STYLE_FAMILY_TEXT_PARAGRAPH: @@ -689,7 +689,7 @@ OUString XMLTextParagraphExport::Find( const XMLPropertyState** ppAddStates) const { OUString sName( rParent ); - UniReference < SvXMLExportPropertyMapper > xPropMapper; + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper; switch( nFamily ) { case XML_STYLE_FAMILY_TEXT_PARAGRAPH: @@ -730,14 +730,14 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( bool& rbHasAutoStyle, const XMLPropertyState** ppAddStates ) const { - UniReference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper()); + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper()); vector< XMLPropertyState > xPropStates(xPropMapper->Filter( rPropSet )); // Get parent and remove hyperlinks (they aren't of interest) OUString sName; rbHyperlink = rbHasCharStyle = rbHasAutoStyle = false; sal_uInt16 nIgnoreProps = 0; - UniReference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); + rtl::Reference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); ::std::vector< XMLPropertyState >::iterator aFirstDel = xPropStates.end(); ::std::vector< XMLPropertyState >::iterator aSecondDel = xPropStates.end(); @@ -1271,7 +1271,7 @@ XMLTextParagraphExport::XMLTextParagraphExport( sTextFieldStartEnd( "TextFieldStartEnd" ), aCharStyleNamesPropInfoCache( sCharStyleNames ) { - UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true )); + rtl::Reference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true )); xParaPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); @@ -1354,7 +1354,7 @@ XMLTextParagraphExport::~XMLTextParagraphExport() SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateShapeExtPropMapper( SvXMLExport& rExport ) { - UniReference < XMLPropertySetMapper > xPropMapper = + rtl::Reference < XMLPropertySetMapper > xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE, true ); return new XMLTextExportPropertySetMapper( xPropMapper, rExport ); } @@ -3766,7 +3766,7 @@ void XMLTextParagraphExport::exportMeta( void XMLTextParagraphExport::PreventExportOfControlsInMuteSections( const Reference & rShapes, - UniReference xFormExport ) + rtl::Reference xFormExport ) { // check parameters ad pre-conditions if( ( ! rShapes.is() ) || ( ! xFormExport.is() ) ) diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 5ab5c10b0c75..2cb66dc444d8 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -636,7 +636,7 @@ XMLImpRubyContext_Impl::XMLImpRubyContext_Impl( XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl() { - const UniReference < XMLTextImportHelper > xTextImport( + const rtl::Reference < XMLTextImportHelper > xTextImport( GetImport().GetTextImport()); const Reference < XTextCursor > xAttrCursor( xTextImport->GetText()->createTextCursorByRange( m_xStart )); @@ -1944,7 +1944,7 @@ XMLParaContext::XMLParaContext( XMLParaContext::~XMLParaContext() { - UniReference < XMLTextImportHelper > xTxtImport( + rtl::Reference < XMLTextImportHelper > xTxtImport( GetImport().GetTextImport()); Reference < XTextRange > xCrsrRange( xTxtImport->GetCursorAsRange() ); if( !xCrsrRange.is() ) diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 7788331a5750..04e073ab4b48 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -174,7 +174,7 @@ SvXMLImportContext *XMLTextStyleContext::CreateChildContext( nFamily = XML_TYPE_PROP_TABLE_ROW; if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) pContext = new XMLTextPropertySetContext( GetImport(), nPrefix, @@ -402,7 +402,7 @@ void XMLTextStyleContext::FillPropertySet( // imitate XMLPropStyleContext::FillPropertySet(...) SvXMLStylesContext* pSvXMLStylesContext = static_cast< SvXMLStylesContext* >(GetStyles()); - UniReference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily()); + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily()); DBG_ASSERT(xImpPrMap.is(),"Where is the import prop mapper?"); if(xImpPrMap.is()) @@ -444,7 +444,7 @@ void XMLTextStyleContext::FillPropertySet( // get property set info Reference< XPropertySetInfo > xInfo; - UniReference< XMLPropertySetMapper > rPropMapper; + rtl::Reference< XMLPropertySetMapper > rPropMapper; bool bAutomatic = false; if(pSvXMLStylesContext->IsAutomaticStyle() && @@ -545,7 +545,7 @@ void XMLTextStyleContext::FillPropertySet( case CTF_FILLHATCHNAME: case CTF_FILLBITMAPNAME: { - // DrawingLayer FillStyle nameŽneeds to be mapped to DisplayName + // DrawingLayer FillStyle name needs to be mapped to DisplayName rtl::OUString sStyleName; rState.maValue >>= sStyleName; -- cgit