diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-30 09:53:06 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-07-02 15:23:52 +0200 |
commit | 4ff115b3e7ff9c73dcc98fc6e7109f499ea81cfe (patch) | |
tree | 3660782eb23bdacd921bb11dcc825bc1b47035cf /reportdesign | |
parent | 8635fa156ba63e5f63565b6d19ea798a61643b01 (diff) |
drop UniReference in favour of rtl::Reference
since they're doing the same thing.
Change-Id: I76134b6b848db8628f315fe5bd9eb972a6bf0cb6
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/filter/xml/xmlAutoStyle.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlCell.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 18 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlExport.hxx | 24 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlHelper.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlHelper.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlStyleImport.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlStyleImport.hxx | 12 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlSubDocument.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.hxx | 18 |
10 files changed, 45 insertions, 45 deletions
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index 01859585e6f9..500ca9715530 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -39,7 +39,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( SvXMLAutoStylePoolP::exportStyleAttributes( rAttrList, nFamily, rProperties, rPropExp, rUnitConverter, rNamespaceMap ); if ( nFamily == XML_STYLE_FAMILY_TABLE_CELL ) { - UniReference< XMLPropertySetMapper > aPropMapper = rORptExport.GetCellStylePropertyMapper(); + rtl::Reference< XMLPropertySetMapper > aPropMapper = rORptExport.GetCellStylePropertyMapper(); ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for (; i != aEnd ; ++i) diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 89c84f3c2562..fe00d4a2a06a 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -164,7 +164,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext( { if ( !m_bContainsShape ) m_nCurrentCount = m_pContainer->getSection()->getCount(); - UniReference< XMLShapeImportHelper > xShapeImportHelper = rImport.GetShapeImport(); + rtl::Reference< XMLShapeImportHelper > xShapeImportHelper = rImport.GetShapeImport(); uno::Reference< drawing::XShapes > xShapes = m_pContainer->getSection().get(); pContext = xShapeImportHelper->CreateGroupChildContext(rImport,_nPrefix,_rLocalName,xAttrList,xShapes); m_bContainsShape = true; diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index efa5d798e934..1ce52a1dfda2 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -164,7 +164,7 @@ namespace rptxml class OSpecialHanldeXMLExportPropertyMapper : public SvXMLExportPropertyMapper { public: - OSpecialHanldeXMLExportPropertyMapper(const UniReference< XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper ) + OSpecialHanldeXMLExportPropertyMapper(const rtl::Reference< XMLPropertySetMapper >& rMapper) : SvXMLExportPropertyMapper(rMapper ) { } /** this method is called for every item that has the @@ -267,9 +267,9 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin m_xPropHdlFactory = new OXMLRptPropHdlFactory(); - UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); - UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper1 = new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(),xFac, true); - UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper2 = new XMLTextPropertySetMapper(TEXT_PROP_MAP_TABLE_DEFAULTS, true ); + rtl::Reference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); + rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper1 = new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(),xFac, true); + rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper2 = new XMLTextPropertySetMapper(TEXT_PROP_MAP_TABLE_DEFAULTS, true ); xTableStylesPropertySetMapper1->AddMapperEntry(xTableStylesPropertySetMapper2); m_xTableStylesExportPropertySetMapper = new SvXMLExportPropertyMapper(xTableStylesPropertySetMapper1); @@ -278,13 +278,13 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin m_xCellStylesExportPropertySetMapper = new OSpecialHanldeXMLExportPropertyMapper(m_xCellStylesPropertySetMapper); m_xCellStylesExportPropertySetMapper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this)); - UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetColumnStyleProps(), m_xPropHdlFactory, true); + rtl::Reference < XMLPropertySetMapper > xColumnStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetColumnStyleProps(), m_xPropHdlFactory, true); m_xColumnStylesExportPropertySetMapper = new OSpecialHanldeXMLExportPropertyMapper(xColumnStylesPropertySetMapper); - UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetRowStyleProps(), m_xPropHdlFactory, true); + rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetRowStyleProps(), m_xPropHdlFactory, true); m_xRowStylesExportPropertySetMapper = new OSpecialHanldeXMLExportPropertyMapper(xRowStylesPropertySetMapper); - UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true )); + rtl::Reference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true )); m_xParaPropMapper = new OSpecialHanldeXMLExportPropertyMapper( xPropMapper); OUString sFamily( GetXMLToken(XML_PARAGRAPH) ); @@ -671,7 +671,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr const Reference< report::XShape > xShape(xReportElement,uno::UNO_QUERY); if ( xShape.is() ) { - UniReference< XMLShapeExport > xShapeExport = GetShapeExport(); + rtl::Reference< XMLShapeExport > xShapeExport = GetShapeExport(); xShapeExport->seekShapes(_xProp.get()); SolarMutexGuard aGuard; xShapeExport->collectShapeAutoStyles(xShape.get()); @@ -1466,7 +1466,7 @@ XMLShapeExport* ORptExport::CreateShapeExport() void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph) { - UniReference< XMLShapeExport > xShapeExport = GetShapeExport(); + rtl::Reference< XMLShapeExport > xShapeExport = GetShapeExport(); xShapeExport->seekShapes(_xSection.get()); const sal_Int32 nCount = _xSection->getCount(); SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index 77f42bab770f..8916e43a376f 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -125,18 +125,18 @@ private: OUString m_sCellStyle; OUString m_sColumnStyle; Any m_aPreviewMode; - UniReference < SvXMLExportPropertyMapper> m_xExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xSectionPropMapper; - UniReference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > m_xParaPropMapper; - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + rtl::Reference < SvXMLExportPropertyMapper> m_xExportHelper; + rtl::Reference < SvXMLExportPropertyMapper> m_xSectionPropMapper; + rtl::Reference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper; + rtl::Reference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper; + rtl::Reference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper; + rtl::Reference < SvXMLExportPropertyMapper> m_xRowStylesExportPropertySetMapper; + rtl::Reference < SvXMLExportPropertyMapper > m_xParaPropMapper; + rtl::Reference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - mutable UniReference < XMLPropertySetMapper > m_xControlStylePropertyMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xControlStylePropertyMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; Reference<XReportDefinition> m_xReportDefinition; bool m_bAllreadyFilled; @@ -196,7 +196,7 @@ public: inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; } - UniReference < XMLPropertySetMapper > GetCellStylePropertyMapper() const { return m_xCellStylesPropertySetMapper;} + rtl::Reference < XMLPropertySetMapper > GetCellStylePropertyMapper() const { return m_xCellStylesPropertySetMapper;} }; /** Exports only settings diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 4c16131f95e9..51c8dbe11240 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -106,7 +106,7 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 #define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010, false } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010, false} -UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat, bool bForExport) +rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat, bool bForExport) { if ( _bOldFormat ) { diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index 6f05ded3d3c1..e36506a6f0ae 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -56,7 +56,7 @@ namespace rptxml class OXMLHelper { public: - static UniReference < XMLPropertySetMapper > GetCellStylePropertyMap(bool _bOldFormat, bool bForExport); + static rtl::Reference < XMLPropertySetMapper > GetCellStylePropertyMap(bool _bOldFormat, bool bForExport); static const SvXMLEnumMapEntry* GetReportPrintOptions(); static const SvXMLEnumMapEntry* GetForceNewPageOptions(); diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 6c3a25447502..9e47479dcd0c 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -52,7 +52,7 @@ using namespace xmloff::token; class OSpecialHanldeXMLImportPropertyMapper : public SvXMLImportPropertyMapper { public: - OSpecialHanldeXMLImportPropertyMapper(const UniReference< XMLPropertySetMapper >& rMapper,SvXMLImport& _rImport) : SvXMLImportPropertyMapper(rMapper ,_rImport) + OSpecialHanldeXMLImportPropertyMapper(const rtl::Reference< XMLPropertySetMapper >& rMapper,SvXMLImport& _rImport) : SvXMLImportPropertyMapper(rMapper ,_rImport) { } /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */ @@ -186,11 +186,11 @@ void OReportStylesContext::EndElement() } -UniReference < SvXMLImportPropertyMapper > +rtl::Reference < SvXMLImportPropertyMapper > OReportStylesContext::GetImportPropertyMapper( sal_uInt16 nFamily ) const { - UniReference < SvXMLImportPropertyMapper > xMapper(SvXMLStylesContext::GetImportPropertyMapper(nFamily)); + rtl::Reference < SvXMLImportPropertyMapper > xMapper(SvXMLStylesContext::GetImportPropertyMapper(nFamily)); if (!xMapper.is()) { @@ -229,7 +229,7 @@ UniReference < SvXMLImportPropertyMapper > { if( !m_xTableImpPropMapper.is() ) { - UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); + rtl::Reference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); m_xTableImpPropMapper = new SvXMLImportPropertyMapper( new XMLPropertySetMapper(OXMLHelper::GetTableStyleProps(), xFac, false), m_rImport ); } xMapper = m_xTableImpPropMapper; diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index ec549b3f6b3a..772a1e95fc00 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -91,11 +91,11 @@ namespace rptxml sal_Int32 m_nNumberFormatIndex; bool bAutoStyles : 1; - //mutable UniReference < SvXMLImportPropertyMapper > m_xControlImpPropMapper; - mutable UniReference < SvXMLImportPropertyMapper > m_xCellImpPropMapper; - mutable UniReference < SvXMLImportPropertyMapper > m_xColumnImpPropMapper; - mutable UniReference < SvXMLImportPropertyMapper > m_xRowImpPropMapper; - mutable UniReference < SvXMLImportPropertyMapper > m_xTableImpPropMapper; + //mutable rtl::Reference < SvXMLImportPropertyMapper > m_xControlImpPropMapper; + mutable rtl::Reference < SvXMLImportPropertyMapper > m_xCellImpPropMapper; + mutable rtl::Reference < SvXMLImportPropertyMapper > m_xColumnImpPropMapper; + mutable rtl::Reference < SvXMLImportPropertyMapper > m_xRowImpPropMapper; + mutable rtl::Reference < SvXMLImportPropertyMapper > m_xTableImpPropMapper; mutable ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > m_xCellStyles; @@ -137,7 +137,7 @@ namespace rptxml virtual void EndElement() SAL_OVERRIDE; - virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( + virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper( sal_uInt16 nFamily ) const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index c94b76280798..4e270774469b 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -79,7 +79,7 @@ SvXMLImportContext* OXMLSubDocument::_CreateChildContext( { if ( !m_bContainsShape ) m_nCurrentCount = m_pContainer->getSection()->getCount(); - UniReference< XMLShapeImportHelper > xShapeImportHelper = GetImport().GetShapeImport(); + rtl::Reference< XMLShapeImportHelper > xShapeImportHelper = GetImport().GetShapeImport(); uno::Reference< drawing::XShapes > xShapes = m_pContainer->getSection().get(); pContext = xShapeImportHelper->CreateGroupChildContext(GetImport(),_nPrefix,_rLocalName,xAttrList,xShapes); m_bContainsShape = true; diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index cf23bdb04b20..eb843b74e7cf 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -92,11 +92,11 @@ private: mutable ::std::auto_ptr<SvXMLTokenMap> m_pCellElemTokenMap; SAL_WNODEPRECATED_DECLARATIONS_POP - UniReference < XMLPropertyHandlerFactory > m_xPropHdlFactory; - UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + rtl::Reference < XMLPropertyHandlerFactory > m_xPropHdlFactory; + rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + rtl::Reference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; Reference<XReportDefinition> m_xReportDefinition; ::boost::shared_ptr<rptui::OReportModel> m_pReportModel; @@ -158,10 +158,10 @@ public: const SvXMLTokenMap& GetColumnTokenMap() const; const SvXMLTokenMap& GetCellElemTokenMap() const; - inline UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return m_xCellStylesPropertySetMapper; } - inline UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return m_xColumnStylesPropertySetMapper; } - inline UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return m_xRowStylesPropertySetMapper; } - inline UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return m_xTableStylesPropertySetMapper; } + inline rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return m_xCellStylesPropertySetMapper; } + inline rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return m_xColumnStylesPropertySetMapper; } + inline rtl::Reference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return m_xRowStylesPropertySetMapper; } + inline rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return m_xTableStylesPropertySetMapper; } static OUString convertFormula(const OUString& _sFormula); /** inserts a new function * |