[PATCH 1/2] remove unused code (oox, sc)
Petr Vorel
petr.vorel at gmail.com
Sat Mar 17 12:25:52 PDT 2012
---
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(); }
- void setStringOption( const String& rKey, const String& rData );
-
const ::rtl::OUString& getStringOption( const String& rKey, const ::rtl::OUString& rDefault ) const;
bool getBoolOption( 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 );
- void setNameList( const String& rListName, const NameListRef& rxList );
void eraseNameList( const String& rListName );
NameListRef getNameList( const String& rListName ) const;
@@ -1792,10 +1789,6 @@ public:
const BinaryInputStreamRef& rxStrm,
const ::rtl::OUString& rSysFileName );
- explicit BinaryStreamObject(
- const OutputObjectBase& rParent,
- const BinaryInputStreamRef& rxStrm );
-
protected:
void dumpBinaryStream( 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 );
void construct(
- const OutputObjectBase& rParent,
- const BinaryInputStreamRef& rxStrm,
- const String& rPropNameList,
- bool b64BitPropFlags = false );
- void construct(
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_Int32 getId() const { return mnId; }
- /** Returns true, if the control is visible. */
- bool isVisible() const;
/** Returns true, if this control is a container control. */
bool isContainer() 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, rSysFileName );
}
-BinaryStreamObject::BinaryStreamObject( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm )
-{
- InputObjectBase::construct( rParent, rxStrm );
-}
-
void BinaryStreamObject::dumpBinaryStream( bool bShowOffset )
{
mxStrm->seekToStart();
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 8c5e5a0..bb3f115 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -1050,13 +1050,6 @@ void AxPropertyObjectBase::construct( const ObjectBase& rParent,
constructAxPropObj( rPropNameList, b64BitPropFlags );
}
-void AxPropertyObjectBase::construct( const OutputObjectBase& rParent,
- const BinaryInputStreamRef& rxStrm, const String& rPropNameList, bool b64BitPropFlags )
-{
- OleInputObjectBase::construct( rParent, rxStrm );
- constructAxPropObj( rPropNameList, b64BitPropFlags );
-}
-
void AxPropertyObjectBase::construct( const InputObjectBase& rParent,
const String& rPropNameList, bool b64BitPropFlags )
{
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 0a4b91b..14768e1 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -225,11 +225,6 @@ bool VbaSiteModel::importBinaryModel( BinaryInputStream& rInStrm )
return aReader.finalizeImport();
}
-bool VbaSiteModel::isVisible() const
-{
- return getFlag( mnFlags, VBA_SITE_VISIBLE );
-}
-
bool VbaSiteModel::isContainer() const
{
return !getFlag( mnFlags, VBA_SITE_OSTREAM );
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 0199d17..66ceccd 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -295,9 +295,6 @@ class ApiTokenIterator
{
public:
explicit ApiTokenIterator( const ApiTokenSequence& rTokens, sal_Int32 nSpacesOpCode, bool bSkipSpaces );
- /** Copy constructor that allows to change the skip spaces mode. */
- explicit ApiTokenIterator( const ApiTokenIterator& rIter, bool bSkipSpaces );
-
inline bool is() const { return mpToken != mpTokenEnd; }
inline const ApiToken* get() const { return mpToken; }
inline const ApiToken* operator->() const { return mpToken; }
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 276564e..934ff8c 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -184,15 +184,6 @@ ApiTokenIterator::ApiTokenIterator( const ApiTokenSequence& rTokens, sal_Int32 n
skipSpaces();
}
-ApiTokenIterator::ApiTokenIterator( const ApiTokenIterator& rIter, bool bSkipSpaces ) :
- mpToken( rIter.mpToken ),
- mpTokenEnd( rIter.mpTokenEnd ),
- mnSpacesOpCode( rIter.mnSpacesOpCode ),
- mbSkipSpaces( bSkipSpaces )
-{
- skipSpaces();
-}
-
ApiTokenIterator& ApiTokenIterator::operator++()
{
if( is() )
diff --git a/unusedcode.easy b/unusedcode.easy
index c7a91d5..140ed4d 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -888,10 +888,6 @@ nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::
o3tltests::cow_wrapper_client2::queryUnmodified() const
o3tltests::cow_wrapper_client3::queryUnmodified() const
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&)
-oox::dump::AxPropertyObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, bool)
-oox::dump::BinaryStreamObject::BinaryStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
-oox::dump::Config::setNameList(oox::dump::String const&, boost::shared_ptr<oox::dump::NameListBase> const&)
-oox::dump::Config::setStringOption(oox::dump::String const&, oox::dump::String const&)
oox::dump::ConfigItemBase::readConfigLine(oox::TextInputStream&) const
oox::dump::DffStreamObject::construct(oox::dump::ObjectBase const&, oox::dump::BinaryInputStreamRef const&, rtl::OUString const&)
oox::dump::DffStreamObject::dumpDffColor(oox::dump::String const&)
@@ -908,9 +904,6 @@ oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const&, bool)
oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const&, unsigned short)
oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const
oox::formulaimport::XmlStream::skipElement(int)
-oox::ole::VbaSiteModel::isVisible() const
-oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&)
-oox::xls::ApiTokenIterator::ApiTokenIterator(oox::xls::ApiTokenIterator const&, bool)
oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> const&)
oox::xls::BiffDrawingBase::setSkipObj(unsigned short)
oox::xls::BiffDrawingObjectBase::importObjBiff8(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
--
1.7.9.1
--k1lZvvs/B4yU6o8G
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0002-remove-unused-code.patch"
More information about the LibreOffice
mailing list