diff options
Diffstat (limited to 'xmloff/source/text')
22 files changed, 60 insertions, 60 deletions
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx index a706ec20fb26..857809f0f24c 100644 --- a/xmloff/source/text/XMLChangeImportContext.cxx +++ b/xmloff/source/text/XMLChangeImportContext.cxx @@ -68,7 +68,7 @@ void XMLChangeImportContext::StartElement( // Id found! Now call RedlineImportHelper // prepare parameters - UniReference<XMLTextImportHelper> rHelper = + rtl::Reference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); OUString sID = xAttrList->getValueByIndex(nAttr); diff --git a/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index 856ee7f2a30c..0914e05c6a42 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -146,7 +146,7 @@ void XMLChangedRegionImportContext::EndElement() { // delete last paragraph // (one extra paragraph was inserted in the beginning) - UniReference<XMLTextImportHelper> rHelper = + rtl::Reference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); rHelper->DeleteParagraph(); @@ -175,7 +175,7 @@ void XMLChangedRegionImportContext::UseRedlineText() if (! xOldCursor.is()) { // get TextImportHelper and old Cursor - UniReference<XMLTextImportHelper> rHelper(GetImport().GetTextImport()); + rtl::Reference<XMLTextImportHelper> rHelper(GetImport().GetTextImport()); Reference<XTextCursor> xCursor( rHelper->GetCursor() ); // create Redline and new Cursor diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index b7a2c902e268..0054d6e04d71 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -200,7 +200,7 @@ void XMLIndexTOCContext::StartElement( #else OUString sMarker("Y"); #endif - UniReference<XMLTextImportHelper> rImport = + rtl::Reference<XMLTextImportHelper> rImport = GetImport().GetTextImport(); // a) insert index @@ -263,7 +263,7 @@ void XMLIndexTOCContext::EndElement() { // preliminaries OUString sEmpty; - UniReference<XMLTextImportHelper> rHelper= GetImport().GetTextImport(); + rtl::Reference<XMLTextImportHelper> rHelper= GetImport().GetTextImport(); // get rid of last paragraph (unless it's the only paragraph) rHelper->GetCursor()->goRight(1, sal_False); diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx index 16f0f7e37299..18c4194a31a3 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx @@ -52,7 +52,7 @@ void XMLSectionFootnoteConfigExport::exportXML( nIdx #endif , - const UniReference<XMLPropertySetMapper> & rMapper) + const rtl::Reference<XMLPropertySetMapper> & rMapper) { // store and initialize the values bool bNumOwn = false; diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx index 6935bcad4eff..985f7c70a3c5 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.hxx @@ -28,7 +28,9 @@ class SvXMLExport; class XMLPropertySetMapper; struct XMLPropertyState; -template<class X> class UniReference; +namespace rtl { + template<class X> class Reference; +} /** * Export the footnote-/endnote-configuration element in section styles. @@ -45,7 +47,7 @@ public: bool bEndnote, const ::std::vector<XMLPropertyState> * pProperties, sal_uInt32 nIdx, - const UniReference<XMLPropertySetMapper> & rMapper); /// used only for debugging + const rtl::Reference<XMLPropertySetMapper> & rMapper); /// used only for debugging }; #endif diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx index a280dd9ab7a8..1ddce2b57cfe 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx @@ -54,7 +54,7 @@ XMLSectionFootnoteConfigImport::XMLSectionFootnoteConfigImport( sal_uInt16 nPrefix, const OUString& rLocalName, vector<XMLPropertyState> & rProps, - const UniReference<XMLPropertySetMapper> & rMapperRef) : + const rtl::Reference<XMLPropertySetMapper> & rMapperRef) : SvXMLImportContext(rImport, nPrefix, rLocalName), rProperties(rProps), rMapper(rMapperRef) diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index bed2993bf4aa..5eab5365648c 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -21,10 +21,8 @@ #ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLSECTIONFOOTNOTECONFIGIMPORT_HXX - #include <xmloff/xmlictxt.hxx> -#include <xmloff/uniref.hxx> - +#include <rtl/ref.hxx> #include <vector> @@ -43,7 +41,7 @@ namespace com { namespace sun { namespace star { class XMLSectionFootnoteConfigImport : public SvXMLImportContext { ::std::vector<XMLPropertyState> & rProperties; - UniReference<XMLPropertySetMapper> rMapper; + rtl::Reference<XMLPropertySetMapper> rMapper; public: @@ -54,7 +52,7 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, ::std::vector<XMLPropertyState> & rProperties, - const UniReference<XMLPropertySetMapper> & rMapperRef); + const rtl::Reference<XMLPropertySetMapper> & rMapperRef); virtual ~XMLSectionFootnoteConfigImport(); diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 88a5e488310c..ea8ed959435a 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -130,7 +130,7 @@ void XMLSectionImportContext::StartElement( bValid = true; } - UniReference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); + rtl::Reference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); // valid? if (bValid) @@ -333,7 +333,7 @@ void XMLSectionImportContext::EndElement() { // get rid of last paragraph // (unless it's the only paragraph in the section) - UniReference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); + rtl::Reference<XMLTextImportHelper> rHelper = GetImport().GetTextImport(); rHelper->GetCursor()->goRight(1, sal_False); if (bHasContent) { diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index c16c38b23b49..62ea125e1253 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -477,7 +477,7 @@ TYPEINIT1( XMLTextFrameContext_Impl, SvXMLImportContext ); void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) { - UniReference < XMLTextImportHelper > xTextImportHelper = + rtl::Reference < XMLTextImportHelper > xTextImportHelper = GetImport().GetTextImport(); switch ( nType) @@ -717,7 +717,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) // URL OSL_ENSURE( !sHRef.isEmpty() || xBase64Stream.is(), "neither URL nor base64 image data given" ); - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); if( !sHRef.isEmpty() ) { @@ -895,7 +895,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl( bCreateFailed = false; bOwnBase64Stream = false; - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); const SvXMLTokenMap& rTokenMap = xTxtImport->GetTextFrameAttrTokenMap(); @@ -1273,7 +1273,7 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef, if( !xPropSet.is() ) return; - UniReference< XMLTextImportHelper > xTxtImp = GetImport().GetTextImport(); + rtl::Reference< XMLTextImportHelper > xTxtImp = GetImport().GetTextImport(); Reference < XPropertySetInfo > xPropSetInfo = xPropSet->getPropertySetInfo(); if( !xPropSetInfo.is() || @@ -1398,7 +1398,7 @@ XMLTextFrameContext::XMLTextFrameContext( OUString aStyleName = xAttrList->getValueByIndex( i ); if( !aStyleName.isEmpty() ) { - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); XMLPropStyleContext* pStyle( 0L ); pStyle = xTxtImport->FindAutoFrameStyle( aStyleName ); diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index ca59d826c79a..81c12bceb92a 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -162,7 +162,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext( xText->setString( aText ); } - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); xOldTextCursor = xTxtImport->GetCursor(); diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx index 33cb64542399..2afbd9635c24 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.cxx +++ b/xmloff/source/text/XMLTextPropertySetContext.cxx @@ -37,7 +37,7 @@ XMLTextPropertySetContext::XMLTextPropertySetContext( const Reference< xml::sax::XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, OUString& rDCTextStyleName ) : SvXMLPropertySetContext( rImport, nPrfx, rLName, xAttrList, nFamily, rProps, rMap ), diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index b66408e7e431..d7e15ed393bc 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -37,7 +37,7 @@ public: ::com::sun::star::xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap, + const rtl::Reference < SvXMLImportPropertyMapper > &rMap, OUString& rDopCapTextStyleName ); virtual ~XMLTextPropertySetContext(); diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx b/xmloff/source/text/XMLTextShapeImportHelper.cxx index 701cf1df920d..60aae4701189 100644 --- a/xmloff/source/text/XMLTextShapeImportHelper.cxx +++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx @@ -79,7 +79,7 @@ void XMLTextShapeImportHelper::addShape( sal_Int16 nPage = 0; sal_Int32 nY = 0; - UniReference < XMLTextImportHelper > xTxtImport = + rtl::Reference < XMLTextImportHelper > xTxtImport = rImport.GetTextImport(); const SvXMLTokenMap& rTokenMap = xTxtImport->GetTextFrameAttrTokenMap(); diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 25d9a4ad2c6f..9a51d82b5b4f 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -46,7 +46,7 @@ public: const Reference< XAttributeList >& xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap ); + const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); virtual ~XMLTextShapePropertySetContext_Impl(); @@ -64,7 +64,7 @@ XMLTextShapePropertySetContext_Impl::XMLTextShapePropertySetContext_Impl( const Reference< XAttributeList > & xAttrList, sal_uInt32 nFamily, ::std::vector< XMLPropertyState > &rProps, - const UniReference < SvXMLImportPropertyMapper > &rMap ) : + const rtl::Reference < SvXMLImportPropertyMapper > &rMap ) : XMLShapePropertySetContext( rImport, nPrfx, rLName, xAttrList, nFamily, rProps, rMap ) { @@ -172,7 +172,7 @@ SvXMLImportContext *XMLTextShapeStyleContext::CreateChildContext( nFamily = XML_TYPE_PROP_GRAPHIC; if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) { diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 0cd2bb72f0e1..edc98a8fe57c 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -173,7 +173,7 @@ void XMLTextExportPropertySetMapper::handleSpecialItem( } XMLTextExportPropertySetMapper::XMLTextExportPropertySetMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExp ) : SvXMLExportPropertyMapper( rMapper ), rExport( rExp ), diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index 008b169f3866..209914fa92e8 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -66,7 +66,7 @@ protected: public: XMLTextExportPropertySetMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExt ); virtual ~XMLTextExportPropertySetMapper(); diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 3e8a8e718d5a..dbf3f0942d63 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3664,7 +3664,7 @@ SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext( aAny >>= xText; if( xText.is() ) { - UniReference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); + rtl::Reference < XMLTextImportHelper > xTxtImport = GetImport().GetTextImport(); if( !mxCursor.is() ) { mxOldCursor = xTxtImport->GetCursor(); diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 5c5e17e09026..ebefde2cfcae 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -502,11 +502,11 @@ struct XMLTextImportHelper::Impl SvXMLImportContextRef m_xAutoStyles; SvXMLImportContextRef m_xFontDecls; - UniReference< SvXMLImportPropertyMapper > m_xParaImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xTextImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xFrameImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xSectionImpPrMap; - UniReference< SvXMLImportPropertyMapper > m_xRubyImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xParaImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xTextImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xFrameImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xSectionImpPrMap; + rtl::Reference< SvXMLImportPropertyMapper > m_xRubyImpPrMap; boost::scoped_ptr<SvI18NMap> m_pRenameMap; @@ -693,25 +693,25 @@ XMLTextImportHelper::GetChapterNumbering() const return m_pImpl->m_xChapterNumbering; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetParaImportPropertySetMapper() const { return m_pImpl->m_xParaImpPrMap; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetTextImportPropertySetMapper() const { return m_pImpl->m_xTextImpPrMap; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetSectionImportPropertySetMapper() const { return m_pImpl->m_xSectionImpPrMap; } -UniReference< SvXMLImportPropertyMapper > const& +rtl::Reference< SvXMLImportPropertyMapper > const& XMLTextImportHelper::GetRubyImportPropertySetMapper() const { return m_pImpl->m_xRubyImpPrMap; @@ -1230,12 +1230,12 @@ OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars, sal_Int32 nCount = pStyle->_GetProperties().size(); if( nCount ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = ((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles) ->GetImportPropertyMapper(nFamily); if( xImpPrMap.is() ) { - UniReference<XMLPropertySetMapper> rPropMapper = + rtl::Reference<XMLPropertySetMapper> rPropMapper = xImpPrMap->getPropertySetMapper(); for( sal_Int32 i=0; i < nCount; i++ ) { diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 7ac8db5815da..36fb328eabc7 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -131,7 +131,7 @@ bool XMLTextImportPropertyMapper::handleSpecialItem( } XMLTextImportPropertyMapper::XMLTextImportPropertyMapper( - const UniReference< XMLPropertySetMapper >& rMapper, + const rtl::Reference< XMLPropertySetMapper >& rMapper, SvXMLImport& rImp ) : SvXMLImportPropertyMapper( rMapper, rImp ), nSizeTypeIndex( -2 ), @@ -257,7 +257,7 @@ namespace { //On import clear 100% all-margins relative sizes. static bool -isNotDefaultRelSize(const XMLPropertyState* pRelState, const UniReference<XMLPropertySetMapper>& rPrMap) +isNotDefaultRelSize(const XMLPropertyState* pRelState, const rtl::Reference<XMLPropertySetMapper>& rPrMap) { if (rPrMap->GetEntryContextId(pRelState->mnIndex) == CTF_PARAMARGINALL_REL) { @@ -281,7 +281,7 @@ static void lcl_SeparateBorder( XMLPropertyState* pNewBorders[4], XMLPropertyState* pAllBorderWidth, XMLPropertyState* pBorderWidths[4] #ifdef DBG_UTIL - , const UniReference< XMLPropertySetMapper >& rMapper + , const rtl::Reference< XMLPropertySetMapper >& rMapper #endif ) { diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 4475819a2acb..30f3f303ebc2 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -448,7 +448,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, const Reference < XPropertySet > & rPropSet, const XMLPropertyState** ppAddStates, bool bDontSeek ) { - UniReference < SvXMLExportPropertyMapper > xPropMapper; + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper; switch( nFamily ) { case XML_STYLE_FAMILY_TEXT_PARAGRAPH: @@ -539,7 +539,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, case XML_STYLE_FAMILY_TEXT_TEXT: { // Get parent and remove hyperlinks (they aren't of interest) - UniReference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); + rtl::Reference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); for( ::std::vector< XMLPropertyState >::iterator i(xPropStates.begin()); nIgnoreProps < 2 && i != xPropStates.end(); ) { @@ -594,7 +594,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily, const Reference < XPropertySet > & rPropSet, const XMLPropertyState** ppAddStates) { - UniReference < SvXMLExportPropertyMapper > xPropMapper; + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper; switch( nFamily ) { case XML_STYLE_FAMILY_TEXT_PARAGRAPH: @@ -689,7 +689,7 @@ OUString XMLTextParagraphExport::Find( const XMLPropertyState** ppAddStates) const { OUString sName( rParent ); - UniReference < SvXMLExportPropertyMapper > xPropMapper; + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper; switch( nFamily ) { case XML_STYLE_FAMILY_TEXT_PARAGRAPH: @@ -730,14 +730,14 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink( bool& rbHasAutoStyle, const XMLPropertyState** ppAddStates ) const { - UniReference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper()); + rtl::Reference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper()); vector< XMLPropertyState > xPropStates(xPropMapper->Filter( rPropSet )); // Get parent and remove hyperlinks (they aren't of interest) OUString sName; rbHyperlink = rbHasCharStyle = rbHasAutoStyle = false; sal_uInt16 nIgnoreProps = 0; - UniReference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); + rtl::Reference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper()); ::std::vector< XMLPropertyState >::iterator aFirstDel = xPropStates.end(); ::std::vector< XMLPropertyState >::iterator aSecondDel = xPropStates.end(); @@ -1271,7 +1271,7 @@ XMLTextParagraphExport::XMLTextParagraphExport( sTextFieldStartEnd( "TextFieldStartEnd" ), aCharStyleNamesPropInfoCache( sCharStyleNames ) { - UniReference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true )); + rtl::Reference < XMLPropertySetMapper > xPropMapper(new XMLTextPropertySetMapper( TEXT_PROP_MAP_PARA, true )); xParaPropMapper = new XMLTextExportPropertySetMapper( xPropMapper, GetExport() ); @@ -1354,7 +1354,7 @@ XMLTextParagraphExport::~XMLTextParagraphExport() SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateShapeExtPropMapper( SvXMLExport& rExport ) { - UniReference < XMLPropertySetMapper > xPropMapper = + rtl::Reference < XMLPropertySetMapper > xPropMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_SHAPE, true ); return new XMLTextExportPropertySetMapper( xPropMapper, rExport ); } @@ -3766,7 +3766,7 @@ void XMLTextParagraphExport::exportMeta( void XMLTextParagraphExport::PreventExportOfControlsInMuteSections( const Reference<XIndexAccess> & rShapes, - UniReference<xmloff::OFormLayerXMLExport> xFormExport ) + rtl::Reference<xmloff::OFormLayerXMLExport> xFormExport ) { // check parameters ad pre-conditions if( ( ! rShapes.is() ) || ( ! xFormExport.is() ) ) diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 5ab5c10b0c75..2cb66dc444d8 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -636,7 +636,7 @@ XMLImpRubyContext_Impl::XMLImpRubyContext_Impl( XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl() { - const UniReference < XMLTextImportHelper > xTextImport( + const rtl::Reference < XMLTextImportHelper > xTextImport( GetImport().GetTextImport()); const Reference < XTextCursor > xAttrCursor( xTextImport->GetText()->createTextCursorByRange( m_xStart )); @@ -1944,7 +1944,7 @@ XMLParaContext::XMLParaContext( XMLParaContext::~XMLParaContext() { - UniReference < XMLTextImportHelper > xTxtImport( + rtl::Reference < XMLTextImportHelper > xTxtImport( GetImport().GetTextImport()); Reference < XTextRange > xCrsrRange( xTxtImport->GetCursorAsRange() ); if( !xCrsrRange.is() ) diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 7788331a5750..04e073ab4b48 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -174,7 +174,7 @@ SvXMLImportContext *XMLTextStyleContext::CreateChildContext( nFamily = XML_TYPE_PROP_TABLE_ROW; if( nFamily ) { - UniReference < SvXMLImportPropertyMapper > xImpPrMap = + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) pContext = new XMLTextPropertySetContext( GetImport(), nPrefix, @@ -402,7 +402,7 @@ void XMLTextStyleContext::FillPropertySet( // imitate XMLPropStyleContext::FillPropertySet(...) SvXMLStylesContext* pSvXMLStylesContext = static_cast< SvXMLStylesContext* >(GetStyles()); - UniReference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily()); + rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = pSvXMLStylesContext->GetImportPropertyMapper(GetFamily()); DBG_ASSERT(xImpPrMap.is(),"Where is the import prop mapper?"); if(xImpPrMap.is()) @@ -444,7 +444,7 @@ void XMLTextStyleContext::FillPropertySet( // get property set info Reference< XPropertySetInfo > xInfo; - UniReference< XMLPropertySetMapper > rPropMapper; + rtl::Reference< XMLPropertySetMapper > rPropMapper; bool bAutomatic = false; if(pSvXMLStylesContext->IsAutomaticStyle() && @@ -545,7 +545,7 @@ void XMLTextStyleContext::FillPropertySet( case CTF_FILLHATCHNAME: case CTF_FILLBITMAPNAME: { - // DrawingLayer FillStyle nameneeds to be mapped to DisplayName + // DrawingLayer FillStyle name needs to be mapped to DisplayName rtl::OUString sStyleName; rState.maValue >>= sStyleName; |