[Libreoffice-commits] .: 4 commits - oox/inc oox/source unusedcode.easy

Caolán McNamara caolan at kemper.freedesktop.org
Wed Mar 14 09:46:57 PDT 2012


 oox/inc/oox/drawingml/customshapeproperties.hxx |    1 -
 oox/inc/oox/drawingml/table/tableproperties.hxx |    1 -
 oox/inc/oox/drawingml/theme.hxx                 |    2 --
 oox/source/drawingml/customshapeproperties.cxx  |   10 ----------
 oox/source/drawingml/diagram/diagram.cxx        |    3 ---
 oox/source/drawingml/diagram/diagram.hxx        |    2 --
 oox/source/drawingml/table/tableproperties.cxx  |    4 ----
 oox/source/drawingml/theme.cxx                  |    5 -----
 unusedcode.easy                                 |    4 ----
 9 files changed, 32 deletions(-)

New commits:
commit 02f1aad7003703cf604c5c46da82cf0f46c7f709
Author: Mariana Marasoiu <mariana.marasoiu at gmail.com>
Date:   Wed Mar 14 01:34:42 2012 +0200

    Remove unused code in drawingml/table.

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 11e3bac..5e63e06 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -907,7 +907,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&)
commit 238944f008610d7faeab473c9b26ad04fc024429
Author: Mariana Marasoiu <mariana.marasoiu at gmail.com>
Date:   Wed Mar 14 01:25:57 2012 +0200

    Remove unused code in drawingml/theme.

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 97d0fb5..11e3bac 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -901,7 +901,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&)
commit f8c476f70c2315594dff38a5f36eb55673836080
Author: Mariana Marasoiu <mariana.marasoiu at gmail.com>
Date:   Wed Mar 14 01:15:11 2012 +0200

    Remove unused code in drawingml/diagram.

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 4c2b487..97d0fb5 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -898,7 +898,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
commit 0b54154f53ff06d205671fa3e3698d72f3bb6f64
Author: Mariana Marasoiu <mariana.marasoiu at gmail.com>
Date:   Wed Mar 14 01:07:16 2012 +0200

    Remove unused code in drawingml.

diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx
index 957a32a..16ef7a7 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -156,7 +156,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 dbe22fb..4c2b487 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -898,7 +898,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


More information about the Libreoffice-commits mailing list