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 /dbaccess | |
parent | 8635fa156ba63e5f63565b6d19ea798a61643b01 (diff) |
drop UniReference in favour of rtl::Reference
since they're doing the same thing.
Change-Id: I76134b6b848db8628f315fe5bd9eb972a6bf0cb6
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/filter/xml/xmlAutoStyle.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 12 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlExport.hxx | 22 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlHelper.cxx | 16 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlHelper.hxx | 8 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlStyleImport.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlStyleImport.hxx | 8 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.hxx | 12 |
9 files changed, 45 insertions, 45 deletions
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index 976a0773c74e..2c1360f3c6ad 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/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_COLUMN ) { - UniReference< XMLPropertySetMapper > aPropMapper = rODBExport.GetColumnStylesPropertySetMapper(); + rtl::Reference< XMLPropertySetMapper > aPropMapper = rODBExport.GetColumnStylesPropertySetMapper(); ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for ( ; i != aEnd ; ++i ) diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 2169f9b2db4f..d173fa2d9ef1 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -173,7 +173,7 @@ namespace dbaxml 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 @@ -1152,7 +1152,7 @@ void ODBExport::exportTables(bool _bExportContext) void ODBExport::exportAutoStyle(XPropertySet* _xProp) { typedef ::std::pair<TPropertyStyleMap*,sal_uInt16> TEnumMapperPair; - typedef ::std::pair< UniReference < SvXMLExportPropertyMapper> , TEnumMapperPair> TExportPropMapperPair; + typedef ::std::pair< rtl::Reference < SvXMLExportPropertyMapper> , TEnumMapperPair> TExportPropMapperPair; Reference<XColumnsSupplier> xSup(_xProp,UNO_QUERY); if ( xSup.is() ) { @@ -1215,7 +1215,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) { ::std::vector< XMLPropertyState >::iterator aItr = aPropStates.begin(); ::std::vector< XMLPropertyState >::iterator aEnd = aPropStates.end(); - const UniReference < XMLPropertySetMapper >& pStyle = pExportHelper[i].first->getPropertySetMapper(); + const rtl::Reference < XMLPropertySetMapper >& pStyle = pExportHelper[i].first->getPropertySetMapper(); while ( aItr != aEnd ) { if ( aItr->mnIndex != -1 ) @@ -1396,7 +1396,7 @@ OUString ODBExport::implConvertAny(const Any& _rValue) return aBuffer.makeStringAndClear(); } -UniReference < XMLPropertySetMapper > ODBExport::GetTableStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > ODBExport::GetTableStylesPropertySetMapper() const { if ( !m_xTableStylesPropertySetMapper.is() ) { @@ -1405,7 +1405,7 @@ UniReference < XMLPropertySetMapper > ODBExport::GetTableStylesPropertySetMapper return m_xTableStylesPropertySetMapper; } -UniReference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMapper() const { if ( !m_xCellStylesPropertySetMapper.is() ) { @@ -1414,7 +1414,7 @@ UniReference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMapper( return m_xCellStylesPropertySetMapper; } -UniReference < XMLPropertySetMapper > ODBExport::GetColumnStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > ODBExport::GetColumnStylesPropertySetMapper() const { if ( !m_xColumnStylesPropertySetMapper.is() ) { diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index fee482b8e85f..ca8bf7818fcd 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -100,15 +100,15 @@ class ODBExport : public SvXMLExport TPropertyStyleMap m_aRowAutoStyleNames; TTableColumnMap m_aTableDummyColumns; OUString m_sCharSet; - UniReference < SvXMLExportPropertyMapper> m_xExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xRowExportHelper; + rtl::Reference < SvXMLExportPropertyMapper> m_xExportHelper; + rtl::Reference < SvXMLExportPropertyMapper> m_xColumnExportHelper; + rtl::Reference < SvXMLExportPropertyMapper> m_xCellExportHelper; + rtl::Reference < SvXMLExportPropertyMapper> m_xRowExportHelper; - mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; Reference<XPropertySet> m_xDataSource; ::dbaccess::ODsnTypeCollection m_aTypeCollection; @@ -153,7 +153,7 @@ class ODBExport : public SvXMLExport OUString implConvertAny(const Any& _rValue); - UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; private: ODBExport(); @@ -184,8 +184,8 @@ public: static css::uno::Reference<css::uno::XInterface> SAL_CALL Create( css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB); - UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const; - UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; // XExporter virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index 6157ec37e155..c604f0524c94 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -68,17 +68,17 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010, false} -UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper( bool bForExport ) +rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper( bool bForExport ) { static const XMLPropertyMapEntry s_aTableStylesProperties[] = { MAP_END() }; - UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); + rtl::Reference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aTableStylesProperties, xFac, bForExport); } -UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapper( bool bForExport ) +rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapper( bool bForExport ) { #define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010, false } static const XMLPropertyMapEntry s_aColumnStylesProperties[] = @@ -88,11 +88,11 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapp MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, CTF_DB_NUMBERFORMAT), MAP_END() }; - UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); + rtl::Reference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aColumnStylesProperties, xFac, bForExport); } -UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper( bool bForExport ) +rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper( bool bForExport ) { #define MAP_CONST_CELL( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010, false } #define MAP_CONST_TEXT( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010, false } @@ -129,11 +129,11 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ), MAP_END() }; - UniReference < XMLPropertyHandlerFactory> xFac = new /*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory(); + rtl::Reference < XMLPropertyHandlerFactory> xFac = new /*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory(); return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aCellStylesProperties, xFac, bForExport); } -UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper( bool bForExport ) +rtl::Reference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper( bool bForExport ) { #define MAP_CONST_ROW( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010, false } static const XMLPropertyMapEntry s_aStylesProperties[] = @@ -141,7 +141,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper( MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0), MAP_END() }; - UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); + rtl::Reference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aStylesProperties, xFac, bForExport); } diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index 6d6d4a1d1938..1f536de7af0f 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -50,10 +50,10 @@ namespace dbaxml class OXMLHelper { public: - static UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper( bool bForExport ); - static UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper( bool bForExport ); - static UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper( bool bForExport ); - static UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper( bool bForExport ); + static rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper( bool bForExport ); + static rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper( bool bForExport ); + static rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper( bool bForExport ); + static rtl::Reference < XMLPropertySetMapper > GetRowStylesPropertySetMapper( bool bForExport ); }; } // dbaxml #endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHELPER_HXX diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index 7799cd291a9e..932f5cff057a 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -170,11 +170,11 @@ void OTableStylesContext::EndElement() GetImport().GetStyles()->CopyStylesToDoc(true); } -UniReference < SvXMLImportPropertyMapper > +rtl::Reference < SvXMLImportPropertyMapper > OTableStylesContext::GetImportPropertyMapper( sal_uInt16 nFamily ) const { - UniReference < SvXMLImportPropertyMapper > xMapper = SvXMLStylesContext::GetImportPropertyMapper(nFamily); + rtl::Reference < SvXMLImportPropertyMapper > xMapper = SvXMLStylesContext::GetImportPropertyMapper(nFamily); if (!xMapper.is()) { diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 8c3b8b51f600..1f9440c4b81c 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -83,9 +83,9 @@ namespace dbaxml sal_Int32 m_nMasterPageNameIndex; bool bAutoStyles : 1; - mutable UniReference < SvXMLImportPropertyMapper > m_xTableImpPropMapper; - mutable UniReference < SvXMLImportPropertyMapper > m_xColumnImpPropMapper; - mutable UniReference < SvXMLImportPropertyMapper > m_xCellImpPropMapper; + mutable rtl::Reference < SvXMLImportPropertyMapper > m_xTableImpPropMapper; + mutable rtl::Reference < SvXMLImportPropertyMapper > m_xColumnImpPropMapper; + mutable rtl::Reference < SvXMLImportPropertyMapper > m_xCellImpPropMapper; ODBFilter& GetOwnImport(); @@ -110,7 +110,7 @@ namespace dbaxml 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/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 148ebc32fbb3..a8a8a3b56a26 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -842,7 +842,7 @@ SvXMLImportContext* ODBFilter::CreateScriptContext( const OUString& _rLocalName return new XMLScriptContext( *this, XML_NAMESPACE_OFFICE, _rLocalName, GetModel() ); } -UniReference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper() const { if ( !m_xTableStylesPropertySetMapper.is() ) { @@ -851,7 +851,7 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper return m_xTableStylesPropertySetMapper; } -UniReference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMapper() const { if ( !m_xColumnStylesPropertySetMapper.is() ) { @@ -860,7 +860,7 @@ UniReference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMappe return m_xColumnStylesPropertySetMapper; } -UniReference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper() const { if ( !m_xCellStylesPropertySetMapper.is() ) { diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 5a7cfdf26c96..452fff80dc87 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -78,9 +78,9 @@ private: mutable ::std::auto_ptr<SvXMLTokenMap> m_pColumnElemTokenMap; SAL_WNODEPRECATED_DECLARATIONS_POP - mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; Reference<XPropertySet> m_xDataSource; sal_Int32 m_nPreviewMode; bool m_bNewFormat; @@ -142,9 +142,9 @@ public: const SvXMLTokenMap& GetQueryElemTokenMap() const; const SvXMLTokenMap& GetColumnElemTokenMap() const; - UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; - UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const; - UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; /** add a Info to the sequence which will be appened to the data source @param _rInfo The property to append. |