diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-17 16:15:04 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-18 08:51:07 +0200 |
commit | a8b2bfdcb0d62afdc6c363cb3c456b2379090ce2 (patch) | |
tree | 14d0e3bd5c5c2a2354ad78c98d3a629973266d3e | |
parent | 7477ab139142c55da6a7d4fb10903dcb464ee97b (diff) |
loplugin:inlineablemethods in writerfilter
Change-Id: Iada0f4d631703b3067c90923632ce9a1012bad62
-rw-r--r-- | writerfilter/source/dmapper/TableManager.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TableManager.hxx | 14 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 1 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 28 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 4 |
6 files changed, 8 insertions, 47 deletions
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index d9f50799b4cf..e69d32201593 100644 --- a/writerfilter/source/dmapper/TableManager.cxx +++ b/writerfilter/source/dmapper/TableManager.cxx @@ -257,7 +257,7 @@ void TableManager::endParagraphGroup() { endOfRowAction(); mTableDataStack.top()->endRow(getRowProps()); - resetRowProps(); + mState.resetRowProps(); } else if (isInCell()) @@ -270,7 +270,7 @@ void TableManager::endParagraphGroup() closeCell(getHandle()); } } - resetCellProps(); + mState.resetCellProps(); } } @@ -321,7 +321,7 @@ void TableManager::resolveCurrentTable() SAL_WARN("writerfilter", "resolving of current table failed with: " << e.Message); } } - resetTableProps(); + mState.resetTableProps(); clearData(); #ifdef DEBUG_WRITERFILTER diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 334634d8d335..d94a80518fc2 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -216,11 +216,6 @@ protected: mState.setCellProps(pProps); } - void resetCellProps() - { - mState.resetCellProps(); - } - public: TablePropertyMapPtr getRowProps() { @@ -232,10 +227,6 @@ public: mState.setRowProps(pProps); } - void resetRowProps() - { - mState.resetRowProps(); - } protected: void setInCell(bool bInCell) @@ -278,11 +269,6 @@ protected: mState.setTableProps(pProps); } - void resetTableProps() - { - mState.resetTableProps(); - } - const css::uno::Reference<css::text::XTextRange>& getHandle() { return mCurHandle; diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index ae8d8feb7301..f8d5bdc883df 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -271,7 +271,7 @@ OOXMLDocumentImpl::getSubStream(const OUString & rId) writerfilter::Reference<Stream>::Pointer_t pRet( pTemp = new OOXMLDocumentImpl(pStream, uno::Reference<task::XStatusIndicator>(), mbSkipImages, maMediaDescriptor)); pTemp->setModel(mxModel); pTemp->setDrawPage(mxDrawPage); - pTemp->setIsSubstream( true ); + pTemp->mbIsSubstream = true; return pRet; } diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index 12a49abd3208..43bdeb651d78 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -87,7 +87,6 @@ protected: Id aType, const sal_Int32 nNoteId); - void setIsSubstream( bool bSubstream ) { mbIsSubstream = bSubstream; }; void resolveCustomXmlStream(Stream & rStream); void resolveActiveXStream(Stream & rStream); void resolveGlossaryStream(Stream & rStream); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 01c0c0ce397f..577cddc5b196 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -308,16 +308,6 @@ void RTFDocumentImpl::setSuperstream(RTFDocumentImpl* pSuperstream) m_pSuperstream = pSuperstream; } -void RTFDocumentImpl::setStreamType(Id nId) -{ - m_nStreamType = nId; -} - -void RTFDocumentImpl::setAuthor(OUString& rAuthor) -{ - m_aAuthor = rAuthor; -} - void RTFDocumentImpl::setAuthorInitials(OUString& rAuthorInitials) { m_aAuthorInitials = rAuthorInitials; @@ -333,11 +323,6 @@ void RTFDocumentImpl::finishSubstream() checkUnicode(/*bUnicode =*/ true, /*bHex =*/ true); } -void RTFDocumentImpl::setIgnoreFirst(OUString& rIgnoreFirst) -{ - m_aIgnoreFirst = rIgnoreFirst; -} - void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId) { OUString aStr; @@ -349,11 +334,11 @@ void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString& rIgno // Seek to header position, parse, then seek back. auto pImpl = std::make_shared<RTFDocumentImpl>(m_xContext, m_xInputStream, m_xDstDoc, m_xFrame, m_xStatusIndicator, m_rMediaDescriptor); pImpl->setSuperstream(this); - pImpl->setStreamType(nId); - pImpl->setIgnoreFirst(rIgnoreFirst); + pImpl->m_nStreamType = nId; + pImpl->m_aIgnoreFirst = rIgnoreFirst; if (!m_aAuthor.isEmpty()) { - pImpl->setAuthor(m_aAuthor); + pImpl->m_aAuthor = m_aAuthor; m_aAuthor.clear(); } if (!m_aAuthorInitials.isEmpty()) @@ -362,7 +347,7 @@ void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString& rIgno m_aAuthorInitials.clear(); } pImpl->m_nDefaultFontIndex = m_nDefaultFontIndex; - pImpl->seek(nPos); + pImpl->Strm().Seek(nPos); SAL_INFO("writerfilter", "substream start"); Mapper().substream(nId, pImpl); SAL_INFO("writerfilter", "substream end"); @@ -635,11 +620,6 @@ void RTFDocumentImpl::sectBreak(bool bFinal) m_bNeedSect = false; } -void RTFDocumentImpl::seek(sal_uInt64 const nPos) -{ - Strm().Seek(nPos); -} - sal_uInt32 RTFDocumentImpl::getColorTable(sal_uInt32 nIndex) { if (!m_pSuperstream) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index d1b5ca1f1bad..3fec6890129d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -413,11 +413,7 @@ public: return *m_pMapperStream; } void setSuperstream(RTFDocumentImpl* pSuperstream); - void setStreamType(Id nId); - void setAuthor(OUString& rAuthor); void setAuthorInitials(OUString& rAuthorInitials); - void setIgnoreFirst(OUString& rIgnoreFirst); - void seek(sal_uInt64 nPos); const css::uno::Reference<css::lang::XMultiServiceFactory>& getModelFactory() { return m_xModelFactory; |