[PATCH] Remove unused code (oox)
This patch removes unused code as listed in unusedcode.easy 0001-Remove-unused-code-in-oox.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] Remove unused code (oox)
On Sun, 2012-04-08 at 21:56 +0200, Santiago Martinez wrote: This patch removes unused code as listed in unusedcode.easy Yup, pushed now. Well, actually Julien removed the same code and got in first. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused code (oox)
This patch removes unused code as listed in unusedcode.easy 0001-Remove-unused-code-in-oox.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] remove unused code (oox)
Hi Petr, Petr Vorel píše v Po 02. 04. 2012 v 16:18 +0200: removed unused classes from oox. Pushed: http://cgit.freedesktop.org/libreoffice/core/commit/?id=07ff032c805835355ff0dff75b8ad534dfb770e9 Thank you! :-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused code (oox)
Hi there,
removed unused classes from oox.
Regards,
Petr
From b4350501d1fe85da2cce5750b480e33eb6409301 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Mon, 2 Apr 2012 11:40:06 +0200
Subject: [PATCH] remove unused code (oox)
---
oox/inc/oox/dump/dumperbase.hxx | 18 --
oox/inc/oox/dump/oledumper.hxx | 21 ---
oox/source/dump/dumperbase.cxx | 107
oox/source/dump/oledumper.cxx | 114 ---
unusedcode.easy | 17 --
5 files changed, 0 insertions(+), 277 deletions(-)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 7f18220..a099886 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -395,7 +395,6 @@ public:
// token list -
static void appendToken( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-static void appendToken( ::rtl::OUStringBuffer rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
static void appendIndex( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rIdx );
static void appendIndex( ::rtl::OUStringBuffer rStr, sal_Int64 nIdx );
@@ -1074,9 +1073,6 @@ public:
voidwriteColRowRange( sal_Int32 nColRow1, sal_Int32 nColRow2 );
voidwriteColRange( sal_Int32 nCol1, sal_Int32 nCol2 );
voidwriteRowRange( sal_Int32 nRow1, sal_Int32 nRow2 );
-voidwriteAddress( const Address rPos );
-voidwriteRange( const Range rRange );
-voidwriteRangeList( const RangeList rRanges );
template typename Type
inline void writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' )
@@ -1349,17 +1345,6 @@ protected:
voidwriteArrayItem( const String rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
voidwriteDateTimeItem( const String rName, const ::com::sun::star::util::DateTime rDateTime );
voidwriteGuidItem( const String rName, const ::rtl::OUString rGuid );
-voidwriteColIndexItem( const String rName, sal_Int32 nCol );
-voidwriteRowIndexItem( const String rName, sal_Int32 nRow );
-voidwriteColRangeItem( const String rName, sal_Int32 nCol1, sal_Int32 nCol2 );
-voidwriteRowRangeItem( const String rName, sal_Int32 nRow1, sal_Int32 nRow2 );
-voidwriteAddressItem( const String rName, const Address rPos );
-voidwriteRangeItem( const String rName, const Range rRange );
-voidwriteRangeListItem( const String rName, const RangeList rRanges );
-voidwriteTokenAddressItem( const String rName, const TokenAddress rPos, bool bNameMode );
-voidwriteTokenAddress3dItem( const String rName, const ::rtl::OUString rRef, const TokenAddress rPos, bool bNameMode );
-voidwriteTokenRangeItem( const String rName, const TokenRange rRange, bool bNameMode );
-voidwriteTokenRange3dItem( const String rName, const ::rtl::OUString rRef, const TokenRange rRange, bool bNameMode );
template typename Type
voidaddNameToItem( Type nData, const NameListWrapper rListWrp );
@@ -1753,9 +1738,6 @@ protected:
const OutputObjectBase rParent,
const BinaryInputStreamRef rxStrm,
rtl_TextEncoding eTextEnc );
-voidconstruct(
-const InputObjectBase rParent,
-rtl_TextEncoding eTextEnc );
virtual boolimplIsValid() const;
virtual voidimplDump();
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 4d3ceaa..64d3d5c 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -84,27 +84,6 @@ protected:
};
//
-
-class StdHlinkObject : public OleInputObjectBase
-{
-public:
-explicitStdHlinkObject( const InputObjectBase rParent );
-
-protected:
-virtual voidimplDump();
-
-private:
-::rtl::OUString dumpHyperlinkString( const String rName, bool bUnicode );
-
-booldumpGuidAndMoniker();
-voiddumpUrlMoniker();
-voiddumpFileMoniker();
-voiddumpItemMoniker();
-voiddumpAntiMoniker();
-voiddumpCompositeMoniker
[PATCH] remove unused code (oox)
Hi there,
removed unused methods, hope better this time.
Regards,
Petr
From 2d8c47fede9ec6842a98663f16c4efa70f833e22 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Thu, 29 Mar 2012 11:54:36 +0200
Subject: [PATCH] remove unused code (oox)
---
oox/inc/oox/dump/dffdumper.hxx |1 -
oox/inc/oox/dump/dumperbase.hxx | 10 --
oox/inc/oox/dump/oledumper.hxx |1 -
oox/inc/oox/ole/vbaprojectfilter.hxx |5 ---
oox/source/dump/dffdumper.cxx|6
oox/source/dump/dumperbase.cxx | 53 --
oox/source/dump/oledumper.cxx|5 ---
oox/source/ole/vbaprojectfilter.cxx |5 ---
unusedcode.easy | 12 ---
9 files changed, 0 insertions(+), 98 deletions(-)
diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx
index 10f84f3..de0913f 100644
--- a/oox/inc/oox/dump/dffdumper.hxx
+++ b/oox/inc/oox/dump/dffdumper.hxx
@@ -49,7 +49,6 @@ protected:
inline explicit DffStreamObject() {}
using SequenceRecordObjectBase::construct;
-voidconstruct( const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm );
virtual boolimplReadRecordHeader( BinaryInputStream rBaseStrm, sal_Int64 ornRecId, sal_Int64 ornRecSize );
virtual voidimplWriteExtHeader();
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index a8b16b0..0dd1abc 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -231,7 +231,6 @@ struct ItemFormat
explicitItemFormat();
voidset( DataType eDataType, FormatType eFmtType, const ::rtl::OUString rItemName );
-voidset( DataType eDataType, FormatType eFmtType, const ::rtl::OUString rItemName, const ::rtl::OUString rListName );
/** Initializes the struct from a vector of strings containing the item format.
@@ -398,7 +397,6 @@ public:
static void appendToken( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
static void appendToken( ::rtl::OUStringBuffer rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
static void prependToken( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-static void prependToken( ::rtl::OUStringBuffer rStr, sal_Int64 nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
static void appendIndex( ::rtl::OUStringBuffer rStr, const ::rtl::OUString rIdx );
static void appendIndex( ::rtl::OUStringBuffer rStr, sal_Int64 nIdx );
@@ -1047,11 +1045,9 @@ public:
voidincIndent();
voiddecIndent();
-voidresetIndent();
voidstartTable( sal_Int32 nW1 );
voidstartTable( sal_Int32 nW1, sal_Int32 nW2 );
-voidstartTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3 );
voidstartTable( sal_Int32 nW1, sal_Int32 nW2, sal_Int32 nW3, sal_Int32 nW4 );
voidstartTable( size_t nColCount, const sal_Int32* pnColWidths );
voidtab();
@@ -1209,8 +1205,6 @@ public:
explicitStorageIterator( const StorageRef rxStrg );
virtual ~StorageIterator();
-size_t getElementCount() const;
-
StorageIteratoroperator++();
::rtl::OUString getName() const;
@@ -1251,8 +1245,6 @@ protected:
//
-voidreconstructConfig( const ConfigRef rxConfig );
-
inline Config cfg() const { return *mxConfig; }
private:
@@ -1564,8 +1556,6 @@ protected:
::rtl::OUString dumpNullCharArray( const String rName, rtl_TextEncoding eTextEnc );
::rtl::OUString dumpNullUnicodeArray( const String rName );
-double dumpRk( const String rName = EMPTY_STRING );
-sal_Int32 dumpColorABGR( const String rName = EMPTY_STRING );
::com::sun::star::util::DateTime dumpFileTime( const String rName = EMPTY_STRING );
::rtl::OUString dumpGuid( const String rName = EMPTY_STRING );
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 42abf2d..4d3ceaa 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -178,7 +178,6 @@ protected:
using StorageObjectBase::construct;
voidconstruct( const ObjectBase rParent, const StorageRef rxStrg, const ::rtl::OUString rSysPath );
-voidconstruct( const ObjectBase rParent );
virtual voidimplDumpStream(
const ::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream rxStrm,
diff --git a/oox/inc/oox/ole/vbaprojectfilter.hxx
Re: [PUSHED][PATCH] remove unused code (oox)
On Thu, 2012-03-29 at 15:23 +0200, Petr Vorel wrote: Hi there, removed unused methods pushed, thanks for these C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused code (oox, sc)
Hi there,
yet another remove unused code patch.
Regards,
Petr
From 38a7f343736f7049d28aae132307eba02a019f27 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Wed, 28 Mar 2012 11:20:18 +0200
Subject: [PATCH] remove unused code (oox, sc)
---
oox/inc/oox/drawingml/textparagraphproperties.hxx |4 -
oox/inc/oox/dump/dffdumper.hxx|2 -
oox/inc/oox/dump/dumperbase.hxx | 13
oox/source/drawingml/textparagraphproperties.cxx | 25
oox/source/dump/dffdumper.cxx | 11
oox/source/dump/dumperbase.cxx| 65 -
sd/source/filter/eppt/epptooxml.hxx |1 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 14 -
unusedcode.easy | 14 -
9 files changed, 0 insertions(+), 149 deletions(-)
diff --git a/oox/inc/oox/drawingml/textparagraphproperties.hxx b/oox/inc/oox/drawingml/textparagraphproperties.hxx
index b2c5096..e037ff2 100644
--- a/oox/inc/oox/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/oox/drawingml/textparagraphproperties.hxx
@@ -114,10 +114,6 @@ public:
size can be zero and the default value is returned. */
float getCharHeightPoints( float fDefault ) const;
-#if OSL_DEBUG_LEVEL 0
-void dump() const;
-#endif
-
protected:
TextCharacterProperties maTextCharacterProperties;
diff --git a/oox/inc/oox/dump/dffdumper.hxx b/oox/inc/oox/dump/dffdumper.hxx
index a23d071..10f84f3 100644
--- a/oox/inc/oox/dump/dffdumper.hxx
+++ b/oox/inc/oox/dump/dffdumper.hxx
@@ -49,7 +49,6 @@ protected:
inline explicit DffStreamObject() {}
using SequenceRecordObjectBase::construct;
-voidconstruct( const ObjectBase rParent, const BinaryInputStreamRef rxStrm, const ::rtl::OUString rSysFileName );
voidconstruct( const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm );
virtual boolimplReadRecordHeader( BinaryInputStream rBaseStrm, sal_Int64 ornRecId, sal_Int64 ornRecSize );
@@ -61,7 +60,6 @@ private:
voidconstructDffObj();
sal_uInt32 dumpDffSimpleColor( const String rName );
-sal_uInt32 dumpDffColor( const String rName );
voiddumpDffOpt();
sal_uInt16 dumpDffOptPropHeader();
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 5989c1e..68a4848 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -480,26 +480,18 @@ static const String EMPTY_STRING;
class FormulaStack
{
public:
-explicitFormulaStack();
-
inline const ::rtl::OUString getFormulaString() const { return getString( maFmlaStack ); }
inline const ::rtl::OUString getClassesString() const { return getString( maClassStack ); }
voidpushOperand( const String rOp, const ::rtl::OUString rTokClass );
-voidpushOperand( const String rOp );
-voidpushUnaryOp( const String rLOp, const String rROp );
-voidpushBinaryOp( const String rOp );
-voidpushFuncOp( const String rFunc, const ::rtl::OUString rTokClass, sal_uInt8 nParamCount );
inline void setError() { mbError = true; }
-voidreplaceOnTop( const ::rtl::OUString rOld, const ::rtl::OUString rNew );
private:
typedef ::std::stack ::rtl::OUString StringStack;
inline bool check( bool bCond ) { return (mbError |= !bCond) == false; }
-const ::rtl::OUString getString( const StringStack rStack ) const;
voidpushUnaryOp( StringStack rStack, const ::rtl::OUString rLOp, const ::rtl::OUString rROp );
voidpushBinaryOp( StringStack rStack, const ::rtl::OUString rOp );
voidpushFuncOp( StringStack rStack, const ::rtl::OUString rOp, sal_uInt8 nParamCount );
@@ -612,9 +604,6 @@ private:
::rtl::OUString orKey,
::rtl::OUString orData ) const;
-LineTypereadConfigLine(
-TextInputStream rStrm ) const;
-
voidprocessConfigItem(
TextInputStream rStrm,
const ::rtl::OUString rKey,
@@ -1013,7 +1002,6 @@ public:
template typename Type
boolhasName( const NameListWrapper rListWrp, Type nKey ) const;
-::com::sun::star::uno::Sequence ::com::sun::star::beans::NamedValue requestEncryptionData( ::comphelper::IDocPasswordVerifier rVerifier );
boolisPasswordCancelled() const;
protected:
@@ -1598,7 +1586,6 @@ protected:
inline void dumpUnused( sal_Int32 nBytes ) { dumpArray( OOX_DUMP_UNUSED, nBytes ); }
inline void dumpUnknown( sal_Int32 nBytes
Re: [PUSHED][PATCH] remove unused code (oox, sc)
On Wed, 2012-03-28 at 16:23 +0200, Petr Vorel wrote: Hi there, yet another remove unused code patch. Pushed now, thanks for this. FWIW, if a class has only one constructor and that constructor is unused then it indicates that the whole class (except perhaps for any static methods it might have) should be possible to be removed. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] remove unused code (oox, sc)
FWIW, if a class has only one constructor and that constructor is unused then it indicates that the whole class (except perhaps for any static methods it might have) should be possible to be removed. Sorry, I'll think more next time. Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused code (oox, sc)
Hi there,
another bits of unused code removed.
Regards,
Petr
From e31c211d2ebb7cde8a260ec0bcef5359c0c1db8f Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Tue, 27 Mar 2012 11:03:09 +0200
Subject: [PATCH] remove unused code (oox, sc)
---
oox/inc/oox/dump/dumperbase.hxx |4 --
oox/inc/oox/mathml/importutils.hxx|4 --
oox/inc/oox/ppt/pptshape.hxx |1 -
oox/source/dump/dumperbase.cxx|5 ---
oox/source/mathml/importutils.cxx | 10 -
oox/source/ppt/pptshape.cxx |7
sc/source/filter/inc/addressconverter.hxx |1 -
sc/source/filter/inc/biffoutputstream.hxx | 14
sc/source/filter/inc/sheetdatabuffer.hxx | 10 -
sc/source/filter/oox/addressconverter.cxx |6 ---
sc/source/filter/oox/biffoutputstream.cxx | 23 -
sc/source/filter/oox/sheetdatabuffer.cxx | 52 +
unusedcode.easy | 12 ---
13 files changed, 1 insertions(+), 148 deletions(-)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 534776b..5989c1e 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1860,10 +1860,6 @@ public:
const BinaryInputStreamRef rxStrm,
const ::rtl::OUString rSysFileName );
-explicitXmlStreamObject(
-const OutputObjectBase rParent,
-const BinaryInputStreamRef rxStrm );
-
protected:
virtual voidimplDumpText( TextInputStream rTextStrm );
};
diff --git a/oox/inc/oox/mathml/importutils.hxx b/oox/inc/oox/mathml/importutils.hxx
index 9b90681..fc0e276 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/oox/inc/oox/mathml/importutils.hxx
@@ -213,10 +213,6 @@ public:
*/
bool findTag( int token );
/**
- Skips the given element (i.e. reads up to and including the matching closing tag).
-*/
-void skipElement( int token );
-/**
Handle the current (unexpected) tag.
*/
void handleUnexpectedTag();
diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx
index e06fda6..07ab723 100644
--- a/oox/inc/oox/ppt/pptshape.hxx
+++ b/oox/inc/oox/ppt/pptshape.hxx
@@ -67,7 +67,6 @@ public:
static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector oox::drawingml::ShapePtr rShapes );
static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector oox::drawingml::ShapePtr rShapes );
-static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector oox::drawingml::ShapePtr rShapes );
static oox::drawingml::TextListStylePtr getSubTypeTextListStyle( const SlidePersist rSlidePersist, sal_Int32 nSubType );
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index f078111..366090c 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -2920,11 +2920,6 @@ XmlStreamObject::XmlStreamObject( const ObjectBase rParent,
TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8, rSysFileName );
}
-XmlStreamObject::XmlStreamObject( const OutputObjectBase rParent, const BinaryInputStreamRef rxStrm )
-{
-TextStreamObjectBase::construct( rParent, rxStrm, RTL_TEXTENCODING_UTF8 );
-}
-
void XmlStreamObject::implDumpText( TextInputStream rTextStrm )
{
/* Buffers a start element and the following element text. Needed to dump
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index ab9d224..41a254d 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -114,11 +114,6 @@ static OUString tokenToString( int token )
} // namespace
-bool XmlStream::AttributeList::hasAttribute( int token ) const
-{
-return attrs.find( token ) != attrs.end();
-}
-
rtl::OUString XmlStream::AttributeList::attribute( int token, const rtl::OUString def ) const
{
std::map int, rtl::OUString ::const_iterator find = attrs.find( token );
@@ -304,11 +299,6 @@ bool XmlStream::findTagInternal( int token, bool silent )
return false;
}
-void XmlStream::skipElement( int token )
-{
-return skipElementInternal( token, true ); // no debug about skipping if called from outside
-}
-
void XmlStream::skipElementInternal( int token, bool silent )
{
int closing = ( token ~TAG_OPENING ) | TAG_CLOSING; // make it a closing tag
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index a72a10c..2b017f0 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -423,13 +423,6 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholderByIndex( const sal_Int32 nIdx,
return aShapePtr;
}
-// if nFirstPlaceholder can't be found, it will be searched for nSecondPlaceholder
-oox
Re: [PUSHED][PATCH] remove unused code (oox, sc)
On Tue, 2012-03-27 at 16:27 +0200, Petr Vorel wrote: Hi there, another bits of unused code removed. looks good, pushed now, thanks for these. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] remove unused code (oox)
On Sun, 2012-03-25 at 20:43 +0200, Petr Vorel wrote: Hi there, removed some code from oox. Pushed, looks good. I suspect that this will have a bit of a cascade effect and a pile more stuff will become available for removal on the next run. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused code (oox)
Hi there,
removed some code from oox.
Regards,
Petr
From e04049e2554a94ce80dc21dfe390e91c8fd8bc41 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Thu, 22 Mar 2012 20:14:13 +0100
Subject: [PATCH] remove unused code (oox)
---
oox/source/ole/vbaprojectfilter.cxx | 13 -
sc/source/filter/inc/biffinputstream.hxx | 27 +---
sc/source/filter/inc/biffoutputstream.hxx |5 --
sc/source/filter/inc/drawingmanager.hxx |4 --
sc/source/filter/oox/biffdetector.cxx |5 --
sc/source/filter/oox/biffinputstream.cxx | 11 -
sc/source/filter/oox/biffoutputstream.cxx | 16 ---
sc/source/filter/oox/drawingmanager.cxx | 71 -
sc/source/filter/oox/excelfilter.cxx | 27 ---
sc/source/filter/oox/ooxformulaparser.cxx |5 --
unusedcode.easy | 13 -
11 files changed, 1 insertions(+), 196 deletions(-)
diff --git a/oox/source/ole/vbaprojectfilter.cxx b/oox/source/ole/vbaprojectfilter.cxx
index e152598..f4698fa 100644
--- a/oox/source/ole/vbaprojectfilter.cxx
+++ b/oox/source/ole/vbaprojectfilter.cxx
@@ -77,19 +77,6 @@ OUString SAL_CALL WordVbaProjectFilter_getImplementationName() throw()
return CREATE_OUSTRING( com.sun.star.comp.oox.WordVbaProjectFilter );
}
-Sequence OUString SAL_CALL WordVbaProjectFilter_getSupportedServiceNames() throw()
-{
-Sequence OUString aSeq( 1 );
-aSeq[ 0 ] = CREATE_OUSTRING( com.sun.star.document.ImportFilter );
-return aSeq;
-}
-
-Reference XInterface SAL_CALL WordVbaProjectFilter_createInstance(
-const Reference XComponentContext rxContext ) throw( Exception )
-{
-return static_cast ::cppu::OWeakObject* ( new WordVbaProjectFilter( rxContext ) );
-}
-
//
WordVbaProjectFilter::WordVbaProjectFilter( const Reference XComponentContext rxContext ) throw( RuntimeException ) :
diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index 9f01b02..47ee2b0 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -129,16 +129,7 @@ private:
Trying to read over the record limits results in a stream error. The
isValid() function indicates that by returning false. From now on the data
returned by the read functions is undefined. The error state will be reset,
-if the record is reset (with the function resetRecord()), or if the next
-record is started.
-
-To switch off the automatic lookup of CONTINUE records, use resetRecord()
-with false parameter. This is useful e.g. on import of drawing layer data,
-where sometimes solely CONTINUE records will occur. The automatic lookup
-keeps switched off until the method resetRecord() is called with parameter
-true. All other settings done on the stream (e.g. alternative CONTINUE
-record identifier, enabled decryption, NUL substitution character) will be
-reset to default values, if a new record is started.
+if the next record is started.
The import stream supports decrypting the stream data. The contents of a
record (not the record header) will be encrypted by Excel if the file has
@@ -189,22 +180,6 @@ public:
*/
boolstartRecordByHandle( sal_Int64 nRecHandle );
-/** Sets stream pointer to begin of record content.
-
-@param bContLookup
-Automatic CONTINUE lookup on/off. In difference to other stream
-settings, this setting is persistent until next call of this
-function (because it is wanted to receive the next CONTINUE records
-separately).
-@param nAltContId
-Sets an alternative record identifier for content continuation.
-This value is reset automatically when a new record is started with
-startNextRecord().
- */
-voidresetRecord(
-bool bContLookup,
-sal_uInt16 nAltContId = BIFF_ID_UNKNOWN );
-
/** Sets stream pointer before current record and invalidates stream.
The next call to startNextRecord() will start again the current record.
diff --git a/sc/source/filter/inc/biffoutputstream.hxx b/sc/source/filter/inc/biffoutputstream.hxx
index a38bfdf..f7a6462 100644
--- a/sc/source/filter/inc/biffoutputstream.hxx
+++ b/sc/source/filter/inc/biffoutputstream.hxx
@@ -110,8 +110,6 @@ public:
/** Returns the absolute position in the wrapped binary stream. */
sal_Int64 tellBase() const;
-/** Returns the total size of the wrapped binary stream. */
-sal_Int64 sizeBase() const;
// BinaryOutputStream interface (stream write access) -
@@ -120,9 +118,6 @@ public:
/** Writes nBytes bytes from the passed buffer pMem. */
virtual voidwriteMemory( const void* pMem
Re: [PUSHED][PATCH] remove unused code (oox, sc)
On Sun, 2012-03-18 at 14:40 +0100, Petr Vorel wrote: Hi there, some unused code removed (oox, sc). Looks good to me, pushed now, thanks for these. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove unused code (oox, sc)
Hi there,
some unused code removed (oox, sc).
Regards,
Petr
From 3c03ddd6eb8e0cefa229f3874e3da35bd0a57788 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Sat, 17 Mar 2012 20:25:52 +0100
Subject: [PATCH 1/2] remove unused code (oox, sc)
---
oox/inc/oox/dump/dumperbase.hxx |7 ---
oox/inc/oox/dump/oledumper.hxx |5 -
oox/inc/oox/ole/vbacontrol.hxx |2 --
oox/source/dump/dumperbase.cxx | 15 ---
oox/source/dump/oledumper.cxx|7 ---
oox/source/ole/vbacontrol.cxx|5 -
sc/source/filter/inc/formulabase.hxx |3 ---
sc/source/filter/oox/formulabase.cxx |9 -
unusedcode.easy |7 ---
9 files changed, 0 insertions(+), 60 deletions(-)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 7cba7ae..534776b 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -993,8 +993,6 @@ public:
inline const StorageRef getRootStorage() const { return mxCfgData-getRootStorage(); }
inline const ::rtl::OUString getSysFileName() const { return mxCfgData-getSysFileName(); }
-voidsetStringOption( const String rKey, const String rData );
-
const ::rtl::OUString getStringOption( const String rKey, const ::rtl::OUString rDefault ) const;
boolgetBoolOption( const String rKey, bool bDefault ) const;
template typename Type
@@ -1005,7 +1003,6 @@ public:
template typename ListType
::boost::shared_ptr ListType createNameList( const String rListName );
-voidsetNameList( const String rListName, const NameListRef rxList );
voideraseNameList( const String rListName );
NameListRef getNameList( const String rListName ) const;
@@ -1792,10 +1789,6 @@ public:
const BinaryInputStreamRef rxStrm,
const ::rtl::OUString rSysFileName );
-explicitBinaryStreamObject(
-const OutputObjectBase rParent,
-const BinaryInputStreamRef rxStrm );
-
protected:
voiddumpBinaryStream( bool bShowOffset = true );
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 1a94e77..42abf2d 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -331,11 +331,6 @@ protected:
const String rPropNameList,
bool b64BitPropFlags = false );
voidconstruct(
-const OutputObjectBase rParent,
-const BinaryInputStreamRef rxStrm,
-const String rPropNameList,
-bool b64BitPropFlags = false );
-voidconstruct(
const InputObjectBase rParent,
const String rPropNameList,
bool b64BitPropFlags = false );
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index 4647245..b4d2afb 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -65,8 +65,6 @@ public:
inline const AxPairData getPosition() const { return maPos; }
/** Returns the unique identifier of this control. */
inline sal_Int32getId() const { return mnId; }
-/** Returns true, if the control is visible. */
-boolisVisible() const;
/** Returns true, if this control is a container control. */
boolisContainer() const;
/** Returns the length of the stream data for stream based controls. */
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 54159b440..f078111 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1699,11 +1699,6 @@ void Config::construct( const sal_Char* pcEnvVar, const Reference XComponentCon
mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName, rMediaDesc ) );
}
-void Config::setStringOption( const String rKey, const String rData )
-{
-mxCfgData-setOption( rKey, rData );
-}
-
const OUString Config::getStringOption( const String rKey, const OUString rDefault ) const
{
const OUString* pData = implGetOption( rKey );
@@ -1726,11 +1721,6 @@ bool Config::isImportEnabled() const
return getBoolOption( enable-import, true );
}
-void Config::setNameList( const String rListName, const NameListRef rxList )
-{
-mxCfgData-setNameList( rListName, rxList );
-}
-
void Config::eraseNameList( const String rListName )
{
mxCfgData-eraseNameList( rListName );
@@ -2837,11 +2827,6 @@ BinaryStreamObject::BinaryStreamObject( const ObjectBase rParent, const BinaryI
InputObjectBase::construct( rParent, rxStrm,
[PATCH] remove unused code (oox, sd)
Hi there,
remove some unused code in oox and sd.
Regards,
Petr
From 2cc831282d53c3a14dd10fc8cb190f1d15df3354 Mon Sep 17 00:00:00 2001
From: Petr Vorel petr.vo...@gmail.com
Date: Thu, 15 Mar 2012 11:40:15 +0100
Subject: [PATCH] remove unused code (oox, sd)
---
oox/inc/oox/helper/attributelist.hxx |6 --
oox/inc/oox/helper/containerhelper.hxx | 16
oox/inc/oox/helper/graphichelper.hxx |2 --
oox/source/helper/attributelist.cxx | 10 --
oox/source/helper/containerhelper.cxx| 18 --
oox/source/helper/graphichelper.cxx |5 -
sd/source/filter/eppt/epptooxml.hxx |1 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 10 --
unusedcode.easy |5 -
9 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/oox/inc/oox/helper/attributelist.hxx b/oox/inc/oox/helper/attributelist.hxx
index d0a0600..c60c6f8 100644
--- a/oox/inc/oox/helper/attributelist.hxx
+++ b/oox/inc/oox/helper/attributelist.hxx
@@ -66,12 +66,6 @@ public:
/** Returns the 32-bit signed integer value from the passed string (hexadecimal). */
static sal_Int32decodeIntegerHex( const ::rtl::OUString rValue );
-
-/** Returns the 32-bit unsigned integer value from the passed string (hexadecimal). */
-static sal_uInt32 decodeUnsignedHex( const ::rtl::OUString rValue );
-
-/** Returns the 64-bit signed integer value from the passed string (hexadecimal). */
-static sal_Int64decodeHyperHex( const ::rtl::OUString rValue );
};
//
diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx
index 5c9dc88..eef9429 100644
--- a/oox/inc/oox/helper/containerhelper.hxx
+++ b/oox/inc/oox/helper/containerhelper.hxx
@@ -173,22 +173,6 @@ public:
static ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexContainer
createIndexContainer( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext rxContext );
-/** Inserts an object into an indexed container.
-
-@param rxIndexContainer com.sun.star.container.XIndexContainer
-interface of the indexed container.
-
-@param nIndex Insertion index for the object.
-
-@param rObject The object to be inserted.
-
-@return True = object successfully inserted.
- */
-static bool insertByIndex(
-const ::com::sun::star::uno::Reference ::com::sun::star::container::XIndexContainer rxIndexContainer,
-sal_Int32 nIndex,
-const ::com::sun::star::uno::Any rObject );
-
// com.sun.star.container.XNameContainer --
/** Creates a new name container object from scratch. */
diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx
index d3507fa..9881200 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -93,8 +93,6 @@ public:
sal_Int32 convertScreenPixelXToHmm( double fPixelX ) const;
/** Converts the passed value from vertical screen pixels to 1/100 mm. */
sal_Int32 convertScreenPixelYToHmm( double fPixelY ) const;
-/** Converts the passed point from screen pixels to 1/100 mm. */
-::com::sun::star::awt::Point convertScreenPixelToHmm( const ::com::sun::star::awt::Point rPixel ) const;
/** Converts the passed size from screen pixels to 1/100 mm. */
::com::sun::star::awt::Size convertScreenPixelToHmm( const ::com::sun::star::awt::Size rPixel ) const;
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index 33f4ed5..f1d114d 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -122,16 +122,6 @@ sal_Int32 AttributeConversion::decodeIntegerHex( const OUString rValue )
return rValue.toInt32( 16 );
}
-sal_uInt32 AttributeConversion::decodeUnsignedHex( const OUString rValue )
-{
-return getLimitedValue sal_uInt32, sal_Int64 ( rValue.toInt64( 16 ), 0, SAL_MAX_UINT32 );
-}
-
-sal_Int64 AttributeConversion::decodeHyperHex( const OUString rValue )
-{
-return rValue.toInt64( 16 );
-}
-
//
AttributeList::AttributeList( const Reference XFastAttributeList rxAttribs ) :
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index 23bad22..a19e9b4 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -119,24 +119,6 @@ Reference XIndexContainer ContainerHelper::createIndexContainer( const Refere
return xContainer;
}
-bool ContainerHelper::insertByIndex(
-const Reference XIndexContainer rxIndexContainer,
-sal_Int32
