[Libreoffice-commits] .: 2 commits - sc/inc sc/source

[Thomas Arnhold]

 sc/inc/document.hxx                     |    1 -
 sc/source/core/data/documen2.cxx        |    4 ----
 sc/source/filter/inc/drawingmanager.hxx |    9 ---------
 sc/source/filter/oox/drawingmanager.cxx |   16 ----------------
 sc/source/ui/view/tabvwsh5.cxx          |    4 ----
 5 files changed, 34 deletions(-)

New commits:
commit 96caa3b7aea151744c5fa9ba4a4a940817e12531
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Jun 7 18:26:35 2012 +0200

    dead code: unused Biff virtuals
    
    Change-Id: I67ac9c0f3c7d6cd4c6c17e774fc11655341a3d4f

diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index f79a7b3..4b39755 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -147,15 +147,6 @@ protected:
     /** Converts the passed fill formatting to the passed property map. */
     void                convertFillProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjFillModel& rFillModel ) const;
 
-    /** Derived classes read the contents of the a BIFF3 OBJ record from the passed stream. */
-    virtual void        implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
-    /** Derived classes read the contents of the a BIFF4 OBJ record from the passed stream. */
-    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
-    /** Derived classes read the contents of the a BIFF5 OBJ record from the passed stream. */
-    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
-    /** Derived classes read the contents of the specified subrecord of a BIFF8 OBJ record from stream. */
-    virtual void        implReadObjBiff8SubRec( BiffInputStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize );
-
     /** Derived classes create the corresponding XShape and insert it into the passed container. */
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
                         implConvertAndInsert( BiffDrawingBase& rDrawing,
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 25d166b..37eecb3 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -476,22 +476,6 @@ void BiffDrawingObjectBase::convertFillProperties( ShapePropertyMap& rPropMap, c
     aFillProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() );
 }
 
-void BiffDrawingObjectBase::implReadObjBiff3( BiffInputStream& /*rStrm*/, sal_uInt16 /*nMacroSize*/ )
-{
-}
-
-void BiffDrawingObjectBase::implReadObjBiff4( BiffInputStream& /*rStrm*/, sal_uInt16 /*nMacroSize*/ )
-{
-}
-
-void BiffDrawingObjectBase::implReadObjBiff5( BiffInputStream& /*rStrm*/, sal_uInt16 /*nNameLen*/, sal_uInt16 /*nMacroSize*/ )
-{
-}
-
-void BiffDrawingObjectBase::implReadObjBiff8SubRec( BiffInputStream& /*rStrm*/, sal_uInt16 /*nSubRecId*/, sal_uInt16 /*nSubRecSize*/ )
-{
-}
-
 // ============================================================================
 // BIFF drawing page
 // ============================================================================
commit 3a774815a24d3f55a64d901a1266e4543a2a2930
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Thu Jun 7 19:42:29 2012 +0200

    dead code: ScDocument::DeleteNumberFormat
    
    Thanks to Daniel Bankston for reviewing :)
    
    Change-Id: I7235520aa9d2cc95ac71e783f851b89d8598c17f

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5508c32..90d2f76 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1266,7 +1266,6 @@ public:
                                     bool bPutToPool = false );
     SC_DLLPUBLIC void           SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr,
                                     bool bPutToPool = false );
-    void            DeleteNumberFormat( const sal_uInt32* pDelKeys, sal_uInt32 nCount );
 
     void            AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
                                     sal_uInt16 nFormatNo, const ScMarkData& rMark );
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index dd9b048..9125e8a 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -584,10 +584,6 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab )
     }
 }
 
-void ScDocument::DeleteNumberFormat( const sal_uInt32* /* pDelKeys */, sal_uInt32 /* nCount */ )
-{
-}
-
 void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
                           ScBaseCell* pCell, sal_uLong nFormatIndex, bool bForceTab )
 {
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 87bc8c7..7acaa96 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -425,10 +425,6 @@ void ScTabViewShell::UpdateNumberFormatter(
         for ( sal_uInt16 i=0; i<nDelCount; i++ )
             rInfoItem.GetNumberFormatter()->DeleteEntry( pDelArr[i] );
     }
-
-    // sollte besser UpdateNumberFormats() heissen ?
-    pDoc->DeleteNumberFormat( rInfoItem.GetDelArray(),
-                              rInfoItem.GetDelCount() );
 }