summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-21 12:39:06 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-22 07:38:28 +0100
commit5923df69b46295c5686e5c91ea2a8fc7b46d8357 (patch)
treeb6d416465734360aaa5760615d42d8db31652d13 /writerfilter/source
parent3114e187e5abd34207f220b6d9f42b63b4fe0bd8 (diff)
loplugin:unusedfields in writerfilter
Change-Id: Icce42e5db6d8ac51bf8b7d40cb497c6c365099d2 Reviewed-on: https://gerrit.libreoffice.org/68152 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/dmapper/FontTable.cxx1
-rw-r--r--writerfilter/source/dmapper/FontTable.hxx1
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/OLEHandler.hxx5
-rw-r--r--writerfilter/source/dmapper/SettingsTable.cxx9
5 files changed, 1 insertions, 20 deletions
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index c3798d9bad58..45c63558d077 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -272,7 +272,6 @@ void EmbeddedFontHandler::lcl_attribute( Id name, Value& val )
fontKey = sValue;
break;
case NS_ooxml::LN_CT_Rel_id:
- id = sValue;
break;
case NS_ooxml::LN_CT_FontRel_subsetted:
break; // TODO? Let's just ignore this for now and hope
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index ef2b3adbe79b..e1878190a1d4 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -93,7 +93,6 @@ private:
virtual void lcl_sprm( Sprm& rSprm ) override;
OUString const fontName;
const char* const style;
- OUString id;
OUString fontKey;
css::uno::Reference<css::io::XInputStream> inputStream;
};
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index fad449489e3c..8eb6fddeb303 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -74,22 +74,18 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
switch( rName )
{
case NS_ooxml::LN_CT_OLEObject_Type:
- m_sObjectType = sStringValue;
break;
case NS_ooxml::LN_CT_OLEObject_ProgID:
m_sProgId = sStringValue;
break;
case NS_ooxml::LN_CT_OLEObject_ShapeID:
- m_sShapeId = sStringValue;
break;
case NS_ooxml::LN_CT_OLEObject_DrawAspect:
m_sDrawAspect = sStringValue;
break;
case NS_ooxml::LN_CT_OLEObject_ObjectID:
- m_sObjectId = sStringValue;
break;
case NS_ooxml::LN_CT_OLEObject_r_id:
- m_sr_id = sStringValue;
break;
case NS_ooxml::LN_inputstream:
rVal.getAny() >>= m_xInputStream;
@@ -125,7 +121,6 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
xShapeProps->setPropertyValue("Opaque", uno::makeAny(false));
m_aShapeSize = xTempShape->getSize();
- m_aShapePosition = xTempShape->getPosition();
xShapeProps->getPropertyValue( getPropertyName( PROP_BITMAP ) ) >>= m_xReplacement;
}
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index b0aae530f37a..aba97ac52c4e 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -48,14 +48,10 @@ class DomainMapper;
*/
class OLEHandler : public LoggedProperties
{
- OUString m_sObjectType;
OUString m_sProgId;
- OUString m_sShapeId;
OUString m_sDrawAspect;
OUString m_sVisAreaWidth;
OUString m_sVisAreaHeight;
- OUString m_sObjectId;
- OUString m_sr_id;
/// The stream URL right after the import of the raw data.
OUString m_aURL;
@@ -64,7 +60,6 @@ class OLEHandler : public LoggedProperties
css::uno::Reference<css::drawing::XShape> m_xShape;
css::awt::Size m_aShapeSize;
- css::awt::Point m_aShapePosition;
css::uno::Reference<css::graphic::XGraphic> m_xReplacement;
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 2216e69b78ba..734c5f1cd382 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -231,10 +231,6 @@ namespace dmapper
struct SettingsTable_Impl
{
- OUString m_sCharacterSpacing;
- OUString m_sDecimalSymbol;
- OUString m_sListSeparatorForFields; //2.15.1.56 listSeparator (List Separator for Field Code Evaluation)
-
int m_nDefaultTabStop;
bool m_bRecordChanges;
@@ -391,7 +387,6 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
Value::Pointer_t pValue = rSprm.getValue();
sal_Int32 nIntValue = pValue->getInt();
- OUString sStringValue = pValue->getString();
switch(nSprmId)
{
@@ -424,15 +419,13 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
case NS_ooxml::LN_CT_Settings_noPunctuationKerning: // 92526;
break;
case NS_ooxml::LN_CT_Settings_characterSpacingControl: // 92527;
- m_pImpl->m_sCharacterSpacing = sStringValue; // doNotCompress, compressPunctuation, compressPunctuationAndJapaneseKana
+ // doNotCompress, compressPunctuation, compressPunctuationAndJapaneseKana
break;
case NS_ooxml::LN_CT_Settings_doNotIncludeSubdocsInStats: // 92554; // Do Not Include Content in Text Boxes, Footnotes, and Endnotes in Document Statistics)
break;
case NS_ooxml::LN_CT_Settings_decimalSymbol: // 92562;
- m_pImpl->m_sDecimalSymbol = sStringValue;
break;
case NS_ooxml::LN_CT_Settings_listSeparator: // 92563;
- m_pImpl->m_sListSeparatorForFields = sStringValue;
break;
case NS_ooxml::LN_CT_Settings_rsids: // 92549; revision save Ids - probably not necessary
break;