Kaydet (Commit) 5923df69 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in writerfilter

Change-Id: Icce42e5db6d8ac51bf8b7d40cb497c6c365099d2
Reviewed-on: https://gerrit.libreoffice.org/68152
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 3114e187
...@@ -272,7 +272,6 @@ void EmbeddedFontHandler::lcl_attribute( Id name, Value& val ) ...@@ -272,7 +272,6 @@ void EmbeddedFontHandler::lcl_attribute( Id name, Value& val )
fontKey = sValue; fontKey = sValue;
break; break;
case NS_ooxml::LN_CT_Rel_id: case NS_ooxml::LN_CT_Rel_id:
id = sValue;
break; break;
case NS_ooxml::LN_CT_FontRel_subsetted: case NS_ooxml::LN_CT_FontRel_subsetted:
break; // TODO? Let's just ignore this for now and hope break; // TODO? Let's just ignore this for now and hope
......
...@@ -93,7 +93,6 @@ private: ...@@ -93,7 +93,6 @@ private:
virtual void lcl_sprm( Sprm& rSprm ) override; virtual void lcl_sprm( Sprm& rSprm ) override;
OUString const fontName; OUString const fontName;
const char* const style; const char* const style;
OUString id;
OUString fontKey; OUString fontKey;
css::uno::Reference<css::io::XInputStream> inputStream; css::uno::Reference<css::io::XInputStream> inputStream;
}; };
......
...@@ -74,22 +74,18 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal) ...@@ -74,22 +74,18 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
switch( rName ) switch( rName )
{ {
case NS_ooxml::LN_CT_OLEObject_Type: case NS_ooxml::LN_CT_OLEObject_Type:
m_sObjectType = sStringValue;
break; break;
case NS_ooxml::LN_CT_OLEObject_ProgID: case NS_ooxml::LN_CT_OLEObject_ProgID:
m_sProgId = sStringValue; m_sProgId = sStringValue;
break; break;
case NS_ooxml::LN_CT_OLEObject_ShapeID: case NS_ooxml::LN_CT_OLEObject_ShapeID:
m_sShapeId = sStringValue;
break; break;
case NS_ooxml::LN_CT_OLEObject_DrawAspect: case NS_ooxml::LN_CT_OLEObject_DrawAspect:
m_sDrawAspect = sStringValue; m_sDrawAspect = sStringValue;
break; break;
case NS_ooxml::LN_CT_OLEObject_ObjectID: case NS_ooxml::LN_CT_OLEObject_ObjectID:
m_sObjectId = sStringValue;
break; break;
case NS_ooxml::LN_CT_OLEObject_r_id: case NS_ooxml::LN_CT_OLEObject_r_id:
m_sr_id = sStringValue;
break; break;
case NS_ooxml::LN_inputstream: case NS_ooxml::LN_inputstream:
rVal.getAny() >>= m_xInputStream; rVal.getAny() >>= m_xInputStream;
...@@ -125,7 +121,6 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal) ...@@ -125,7 +121,6 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
xShapeProps->setPropertyValue("Opaque", uno::makeAny(false)); xShapeProps->setPropertyValue("Opaque", uno::makeAny(false));
m_aShapeSize = xTempShape->getSize(); m_aShapeSize = xTempShape->getSize();
m_aShapePosition = xTempShape->getPosition();
xShapeProps->getPropertyValue( getPropertyName( PROP_BITMAP ) ) >>= m_xReplacement; xShapeProps->getPropertyValue( getPropertyName( PROP_BITMAP ) ) >>= m_xReplacement;
} }
......
...@@ -48,14 +48,10 @@ class DomainMapper; ...@@ -48,14 +48,10 @@ class DomainMapper;
*/ */
class OLEHandler : public LoggedProperties class OLEHandler : public LoggedProperties
{ {
OUString m_sObjectType;
OUString m_sProgId; OUString m_sProgId;
OUString m_sShapeId;
OUString m_sDrawAspect; OUString m_sDrawAspect;
OUString m_sVisAreaWidth; OUString m_sVisAreaWidth;
OUString m_sVisAreaHeight; OUString m_sVisAreaHeight;
OUString m_sObjectId;
OUString m_sr_id;
/// The stream URL right after the import of the raw data. /// The stream URL right after the import of the raw data.
OUString m_aURL; OUString m_aURL;
...@@ -64,7 +60,6 @@ class OLEHandler : public LoggedProperties ...@@ -64,7 +60,6 @@ class OLEHandler : public LoggedProperties
css::uno::Reference<css::drawing::XShape> m_xShape; css::uno::Reference<css::drawing::XShape> m_xShape;
css::awt::Size m_aShapeSize; css::awt::Size m_aShapeSize;
css::awt::Point m_aShapePosition;
css::uno::Reference<css::graphic::XGraphic> m_xReplacement; css::uno::Reference<css::graphic::XGraphic> m_xReplacement;
......
...@@ -231,10 +231,6 @@ namespace dmapper ...@@ -231,10 +231,6 @@ namespace dmapper
struct SettingsTable_Impl 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; int m_nDefaultTabStop;
bool m_bRecordChanges; bool m_bRecordChanges;
...@@ -391,7 +387,6 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) ...@@ -391,7 +387,6 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
Value::Pointer_t pValue = rSprm.getValue(); Value::Pointer_t pValue = rSprm.getValue();
sal_Int32 nIntValue = pValue->getInt(); sal_Int32 nIntValue = pValue->getInt();
OUString sStringValue = pValue->getString();
switch(nSprmId) switch(nSprmId)
{ {
...@@ -424,15 +419,13 @@ void SettingsTable::lcl_sprm(Sprm& rSprm) ...@@ -424,15 +419,13 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
case NS_ooxml::LN_CT_Settings_noPunctuationKerning: // 92526; case NS_ooxml::LN_CT_Settings_noPunctuationKerning: // 92526;
break; break;
case NS_ooxml::LN_CT_Settings_characterSpacingControl: // 92527; case NS_ooxml::LN_CT_Settings_characterSpacingControl: // 92527;
m_pImpl->m_sCharacterSpacing = sStringValue; // doNotCompress, compressPunctuation, compressPunctuationAndJapaneseKana // doNotCompress, compressPunctuation, compressPunctuationAndJapaneseKana
break; break;
case NS_ooxml::LN_CT_Settings_doNotIncludeSubdocsInStats: // 92554; // Do Not Include Content in Text Boxes, Footnotes, and Endnotes in Document Statistics) case NS_ooxml::LN_CT_Settings_doNotIncludeSubdocsInStats: // 92554; // Do Not Include Content in Text Boxes, Footnotes, and Endnotes in Document Statistics)
break; break;
case NS_ooxml::LN_CT_Settings_decimalSymbol: // 92562; case NS_ooxml::LN_CT_Settings_decimalSymbol: // 92562;
m_pImpl->m_sDecimalSymbol = sStringValue;
break; break;
case NS_ooxml::LN_CT_Settings_listSeparator: // 92563; case NS_ooxml::LN_CT_Settings_listSeparator: // 92563;
m_pImpl->m_sListSeparatorForFields = sStringValue;
break; break;
case NS_ooxml::LN_CT_Settings_rsids: // 92549; revision save Ids - probably not necessary case NS_ooxml::LN_CT_Settings_rsids: // 92549; revision save Ids - probably not necessary
break; break;
......
...@@ -153,23 +153,9 @@ public: ...@@ -153,23 +153,9 @@ public:
} }
// XInitialization // XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) override virtual void SAL_CALL
initialize(const css::uno::Sequence<css::uno::Any>& /*aArguments*/) override
{ {
css::uno::Sequence<css::beans::PropertyValue> aAnySeq;
sal_Int32 nLength = aArguments.getLength();
if (nLength && (aArguments[0] >>= aAnySeq))
{
const css::beans::PropertyValue* pValue = aAnySeq.getConstArray();
nLength = aAnySeq.getLength();
for (sal_Int32 i = 0; i < nLength; i++)
{
if (pValue[i].Name == "Type")
{
pValue[i].Value >>= msFilterName;
break;
}
}
}
} }
private: private:
...@@ -181,7 +167,6 @@ private: ...@@ -181,7 +167,6 @@ private:
css::uno::Reference<css::uno::XComponentContext> mxContext; css::uno::Reference<css::uno::XComponentContext> mxContext;
css::uno::Reference<css::lang::XComponent> mxDoc; css::uno::Reference<css::lang::XComponent> mxDoc;
OUString msFilterName;
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment