[Libreoffice-commits] core.git: 2 commits - dbaccess/source editeng/source filter/Library_svgfilter.mk filter/source include/xmloff reportdesign/source sc/qa sc/source sw/source xmloff/inc xmloff/Library_xo.mk xmloff/qa xmloff/source
Noel Grandin
noel at peralex.com
Wed Jul 2 06:30:49 PDT 2014
dbaccess/source/filter/xml/xmlAutoStyle.cxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 12
dbaccess/source/filter/xml/xmlExport.hxx | 22 -
dbaccess/source/filter/xml/xmlHelper.cxx | 16 -
dbaccess/source/filter/xml/xmlHelper.hxx | 8
dbaccess/source/filter/xml/xmlStyleImport.cxx | 4
dbaccess/source/filter/xml/xmlStyleImport.hxx | 8
dbaccess/source/filter/xml/xmlfilter.cxx | 6
dbaccess/source/filter/xml/xmlfilter.hxx | 12
editeng/source/xml/xmltxtexp.cxx | 4
filter/Library_svgfilter.mk | 1
filter/source/svg/svgexport.cxx | 2
include/xmloff/SchXMLExportHelper.hxx | 4
include/xmloff/SchXMLImportHelper.hxx | 4
include/xmloff/XMLFontAutoStylePool.hxx | 4
include/xmloff/XMLPageExport.hxx | 11
include/xmloff/animationexport.hxx | 4
include/xmloff/animexp.hxx | 4
include/xmloff/prhdlfac.hxx | 4
include/xmloff/shapeexport.hxx | 16 -
include/xmloff/shapeimport.hxx | 4
include/xmloff/styleexp.hxx | 16 -
include/xmloff/table/XMLTableExport.hxx | 4
include/xmloff/table/XMLTableImport.hxx | 4
include/xmloff/txtimp.hxx | 13 -
include/xmloff/txtimppr.hxx | 2
include/xmloff/txtparae.hxx | 29 +-
include/xmloff/uniref.hxx | 224 ------------------
include/xmloff/xmlaustp.hxx | 8
include/xmloff/xmlexp.hxx | 42 +--
include/xmloff/xmlexppr.hxx | 11
include/xmloff/xmlimp.hxx | 24 -
include/xmloff/xmlimppr.hxx | 25 +-
include/xmloff/xmlprcon.hxx | 5
include/xmloff/xmlprmap.hxx | 13 -
include/xmloff/xmlstyle.hxx | 14 -
reportdesign/source/filter/xml/xmlAutoStyle.cxx | 2
reportdesign/source/filter/xml/xmlCell.cxx | 2
reportdesign/source/filter/xml/xmlExport.cxx | 18 -
reportdesign/source/filter/xml/xmlExport.hxx | 24 -
reportdesign/source/filter/xml/xmlHelper.cxx | 2
reportdesign/source/filter/xml/xmlHelper.hxx | 2
reportdesign/source/filter/xml/xmlStyleImport.cxx | 8
reportdesign/source/filter/xml/xmlStyleImport.hxx | 12
reportdesign/source/filter/xml/xmlSubDocument.cxx | 2
reportdesign/source/filter/xml/xmlfilter.hxx | 18 -
sc/qa/unit/ucalc_formula.cxx | 4
sc/source/filter/xml/xmlcelli.cxx | 2
sc/source/filter/xml/xmlexprt.cxx | 20 -
sc/source/filter/xml/xmlexprt.hxx | 22 -
sc/source/filter/xml/xmlimprt.hxx | 18 -
sc/source/filter/xml/xmlstyle.cxx | 12
sc/source/filter/xml/xmlstyle.hxx | 8
sc/source/filter/xml/xmlstyli.cxx | 18 -
sc/source/filter/xml/xmlstyli.hxx | 14 -
sw/source/filter/xml/xmlexp.hxx | 5
sw/source/filter/xml/xmlfmt.cxx | 6
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/filter/xml/xmltexte.cxx | 6
sw/source/filter/xml/xmltexti.cxx | 8
xmloff/Library_xo.mk | 1
xmloff/inc/SchXMLExport.hxx | 3
xmloff/inc/XMLChartPropertySetMapper.hxx | 5
xmloff/inc/XMLShapePropertySetContext.hxx | 2
xmloff/inc/anim.hxx | 1
xmloff/qa/unit/uxmloff.cxx | 6
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
xmloff/source/text/XMLChangedRegionImportContext.cxx | 4
xmloff/source/text/XMLIndexTOCContext.cxx | 4
xmloff/source/text/XMLSectionFootnoteConfigExport.cxx | 2
xmloff/source/text/XMLSectionFootnoteConfigExport.hxx | 6
xmloff/source/text/XMLSectionFootnoteConfigImport.cxx | 2
xmloff/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
142 files changed, 525 insertions(+), 788 deletions(-)
New commits:
commit 88b4abbb80de866e0dc439711b13ae380b8d0afc
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jul 2 11:28:44 2014 +0200
loplugin:stringconcat
Change-Id: Ia109af75003dbcf5492fc1054663b617caa3ab3d
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index f0f4a84..f9a5ac1 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -3303,7 +3303,7 @@ void runTestMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrStrCheck aC
if (!aStr.equalsAscii(aChecks[i].pRes))
{
cerr << "row " << (i+1) << ": expected='" << aChecks[i].pRes << "' actual='" << aStr << "'"
- << " criterion='" << aChecks[i].pVal << "'" << endl;
+ " criterion='" << aChecks[i].pVal << "'" << endl;
CPPUNIT_ASSERT_MESSAGE("Unexpected result for MATCH", false);
}
}
@@ -3343,7 +3343,7 @@ void runTestHorizontalMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrS
if (!aStr.equalsAscii(aChecks[i].pRes))
{
cerr << "column " << char('A'+i) << ": expected='" << aChecks[i].pRes << "' actual='" << aStr << "'"
- << " criterion='" << aChecks[i].pVal << "'" << endl;
+ " criterion='" << aChecks[i].pVal << "'" << endl;
CPPUNIT_ASSERT_MESSAGE("Unexpected result for horizontal MATCH", false);
}
}
commit 4ff115b3e7ff9c73dcc98fc6e7109f499ea81cfe
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jun 30 09:53:06 2014 +0200
drop UniReference in favour of rtl::Reference
since they're doing the same thing.
Change-Id: I76134b6b848db8628f315fe5bd9eb972a6bf0cb6
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
index 976a077..2c1360f 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 2169f9b..d173fa2 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 fee482b..ca8bf78 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 6157ec3..c604f05 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 6d6d4a1..1f536de 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 7799cd2..932f5cf 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 8c3b8b5..1f9440c 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 148ebc3..a8a8a3b 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 5a7cfdf..452fff8 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.
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 324dbcc..30aeaca 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -452,7 +452,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
// methods without content:
void SvxXMLTextExportComponent::_ExportAutoStyles()
{
- UniReference< XMLTextParagraphExport > xTextExport( GetTextParagraphExport() );
+ rtl::Reference< XMLTextParagraphExport > xTextExport( GetTextParagraphExport() );
xTextExport->collectTextAutoStyles( mxText );
xTextExport->exportTextAutoStyles();
@@ -460,7 +460,7 @@ void SvxXMLTextExportComponent::_ExportAutoStyles()
void SvxXMLTextExportComponent::_ExportContent()
{
- UniReference< XMLTextParagraphExport > xTextExport( GetTextParagraphExport() );
+ rtl::Reference< XMLTextParagraphExport > xTextExport( GetTextParagraphExport() );
xTextExport->exportText( mxText );
}
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index 8bbdd60..9d647b5 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\
tl \
i18nlangtag \
sax \
+ salhelper \
comphelper \
basegfx \
cppuhelper \
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 1f1fe1d..2c42ff1 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1184,7 +1184,7 @@ bool SVGFilter::implExportAnimations()
mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Animations" );
SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true );
- UniReference< xmloff::AnimationsExporter > xAnimationsExporter;
+ rtl::Reference< xmloff::AnimationsExporter > xAnimationsExporter;
xAnimationsExporter = new xmloff::AnimationsExporter( *mpSVGExport, xProps );
xAnimationsExporter->prepare( xRootNode );
xAnimationsExporter->exportAnimations( xRootNode );
diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index af866be..5149c7a 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -22,7 +22,7 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/util/XStringMapping.hpp>
#include <com/sun/star/awt/Size.hpp>
@@ -41,7 +41,7 @@ class SchXMLExportHelper_Impl;
the latter case you have to provide a table address mapper if the
cell addressing set at the document is not in XML format.
*/
-class XMLOFF_DLLPUBLIC SchXMLExportHelper : public UniRefBase
+class XMLOFF_DLLPUBLIC SchXMLExportHelper : public salhelper::SimpleReferenceObject
{
public:
SchXMLExportHelper( SvXMLExport& rExport,
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index e35f5b6..b4dd0e5 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX
#define INCLUDED_XMLOFF_SCHXMLIMPORTHELPER_HXX
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/families.hxx>
#include <com/sun/star/util/XStringMapping.hpp>
#include <com/sun/star/chart/XChartDocument.hpp>
@@ -61,7 +61,7 @@ class SvXMLImport;
converts table addresses in XML format to the appropriate application
format.
*/
-class SchXMLImportHelper : public UniRefBase
+class SchXMLImportHelper : public salhelper::SimpleReferenceObject
{
private:
com::sun::star::uno::Reference< com::sun::star::chart::XChartDocument > mxChartDoc;
diff --git a/include/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx
index 5deabf7..b26c0d3 100644
--- a/include/xmloff/XMLFontAutoStylePool.hxx
+++ b/include/xmloff/XMLFontAutoStylePool.hxx
@@ -24,14 +24,14 @@
#include <xmloff/dllapi.h>
#include <rtl/ustring.hxx>
#include <tools/fontenum.hxx>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <set>
class XMLFontAutoStylePool_Impl;
typedef std::set<OUString> XMLFontAutoStylePoolNames_Impl;
class SvXMLExport;
-class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLFontAutoStylePool : public salhelper::SimpleReferenceObject
{
SvXMLExport& rExport;
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 5961ad3..70ae41d 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -26,7 +26,8 @@
#include <rtl/ustring.hxx>
#include <vector>
#include <xmloff/attrlist.hxx>
-#include <xmloff/uniref.hxx>
+#include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
namespace com { namespace sun { namespace star {
@@ -50,7 +51,7 @@ struct XMLPageExportNameEntry
-class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLPageExport : public salhelper::SimpleReferenceObject
{
SvXMLExport& rExport;
@@ -63,9 +64,9 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public UniRefBase
::std::vector< XMLPageExportNameEntry > aNameVector;
SAL_DLLPRIVATE bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const;
- UniReference < XMLPropertyHandlerFactory > xPageMasterPropHdlFactory;
- UniReference < XMLPropertySetMapper > xPageMasterPropSetMapper;
- UniReference < SvXMLExportPropertyMapper > xPageMasterExportPropMapper;
+ rtl::Reference < XMLPropertyHandlerFactory > xPageMasterPropHdlFactory;
+ rtl::Reference < XMLPropertySetMapper > xPageMasterPropSetMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xPageMasterExportPropMapper;
protected:
diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index 4614fc9..f664144 100644
--- a/include/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/animations/XAnimationNode.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
class SvXMLExport;
@@ -34,7 +34,7 @@ namespace xmloff
{
class AnimationsExporterImpl;
-class XMLOFF_DLLPUBLIC AnimationsExporter : public UniRefBase
+class XMLOFF_DLLPUBLIC AnimationsExporter : public salhelper::SimpleReferenceObject
{
AnimationsExporterImpl* mpImpl;
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 61946ae..b5a575c 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -21,13 +21,13 @@
#define INCLUDED_XMLOFF_ANIMEXP_HXX
#include <com/sun/star/drawing/XShape.hpp>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
class AnimExpImpl;
class SvXMLExport;
class XMLShapeExport;
-class XMLAnimationsExporter : public UniRefBase
+class XMLAnimationsExporter : public salhelper::SimpleReferenceObject
{
AnimExpImpl* mpImpl;
diff --git a/include/xmloff/prhdlfac.hxx b/include/xmloff/prhdlfac.hxx
index 7f3eda5..e21b5cb 100644
--- a/include/xmloff/prhdlfac.hxx
+++ b/include/xmloff/prhdlfac.hxx
@@ -25,7 +25,7 @@
#include <sal/types.h>
#include <map>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/xmlprhdl.hxx>
/**
@@ -37,7 +37,7 @@
you have to override the virtual method GetPropertyHandler
( see below ).
*/
-class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLPropertyHandlerFactory : public salhelper::SimpleReferenceObject
{
public:
virtual ~XMLPropertyHandlerFactory();
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 9a3ec8e..134b15f 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -26,7 +26,7 @@
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
@@ -154,14 +154,14 @@ namespace basegfx
class B2DHomMatrix;
} // end of namespace basegfx
-class XMLOFF_DLLPUBLIC XMLShapeExport : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLShapeExport : public salhelper::SimpleReferenceObject
{
private:
SvXMLExport& mrExport;
- UniReference< XMLPropertyHandlerFactory > mxSdPropHdlFactory;
- UniReference< SvXMLExportPropertyMapper > mxPropertySetMapper;
- UniReference< XMLAnimationsExporter > mxAnimationsExporter;
+ rtl::Reference< XMLPropertyHandlerFactory > mxSdPropHdlFactory;
+ rtl::Reference< SvXMLExportPropertyMapper > mxPropertySetMapper;
+ rtl::Reference< XMLAnimationsExporter > mxAnimationsExporter;
ShapesInfos maShapesInfos;
ShapesInfos::iterator maCurrentShapesIter;
bool mbExportLayer;
@@ -179,7 +179,7 @@ protected:
const SvXMLExport& GetExport() const { return mrExport; }
private:
- SAL_DLLPRIVATE UniReference< SvXMLExportPropertyMapper > GetPropertySetMapper() const { return mxPropertySetMapper; }
+ SAL_DLLPRIVATE rtl::Reference< SvXMLExportPropertyMapper > GetPropertySetMapper() const { return mxPropertySetMapper; }
const OUString msZIndex;
const OUString msPrintable;
@@ -287,10 +287,10 @@ public:
If this is a non NULL reference, the animation information from all shapes given to exportShape()
from now on are collected.
*/
- void setAnimationsExporter( UniReference< XMLAnimationsExporter > xAnimExport ) { mxAnimationsExporter = xAnimExport; }
+ void setAnimationsExporter( rtl::Reference< XMLAnimationsExporter > xAnimExport ) { mxAnimationsExporter = xAnimExport; }
/** returns the last set XMLAnimationExport */
- UniReference< XMLAnimationsExporter > getAnimationsExporter() const { return mxAnimationsExporter; }
+ rtl::Reference< XMLAnimationsExporter > getAnimationsExporter() const { return mxAnimationsExporter; }
/// returns the export property mapper for external chaining
static SvXMLExportPropertyMapper* CreateShapePropMapper( SvXMLExport& rExport );
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 47156c8..a6d3a25 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/drawing/HomogenMatrix.hpp>
#include <com/sun/star/drawing/ProjectionMode.hpp>
#include <com/sun/star/drawing/ShadeMode.hpp>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/table/XMLTableImport.hxx>
@@ -269,7 +269,7 @@ class ShapeSortContext;
struct XMLShapeImportHelperImpl;
struct XMLShapeImportPageContextImpl;
-class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceObject
{
XMLShapeImportHelperImpl* mpImpl;
diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index c58fc7f..2732485 100644
--- a/include/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
@@ -24,7 +24,7 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.h>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
namespace com { namespace sun { namespace star
{
@@ -48,7 +48,7 @@ class SvXMLExportPropertyMapper;
class SvXMLAutoStylePoolP;
class SvXMLExport;
-class XMLOFF_DLLPUBLIC XMLStyleExport : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLStyleExport : public salhelper::SimpleReferenceObject
{
SvXMLExport& rExport;
protected:
@@ -73,7 +73,7 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::style::XStyle > & rStyle,
const OUString& rXMLFamily,
- const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
+ const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xStyles,
const OUString* pPrefix = 0L );
@@ -93,13 +93,13 @@ public:
// void exportStyleFamily(
// const OUString& rFamily, const OUString& rXMLFamily,
-// const UniReference < XMLPropertySetMapper >& rPropMapper,
+// const rtl::Reference < XMLPropertySetMapper >& rPropMapper,
// bool bUsed, sal_uInt16 nFamily = 0,
// const OUString* pPrefix = 0L);
// void exportStyleFamily(
// const sal_Char *pFamily, const OUString& rXMLFamily,
-// const UniReference < XMLPropertySetMapper >& rPropMapper,
+// const rtl::Reference < XMLPropertySetMapper >& rPropMapper,
// bool bUsed, sal_uInt16 nFamily = 0,
// const OUString* pPrefix = 0L);
@@ -107,17 +107,17 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xPropSet,
const OUString& rXMLFamily,
- const UniReference < SvXMLExportPropertyMapper >& rPropMapper );
+ const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper );
void exportStyleFamily(
const OUString& rFamily, const OUString& rXMLFamily,
- const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
+ const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper,
bool bUsed, sal_uInt16 nFamily = 0,
const OUString* pPrefix = 0L);
void exportStyleFamily(
const sal_Char *pFamily, const OUString& rXMLFamily,
- const UniReference < SvXMLExportPropertyMapper >& rPropMapper,
+ const rtl::Reference < SvXMLExportPropertyMapper >& rPropMapper,
bool bUsed, sal_uInt16 nFamily = 0,
const OUString* pPrefix = 0L);
};
diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx
index 8fe048c..cf324e7 100644
--- a/include/xmloff/table/XMLTableExport.hxx
+++ b/include/xmloff/table/XMLTableExport.hxx
@@ -38,7 +38,7 @@
#include <rtl/ref.hxx>
#include <xmloff/dllapi.h>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/xmlprmap.hxx>
#include <xmloff/xmlexppr.hxx>
@@ -61,7 +61,7 @@ struct XMLTableInfo
typedef ::std::map< const ::com::sun::star::uno::Reference< com::sun::star::table::XColumnRowRange >, boost::shared_ptr< XMLTableInfo > > TableInfoMap;
-class XMLOFF_DLLPUBLIC XMLTableExport : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLTableExport : public salhelper::SimpleReferenceObject
{
public:
XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExportPropertyMapper >& xCellExportPropertySetMapper, const rtl::Reference< XMLPropertyHandlerFactory >& xFactoryRef );
diff --git a/include/xmloff/table/XMLTableImport.hxx b/include/xmloff/table/XMLTableImport.hxx
index bb40ff8..4de0822 100644
--- a/include/xmloff/table/XMLTableImport.hxx
+++ b/include/xmloff/table/XMLTableImport.hxx
@@ -24,7 +24,7 @@
#include <xmloff/dllapi.h>
#include <xmloff/xmlictxt.hxx>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/xmlimppr.hxx>
#include <xmloff/prhdlfac.hxx>
@@ -38,7 +38,7 @@ class SvXMLStyleContext;
typedef std::map< OUString, OUString > XMLTableTemplate;
typedef std::map < OUString, boost::shared_ptr< XMLTableTemplate > > XMLTableTemplateMap;
-class XMLTableImport : public UniRefBase
+class XMLTableImport : public salhelper::SimpleReferenceObject
{
friend class XMLTableImportContext;
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 4ab7881..892fd75 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -30,7 +30,8 @@
#include <boost/scoped_ptr.hpp>
#include <xmloff/xmltkmap.hxx>
-#include <xmloff/uniref.hxx>
+#include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
class XMLTextListsHelper;
class SvXMLImportContext;
@@ -365,7 +366,7 @@ enum XMLTextType
#define XML_TEXT_RENAME_TYPE_FRAME 10
#define XML_TEXT_RENAME_TYPE_TABLE 20
-class XMLOFF_DLLPUBLIC XMLTextImportHelper : public UniRefBase,
+class XMLOFF_DLLPUBLIC XMLTextImportHelper : public salhelper::SimpleReferenceObject,
private boost::noncopyable
{
private:
@@ -543,13 +544,13 @@ public:
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rFrmPropSet );
- UniReference< SvXMLImportPropertyMapper > const&
+ rtl::Reference< SvXMLImportPropertyMapper > const&
GetParaImportPropertySetMapper() const;
- UniReference< SvXMLImportPropertyMapper > const&
+ rtl::Reference< SvXMLImportPropertyMapper > const&
GetTextImportPropertySetMapper() const;
- UniReference< SvXMLImportPropertyMapper > const&
+ rtl::Reference< SvXMLImportPropertyMapper > const&
GetSectionImportPropertySetMapper() const;
- UniReference< SvXMLImportPropertyMapper > const&
+ rtl::Reference< SvXMLImportPropertyMapper > const&
GetRubyImportPropertySetMapper() const;
static SvXMLImportPropertyMapper *CreateShapeExtPropMapper(SvXMLImport&);
diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index 2290786..baa7cee 100644
--- a/include/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
@@ -56,7 +56,7 @@ protected:
const SvXMLNamespaceMap& rNamespaceMap ) const SAL_OVERRIDE;
public:
XMLTextImportPropertyMapper(
- const UniReference< XMLPropertySetMapper >& rMapper,
+ const rtl::Reference< XMLPropertySetMapper >& rMapper,
SvXMLImport& rImport );
virtual ~XMLTextImportPropertyMapper();
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index ff40374..2323660 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <xmloff/uniref.hxx>
#include <xmloff/xmlexppr.hxx>
#include <xmloff/styleexp.hxx>
#include <xmloff/xmltoken.hxx>
@@ -70,12 +69,12 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
// SvXMLExport& rExport;
SvXMLAutoStylePoolP& rAutoStylePool;
- UniReference < SvXMLExportPropertyMapper > xParaPropMapper;
- UniReference < SvXMLExportPropertyMapper > xTextPropMapper;
- UniReference < SvXMLExportPropertyMapper > xFramePropMapper;
- UniReference < SvXMLExportPropertyMapper > xAutoFramePropMapper;
- UniReference < SvXMLExportPropertyMapper > xSectionPropMapper;
- UniReference < SvXMLExportPropertyMapper > xRubyPropMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xParaPropMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xTextPropMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xFramePropMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xAutoFramePropMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xSectionPropMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xRubyPropMapper;
const ::std::auto_ptr< ::xmloff::BoundFrameSets > pBoundFrameSets;
XMLTextFieldExport *pFieldExport;
@@ -211,29 +210,29 @@ protected:
const SvXMLAutoStylePoolP& GetAutoStylePool() const { return rAutoStylePool; }
public:
- UniReference < SvXMLExportPropertyMapper > GetParaPropMapper() const
+ rtl::Reference < SvXMLExportPropertyMapper > GetParaPropMapper() const
{
return xParaPropMapper;
}
- UniReference < SvXMLExportPropertyMapper > GetTextPropMapper() const
+ rtl::Reference < SvXMLExportPropertyMapper > GetTextPropMapper() const
{
return xTextPropMapper;
}
- UniReference < SvXMLExportPropertyMapper > GetFramePropMapper() const
+ rtl::Reference < SvXMLExportPropertyMapper > GetFramePropMapper() const
{
return xFramePropMapper;
}
- UniReference < SvXMLExportPropertyMapper > GetAutoFramePropMapper() const
+ rtl::Reference < SvXMLExportPropertyMapper > GetAutoFramePropMapper() const
{
return xAutoFramePropMapper;
}
- UniReference < SvXMLExportPropertyMapper > GetSectionPropMapper() const
+ rtl::Reference < SvXMLExportPropertyMapper > GetSectionPropMapper() const
{
return xSectionPropMapper;
}
- UniReference < SvXMLExportPropertyMapper > GetRubyPropMapper() const
+ rtl::Reference < SvXMLExportPropertyMapper > GetRubyPropMapper() const
{
return xRubyPropMapper;
}
@@ -647,7 +646,7 @@ public:
bool IsBlockMode() const { return bBlock; }
- UniReference < SvXMLExportPropertyMapper > GetParagraphPropertyMapper() const
+ rtl::Reference < SvXMLExportPropertyMapper > GetParagraphPropertyMapper() const
{
return xParaPropMapper;
}
@@ -667,7 +666,7 @@ public:
void PreventExportOfControlsInMuteSections(
const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess> & rShapes,
- UniReference<xmloff::OFormLayerXMLExport> xFormExport );
+ rtl::Reference<xmloff::OFormLayerXMLExport> xFormExport );
SinglePropertySetInfoCache& GetCharStyleNamesPropInfoCache() { return aCharStyleNamesPropInfoCache; }
diff --git a/include/xmloff/uniref.hxx b/include/xmloff/uniref.hxx
deleted file mode 100644
index e1ef4b8..0000000
--- a/include/xmloff/uniref.hxx
+++ /dev/null
@@ -1,224 +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 .
- */
-
-#ifndef INCLUDED_XMLOFF_UNIREF_HXX
-#define INCLUDED_XMLOFF_UNIREF_HXX
-
-#include <sal/config.h>
-#include <xmloff/dllapi.h>
-#include <sal/types.h>
-#include <osl/interlck.h>
-
-/**
- * An instance of this class holds a pointer to an object. The lifetime of
- * the object is controlled by the instance. The constructor calls
- * acquire() and the destructor calls release().
- * You could derive your class from the baseclass UniRefBase which implements
- * the methods acquire and release, yet.
- */
-template< class T > class UniReference
-{
-private:
- T* mpElement;
-
-public:
- /** Create an empty reference.*/
- UniReference()
- : mpElement( NULL )
- {}
-
- /** Destroy the reference and releases the element.*/
- inline ~UniReference();
-
- /** Create a new reference with the same element as in rRef and acquire this one.*/
- inline UniReference( const UniReference< T > & rRef );
-
- /**
- * Create a new reference with the given element pElement and acquire this one.
- */
- inline UniReference( T * pElement );
-
- /**
- * Release the reference and set the new one pObj.
- */
- inline UniReference< T > & operator = ( T * pElement );
-
- /**
- * Release the reference and set the new one from rObj.
- */
- inline UniReference< T > & operator = ( const UniReference< T > & rRef );
-
- /**
- * Return the pointer to the element, may be null.
- */
- inline T* operator -> () const;
-
- /**
- * Returns true if the pointer to the element is valid.
- */
- inline bool is() const;
-
- /**
- * Return true if both elements refer to the same object.
- */
- inline bool operator == ( const UniReference & rRef ) const;
-
- /**
- * Return true if both elements does not refer to the same object.
- */
- inline bool operator != ( const UniReference & rRef ) const;
-
- /** Gets implementation pointer.
- This call does <b>not</b> acquire the implementation.
- <br>
- @return <b>un</b>acquired implementation pointer
- */
- inline T* get() const;
-};
-
-class XMLOFF_DLLPUBLIC UniRefBase
-{
-private:
- /**
- * The reference counter.
- */
- oslInterlockedCount m_refCount;
-
-public:
- UniRefBase() : m_refCount( 0 )
- {}
- virtual ~UniRefBase();
-
- void acquire() { osl_atomic_increment( &m_refCount ); }
- void release();
-
-};
-
-
-
-// Inline-implementations of UniReference
-
-
-/** Create a new reference with the same element as in rRef and acquire this one.*/
-template< class T >
-inline UniReference< T >::UniReference( const UniReference< T > & rRef )
- : mpElement( rRef.mpElement )
-{
- if( mpElement )
- mpElement->acquire();
-}
-
-template< class T >
-inline UniReference< T >::~UniReference()
-{
- if( mpElement )
- mpElement->release();
-}
-
-/**
- * Create a new reference with the given element pElement and acquire this one.
- * @param pInterface the interface, pointer may be null.
- */
-template< class T >
-inline UniReference< T >::UniReference( T * pElement )
- : mpElement( pElement )
-{
- if( mpElement )
- mpElement->acquire();
-}
-
-/**
- * Release the reference and set the new one pObj.<BR>
- * <B>The operation is not thread save. You must protect all assigns to a reference class.</B>
- */
-template< class T >
-inline UniReference< T > & UniReference< T >::operator = ( T * pElement )
-{
- if( pElement )
- pElement->acquire();
- if( mpElement )
- mpElement->release();
-
- mpElement = pElement;
-
- return *this;
-}
-
-/**
- * Release the reference and set the new one from rObj.<BR>
- * <B>The operation is not thread save. You must protect all assigns to a reference class.</B>
- */
-template< class T >
-inline UniReference< T > & UniReference< T >::operator = ( const UniReference< T > & rRef )
-{
- return operator = ( rRef.mpElement );
-}
-
-/**
- * Return the pointer to the interface, may be null.
- */
-template< class T >
-inline T* UniReference< T >::operator -> () const
-{
- return get();
-}
-
-/**
- * Return the pointer to the interface, may be null.
- */
-template< class T >
-inline T* UniReference< T >::get () const
-{
- return static_cast< T * >( mpElement );
-}
-
-/**
- * Returns true if the pointer to the interface is valid.
- */
-template< class T >
-inline bool UniReference< T >::is() const
-{
- return (mpElement != 0);
-}
-/**
- * Return true if both interfaces refer to the same object. The operation can be
- * much more expensive than a pointer comparison.<BR>
- *
- * @param rRef another interface reference
- */
-template< class T >
-inline bool UniReference< T >::operator == ( const UniReference & rRef ) const
-{
- return ( mpElement == rRef.mpElement );
-}
-/**
- * Return true if both interfaces does not refer to the same object. The operation can be
- * much more expensive than a pointer comparison.<BR>
- *
- * @param rRef another interface reference
- */
-template< class T >
-inline bool UniReference< T >::operator != ( const UniReference & rRef ) const
-{
- return ( ! operator == ( rRef ) );
-}
-
-#endif // INCLUDED_XMLOFF_UNIREF_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index 55cb05d..812f69f 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -24,7 +24,7 @@
#include <xmloff/dllapi.h>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <xmloff/xmlprmap.hxx>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
class SvXMLExportPropertyMapper;
class SvXMLNamespaceMap;
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno
{ template<typename A> class Sequence; }
} } }
-class XMLOFF_DLLPUBLIC SvXMLAutoStylePoolP : public UniRefBase
+class XMLOFF_DLLPUBLIC SvXMLAutoStylePoolP : public salhelper::SimpleReferenceObject
{
friend class Test;
friend class SvXMLAutoStylePoolP_Impl;
@@ -79,10 +79,10 @@ public:
// TODO: Remove this ugly method as soon as possible
void AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, const OUString& aStrPrefix, bool bAsFamily = true );
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 );
/// Register a name that must not be used as a generated name.
void RegisterName( sal_Int32 nFamily, const OUString& rName );
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 62a68be..57cc643 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -132,13 +132,13 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
SvXMLNumFmtExport *mpNumExport;
ProgressBarHelper *mpProgressBarHelper;
- UniReference< XMLTextParagraphExport > mxTextParagraphExport;
- UniReference< XMLShapeExport > mxShapeExport;
- UniReference< SvXMLAutoStylePoolP > mxAutoStylePool;
- UniReference< SchXMLExportHelper > mxChartExport;
- UniReference< XMLPageExport > mxPageExport;
- UniReference< XMLFontAutoStylePool > mxFontAutoStylePool;
- UniReference< xmloff::OFormLayerXMLExport > mxFormExport;
+ rtl::Reference< XMLTextParagraphExport > mxTextParagraphExport;
+ rtl::Reference< XMLShapeExport > mxShapeExport;
+ rtl::Reference< SvXMLAutoStylePoolP > mxAutoStylePool;
+ rtl::Reference< SchXMLExportHelper > mxChartExport;
+ rtl::Reference< XMLPageExport > mxPageExport;
+ rtl::Reference< XMLFontAutoStylePool > mxFontAutoStylePool;
+ rtl::Reference< xmloff::OFormLayerXMLExport > mxFormExport;
XMLEventExport* mpEventExport;
XMLImageMapExport* mpImageMapExport;
XMLErrors* mpXMLErrors;
@@ -441,27 +441,27 @@ public:
}
// get export helper for text
- inline UniReference< XMLTextParagraphExport > GetTextParagraphExport();
+ inline rtl::Reference< XMLTextParagraphExport > GetTextParagraphExport();
// get export helper for shapes
- inline UniReference< XMLShapeExport > GetShapeExport();
+ inline rtl::Reference< XMLShapeExport > GetShapeExport();
// get auto style pool
- inline UniReference< SvXMLAutoStylePoolP > GetAutoStylePool();
+ inline rtl::Reference< SvXMLAutoStylePoolP > GetAutoStylePool();
// get Page Export
- inline UniReference< XMLPageExport > GetPageExport();
+ inline rtl::Reference< XMLPageExport > GetPageExport();
// get chart export helper
- inline UniReference< SchXMLExportHelper > GetChartExport();
+ inline rtl::Reference< SchXMLExportHelper > GetChartExport();
// get font auto style pool
- inline UniReference< XMLFontAutoStylePool > GetFontAutoStylePool();
+ inline rtl::Reference< XMLFontAutoStylePool > GetFontAutoStylePool();
ProgressBarHelper* GetProgressBarHelper();
// get Formlayer Export
- inline UniReference< xmloff::OFormLayerXMLExport > GetFormExport();
+ inline rtl::Reference< xmloff::OFormLayerXMLExport > GetFormExport();
inline bool HasFormExport();
// get XPropertySet with export information
@@ -581,7 +581,7 @@ public:
bool SetNullDateOnUnitConverter();
};
-inline UniReference< XMLTextParagraphExport > SvXMLExport::GetTextParagraphExport()
+inline rtl::Reference< XMLTextParagraphExport > SvXMLExport::GetTextParagraphExport()
{
if( !mxTextParagraphExport.is() )
mxTextParagraphExport = CreateTextParagraphExport();
@@ -589,7 +589,7 @@ inline UniReference< XMLTextParagraphExport > SvXMLExport::GetTextParagraphExpor
return mxTextParagraphExport;
}
-inline UniReference< XMLShapeExport > SvXMLExport::GetShapeExport()
+inline rtl::Reference< XMLShapeExport > SvXMLExport::GetShapeExport()
{
if( !mxShapeExport.is() )
mxShapeExport = CreateShapeExport();
@@ -597,7 +597,7 @@ inline UniReference< XMLShapeExport > SvXMLExport::GetShapeExport()
return mxShapeExport;
}
-inline UniReference< SvXMLAutoStylePoolP > SvXMLExport::GetAutoStylePool()
+inline rtl::Reference< SvXMLAutoStylePoolP > SvXMLExport::GetAutoStylePool()
{
if( !mxAutoStylePool.is() )
mxAutoStylePool = CreateAutoStylePool();
@@ -605,7 +605,7 @@ inline UniReference< SvXMLAutoStylePoolP > SvXMLExport::GetAutoStylePool()
return mxAutoStylePool;
}
-inline UniReference< SchXMLExportHelper > SvXMLExport::GetChartExport()
+inline rtl::Reference< SchXMLExportHelper > SvXMLExport::GetChartExport()
{
if( !mxChartExport.is() )
mxChartExport = CreateChartExport();
@@ -613,7 +613,7 @@ inline UniReference< SchXMLExportHelper > SvXMLExport::GetChartExport()
return mxChartExport;
}
-inline UniReference< XMLPageExport > SvXMLExport::GetPageExport()
+inline rtl::Reference< XMLPageExport > SvXMLExport::GetPageExport()
{
if( !mxPageExport.is() )
mxPageExport = CreatePageExport();
@@ -621,7 +621,7 @@ inline UniReference< XMLPageExport > SvXMLExport::GetPageExport()
return mxPageExport;
}
-inline UniReference< XMLFontAutoStylePool > SvXMLExport::GetFontAutoStylePool()
+inline rtl::Reference< XMLFontAutoStylePool > SvXMLExport::GetFontAutoStylePool()
{
if( !mxFontAutoStylePool.is() )
mxFontAutoStylePool = CreateFontAutoStylePool();
@@ -629,7 +629,7 @@ inline UniReference< XMLFontAutoStylePool > SvXMLExport::GetFontAutoStylePool()
return mxFontAutoStylePool;
}
-inline UniReference< xmloff::OFormLayerXMLExport > SvXMLExport::GetFormExport()
+inline rtl::Reference< xmloff::OFormLayerXMLExport > SvXMLExport::GetFormExport()
{
if( !mxFormExport.is() )
mxFormExport = CreateFormExport();
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 7a1f655..8d98a1b 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -20,10 +20,11 @@
#ifndef INCLUDED_XMLOFF_XMLEXPPR_HXX
#define INCLUDED_XMLOFF_XMLEXPPR_HXX
+#include <rtl/ref.hxx>
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <xmloff/xmlprmap.hxx>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
class SvXMLUnitConverter;
@@ -39,7 +40,7 @@ class SvXMLExport;
// even if its empty
#define XML_EXPORT_FLAG_IGN_WS 0x0008
-class XMLOFF_DLLPUBLIC SvXMLExportPropertyMapper : public UniRefBase
+class XMLOFF_DLLPUBLIC SvXMLExportPropertyMapper : public salhelper::SimpleReferenceObject
{
struct Impl;
Impl* mpImpl;
@@ -91,14 +92,14 @@ protected:
public:
SvXMLExportPropertyMapper(
- const UniReference< XMLPropertySetMapper >& rMapper );
+ const rtl::Reference< XMLPropertySetMapper >& rMapper );
virtual ~SvXMLExportPropertyMapper();
// Add a ExportPropertyMapper at the end of the import mapper chain.
// The added mapper MUST not be used outside the Mapper chain any longer,
// because its PropertyMapper will be replaced.
void ChainExportMapper(
- const UniReference< SvXMLExportPropertyMapper>& rMapper );
+ const rtl::Reference< SvXMLExportPropertyMapper>& rMapper );
/** Filter all properties we don't want to export:
Take all properties of the XPropertySet which are also found in the
@@ -174,7 +175,7 @@ public:
const ::std::vector< XMLPropertyState > *pProperties = 0,
sal_uInt32 nIdx = 0 ) const;
- const UniReference<XMLPropertySetMapper>& getPropertySetMapper() const;
+ const rtl::Reference<XMLPropertySetMapper>& getPropertySetMapper() const;
void SetStyleName( const OUString& rStyleName );
const OUString& GetStyleName() const;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 3979463..24414ff 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -106,10 +106,10 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper6<
::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedObjectResolver > mxEmbeddedResolver;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > mxImportInfo;
- UniReference< XMLTextImportHelper > mxTextImport;
- UniReference< XMLShapeImportHelper > mxShapeImport;
- UniReference< SchXMLImportHelper > mxChartImport;
- UniReference< ::xmloff::OFormLayerXMLImport > mxFormImport;
+ rtl::Reference< XMLTextImportHelper > mxTextImport;
+ rtl::Reference< XMLShapeImportHelper > mxShapeImport;
+ rtl::Reference< SchXMLImportHelper > mxChartImport;
+ rtl::Reference< ::xmloff::OFormLayerXMLImport > mxFormImport;
SvXMLImportContextRef mxFontDecls;
SvXMLImportContextRef mxStyles;
@@ -256,18 +256,18 @@ public:
virtual void SetStatistics(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > & i_rStats);
// get import helper for text
- inline UniReference< XMLTextImportHelper > GetTextImport();
+ inline rtl::Reference< XMLTextImportHelper > GetTextImport();
bool HasTextImport() const { return mxTextImport.is(); }
inline SvXMLNumFmtHelper* GetDataStylesImport();
// get import helper for shapes
- inline UniReference< XMLShapeImportHelper > GetShapeImport();
+ inline rtl::Reference< XMLShapeImportHelper > GetShapeImport();
// get import helper for charts
- inline UniReference< SchXMLImportHelper > GetChartImport();
+ inline rtl::Reference< SchXMLImportHelper > GetChartImport();
// get import helper for form layer
- inline UniReference< ::xmloff::OFormLayerXMLImport > GetFormImport();
+ inline rtl::Reference< ::xmloff::OFormLayerXMLImport > GetFormImport();
// get XPropertySet with import information
inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getImportInfo() const { return mxImportInfo; }
@@ -482,7 +482,7 @@ public:
bool needFixPositionAfterZ() const;
};
-inline UniReference< XMLTextImportHelper > SvXMLImport::GetTextImport()
+inline rtl::Reference< XMLTextImportHelper > SvXMLImport::GetTextImport()
{
if( !mxTextImport.is() )
mxTextImport = CreateTextImport();
@@ -490,7 +490,7 @@ inline UniReference< XMLTextImportHelper > SvXMLImport::GetTextImport()
return mxTextImport;
}
-inline UniReference< XMLShapeImportHelper > SvXMLImport::GetShapeImport()
+inline rtl::Reference< XMLShapeImportHelper > SvXMLImport::GetShapeImport()
{
if( !mxShapeImport.is() )
mxShapeImport = CreateShapeImport();
@@ -498,7 +498,7 @@ inline UniReference< XMLShapeImportHelper > SvXMLImport::GetShapeImport()
return mxShapeImport;
}
-inline UniReference< SchXMLImportHelper > SvXMLImport::GetChartImport()
+inline rtl::Reference< SchXMLImportHelper > SvXMLImport::GetChartImport()
{
if( !mxChartImport.is() )
mxChartImport = CreateChartImport();
@@ -506,7 +506,7 @@ inline UniReference< SchXMLImportHelper > SvXMLImport::GetChartImport()
return mxChartImport;
}
-inline UniReference< ::xmloff::OFormLayerXMLImport > SvXMLImport::GetFormImport()
+inline rtl::Reference< ::xmloff::OFormLayerXMLImport > SvXMLImport::GetFormImport()
{
if( !mxFormImport.is() )
mxFormImport = CreateFormImport();
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index bf493b2..33679a1 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_XMLOFF_XMLIMPPR_HXX
#define INCLUDED_XMLOFF_XMLIMPPR_HXX
+#include <rtl/ref.hxx>
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
@@ -29,7 +30,7 @@
#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
#include <vector>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
struct XMLPropertyState;
class XMLPropertySetMapper;
@@ -50,9 +51,9 @@ struct _ContextID_Index_Pair
sal_Int32 nIndex;
};
-class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public UniRefBase
+class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public salhelper::SimpleReferenceObject
{
- UniReference< SvXMLImportPropertyMapper> mxNextMapper;
+ rtl::Reference< SvXMLImportPropertyMapper> mxNextMapper;
SvXMLImport& rImport; // access to error handling
@@ -62,13 +63,13 @@ class XMLOFF_DLLPUBLIC SvXMLImportPropertyMapper : public UniRefBase
protected:
- UniReference< XMLPropertySetMapper > maPropMapper;
+ rtl::Reference< XMLPropertySetMapper > maPropMapper;
SvXMLImport& GetImport() const { return rImport;}
public:
SvXMLImportPropertyMapper(
- const UniReference< XMLPropertySetMapper >& rMapper,
+ const rtl::Reference< XMLPropertySetMapper >& rMapper,
SvXMLImport& rImport);
virtual ~SvXMLImportPropertyMapper();
@@ -76,7 +77,7 @@ public:
// The added mapper MUST not be used outside the Mapper chain any longer,
// because its PropertyMapper will be replaced.
void ChainImportMapper(
- const UniReference< SvXMLImportPropertyMapper>& rMapper );
+ const rtl::Reference< SvXMLImportPropertyMapper>& rMapper );
/** fills the given itemset with the attributes in the given list
* the map is only searched within the range
@@ -121,7 +122,7 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues )
const;
- inline const UniReference< XMLPropertySetMapper >&
+ inline const rtl::Reference< XMLPropertySetMapper >&
getPropertySetMapper() const;
@@ -134,7 +135,7 @@ public:
::com::sun::star::beans::XPropertySet> & rPropSet,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo,
- const UniReference<XMLPropertySetMapper> & rPropMapper,
+ const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
SvXMLImport& rImport,
// parameter for use by txtstyli.cxx; allows efficient
@@ -149,7 +150,7 @@ public:
::com::sun::star::beans::XMultiPropertySet> & rMultiPropSet,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo,
- const UniReference<XMLPropertySetMapper> & rPropMapper,
+ const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
// parameters for use by txtstyli.cxx; allows efficient
// catching the combined characters property
@@ -161,7 +162,7 @@ public:
const ::std::vector<XMLPropertyState> & rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XTolerantMultiPropertySet> & rTolPropSet,
- const UniReference<XMLPropertySetMapper> & rPropMapper,
+ const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
SvXMLImport& rImport,
// parameters for use by txtstyli.cxx; allows efficient
@@ -173,14 +174,14 @@ public:
const ::std::vector<XMLPropertyState> & rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo> & rPropSetInfo,
- const UniReference<XMLPropertySetMapper> & rPropMapper,
+ const rtl::Reference<XMLPropertySetMapper> & rPropMapper,
_ContextID_Index_Pair* pSpecialContextIds,
::com::sun::star::uno::Sequence< OUString >& rNames,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues);
};
-inline const UniReference< XMLPropertySetMapper >&
+inline const rtl::Reference< XMLPropertySetMapper >&
SvXMLImportPropertyMapper::getPropertySetMapper() const
{
return maPropMapper;
diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index e7a9d16..1856d23 100644
--- a/include/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
@@ -23,7 +23,6 @@
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlimppr.hxx>
#include <xmloff/xmlprmap.hxx>
-#include <xmloff/uniref.hxx>
class SvXMLImportPropertyMapper;
@@ -35,7 +34,7 @@ protected:
sal_Int32 mnEndIdx;
sal_uInt32 mnFamily;
::std::vector< XMLPropertyState > &mrProperties;
- UniReference < SvXMLImportPropertyMapper > mxMapper;
+ rtl::Reference < SvXMLImportPropertyMapper > mxMapper;
public:
@@ -45,7 +44,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
sal_uInt32 nFamily,
::std::vector< XMLPropertyState > &rProps,
- const UniReference < SvXMLImportPropertyMapper > &rMap,
+ const rtl::Reference < SvXMLImportPropertyMapper > &rMap,
sal_Int32 nStartIdx = -1, sal_Int32 nEndIdx = -1 );
virtual ~SvXMLPropertySetContext();
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index 5f6d52c..e0d4fdb 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_XMLOFF_XMLPRMAP_HXX
#define INCLUDED_XMLOFF_XMLPRMAP_HXX
+#include <rtl/ref.hxx>
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <com/sun/star/uno/Sequence.hxx>
@@ -27,7 +28,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <vector>
-#include <xmloff/uniref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/maptype.hxx>
#include <xmloff/xmltypes.hxx>
#include <xmloff/prhdlfac.hxx>
@@ -64,7 +65,7 @@ struct XMLPropertySetMapperEntry_Impl
XMLPropertySetMapperEntry_Impl(
const XMLPropertyMapEntry& rMapEntry,
- const UniReference< XMLPropertyHandlerFactory >& rFactory );
+ const rtl::Reference< XMLPropertyHandlerFactory >& rFactory );
XMLPropertySetMapperEntry_Impl(
const XMLPropertySetMapperEntry_Impl& rEntry );
@@ -72,10 +73,10 @@ struct XMLPropertySetMapperEntry_Impl
sal_uInt32 GetPropType() const { return nType & XML_TYPE_PROP_MASK; }
};
-class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public UniRefBase
+class XMLOFF_DLLPUBLIC XMLPropertySetMapper : public salhelper::SimpleReferenceObject
{
::std::vector< XMLPropertySetMapperEntry_Impl > aMapEntries;
- ::std::vector< UniReference < XMLPropertyHandlerFactory > > aHdlFactories;
+ ::std::vector< rtl::Reference < XMLPropertyHandlerFactory > > aHdlFactories;
bool mbOnlyExportMappings;
public:
@@ -87,11 +88,11 @@ public:
*/
XMLPropertySetMapper(
const XMLPropertyMapEntry* pEntries,
- const UniReference< XMLPropertyHandlerFactory >& rFactory,
+ const rtl::Reference< XMLPropertyHandlerFactory >& rFactory,
bool bForExport );
virtual ~XMLPropertySetMapper();
- void AddMapperEntry( const UniReference < XMLPropertySetMapper >& rMapper );
+ void AddMapperEntry( const rtl::Reference < XMLPropertySetMapper >& rMapper );
/** Return number of entries in input-array */
sal_Int32 GetEntryCount() const { return aMapEntries.size(); }
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index aaf6ce7..3698925 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_XMLOFF_XMLSTYLE_HXX
#define INCLUDED_XMLOFF_XMLSTYLE_HXX
+#include <rtl/ref.hxx>
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rsc/rscsfx.hxx>
#include <tools/rtti.hxx>
-#include <xmloff/uniref.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlictxt.hxx>
@@ -178,11 +178,11 @@ class XMLOFF_DLLPUBLIC SvXMLStylesContext : public SvXMLImportContext
::com::sun::star::uno::Reference <
::com::sun::star::style::XAutoStyleFamily > mxTextAutoStyles;
- UniReference < SvXMLImportPropertyMapper > mxParaImpPropMapper;
- UniReference < SvXMLImportPropertyMapper > mxTextImpPropMapper;
- UniReference < SvXMLImportPropertyMapper > mxShapeImpPropMapper;
- mutable UniReference < SvXMLImportPropertyMapper > mxChartImpPropMapper;
- mutable UniReference < SvXMLImportPropertyMapper > mxPageImpPropMapper;
+ rtl::Reference < SvXMLImportPropertyMapper > mxParaImpPropMapper;
+ rtl::Reference < SvXMLImportPropertyMapper > mxTextImpPropMapper;
+ rtl::Reference < SvXMLImportPropertyMapper > mxShapeImpPropMapper;
+ mutable rtl::Reference < SvXMLImportPropertyMapper > mxChartImpPropMapper;
+ mutable rtl::Reference < SvXMLImportPropertyMapper > mxPageImpPropMapper;
SAL_DLLPRIVATE const SvXMLTokenMap& GetStyleStylesElemTokenMap();
@@ -241,7 +241,7 @@ public:
const OUString& rName,
bool bCreateIndex = false ) const;
virtual sal_uInt16 GetFamily( const OUString& rFamily ) const;
- virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
+ virtual rtl::Reference < SvXMLImportPropertyMapper > GetImportPropertyMapper(
sal_uInt16 nFamily ) const;
virtual ::com::sun::star::uno::Reference <
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index 0185958..500ca97 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 89c84f3..fe00d4a 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 efa5d79..1ce52a1 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 77f42ba..8916e43 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 4c16131..51c8dbe 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 6f05ded..e36506a 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 6c3a254..9e47479 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 ec549b3..772a1e9 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 c94b762..4e27077 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 cf23bdb..eb843b7 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
*
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 8ad5650..5a2e3aa 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -381,7 +381,7 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 nBegin, sal_Int32 nEnd, cons
return;
// Get the style information from xmloff.
- UniReference<XMLPropertySetMapper> xMapper = GetImport().GetTextImport()->GetTextImportPropertySetMapper()->getPropertySetMapper();
+ rtl::Reference<XMLPropertySetMapper> xMapper = GetImport().GetTextImport()->GetTextImportPropertySetMapper()->getPropertySetMapper();
if (!xMapper.is())
// We can't do anything without the mapper.
return;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 32181cd..11f8a9f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1078,7 +1078,7 @@ namespace {
void handleFont(
std::vector<XMLPropertyState>& rPropStates,
- const SfxPoolItem* p, const UniReference<XMLPropertySetMapper>& xMapper, const OUString& rXMLName )
+ const SfxPoolItem* p, const rtl::Reference<XMLPropertySetMapper>& xMapper, const OUString& rXMLName )
{
sal_Int32 nEntryCount = xMapper->GetEntryCount();
@@ -1099,7 +1099,7 @@ void handleFont(
const SvxFieldData* toXMLPropertyStates(
std::vector<XMLPropertyState>& rPropStates, const std::vector<const SfxPoolItem*>& rSecAttrs,
- const UniReference<XMLPropertySetMapper>& xMapper, const ScXMLEditAttributeMap& rAttrMap )
+ const rtl::Reference<XMLPropertySetMapper>& xMapper, const ScXMLEditAttributeMap& rAttrMap )
{
const SvxFieldData* pField = NULL;
sal_Int32 nEntryCount = xMapper->GetEntryCount();
@@ -1351,8 +1351,8 @@ void ScXMLExport::ExportCellTextAutoStyles(sal_Int32 nTable)
if (!ValidTab(nTable))
return;
- UniReference<XMLPropertySetMapper> xMapper = GetTextParagraphExport()->GetTextPropMapper()->getPropertySetMapper();
- UniReference<SvXMLAutoStylePoolP> xStylePool = GetAutoStylePool();
+ rtl::Reference<XMLPropertySetMapper> xMapper = GetTextParagraphExport()->GetTextPropMapper()->getPropertySetMapper();
+ rtl::Reference<SvXMLAutoStylePoolP> xStylePool = GetAutoStylePool();
const ScXMLEditAttributeMap& rAttrMap = GetEditAttributeMap();
sc::EditTextIterator aIter(*pDoc, nTable);
@@ -2420,7 +2420,7 @@ void ScXMLExport::_ExportAutoStyles()
// stored styles for notes
- UniReference<SvXMLExportPropertyMapper> xShapeMapper = XMLShapeExport::CreateShapePropMapper( *this );
+ rtl::Reference<SvXMLExportPropertyMapper> xShapeMapper = XMLShapeExport::CreateShapePropMapper( *this );
GetShapeExport(); // make sure the graphics styles family is added
const std::vector<ScNoteStyleEntry>& rNoteEntries = pSheetData->GetNoteStyles();
@@ -2469,7 +2469,7 @@ void ScXMLExport::_ExportAutoStyles()
// note paragraph styles
- UniReference<SvXMLExportPropertyMapper> xParaPropMapper = GetTextParagraphExport()->GetParagraphPropertyMapper();
+ rtl::Reference<SvXMLExportPropertyMapper> xParaPropMapper = GetTextParagraphExport()->GetParagraphPropertyMapper();
const std::vector<ScTextStyleEntry>& rNoteParaEntries = pSheetData->GetNoteParaStyles();
std::vector<ScTextStyleEntry>::const_iterator aNoteParaIter = rNoteParaEntries.begin();
@@ -2504,7 +2504,7 @@ void ScXMLExport::_ExportAutoStyles()
// note text styles
- UniReference<SvXMLExportPropertyMapper> xTextPropMapper = XMLTextParagraphExport::CreateCharExtPropMapper( *this );
+ rtl::Reference<SvXMLExportPropertyMapper> xTextPropMapper = XMLTextParagraphExport::CreateCharExtPropMapper( *this );
const std::vector<ScTextStyleEntry>& rNoteTextEntries = pSheetData->GetNoteTextStyles();
std::vector<ScTextStyleEntry>::const_iterator aNoteTextIter = rNoteTextEntries.begin();
@@ -3145,7 +3145,7 @@ void writeContent(
void flushParagraph(
ScXMLExport& rExport, const OUString& rParaText,
- UniReference<XMLPropertySetMapper> xMapper, UniReference<SvXMLAutoStylePoolP> xStylePool,
+ rtl::Reference<XMLPropertySetMapper> xMapper, rtl::Reference<SvXMLAutoStylePoolP> xStylePool,
const ScXMLEditAttributeMap& rAttrMap,
std::vector<editeng::Section>::const_iterator it, std::vector<editeng::Section>::const_iterator itEnd )
{
@@ -3346,8 +3346,8 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
void ScXMLExport::WriteEditCell(const EditTextObject* pText)
{
- UniReference<XMLPropertySetMapper> xMapper = GetTextParagraphExport()->GetTextPropMapper()->getPropertySetMapper();
- UniReference<SvXMLAutoStylePoolP> xStylePool = GetAutoStylePool();
+ rtl::Reference<XMLPropertySetMapper> xMapper = GetTextParagraphExport()->GetTextPropMapper()->getPropertySetMapper();
+ rtl::Reference<SvXMLAutoStylePoolP> xStylePool = GetAutoStylePool();
const ScXMLEditAttributeMap& rAttrMap = GetEditAttributeMap();
// Get raw paragraph texts first.
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index ef42111..a6ed689 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -83,15 +83,15 @@ class ScXMLExport : public SvXMLExport
mutable boost::scoped_ptr<ScXMLEditAttributeMap> mpEditAttrMap;
boost::scoped_ptr<ScMyNotEmptyCellsIterator> mpCellsItr;
boost::scoped_ptr<sc::CompileFormulaContext> mpCompileFormulaCxt;
- UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory;
- UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper;
- UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper;
+ rtl::Reference < XMLPropertyHandlerFactory > xScPropHdlFactory;
+ rtl::Reference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
+ rtl::Reference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
+ rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
+ rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper;
+ rtl::Reference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper;
XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper;
typedef ::boost::unordered_map<sal_Int32, sal_Int32> NumberFormatIndexMap;
NumberFormatIndexMap aNumFmtIndexMap;
@@ -248,8 +248,8 @@ public:
bool IsMatrix (const ScAddress& aCell,
com::sun::star::table::CellRangeAddress& aCellAddress, bool& bIsFirst) const;
- UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() { return xCellStylesPropertySetMapper; }
- UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() { return xTableStylesPropertySetMapper; }
+ rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() { return xCellStylesPropertySetMapper; }
+ rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() { return xTableStylesPropertySetMapper; }
void SetSourceStream( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xNewStream );
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 68851fe..0d95343 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -840,11 +840,11 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable
OUString sStandardFormat;
OUString sType;
- UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory;
- UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
- UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
+ rtl::Reference < XMLPropertyHandlerFactory > xScPropHdlFactory;
+ rtl::Reference < XMLPropertySetMapper > xCellStylesPropertySetMapper;
+ rtl::Reference < XMLPropertySetMapper > xColumnStylesPropertySetMapper;
+ rtl::Reference < XMLPropertySetMapper > xRowStylesPropertySetMapper;
+ rtl::Reference < XMLPropertySetMapper > xTableStylesPropertySetMapper;
SvXMLTokenMap *pDocElemTokenMap;
SvXMLTokenMap *pStylesElemTokenMap;
@@ -1020,10 +1020,10 @@ public:
sal_Int16 GetCellType(const OUString& rStrValue) const;
- UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; }
- UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; }
- UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; }
- UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; }
+ rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; }
+ rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; }
+ rtl::Reference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; }
+ rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; }
const SvXMLTokenMap& GetDocElemTokenMap();
const SvXMLTokenMap& GetBodyElemTokenMap();
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index 9057190..9763f3d 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -180,7 +180,7 @@ const XMLPropertyMapEntry aXMLScTableStylesProperties[] =
};
ScXMLCellExportPropertyMapper::ScXMLCellExportPropertyMapper(
- const UniReference< XMLPropertySetMapper >& rMapper )
+ const rtl::Reference< XMLPropertySetMapper >& rMapper )
: SvXMLExportPropertyMapper(rMapper)
{
}
@@ -548,7 +548,7 @@ void ScXMLCellExportPropertyMapper::handleElementItem(
}
ScXMLRowExportPropertyMapper::ScXMLRowExportPropertyMapper(
- const UniReference< XMLPropertySetMapper >& rMapper )
+ const rtl::Reference< XMLPropertySetMapper >& rMapper )
: SvXMLExportPropertyMapper(rMapper)
{
}
@@ -566,7 +566,7 @@ void ScXMLRowExportPropertyMapper::ContextFilter(
}
ScXMLColumnExportPropertyMapper::ScXMLColumnExportPropertyMapper(
- const UniReference< XMLPropertySetMapper >& rMapper )
+ const rtl::Reference< XMLPropertySetMapper >& rMapper )
: SvXMLExportPropertyMapper(rMapper)
{
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list