diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-04 14:41:39 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-19 10:45:01 +0200 |
commit | 900e49cd27f23d2f991f902e81f471eb49232076 (patch) | |
tree | a9b221b6a351c15bbe03d6c9025140296b1865ac /oox | |
parent | 2f30600296d217751e2b18f3b971c5d0fa2b9f65 (diff) |
loplugin:constantfunction: oox
Change-Id: Iec2bc991821aed8da4427c6efc4ec8df72554923
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/core/filterdetect.cxx | 7 | ||||
-rw-r--r-- | oox/source/crypto/DocumentDecryption.cxx | 5 | ||||
-rw-r--r-- | oox/source/drawingml/chart/objectformatter.cxx | 11 | ||||
-rw-r--r-- | oox/source/dump/dffdumper.cxx | 5 | ||||
-rw-r--r-- | oox/source/dump/oledumper.cxx | 7 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 6 | ||||
-rw-r--r-- | oox/source/ole/axcontrol.cxx | 12 | ||||
-rw-r--r-- | oox/source/ole/vbaproject.cxx | 6 |
8 files changed, 3 insertions, 56 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 6fc8951001bb..5c6dee2f29e3 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -285,12 +285,9 @@ comphelper::DocPasswordVerifierResult PasswordVerifier::verifyPassword( const OU return rEncryptionData.hasElements() ? comphelper::DocPasswordVerifierResult_OK : comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; } -comphelper::DocPasswordVerifierResult PasswordVerifier::verifyEncryptionData( const Sequence<NamedValue>& rEncryptionData ) +comphelper::DocPasswordVerifierResult PasswordVerifier::verifyEncryptionData( const Sequence<NamedValue>& ) { - comphelper::DocPasswordVerifierResult aResult = comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; - if (DocumentDecryption::checkEncryptionData(rEncryptionData)) - aResult = comphelper::DocPasswordVerifierResult_OK; - return aResult; + return comphelper::DocPasswordVerifierResult_WRONG_PASSWORD; } } // namespace diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index 5d5e6466d813..a612dcb5e19a 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -194,11 +194,6 @@ DocumentDecryption::DocumentDecryption(oox::ole::OleStorage& rOleStorage, Refere mCryptoType(UNKNOWN) {} -bool DocumentDecryption::checkEncryptionData(const Sequence<NamedValue>& /*rEncryptionData*/) -{ - return false; -} - bool DocumentDecryption::generateEncryptionKey(const OUString& rPassword) { if (mEngine.get()) diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 95bda7b0b778..b61b991ea8fd 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -655,11 +655,6 @@ public: ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ); - /** Converts effect formatting to the passed property set. */ - void convertFormatting( - ShapePropertyMap& rPropMap, - const ModelRef< Shape >& rxShapeProp, - sal_Int32 nSeriesIdx ) const; }; class TextFormatter : public DetailFormatterBase @@ -902,10 +897,6 @@ EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEn DetailFormatterBase( rData, pAutoFormatEntry ) { } -//TODO : -void EffectFormatter::convertFormatting( ShapePropertyMap& /*rPropMap*/, const ModelRef< Shape >& /*rxShapeProp*/, sal_Int32 /*nSeriesIdx*/ ) const -{ -} namespace { @@ -972,7 +963,6 @@ void ObjectTypeFormatter::convertFrameFormatting( PropertySet& rPropSet, const M maLineFormatter.convertFormatting( aPropMap, rxShapeProp, nSeriesIdx ); if( mrEntry.mbIsFrame ) maFillFormatter.convertFormatting( aPropMap, rxShapeProp, pPicOptions, nSeriesIdx ); - maEffectFormatter.convertFormatting( aPropMap, rxShapeProp, nSeriesIdx ); rPropSet.setProperties( aPropMap ); } @@ -997,7 +987,6 @@ void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32 ShapePropertyMap aPropMap( mrModelObjHelper, *mrEntry.mpPropInfo ); ModelRef< Shape > xShapeProp; maFillFormatter.convertFormatting( aPropMap, xShapeProp, 0, nSeriesIdx ); - maEffectFormatter.convertFormatting( aPropMap, xShapeProp, nSeriesIdx ); rPropSet.setProperties( aPropMap ); } diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index e2f76a1e25ae..220bf29aba82 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -96,7 +96,6 @@ void DffStreamObject::implDumpRecordBody() break; case DFF_ID_CLIENTANCHOR: - implDumpClientAnchor(); break; case DFF_ID_DG: @@ -149,10 +148,6 @@ void DffStreamObject::implDumpRecordBody() } } -void DffStreamObject::implDumpClientAnchor() -{ -} - sal_uInt32 DffStreamObject::dumpDffSimpleColor( const String& rName ) { return dumpHex< sal_uInt32 >( rName, "DFF-SIMPLE-COLOR" ); diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index feb51ff08ebf..100b9b1af0ed 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -347,7 +347,7 @@ sal_uInt16 OlePropertyStreamObject::dumpPropertyContents( sal_Int32 nPropId ) { case OLEPROP_TYPE_SIMPLE: dumpPropertyValue( nPropId, nBaseType ); break; case OLEPROP_TYPE_VECTOR: dumpPropertyVector( nPropId, nBaseType ); break; - case OLEPROP_TYPE_ARRAY: dumpPropertyArray( nPropId, nBaseType ); break; + case OLEPROP_TYPE_ARRAY: /*TODO*/; break; } return nType; } @@ -393,11 +393,6 @@ void OlePropertyStreamObject::dumpPropertyVector( sal_Int32 nPropId, sal_uInt16 } } -void OlePropertyStreamObject::dumpPropertyArray( sal_Int32 /*nPropId*/, sal_uInt16 /*nBaseType*/ ) -{ - // TODO -} - sal_uInt16 OlePropertyStreamObject::dumpPropertyType() { return static_cast< sal_uInt16 >( dumpHex< sal_Int32 >( "type", "OLEPROP-TYPE" ) & 0xFFFF ); diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index dbd28ebed128..6187f678d475 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1089,7 +1089,6 @@ void ChartExport::exportPlotArea( ) } case chart::TYPEID_OFPIE: { - exportOfPieChart( xChartType ); break; } case chart::TYPEID_DOUGHNUT: @@ -1444,11 +1443,6 @@ void ChartExport::exportLineChart( Reference< chart2::XChartType > xChartType ) pFS->endElement( FSNS( XML_c, nTypeId ) ); } -void ChartExport::exportOfPieChart( Reference< chart2::XChartType > /*xChartType*/ ) -{ - // TODO: -} - void ChartExport::exportPieChart( Reference< chart2::XChartType > xChartType ) { sal_Int32 eChartType = getChartType( ); diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 08eab4cb15e7..89f612c1a4dd 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -686,14 +686,6 @@ void ComCtlModelBase::convertProperties( PropertyMap& rPropMap, const ControlCon ControlModelBase::convertProperties( rPropMap, rConv ); } -void ComCtlModelBase::importCommonExtraData( BinaryInputStream& /*rInStrm*/ ) -{ -} - -void ComCtlModelBase::importCommonTrailingData( BinaryInputStream& /*rInStrm*/ ) -{ -} - sal_uInt32 ComCtlModelBase::getDataPartId() const { switch( mnVersion ) @@ -736,11 +728,7 @@ bool ComCtlModelBase::importCommonPart( BinaryInputStream& rInStrm, sal_uInt32 n { rInStrm.skip( 4 ); mnFlags = rInStrm.readuInt32(); - // implementations may read less than the exact amount of data - importCommonExtraData( rInStrm ); rInStrm.seek( nEndPos ); - // implementations must read the exact amount of data, stream must point to its end afterwards - importCommonTrailingData( rInStrm ); return !rInStrm.isEof(); } return false; diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 8e5365f92ed0..fa32c6f6299d 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -208,10 +208,6 @@ void VbaProject::prepareImport() { } -void VbaProject::finalizeImport() -{ -} - // private -------------------------------------------------------------------- Reference< XLibraryContainer > VbaProject::getLibraryContainer( sal_Int32 nPropId ) @@ -508,8 +504,6 @@ void VbaProject::importModulesAndForms( StorageBase& rVbaPrjStrg, const GraphicH // attach macros to registered objects attachMacros(); - // virtual call, derived classes may do some more processing - finalizeImport(); } void VbaProject::attachMacros() |