sc/source/filter/inc/drawingmanager.hxx | 15 --
sc/source/filter/oox/drawingmanager.cxx | 165 --------------------------------
unusedcode.easy | 3
3 files changed, 183 deletions(-)
New commits:
commit 7b0bf8878b057def9539ddde8aef790e30b58532
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Fri Apr 13 20:07:44 2012 +0200
Cleaning sc module (oox)
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index 6a713e0..c10c5b6 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -117,13 +117,6 @@ public:
explicit BiffDrawingObjectBase( const WorksheetHelper& rHelper
);
virtual ~BiffDrawingObjectBase();
- /** Reads the BIFF3 OBJ record, returns a new drawing object. */
- static BiffDrawingObjectRef importObjBiff3( const WorksheetHelper&
rHelper, BiffInputStream& rStrm );
- /** Reads the BIFF4 OBJ record, returns a new drawing object. */
- static BiffDrawingObjectRef importObjBiff4( const WorksheetHelper&
rHelper, BiffInputStream& rStrm );
- /** Reads the BIFF5 OBJ record, returns a new drawing object. */
- static BiffDrawingObjectRef importObjBiff5( const WorksheetHelper&
rHelper, BiffInputStream& rStrm );
-
/** Sets whether this is an area object (then its width and height must be
greater than 0). */
inline void setAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
/** If set to true, the object supports a simple on-click macro and/or
hyperlink. */
@@ -187,14 +180,6 @@ protected:
const ::com::sun::star::awt::Rectangle& rShapeRect
) const = 0;
private:
- /** Reads the contents of a BIFF3 OBJ record. */
- void importObjBiff3( BiffInputStream& rStrm );
- /** Reads the contents of a BIFF4 OBJ record. */
- void importObjBiff4( BiffInputStream& rStrm );
- /** Reads the contents of a BIFF5 OBJ record. */
- void importObjBiff5( BiffInputStream& rStrm );
-
-private:
ShapeAnchor maAnchor; /// Position of the drawing object.
::rtl::OUString maObjName; /// Name of the object.
::rtl::OUString maMacroName; /// Name of an attached macro.
diff --git a/sc/source/filter/oox/drawingmanager.cxx
b/sc/source/filter/oox/drawingmanager.cxx
index 1e00ff7..8c46db1 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -270,120 +270,6 @@ BiffDrawingObjectBase::~BiffDrawingObjectBase()
{
}
-/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff3( const
WorksheetHelper& rHelper, BiffInputStream& rStrm )
-{
- BiffDrawingObjectRef xDrawingObj;
-
- if( rStrm.getRemaining() >= 30 )
- {
- sal_uInt16 nObjType;
- rStrm.skip( 4 );
- rStrm >> nObjType;
- switch( nObjType )
- {
- case BIFF_OBJTYPE_GROUP: xDrawingObj.reset( new
BiffGroupObject( rHelper ) ); break;
- case BIFF_OBJTYPE_LINE: xDrawingObj.reset( new
BiffLineObject( rHelper ) ); break;
- case BIFF_OBJTYPE_RECTANGLE: xDrawingObj.reset( new
BiffRectObject( rHelper ) ); break;
- case BIFF_OBJTYPE_OVAL: xDrawingObj.reset( new
BiffOvalObject( rHelper ) ); break;
- case BIFF_OBJTYPE_ARC: xDrawingObj.reset( new
BiffArcObject( rHelper ) ); break;
-#if 0
- case BIFF_OBJTYPE_CHART: xDrawingObj.reset( new
XclImpChartObj( rHelper ) ); break;
- case BIFF_OBJTYPE_TEXT: xDrawingObj.reset( new
XclImpTextObj( rHelper ) ); break;
- case BIFF_OBJTYPE_BUTTON: xDrawingObj.reset( new
XclImpButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_PICTURE: xDrawingObj.reset( new
XclImpPictureObj( rHelper ) ); break;
-#endif
- default:
-#if 0
- OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff3 -
unknown object type" );
-#endif
- xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
- }
- }
-
- xDrawingObj->importObjBiff3( rStrm );
- return xDrawingObj;
-}
-
-/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff4( const
WorksheetHelper& rHelper, BiffInputStream& rStrm )
-{
- BiffDrawingObjectRef xDrawingObj;
-
- if( rStrm.getRemaining() >= 30 )
- {
- sal_uInt16 nObjType;
- rStrm.skip( 4 );
- rStrm >> nObjType;
- switch( nObjType )
- {
- case BIFF_OBJTYPE_GROUP: xDrawingObj.reset( new
BiffGroupObject( rHelper ) ); break;
- case BIFF_OBJTYPE_LINE: xDrawingObj.reset( new
BiffLineObject( rHelper ) ); break;
- case BIFF_OBJTYPE_RECTANGLE: xDrawingObj.reset( new
BiffRectObject( rHelper ) ); break;
- case BIFF_OBJTYPE_OVAL: xDrawingObj.reset( new
BiffOvalObject( rHelper ) ); break;
- case BIFF_OBJTYPE_ARC: xDrawingObj.reset( new
BiffArcObject( rHelper ) ); break;
- case BIFF_OBJTYPE_POLYGON: xDrawingObj.reset( new
BiffPolygonObject( rHelper ) ); break;
-#if 0
- case BIFF_OBJTYPE_CHART: xDrawingObj.reset( new
XclImpChartObj( rHelper ) ); break;
- case BIFF_OBJTYPE_TEXT: xDrawingObj.reset( new
XclImpTextObj( rHelper ) ); break;
- case BIFF_OBJTYPE_BUTTON: xDrawingObj.reset( new
XclImpButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_PICTURE: xDrawingObj.reset( new
XclImpPictureObj( rHelper ) ); break;
-#endif
- default:
-#if 0
- OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff4 -
unknown object type" );
-#endif
- xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
- }
- }
-
- xDrawingObj->importObjBiff4( rStrm );
- return xDrawingObj;
-}
-
-/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff5( const
WorksheetHelper& rHelper, BiffInputStream& rStrm )
-{
- BiffDrawingObjectRef xDrawingObj;
-
- if( rStrm.getRemaining() >= 34 )
- {
- sal_uInt16 nObjType;
- rStrm.skip( 4 );
- rStrm >> nObjType;
- switch( nObjType )
- {
- case BIFF_OBJTYPE_GROUP: xDrawingObj.reset( new
BiffGroupObject( rHelper ) ); break;
- case BIFF_OBJTYPE_LINE: xDrawingObj.reset( new
BiffLineObject( rHelper ) ); break;
- case BIFF_OBJTYPE_RECTANGLE: xDrawingObj.reset( new
BiffRectObject( rHelper ) ); break;
- case BIFF_OBJTYPE_OVAL: xDrawingObj.reset( new
BiffOvalObject( rHelper ) ); break;
- case BIFF_OBJTYPE_ARC: xDrawingObj.reset( new
BiffArcObject( rHelper ) ); break;
- case BIFF_OBJTYPE_POLYGON: xDrawingObj.reset( new
BiffPolygonObject( rHelper ) ); break;
-#if 0
- case BIFF_OBJTYPE_CHART: xDrawingObj.reset( new
XclImpChartObj( rHelper ) ); break;
- case BIFF_OBJTYPE_TEXT: xDrawingObj.reset( new
XclImpTextObj( rHelper ) ); break;
- case BIFF_OBJTYPE_BUTTON: xDrawingObj.reset( new
XclImpButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_PICTURE: xDrawingObj.reset( new
XclImpPictureObj( rHelper ) ); break;
- case BIFF_OBJTYPE_CHECKBOX: xDrawingObj.reset( new
XclImpCheckBoxObj( rHelper ) ); break;
- case BIFF_OBJTYPE_OPTIONBUTTON: xDrawingObj.reset( new
XclImpOptionButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_EDIT: xDrawingObj.reset( new
XclImpEditObj( rHelper ) ); break;
- case BIFF_OBJTYPE_LABEL: xDrawingObj.reset( new
XclImpLabelObj( rHelper ) ); break;
- case BIFF_OBJTYPE_DIALOG: xDrawingObj.reset( new
XclImpDialogObj( rHelper ) ); break;
- case BIFF_OBJTYPE_SPIN: xDrawingObj.reset( new
XclImpSpinButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_SCROLLBAR: xDrawingObj.reset( new
XclImpScrollBarObj( rHelper ) ); break;
- case BIFF_OBJTYPE_LISTBOX: xDrawingObj.reset( new
XclImpListBoxObj( rHelper ) ); break;
- case BIFF_OBJTYPE_GROUPBOX: xDrawingObj.reset( new
XclImpGroupBoxObj( rHelper ) ); break;
- case BIFF_OBJTYPE_DROPDOWN: xDrawingObj.reset( new
XclImpDropDownObj( rHelper ) ); break;
-#endif
- default:
-#if 0
- OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff5 -
unknown object type" );
-#endif
- xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
- }
- }
-
- xDrawingObj->importObjBiff5( rStrm );
- return xDrawingObj;
-}
-
Reference< XShape > BiffDrawingObjectBase::convertAndInsert( BiffDrawingBase&
rDrawing,
const Reference< XShapes >& rxShapes, const Rectangle* pParentRect )
const
{
@@ -666,57 +552,6 @@ void BiffDrawingObjectBase::implReadObjBiff8SubRec(
BiffInputStream& /*rStrm*/,
// private --------------------------------------------------------------------
-void BiffDrawingObjectBase::importObjBiff3( BiffInputStream& rStrm )
-{
- // back to offset 4 (ignore object count field)
- rStrm.seek( 4 );
-
- sal_uInt16 nObjFlags, nMacroSize;
- rStrm >> mnObjType >> mnObjId >> nObjFlags >> maAnchor >> nMacroSize;
- rStrm.skip( 2 );
-
- mbHasAnchor = true;
- mbHidden = getFlag( nObjFlags, BIFF_OBJ_HIDDEN );
- mbVisible = getFlag( nObjFlags, BIFF_OBJ_VISIBLE );
- implReadObjBiff3( rStrm, nMacroSize );
-}
-
-void BiffDrawingObjectBase::importObjBiff4( BiffInputStream& rStrm )
-{
- // back to offset 4 (ignore object count field)
- rStrm.seek( 4 );
-
- sal_uInt16 nObjFlags, nMacroSize;
- rStrm >> mnObjType >> mnObjId >> nObjFlags >> maAnchor >> nMacroSize;
- rStrm.skip( 2 );
-
- mbHasAnchor = true;
- mbHidden = getFlag( nObjFlags, BIFF_OBJ_HIDDEN );
- mbVisible = getFlag( nObjFlags, BIFF_OBJ_VISIBLE );
- mbPrintable = getFlag( nObjFlags, BIFF_OBJ_PRINTABLE );
- implReadObjBiff4( rStrm, nMacroSize );
-}
-
-void BiffDrawingObjectBase::importObjBiff5( BiffInputStream& rStrm )
-{
- // back to offset 4 (ignore object count field)
- rStrm.seek( 4 );
-
- sal_uInt16 nObjFlags, nMacroSize, nNameLen;
- rStrm >> mnObjType >> mnObjId >> nObjFlags >> maAnchor >> nMacroSize;
- rStrm.skip( 2 );
- rStrm >> nNameLen;
- rStrm.skip( 2 );
-
- mbHasAnchor = true;
- mbHidden = getFlag( nObjFlags, BIFF_OBJ_HIDDEN );
- mbVisible = getFlag( nObjFlags, BIFF_OBJ_VISIBLE );
- mbPrintable = getFlag( nObjFlags, BIFF_OBJ_PRINTABLE );
- implReadObjBiff5( rStrm, nNameLen, nMacroSize );
-}
-
-// ============================================================================
-
BiffPlaceholderObject::BiffPlaceholderObject( const WorksheetHelper& rHelper )
:
BiffDrawingObjectBase( rHelper )
{
diff --git a/unusedcode.easy b/unusedcode.easy
index d9aa496..e24c9f9 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -760,9 +760,6 @@
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::
oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
oox::xls::BiffDecoder_RCF::BiffDecoder_RCF(unsigned char*, unsigned char*,
unsigned char*)
oox::xls::BiffDecoder_XOR::BiffDecoder_XOR(unsigned short, unsigned short)
-oox::xls::BiffDrawingObjectBase::importObjBiff3(oox::xls::WorksheetHelper
const&, oox::xls::BiffInputStream&)
-oox::xls::BiffDrawingObjectBase::importObjBiff4(oox::xls::WorksheetHelper
const&, oox::xls::BiffInputStream&)
-oox::xls::BiffDrawingObjectBase::importObjBiff5(oox::xls::WorksheetHelper
const&, oox::xls::BiffInputStream&)
oox::xls::BiffHelper::calcTextEncodingFromCodePage(unsigned short)
oox::xls::BiffWorkbookContextBase::BiffWorkbookContextBase(oox::xls::WorkbookHelper
const&)
oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&,
oox::ValueRange const&, int)
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
