diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-05 12:55:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-05 13:32:16 +0200 |
commit | 281296330735158d6265e0b146b5d5301f6e610e (patch) | |
tree | ee8235f54b59dbec8d13f12b0bafa62e61ab9ad1 /writerfilter | |
parent | 75da22e3ce80f8dcdeef0488b22c4dc522c2ec29 (diff) |
use uno::Reference::set method instead of assignment
Change-Id: I31a69a997098eb1807361b8049c3312a4f287d75
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 26 | ||||
-rw-r--r-- | writerfilter/source/dmapper/FormControlHelper.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 24 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 8 |
6 files changed, 31 insertions, 37 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx index 1f3a9b461d94..8c31f92abe9a 100644 --- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx +++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx @@ -50,7 +50,7 @@ void RtfTest::setUp() { test::BootstrapFixture::setUp(); - m_xFilter = uno::Reference< document::XFilter >(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW); + m_xFilter.set(m_xSFactory->createInstance("com.sun.star.comp.Writer.RtfFilter"), uno::UNO_QUERY_THROW); } bool RtfTest::load(const OUString&, diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index c51d4eac0390..1c2778e8ee3f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -242,7 +242,7 @@ DomainMapper_Impl::DomainMapper_Impl( { appendTableManager( ); GetBodyText(); - uno::Reference< text::XTextAppend > xBodyTextAppend = uno::Reference< text::XTextAppend >( m_xBodyText, uno::UNO_QUERY ); + uno::Reference< text::XTextAppend > xBodyTextAppend( m_xBodyText, uno::UNO_QUERY ); m_aTextAppendStack.push(TextAppendContext(xBodyTextAppend, m_bIsNewDoc ? uno::Reference<text::XTextCursor>() : m_xBodyText->createTextCursorByRange(m_xInsertTextRange))); @@ -301,8 +301,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::GetDocumentSettings() { if( !m_xDocumentSettings.is() && m_xTextFactory.is()) { - m_xDocumentSettings = uno::Reference< beans::XPropertySet >( - m_xTextFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY ); + m_xDocumentSettings.set( m_xTextFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY ); } return m_xDocumentSettings; } @@ -1447,7 +1446,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter( static const char sSectionService[] = "com.sun.star.text.TextSection"; uno::Reference< text::XTextContent > xSection( m_xTextFactory->createInstance(sSectionService), uno::UNO_QUERY_THROW ); xSection->attach( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW) ); - xRet = uno::Reference< beans::XPropertySet > (xSection, uno::UNO_QUERY ); + xRet.set(xSection, uno::UNO_QUERY ); } catch(const uno::Exception&) { @@ -1719,9 +1718,8 @@ void DomainMapper_Impl::PushAnnotation() m_bIsInComments = true; if (!GetTextFactory().is()) return; - m_xAnnotationField = uno::Reference< beans::XPropertySet >( GetTextFactory()->createInstance( - "com.sun.star.text.TextField.Annotation" ), - uno::UNO_QUERY_THROW ); + m_xAnnotationField.set( GetTextFactory()->createInstance( "com.sun.star.text.TextField.Annotation" ), + uno::UNO_QUERY_THROW ); uno::Reference< text::XText > xAnnotationText; m_xAnnotationField->getPropertyValue("TextRange") >>= xAnnotationText; m_aTextAppendStack.push(TextAppendContext(uno::Reference< text::XTextAppend >( xAnnotationText, uno::UNO_QUERY_THROW ), @@ -2607,16 +2605,14 @@ uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(c if(xFieldMasterAccess->hasByName(sFieldMasterName)) { //get the master - xMaster = uno::Reference< beans::XPropertySet >(xFieldMasterAccess->getByName(sFieldMasterName), - uno::UNO_QUERY_THROW); + xMaster.set(xFieldMasterAccess->getByName(sFieldMasterName), uno::UNO_QUERY_THROW); } else { //create the master - xMaster = uno::Reference< beans::XPropertySet >( - m_xTextFactory->createInstance(sFieldMasterService), uno::UNO_QUERY_THROW); + xMaster.set( m_xTextFactory->createInstance(sFieldMasterService), uno::UNO_QUERY_THROW); //set the master's name - xMaster->setPropertyValue( + xMaster->setPropertyValue( getPropertyName(PROP_NAME), uno::makeAny(rFieldMasterName)); } @@ -3623,7 +3619,7 @@ void DomainMapper_Impl::CloseFieldCommand() if (m_xTextFactory.is()) { xFieldInterface = m_xTextFactory->createInstance(sServiceName); - xFieldProperties = uno::Reference< beans::XPropertySet >( xFieldInterface, uno::UNO_QUERY_THROW); + xFieldProperties.set( xFieldInterface, uno::UNO_QUERY_THROW); } } switch( aIt->second.eFieldId ) @@ -4480,9 +4476,9 @@ void DomainMapper_Impl::PopFieldContext() } else { - xToInsert = uno::Reference< text::XTextContent >(pContext->GetTC(), uno::UNO_QUERY); + xToInsert.set(pContext->GetTC(), uno::UNO_QUERY); if( !xToInsert.is() && !m_bStartTOC && !m_bStartIndex && !m_bStartBibliography ) - xToInsert = uno::Reference< text::XTextContent >(pContext->GetTextField(), uno::UNO_QUERY); + xToInsert.set( pContext->GetTextField(), uno::UNO_QUERY); if( xToInsert.is() && !m_bStartTOC && !m_bStartIndex && !m_bStartBibliography) { PropertyMap aMap; diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 1e2d4912f901..c35edcfce1f1 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -75,7 +75,7 @@ uno::Reference<drawing::XDrawPage> FormControlHelper::FormControlHelper_Impl::ge uno::Reference<lang::XMultiServiceFactory> FormControlHelper::FormControlHelper_Impl::getServiceFactory() { if (! rServiceFactory.is()) - rServiceFactory = uno::Reference<lang::XMultiServiceFactory>(rTextDocument, uno::UNO_QUERY); + rServiceFactory.set(rTextDocument, uno::UNO_QUERY); return rServiceFactory; } @@ -110,7 +110,7 @@ uno::Reference<form::XForm> FormControlHelper::FormControlHelper_Impl::getForm() xFormProperties->setPropertyValue("Name", aAny); } - rForm = uno::Reference<form::XForm>(xForm, uno::UNO_QUERY); + rForm.set(xForm, uno::UNO_QUERY); uno::Reference<container::XIndexContainer> xForms(xFormsNamedContainer, uno::UNO_QUERY); uno::Any aAny(xForm); @@ -157,7 +157,7 @@ bool FormControlHelper::createCheckbox(uno::Reference<text::XTextRange> const& x if (!xInterface.is()) return false; - m_pImpl->rFormComponent = uno::Reference<form::XFormComponent>(xInterface, uno::UNO_QUERY); + m_pImpl->rFormComponent.set(xInterface, uno::UNO_QUERY); if (!m_pImpl->rFormComponent.is()) return false; diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index a384deaf9e24..9cd8852a781f 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1143,7 +1143,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b uno::makeAny( m_pImpl->eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR ? text::TextContentAnchorType_AT_CHARACTER : text::TextContentAnchorType_AS_CHARACTER )); - xGraphicObject = uno::Reference< text::XTextContent >( xGraphicObjectProperties, uno::UNO_QUERY_THROW ); + xGraphicObject.set( xGraphicObjectProperties, uno::UNO_QUERY_THROW ); //shapes have only one border table::BorderLine2 aBorderLine; diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index afff853767ae..536a00c075e9 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -502,9 +502,8 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( { uno::Sequence< OUString > aPageStyleNames = xPageStyles->getElementNames(); m_sFirstPageStyleName = lcl_FindUnusedPageStyleName(aPageStyleNames); - m_aFirstPageStyle = uno::Reference< beans::XPropertySet > ( - xTextFactory->createInstance("com.sun.star.style.PageStyle"), - uno::UNO_QUERY); + m_aFirstPageStyle.set( xTextFactory->createInstance("com.sun.star.style.PageStyle"), + uno::UNO_QUERY); // Call insertByName() before GetPageStyle(), otherwise the // first and the follow page style will have the same name, and @@ -530,9 +529,8 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( { uno::Sequence< OUString > aPageStyleNames = xPageStyles->getElementNames(); m_sFollowPageStyleName = lcl_FindUnusedPageStyleName(aPageStyleNames); - m_aFollowPageStyle = uno::Reference< beans::XPropertySet > ( - xTextFactory->createInstance("com.sun.star.style.PageStyle"), - uno::UNO_QUERY); + m_aFollowPageStyle.set( xTextFactory->createInstance("com.sun.star.style.PageStyle"), + uno::UNO_QUERY); xPageStyles->insertByName( m_sFollowPageStyleName, uno::makeAny(m_aFollowPageStyle) ); } else if(!m_aFollowPageStyle.is() && xPageStyles.is() ) @@ -959,10 +957,10 @@ uno::Reference<beans::XPropertySet> lcl_GetRangeProperties(bool bIsFirstSection, { uno::Reference<container::XEnumerationAccess> xEnumAccess(rDM_Impl.GetBodyText(), uno::UNO_QUERY_THROW); uno::Reference<container::XEnumeration> xEnum = xEnumAccess->createEnumeration(); - xRangeProperties = uno::Reference<beans::XPropertySet>(xEnum->nextElement(), uno::UNO_QUERY_THROW); + xRangeProperties.set(xEnum->nextElement(), uno::UNO_QUERY_THROW); } else if (xStartingRange.is()) - xRangeProperties = uno::Reference<beans::XPropertySet>(xStartingRange, uno::UNO_QUERY_THROW); + xRangeProperties.set(xStartingRange, uno::UNO_QUERY_THROW); return xRangeProperties; } @@ -1036,12 +1034,12 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) uno::Reference< beans::XPropertySet > xRangeProperties; if( m_xStartingRange.is() ) { - xRangeProperties = uno::Reference< beans::XPropertySet >( m_xStartingRange, uno::UNO_QUERY_THROW ); + xRangeProperties.set( m_xStartingRange, uno::UNO_QUERY_THROW ); } else { //set the start value at the beginning of the document - xRangeProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument()->getText()->getStart(), uno::UNO_QUERY_THROW ); + xRangeProperties.set( rDM_Impl.GetTextDocument()->getText()->getStart(), uno::UNO_QUERY_THROW ); } xRangeProperties->setPropertyValue( getPropertyName( PROP_PARA_LINE_NUMBER_START_VALUE ), uno::makeAny( m_nLnnMin )); } @@ -1091,12 +1089,12 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) uno::Reference< beans::XPropertySet > xRangeProperties; if( m_xStartingRange.is() ) { - xRangeProperties = uno::Reference< beans::XPropertySet >( m_xStartingRange, uno::UNO_QUERY_THROW ); + xRangeProperties.set( m_xStartingRange, uno::UNO_QUERY_THROW ); } else { //set the start value at the beginning of the document - xRangeProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument()->getText()->getStart(), uno::UNO_QUERY_THROW ); + xRangeProperties.set( rDM_Impl.GetTextDocument()->getText()->getStart(), uno::UNO_QUERY_THROW ); } xRangeProperties->setPropertyValue(getPropertyName(PROP_BREAK_TYPE), uno::makeAny(style::BreakType_COLUMN_BEFORE)); } @@ -1193,7 +1191,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) try { uno::Reference< beans::XPropertySet > xDocProperties; - xDocProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument(), uno::UNO_QUERY_THROW ); + xDocProperties.set( rDM_Impl.GetTextDocument(), uno::UNO_QUERY_THROW ); bool bSquaredPageMode = false; Insert(PROP_GRID_STANDARD_MODE, uno::makeAny( !bSquaredPageMode )); xDocProperties->setPropertyValue("DefaultPageMode", uno::makeAny( bSquaredPageMode )); diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index c062917dc8fa..31206a7cefcc 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -975,11 +975,11 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) else { bInsert = true; - xStyle = uno::Reference< style::XStyle >(xDocFactory->createInstance( - bParaStyle ? + xStyle.set(xDocFactory->createInstance( + bParaStyle ? getPropertyName( PROP_SERVICE_PARA_STYLE ) : (bListStyle ? OUString("com.sun.star.style.NumberingStyle") : getPropertyName( PROP_SERVICE_CHAR_STYLE ))), - uno::UNO_QUERY_THROW); + uno::UNO_QUERY_THROW); // Numbering styles have to be inserted early, as e.g. the NumberingRules property is only available after insertion. if (bListStyle) @@ -1493,7 +1493,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) try{ if(!m_pImpl->m_xTextDefaults.is()) { - m_pImpl->m_xTextDefaults = uno::Reference< beans::XPropertySet>( + m_pImpl->m_xTextDefaults.set( m_pImpl->m_rDMapper.GetTextFactory()->createInstance("com.sun.star.text.Defaults"), uno::UNO_QUERY_THROW ); } |