summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-10 10:18:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-10 10:18:33 +0100
commit4453b52924db6ed8843f7dce1b0664cdce387742 (patch)
tree3a6e40b8693898fcf903cef52ac109b3482499ef /sc
parent7080d629c82422a419d38051536c7711f8abe53e (diff)
callcatcher: update unused code list
Change-Id: I286988eabcc2d813008597b3657c366d510f8ab6
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/inc/drawingmanager.hxx20
-rw-r--r--sc/source/filter/oox/drawingmanager.cxx60
2 files changed, 0 insertions, 80 deletions
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 6a1953c84a42..f79a7b3b23c5 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -92,9 +92,6 @@ public:
/** Returns true, if the object list is empty. */
inline bool empty() const { return maObjects.empty(); }
- /** Tries to insert the passed object into the last group or appends it. */
- void insertGrouped( const BiffDrawingObjectRef& rxDrawingObj );
-
/** Creates and inserts all UNO shapes into the passed shape container. */
void convertAndInsert( BiffDrawingBase& rDrawing,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
@@ -145,15 +142,6 @@ public:
const ::com::sun::star::awt::Rectangle* pParentRect = 0 ) const;
protected:
- /** Reads the object name in a BIFF5 OBJ record. */
- void readNameBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen );
- /** Reads the macro link in a BIFF3 OBJ record. */
- void readMacroBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the macro link in a BIFF4 OBJ record. */
- void readMacroBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the macro link in a BIFF5 OBJ record. */
- void readMacroBiff5( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
-
/** Converts the passed line formatting to the passed property map. */
void convertLineProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows = 0 ) const;
/** Converts the passed fill formatting to the passed property map. */
@@ -225,14 +213,6 @@ public:
/** Final processing after import of the all drawing objects. */
void finalizeImport();
- /** Creates a new UNO shape object, inserts it into the passed UNO shape
- container, and sets the shape position and size. */
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- createAndInsertXShape(
- const ::rtl::OUString& rService,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
/** Derived classes may want to know that a shape has been inserted. Will
be called from the convertAndInsert() implementation. */
virtual void notifyShapeInserted(
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 9f6f31de78a7..25d166be241d 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -219,11 +219,6 @@ BiffDrawingObjectContainer::BiffDrawingObjectContainer()
{
}
-void BiffDrawingObjectContainer::insertGrouped( const BiffDrawingObjectRef& rxDrawingObj )
-{
- maObjects.push_back( rxDrawingObj );
-}
-
void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
{
maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert, ::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect );
@@ -281,40 +276,6 @@ Reference< XShape > BiffDrawingObjectBase::convertAndInsert( BiffDrawingBase& rD
return xShape;
}
-// protected ------------------------------------------------------------------
-
-void BiffDrawingObjectBase::readNameBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen )
-{
- maObjName = OUString();
- if( nNameLen > 0 )
- {
- // name length field is repeated before the name
- maObjName = rStrm.readByteStringUC( false, getTextEncoding() );
- // skip padding byte for word boundaries
- rStrm.alignToBlock( 2 );
- }
-}
-
-void BiffDrawingObjectBase::readMacroBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
- // skip padding byte for word boundaries, not contained in nMacroSize
- rStrm.alignToBlock( 2 );
-}
-
-void BiffDrawingObjectBase::readMacroBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
-}
-
-void BiffDrawingObjectBase::readMacroBiff5( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
-}
-
void BiffDrawingObjectBase::convertLineProperties( ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows ) const
{
if( rLineModel.mbAuto )
@@ -557,27 +518,6 @@ void BiffDrawingBase::finalizeImport()
maRawObjs.convertAndInsert( *this, xShapes );
}
-Reference< XShape > BiffDrawingBase::createAndInsertXShape( const OUString& rService,
- const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
-{
- OSL_ENSURE( !rService.isEmpty(), "BiffDrawingBase::createAndInsertXShape - missing UNO shape service name" );
- OSL_ENSURE( rxShapes.is(), "BiffDrawingBase::createAndInsertXShape - missing XShapes container" );
- Reference< XShape > xShape;
- if( !rService.isEmpty() && rxShapes.is() ) try
- {
- xShape.set( getBaseFilter().getModelFactory()->createInstance( rService ), UNO_QUERY_THROW );
- // insert shape into passed shape collection (maybe drawpage or group shape)
- rxShapes->add( xShape );
- xShape->setPosition( Point( rShapeRect.X, rShapeRect.Y ) );
- xShape->setSize( Size( rShapeRect.Width, rShapeRect.Height ) );
- }
- catch( Exception& )
- {
- }
- OSL_ENSURE( xShape.is(), "BiffDrawingBase::createAndInsertXShape - cannot instanciate shape object" );
- return xShape;
-}
-
// ============================================================================
BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) :