Hi!
These patches remove unused code as listed in unusedcode.easy
Mariana Marasoiu
From 2fa32c691f2af987bb32bff8b9b3f940c90b08aa Mon Sep 17 00:00:00 2001
From: Mariana Marasoiu <mariana.maras...@gmail.com>
Date: Wed, 14 Mar 2012 01:07:16 +0200
Subject: [PATCH 1/4] Remove unused code in drawingml.
---
oox/inc/oox/drawingml/customshapeproperties.hxx | 1 -
oox/source/drawingml/customshapeproperties.cxx | 10 ----------
unusedcode.easy | 1 -
3 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx
index 5fd6cd0..1b88ed3 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -155,7 +155,6 @@ public:
void setMirroredY( sal_Bool bMirroredY ) { mbMirroredY = bMirroredY; };
void setTextRotateAngle( sal_Int32 nAngle ) { mnTextRotateAngle = nAngle; };
- double getValue( const std::vector< CustomShapeGuide >&, sal_uInt32 nIndex ) const;
static sal_Int32 SetCustomShapeGuideValue( std::vector< CustomShapeGuide >& rGuideList, const CustomShapeGuide& rGuide );
static sal_Int32 GetCustomShapeGuideValue( const std::vector< CustomShapeGuide >& rGuideList, const rtl::OUString& rFormulaName );
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 29844b8..071f37a 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -359,16 +359,6 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
}
}
-double CustomShapeProperties::getValue( const std::vector< CustomShapeGuide >& rGuideList, sal_uInt32 nIndex ) const
-{
- double fRet = 0.0;
- if ( nIndex < rGuideList.size() )
- {
-
- }
- return fRet;
-}
-
Any CustomShapeProvider::createStringSequence( size_t nStrings, const char **pStrings )
{
Sequence< OUString > aStringSequence( nStrings );
diff --git a/unusedcode.easy b/unusedcode.easy
index 77ae5b4..b2450c7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -907,7 +907,6 @@ oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
oox::drawingml::ColorPropertySet::getColor()
oox::drawingml::ColorPropertySet::setColor(int)
-oox::drawingml::CustomShapeProperties::getValue(std::__debug::vector<oox::drawingml::CustomShapeGuide, std::allocator<oox::drawingml::CustomShapeGuide> > const&, unsigned int) const
oox::drawingml::DiagramLayout::layout(std::__debug::vector<oox::drawingml::dgm::Point, std::allocator<oox::drawingml::dgm::Point> > const&, com::sun::star::awt::Point const&)
oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
--
1.7.0.4
From 9e68e6fdf658f4c11bb4ac93402d402544a9d0d1 Mon Sep 17 00:00:00 2001
From: Mariana Marasoiu <mariana.maras...@gmail.com>
Date: Wed, 14 Mar 2012 01:15:11 +0200
Subject: [PATCH 2/4] Remove unused code in drawingml/diagram.
---
oox/source/drawingml/diagram/diagram.cxx | 3 ---
oox/source/drawingml/diagram/diagram.hxx | 2 --
unusedcode.easy | 1 -
3 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 58c8de8..8e6586d 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -95,9 +95,6 @@ void DiagramData::dump()
boost::bind( &dgm::Point::dump, _1 ) );
}
-void DiagramLayout::layout( const dgm::Points & /*pTree*/, const awt::Point & /*pt*/ )
-{
-}
void Diagram::setData( const DiagramDataPtr & pData)
{
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 633f452..0e5bfef 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -237,8 +237,6 @@ public:
const DiagramDataPtr & getStyleData() const
{ return mpStyleData; }
- void layout( const dgm::Points & pTree, const com::sun::star::awt::Point & pt );
-
private:
::rtl::OUString msDefStyle;
::rtl::OUString msMinVer;
diff --git a/unusedcode.easy b/unusedcode.easy
index b2450c7..e357027 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -907,7 +907,6 @@ oox::drawingml::ChartExport::exportXAxis(oox::drawingml::AxisIdPair)
oox::drawingml::ChartExport::exportYAxis(oox::drawingml::AxisIdPair)
oox::drawingml::ColorPropertySet::getColor()
oox::drawingml::ColorPropertySet::setColor(int)
-oox::drawingml::DiagramLayout::layout(std::__debug::vector<oox::drawingml::dgm::Point, std::allocator<oox::drawingml::dgm::Point> > const&, com::sun::star::awt::Point const&)
oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
oox::drawingml::TextListStyle::dump() const
--
1.7.0.4
From eb8eb3f2720872007a7b4849c6858f8e5325c938 Mon Sep 17 00:00:00 2001
From: Mariana Marasoiu <mariana.maras...@gmail.com>
Date: Wed, 14 Mar 2012 01:25:57 +0200
Subject: [PATCH 3/4] Remove unused code in drawingml/theme.
---
oox/inc/oox/drawingml/theme.hxx | 2 --
oox/source/drawingml/theme.cxx | 5 -----
unusedcode.easy | 1 -
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/oox/inc/oox/drawingml/theme.hxx b/oox/inc/oox/drawingml/theme.hxx
index d6dbb2c..b2a039d 100644
--- a/oox/inc/oox/drawingml/theme.hxx
+++ b/oox/inc/oox/drawingml/theme.hxx
@@ -76,8 +76,6 @@ public:
inline EffectStyleList& getEffectStyleList() { return maEffectStyleList; }
inline const EffectStyleList& getEffectStyleList() const { return maEffectStyleList; }
- /** Returns the effect properties of the passed one-based themed style index. */
- const PropertyMap* getEffectStyle( sal_Int32 nIndex ) const;
inline FontScheme& getFontScheme() { return maFontScheme; }
inline const FontScheme& getFontScheme() const { return maFontScheme; }
diff --git a/oox/source/drawingml/theme.cxx b/oox/source/drawingml/theme.cxx
index 47a7d30..46f3dbc 100644
--- a/oox/source/drawingml/theme.cxx
+++ b/oox/source/drawingml/theme.cxx
@@ -66,11 +66,6 @@ const LineProperties* Theme::getLineStyle( sal_Int32 nIndex ) const
return lclGetStyleElement( maLineStyleList, nIndex );
}
-const PropertyMap* Theme::getEffectStyle( sal_Int32 nIndex ) const
-{
- return lclGetStyleElement( maEffectStyleList, nIndex );
-}
-
const TextCharacterProperties* Theme::getFontStyle( sal_Int32 nSchemeType ) const
{
return maFontScheme.get( nSchemeType ).get();
diff --git a/unusedcode.easy b/unusedcode.easy
index e357027..ea9e334 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -910,7 +910,6 @@ oox::drawingml::ColorPropertySet::setColor(int)
oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
oox::drawingml::TextBodyProperties::pushToPropMap(oox::PropertyMap&) const
oox::drawingml::TextListStyle::dump() const
-oox::drawingml::Theme::getEffectStyle(int) const
oox::drawingml::addMissingProperties(oox::PropertyMap const&, oox::PropertyMap&)
oox::drawingml::chart::ObjectTypeFormatter::convertAutomaticLine(oox::PropertySet&, int)
oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&)
--
1.7.0.4
From 80d71960c4748f8bc9fa0e419aa46c2742d18cd5 Mon Sep 17 00:00:00 2001
From: Mariana Marasoiu <mariana.maras...@gmail.com>
Date: Wed, 14 Mar 2012 01:34:42 +0200
Subject: [PATCH 4/4] Remove unused code in drawingml/table.
---
oox/inc/oox/drawingml/table/tableproperties.hxx | 1 -
oox/source/drawingml/table/tableproperties.cxx | 4 ----
unusedcode.easy | 1 -
3 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/oox/inc/oox/drawingml/table/tableproperties.hxx b/oox/inc/oox/drawingml/table/tableproperties.hxx
index 45246bd..3d783d9 100644
--- a/oox/inc/oox/drawingml/table/tableproperties.hxx
+++ b/oox/inc/oox/drawingml/table/tableproperties.hxx
@@ -61,7 +61,6 @@ public:
sal_Bool& isBandRow(){ return mbBandRow; };
sal_Bool& isBandCol(){ return mbBandCol; };
- void apply( const TablePropertiesPtr& );
void pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBase,
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet, ::oox::drawingml::TextListStylePtr pMasterTextListStyle );
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 7fbd4bd..97ed6e7 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -61,10 +61,6 @@ TableProperties::~TableProperties()
{
}
-void TableProperties::apply( const TablePropertiesPtr& /* rSourceTableProperties */ )
-{
-}
-
void CreateTableRows( uno::Reference< XTableRows > xTableRows, const std::vector< TableRow >& rvTableRows )
{
if ( rvTableRows.size() > 1 )
diff --git a/unusedcode.easy b/unusedcode.easy
index ea9e334..6760ae4 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -916,7 +916,6 @@ oox::drawingml::lcl_SequenceHasUnhiddenData(com::sun::star::uno::Reference<com::
oox::drawingml::lcl_dump_pset(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
oox::drawingml::lcl_getSequenceLengthByRole(com::sun::star::uno::Sequence<com::sun::star::uno::Reference<com::sun::star::chart2::data::XLabeledDataSequence> > const&, rtl::OUString const&)
oox::drawingml::lcl_getValueFromSequence(com::sun::star::uno::Reference<com::sun::star::chart2::data::XDataSequence> const&, int)
-oox::drawingml::table::TableProperties::apply(boost::shared_ptr<oox::drawingml::table::TableProperties> 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&)
--
1.7.0.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
