summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/oox/crypto/DocumentDecryption.hxx1
-rw-r--r--include/oox/dump/dffdumper.hxx1
-rw-r--r--include/oox/dump/oledumper.hxx9
-rw-r--r--include/oox/export/chartexport.hxx1
-rw-r--r--include/oox/ole/axcontrol.hxx2
-rw-r--r--include/oox/ole/vbaproject.hxx2
-rw-r--r--oox/source/core/filterdetect.cxx7
-rw-r--r--oox/source/crypto/DocumentDecryption.cxx5
-rw-r--r--oox/source/drawingml/chart/objectformatter.cxx11
-rw-r--r--oox/source/dump/dffdumper.cxx5
-rw-r--r--oox/source/dump/oledumper.cxx7
-rw-r--r--oox/source/export/chartexport.cxx6
-rw-r--r--oox/source/ole/axcontrol.cxx12
-rw-r--r--oox/source/ole/vbaproject.cxx6
14 files changed, 7 insertions, 68 deletions
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index b9bf2d449260..ca80a95de488 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -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
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index f48fcd28ed8d..6ab41a59ea66 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -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 );
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index ad145a2cca07..ea0c8fd9458d 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -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 );
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index 8fbf9c87371f..170fe91031b6 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -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 );
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 24321e94d4bf..d7987e8a450a 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -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. */
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index f258bb081161..3c4de2782e4d 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -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;
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()
generated by cgit (git 2.34.1) at 2024-07-29 04:31:49 +0000