diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-07 13:52:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-08 10:38:35 +0100 |
commit | 17dd2662ccfa9d04efbea74e5d7548db5b2126d4 (patch) | |
tree | 37c0de883c43a57f54b0a483437da9de3bf4c941 /writerfilter | |
parent | 638be04c8334e5e29f9258ff870fbe63603ce7e0 (diff) |
convert "*xxx.get()" to "*xxx"
Change-Id: Ic307226591ff9702957ccdec486ccf70357eb6d9
Reviewed-on: https://gerrit.libreoffice.org/65951
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
4 files changed, 10 insertions, 10 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index e610a32deb1e..b920af4a726a 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -636,7 +636,7 @@ void DomainMapperTableManager::endOfRowAction() // a grid of "20:40:20" and it doesn't have to do something with the tableWidth // -> so we have get the sum of each grid entry for the fullWidthRelative: int nFullWidthRelative = 0; - for (int i : (*pTableGrid.get())) + for (int i : (*pTableGrid)) nFullWidthRelative = o3tl::saturating_add(nFullWidthRelative, i); if( pTableGrid->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) && m_nCell.back( ) > 0 ) @@ -677,7 +677,7 @@ void DomainMapperTableManager::endOfRowAction() { double fGridWidth = 0.; for ( sal_Int32 nGridCount = *aSpansIter; nGridCount > 0; --nGridCount ) - fGridWidth += (*pTableGrid.get())[nBorderGridIndex++]; + fGridWidth += (*pTableGrid)[nBorderGridIndex++]; sal_Int16 nRelPos = rtl::math::round((fGridWidth * 10000) / nFullWidthRelative); @@ -717,7 +717,7 @@ void DomainMapperTableManager::endOfRowAction() // Avoid divide by zero (if there's no grid, position using cell widths). if( nFullWidthRelative == 0 ) for (size_t i = 0; i < pCellWidths->size(); ++i) - nFullWidthRelative += (*pCellWidths.get())[i]; + nFullWidthRelative += (*pCellWidths)[i]; size_t nWidthsBound = pCellWidths->size() - 1; if (nWidthsBound) @@ -727,7 +727,7 @@ void DomainMapperTableManager::endOfRowAction() for (size_t i = 0; i < nWidthsBound; ++i) { - nSum += (*pCellWidths.get())[i]; + nSum += (*pCellWidths)[i]; pSeparators[nPos].Position = (nSum * 10000) / nFullWidthRelative; // Relative position pSeparators[nPos].IsVisible = true; nPos++; diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 8f0ad98c9702..c011777d2b8e 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -548,7 +548,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream) { // Resolving all item[n].xml files from CustomXml folder. uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; - xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*mpStream.get()).accessDocumentStream(), uno::UNO_QUERY); + xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*mpStream).accessDocumentStream(), uno::UNO_QUERY); if (xRelationshipAccess.is()) { static const char sCustomType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml"; @@ -622,7 +622,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) return; } uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; - xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream.get()).accessDocumentStream(), uno::UNO_QUERY); + xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream).accessDocumentStream(), uno::UNO_QUERY); if (xRelationshipAccess.is()) { @@ -715,7 +715,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pStream) { uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; - xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream.get()).accessDocumentStream(), uno::UNO_QUERY); + xRelationshipAccess.set(dynamic_cast<OOXMLStreamImpl&>(*pStream).accessDocumentStream(), uno::UNO_QUERY); if (xRelationshipAccess.is()) { OUString const sChartType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 0d50937b0518..eba8a479e98a 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -2120,7 +2120,7 @@ void OOXMLFastContextHandlerMath::process() // gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class, // so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated // to RTLD_GLOBAL, so most probably a gcc bug. - oox::FormulaImportBase& import = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*component.get())); + oox::FormulaImportBase& import = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*component)); import.readFormulaOoxml(buffer); if (isForwardEvents()) { diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index f3449254ebf7..9ed80c64d34e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2728,8 +2728,8 @@ RTFError RTFDocumentImpl::popState() // gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class, // so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated // to RTLD_GLOBAL, so most probably a gcc bug. - auto& rImport = dynamic_cast<oox::FormulaImportBase&>( - dynamic_cast<SfxBaseModel&>(*xComponent.get())); + auto& rImport + = dynamic_cast<oox::FormulaImportBase&>(dynamic_cast<SfxBaseModel&>(*xComponent)); rImport.readFormulaOoxml(m_aMathBuffer); auto pValue = new RTFValue(xObject); RTFSprms aMathAttributes; |