summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-22 19:03:02 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-22 19:27:55 +0100
commit38d9e38981a8ade60bb627b00197ecd28fb9158e (patch)
tree85573acca3fe6eaf6ce9b3173a0dc3cdf30845f3 /writerfilter
parent1376f86f3fdfb80008687d8b5e8db2b5434b9d7e (diff)
loplugin:unusedfields
Change-Id: Ib2314f23efe953398ed0a5e88305842c812e18bb Reviewed-on: https://gerrit.libreoffice.org/85708 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapper.hxx1
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx3
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx4
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx5
5 files changed, 0 insertions, 18 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 2c2d33febd8e..c284285d5b4f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2846,11 +2846,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const PropertyMapPtr& rContext )
}
}
-void DomainMapper::setInTableStyleRunProps(bool bInTableStyleRunProps)
-{
- m_pImpl->m_bInTableStyleRunProps = bInTableStyleRunProps;
-}
-
void DomainMapper::processDeferredCharacterProperties( const std::map< sal_Int32, uno::Any >& deferredCharacterProperties )
{
assert( m_pImpl->GetTopContextType() == CONTEXT_CHARACTER );
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index 0913dd125814..0742c44d5c04 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -119,7 +119,6 @@ public:
@see DomainMapper_Impl::processDeferredCharacterProperties()
*/
void processDeferredCharacterProperties(const std::map<sal_Int32, css::uno::Any>& rDeferredCharacterProperties);
- void setInTableStyleRunProps(bool bInTableStyleRunProps);
/// Enable storing of seen tokens in a named grab bag.
void enableInteropGrabBag(const OUString& aName);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 694bd2ec52a3..b3e8730e2252 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -301,7 +301,6 @@ DomainMapper_Impl::DomainMapper_Impl(
m_xInsertTextRange(rMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>())),
m_bIsNewDoc(!rMediaDesc.getUnpackedValueOrDefault("InsertMode", false)),
m_bIsReadGlossaries(rMediaDesc.getUnpackedValueOrDefault("ReadGlossaries", false)),
- m_bInTableStyleRunProps(false),
m_nTableDepth(0),
m_nTableCellDepth(0),
m_nLastTableCellParagraphDepth(0),
@@ -1898,7 +1897,6 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper
throw uno::Exception("insertTextPortion failed", nullptr);
m_bTextInserted = true;
xTOCTextCursor->gotoRange(xTextRange->getEnd(), true);
- mxTOCTextCursor = xTOCTextCursor;
if (!m_bStartGenericField)
{
m_aTextAppendStack.push(TextAppendContext(xTextAppend, xTOCTextCursor));
@@ -4188,7 +4186,6 @@ DomainMapper_Impl::StartIndexSectionChecked(const OUString& sServiceName)
= xTextRange->getText()->createTextCursor();
assert(xTOCTextCursor.is());
xTOCTextCursor->gotoEnd(false);
- mxTOCTextCursor = xTOCTextCursor;
m_aTextAppendStack.push(TextAppendContext(xTextAppend, xTOCTextCursor));
}
catch (const uno::Exception&)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index cdbc2f8a80c2..6988045f73ab 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -566,7 +566,6 @@ private:
bool m_bRemoveThisParagraph = false;
css::uno::Reference< css::text::XTextCursor > xTOCMarkerCursor;
- css::uno::Reference< css::text::XTextCursor > mxTOCTextCursor;
//annotation import
css::uno::Reference< css::beans::XPropertySet > m_xAnnotationField;
@@ -982,9 +981,6 @@ public:
/// If we're importing autotext.
bool IsReadGlossaries() const { return m_bIsReadGlossaries;}
- /// If we're inside <w:rPr>, inside <w:style w:type="table">
- bool m_bInTableStyleRunProps;
-
tools::SvRef<SdtHelper> m_pSdtHelper;
/// Document background color, applied to every page style.
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 1da4f85808c5..034807149afb 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -759,9 +759,6 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pCurrentEntry->pProperties );
PropertyMapPtr pProps(new PropertyMap());
- bool bTableStyleRunProps = m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE && nSprmId == NS_ooxml::LN_CT_Style_rPr;
- if (bTableStyleRunProps)
- m_pImpl->m_rDMapper.setInTableStyleRunProps(true);
if (m_pImpl->m_pCurrentEntry->nStyleTypeCode == STYLE_TYPE_TABLE)
{
if (nSprmId == NS_ooxml::LN_CT_Style_pPr)
@@ -778,8 +775,6 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm)
pTableEntry->AppendInteropGrabBag(m_pImpl->m_rDMapper.getInteropGrabBag());
}
}
- if (bTableStyleRunProps)
- m_pImpl->m_rDMapper.setInTableStyleRunProps(false);
m_pImpl->m_pCurrentEntry->pProperties->InsertProps(pProps);