[Libreoffice-commits] .: sc/source unusedcode.easy

[Matus Kukan]

 sc/source/filter/inc/drawingmanager.hxx |   30 --------------
 sc/source/filter/oox/drawingmanager.cxx |   68 --------------------------------
 unusedcode.easy                         |    1 
 3 files changed, 99 deletions(-)

New commits:
commit 7099da8058b5ca6ed681745e8049d095fd38294e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sun May 6 14:16:22 2012 +0200

    unusedcode: BiffGroupObject
    
    Change-Id: I13d969511dfb8cb87a88be47c72de4d882247f46

diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 7021b38..6a1953c 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -196,36 +196,6 @@ private:
 };
 
 // ============================================================================
-
-/** A group object that is able to contain other child objects. */
-class BiffGroupObject : public BiffDrawingObjectBase
-{
-public:
-    explicit            BiffGroupObject( const WorksheetHelper& rHelper );
-
-    /** Tries to insert the passed drawing object into this or a nested group. */
-    bool                tryInsert( const BiffDrawingObjectRef& rxDrawingObj );
-
-protected:
-    /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
-    virtual void        implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
-    /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
-    virtual void        implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
-    /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
-    virtual void        implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
-
-    /** Creates the corresponding XShape and insert it into the passed container. */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-                        implConvertAndInsert( BiffDrawingBase& rDrawing,
-                            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
-                            const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
-protected:
-    BiffDrawingObjectContainer maChildren;     /// All child objects contained in this group object.
-    sal_uInt16          mnFirstUngrouped;   /// Object identfier of first object not grouped into this group.
-};
-
-// ============================================================================
 // BIFF drawing page
 // ============================================================================
 
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 2d081ac..9f6f31d 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -221,10 +221,6 @@ BiffDrawingObjectContainer::BiffDrawingObjectContainer()
 
 void BiffDrawingObjectContainer::insertGrouped( const BiffDrawingObjectRef& rxDrawingObj )
 {
-    if( !maObjects.empty() )
-        if( BiffGroupObject* pGroupObj = dynamic_cast< BiffGroupObject* >( maObjects.back().get() ) )
-            if( pGroupObj->tryInsert( rxDrawingObj ) )
-                return;
     maObjects.push_back( rxDrawingObj );
 }
 
@@ -536,70 +532,6 @@ void BiffDrawingObjectBase::implReadObjBiff8SubRec( BiffInputStream& /*rStrm*/,
 }
 
 // ============================================================================
-
-BiffGroupObject::BiffGroupObject( const WorksheetHelper& rHelper ) :
-    BiffDrawingObjectBase( rHelper ),
-    mnFirstUngrouped( BIFF_OBJ_INVALID_ID )
-{
-}
-
-bool BiffGroupObject::tryInsert( const BiffDrawingObjectRef& rxDrawingObj )
-{
-    if( rxDrawingObj->getObjId() == mnFirstUngrouped )
-        return false;
-    // insert into own list or into nested group
-    maChildren.insertGrouped( rxDrawingObj );
-    return true;
-}
-
-void BiffGroupObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
-    rStrm.skip( 4 );
-    rStrm >> mnFirstUngrouped;
-    rStrm.skip( 16 );
-    readMacroBiff3( rStrm, nMacroSize );
-}
-
-void BiffGroupObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
-    rStrm.skip( 4 );
-    rStrm >> mnFirstUngrouped;
-    rStrm.skip( 16 );
-    readMacroBiff4( rStrm, nMacroSize );
-}
-
-void BiffGroupObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
-{
-    rStrm.skip( 4 );
-    rStrm >> mnFirstUngrouped;
-    rStrm.skip( 16 );
-    readNameBiff5( rStrm, nNameLen );
-    readMacroBiff5( rStrm, nMacroSize );
-}
-
-Reference< XShape > BiffGroupObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
-        const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
-{
-    Reference< XShape > xGroupShape;
-    if( !maChildren.empty() ) try
-    {
-        xGroupShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.GroupShape" ), rxShapes, rShapeRect );
-        Reference< XShapes > xChildShapes( xGroupShape, UNO_QUERY_THROW );
-        maChildren.convertAndInsert( rDrawing, xChildShapes, &rShapeRect );
-        // no child shape has been created - delete the group shape
-        if( !xChildShapes->hasElements() )
-        {
-            rxShapes->remove( xGroupShape );
-            xGroupShape.clear();
-        }
-    }
-    catch( Exception& )
-    {
-    }
-    return xGroupShape;
-}
-
-// ============================================================================
 // BIFF drawing page
 // ============================================================================
 
diff --git a/unusedcode.easy b/unusedcode.easy
index 0f931ac..6071e8a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -687,7 +687,6 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas
 nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
 nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
 oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
-oox::xls::BiffGroupObject::BiffGroupObject(oox::xls::WorksheetHelper const&)
 oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
 sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)