Skip to content

C
core
Kaydet (Commit) 900e49cd authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:constantfunction: oox 

Change-Id: Iec2bc991821aed8da4427c6efc4ec8df72554923
üst 2f306002
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 68 deletions
include/oox/crypto/DocumentDecryption.hxx
Dosyayı görüntüle @ 900e49cd
......@@ -61,7 +61,6 @@ public:
com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(const OUString& rPassword);
static bool checkEncryptionData( const com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue >& rEncryptionData );
};
} // namespace core
......
include/oox/dump/dffdumper.hxx
Dosyayı görüntüle @ 900e49cd
......@@ -44,7 +44,6 @@ protected:
virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE;
virtual void implWriteExtHeader() SAL_OVERRIDE;
virtual void implDumpRecordBody() SAL_OVERRIDE;
void implDumpClientAnchor();
private:
sal_uInt32 dumpDffSimpleColor( const String& rName );
......
include/oox/dump/oledumper.hxx
Dosyayı görüntüle @ 900e49cd
......@@ -115,14 +115,13 @@ private:
sal_uInt16 dumpPropertyContents( sal_Int32 nPropId );
void dumpPropertyValue( sal_Int32 nPropId, sal_uInt16 nBaseType );
void dumpPropertyVector( sal_Int32 nPropId, sal_uInt16 nBaseType );
void dumpPropertyArray( sal_Int32 nPropId, sal_uInt16 nBaseType );
sal_uInt16 dumpPropertyType();
void dumpBlob( sal_Int32 nPropId, const String& rName );
OUString dumpString8( const String& rName );
OUString dumpCharArray8( const String& rName, sal_Int32 nLen );
OUString dumpString16( const String& rName );
OUString dumpCharArray16( const String& rName, sal_Int32 nLen );
OUString dumpString8( const String& rName );
OUString dumpCharArray8( const String& rName, sal_Int32 nLen );
OUString dumpString16( const String& rName );
OUString dumpCharArray16( const String& rName, sal_Int32 nLen );
bool dumpTypedProperty( const String& rName, sal_uInt16 nExpectedType );
void dumpHlinks( sal_Int32 nSize );
......
include/oox/export/chartexport.hxx
Dosyayı görüntüle @ 900e49cd
......@@ -130,7 +130,6 @@ private:
void exportBubbleChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportDoughnutChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportLineChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportOfPieChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportPieChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportRadarChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
void exportScatterChart( com::sun::star::uno::Reference< com::sun::star::chart2::XChartType > xChartType );
......
include/oox/ole/axcontrol.hxx
Dosyayı görüntüle @ 900e49cd
......@@ -406,8 +406,6 @@ public:
protected:
virtual void importControlData( BinaryInputStream& rInStrm ) = 0;
void importCommonExtraData( BinaryInputStream& rInStrm );
void importCommonTrailingData( BinaryInputStream& rInStrm );
private:
/** Returns the data part identifier according to the model version. */
......
include/oox/ole/vbaproject.hxx
Dosyayı görüntüle @ 900e49cd
......@@ -151,8 +151,6 @@ protected:
/** Called when the import process of the VBA project has been started. */
virtual void prepareImport();
/** Called when the import process of the VBA project is finished. */
void finalizeImport();
private:
VbaProject( const VbaProject& ) SAL_DELETED_FUNCTION;
......
oox/source/core/filterdetect.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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
......
oox/source/crypto/DocumentDecryption.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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())
......
oox/source/drawingml/chart/objectformatter.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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 );
}
......
oox/source/dump/dffdumper.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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" );
......
oox/source/dump/oledumper.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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 );
......
oox/source/export/chartexport.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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( );
......
oox/source/ole/axcontrol.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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;
......
oox/source/ole/vbaproject.cxx
Dosyayı görüntüle @ 900e49cd
......@@ -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()
......
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