diff options
31 files changed, 13 insertions, 739 deletions
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 24f39cbc2423..ff11b0037f6b 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -426,29 +426,6 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>() ); - /** returns the statement which is composed from the current settings of a row set - - If the row set is currently not connected, it is attempted to do so with it's current settings. - (TODO: isn't this a resource leak? Do we really need this behaviour?). - - @param _rxRowSet - the row set whose settings should be examined. Must not be <NULL/> - @param _rxFactory - a service factory which may be needed to connect the row set - @param _bUseRowSetFilter - If <TRUE/>, the <b>Filter</b> property of the row set will also be examined. In case it is - not empty, and <b>ApplyFilter</b> is <TRUE/>, it will also be added to the composed statement. - @param _bUseRowSetOrder - If <TRUE/>, the <b>Order</b> property of the row set will also be examined. In case it is - not empty, it will also be added to the composed statement. - */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getComposedRowSetStatement( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRowSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, - sal_Bool _bUseRowSetFilter = sal_True, - sal_Bool _bUseRowSetOrder = sal_True - ) SAL_THROW( ( ::com::sun::star::sdbc::SQLException ) ); - /** create an <type scope="com::sun::star::sdb">XSingleSelectQueryComposer</type> which represents the current settings (Command/CommandType/Filter/Order) of the given rowset. diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index a4aeb5649ada..6b5c891769be 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1359,14 +1359,6 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) } //------------------------------------------------------------------------------ -::rtl::OUString getComposedRowSetStatement( - const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory, - sal_Bool _bUseRowSetFilter, sal_Bool _bUseRowSetOrder ) -{ - return getComposedRowSetStatement( _rxRowSet, _rxFactory, _bUseRowSetFilter, _bUseRowSetOrder, NULL ); -} - -//------------------------------------------------------------------------------ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer( const Reference< XPropertySet>& _rxRowSetProps, const Reference< XMultiServiceFactory>& _rxFactory) diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 10995ef000af..83aa0a91b661 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -377,9 +377,6 @@ public: static void appendAddrCol( ::rtl::OUStringBuffer& rStr, sal_Int32 nCol, bool bRel ); static void appendAddrRow( ::rtl::OUStringBuffer& rStr, sal_Int32 nRow, bool bRel ); - static void appendAddrName( ::rtl::OUStringBuffer& rStr, sal_Unicode cPrefix, sal_Int32 nColRow, bool bRel ); - - static void appendAddress( ::rtl::OUStringBuffer& rStr, const Address& rPos ); // encoded text output ---------------------------------------------------- diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index d7cc27d6141d..dea344525299 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -485,25 +485,6 @@ void StringHelper::appendAddrRow( OUStringBuffer& rStr, sal_Int32 nRow, bool bRe appendDec( rStr, nRow + 1 ); } -void StringHelper::appendAddrName( OUStringBuffer& rStr, sal_Unicode cPrefix, sal_Int32 nColRow, bool bRel ) -{ - rStr.append( cPrefix ); - if( bRel && (nColRow != 0) ) - { - rStr.append( OOX_DUMP_R1C1OPEN ); - appendDec( rStr, nColRow ); - rStr.append( OOX_DUMP_R1C1CLOSE ); - } - else if( !bRel ) - appendDec( rStr, nColRow + 1 ); -} - -void StringHelper::appendAddress( OUStringBuffer& rStr, const Address& rPos ) -{ - appendAddrCol( rStr, rPos.mnCol, true ); - appendAddrRow( rStr, rPos.mnRow, true ); -} - // encoded text output -------------------------------------------------------- void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix ) diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 0354e31cc4ca..af4f8e403be3 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -163,7 +163,6 @@ public: inline explicit BinRangeList() {} void read( SequenceInputStream& rStrm ); - void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 704df9fdbd98..6b1631cbb80b 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -94,9 +94,6 @@ typedef ::boost::shared_ptr< BiffDecoderBase > BiffDecoderRef; /** Decodes BIFF stream contents that are encoded using the old XOR algorithm. */ class BiffDecoder_XOR : public BiffDecoderBase { -public: - explicit BiffDecoder_XOR( sal_uInt16 nKey, sal_uInt16 nHash ); - private: /** Copy constructor for cloning. */ BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ); @@ -128,12 +125,6 @@ private: /** Decodes BIFF stream contents that are encoded using the RC4 algorithm. */ class BiffDecoder_RCF : public BiffDecoderBase { -public: - explicit BiffDecoder_RCF( - sal_uInt8 pnSalt[ 16 ], - sal_uInt8 pnVerifier[ 16 ], - sal_uInt8 pnVerifierHash[ 16 ] ); - private: /** Copy constructor for cloning. */ BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ); diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index 50dba76b3c67..43250681888b 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -130,11 +130,6 @@ public: /** Imports a web query table identifier from the PCITEM_MISSING, PCITEM_STRING, or PCITEM_INDEX record. */ void importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId ); - /** Imports connection settings from the DBQUERY record. */ - void importDbQuery( BiffInputStream& rStrm ); - /** Imports connection settings from the QUERYTABLESETTINGS record. */ - void importQueryTableSettings( BiffInputStream& rStrm ); - /** Returns the unique connection identifier. */ inline sal_Int32 getConnectionId() const { return maModel.mnId; } /** Returns the source data type of the connection. */ @@ -157,8 +152,6 @@ public: /** Creates a new empty connection. */ Connection& createConnection(); - /** Creates a new empty connection with a valid but unused identifier. */ - Connection& createConnectionWithId(); /** Maps all connections by their identifier. */ void finalizeImport(); diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index 4c4769390ed3..339d1b52b3f4 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -102,8 +102,6 @@ public: void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue ); /** Imports the client anchor settings from a VML element. */ void importVmlAnchor( const ::rtl::OUString& rAnchor ); - /** Imports the client anchor settings from a BIFF or DFF stream. */ - void importBiffAnchor( BinaryInputStream& rStrm ); /** Calculates the resulting shape anchor in EMUs. */ ::oox::drawingml::EmuRectangle calcAnchorRectEmu( diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index c10c5b6458fa..e0a80cefad8f 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -202,22 +202,6 @@ private: // ============================================================================ -/** A placeholder object for unknown/unsupported object types. */ -class BiffPlaceholderObject : public BiffDrawingObjectBase -{ -public: - explicit BiffPlaceholderObject( const WorksheetHelper& rHelper ); - -protected: - /** 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; -}; - -// ============================================================================ - /** A group object that is able to contain other child objects. */ class BiffGroupObject : public BiffDrawingObjectBase { @@ -246,36 +230,6 @@ protected: sal_uInt16 mnFirstUngrouped; /// Object identfier of first object not grouped into this group. }; -// ============================================================================ - -/** A simple line object. */ -class BiffLineObject : public BiffDrawingObjectBase -{ -public: - explicit BiffLineObject( const WorksheetHelper& rHelper ); - -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: - BiffObjLineModel maLineModel; /// Line formatting. - sal_uInt16 mnArrows; /// Line arrows. - sal_uInt8 mnStartPoint; /// Starting point. -}; - -// ============================================================================ - /** A simple rectangle object (used as base class for oval objects). */ class BiffRectObject : public BiffDrawingObjectBase { @@ -309,81 +263,6 @@ protected: }; // ============================================================================ - -/** A simple oval object. */ -class BiffOvalObject : public BiffRectObject -{ -public: - explicit BiffOvalObject( const WorksheetHelper& rHelper ); - -protected: - /** 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; -}; - -// ============================================================================ - -/** A simple arc object. */ -class BiffArcObject : public BiffDrawingObjectBase -{ -public: - explicit BiffArcObject( const WorksheetHelper& rHelper ); - -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: - BiffObjFillModel maFillModel; /// Fill formatting. - BiffObjLineModel maLineModel; /// Line formatting. - sal_uInt8 mnQuadrant; /// Visible quadrant of the circle. -}; - -// ============================================================================ - -/** A simple polygon object. */ -class BiffPolygonObject : public BiffRectObject -{ -public: - explicit BiffPolygonObject( const WorksheetHelper& rHelper ); - -protected: - /** 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; - -private: - /** Reads the COORDLIST record following the OBJ record. */ - void importCoordList( BiffInputStream& rStrm ); - -protected: - typedef ::std::vector< ::com::sun::star::awt::Point > PointVector; - PointVector maCoords; /// Coordinates relative to bounding rectangle. - sal_uInt16 mnPolyFlags; /// Additional flags. - sal_uInt16 mnPointCount; /// Polygon point count. -}; - -// ============================================================================ // BIFF drawing page // ============================================================================ diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 56e47fddcf64..53f6bcecc17c 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -111,18 +111,6 @@ public: // ---------------------------------------------------------------------------- -/** Context handler derived from the WorkbookHelper helper class. - - Used to import contexts in global workbook fragments. - */ -class BiffWorkbookContextBase : public BiffContextHandler, public WorkbookHelper -{ -protected: - explicit BiffWorkbookContextBase( const WorkbookHelper& rHelper ); -}; - -// ---------------------------------------------------------------------------- - /** Context handler derived from the WorksheetHelper helper class. Used to import contexts in sheet fragments. diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index ee19fd21950c..2ea0e6bd3ffb 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -118,8 +118,6 @@ public: ::rtl::OUString& orDdeItem ); private: - /** Tries to convert the passed token sequence to an ExternalReference. */ - void extractExternalReference( const ApiTokenSequence& rTokens ); /** Sets the size of the result matrix. */ void setResultSize( sal_Int32 nColumns, sal_Int32 nRows ); diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index 31be3e431587..e666b14680f2 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -455,8 +455,6 @@ public: WorksheetHelper& rSheetHelper, sal_Int32 nRowIdx ) const; private: - /** Reads the sheet name and URL from the DCONREF, DCONNAME, or DCONBINAME records. */ - void importDConUrl( BiffInputStream& rStrm ); /** Finalizes the pivot cache if it is based on internal sheet data. */ void finalizeInternalSheetSource(); diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index a907b3f8e319..3f7125671dde 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -154,9 +154,6 @@ public: /** Imports pivot field item reference settings from the PTREFERENCEITEM record. */ void importPTReferenceItem( SequenceInputStream& rStrm ); - /** Imports settings of an item in this pivot field from the PTFITEM record. */ - void importPTFItem( BiffInputStream& rStrm ); - /** Finalizes the field after import, creates grouping and other settings. */ void finalizeImport( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XDataPilotDescriptor >& rxDPDesc ); diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 95dd4f542d3a..9731e23f034c 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -167,8 +167,6 @@ public: /** Imports phonetic settings from a rich string. */ void importStringData( SequenceInputStream& rStrm ); - /** Imports phonetic settings from a rich string. */ - void importStringData( BiffInputStream& rStrm ); private: PhoneticDataModel maModel; @@ -277,8 +275,6 @@ private: RichStringPhoneticRef createPhonetic(); /** Create base text portions from the passed string and character formatting. */ - void createTextPortions( const ::rtl::OString& rText, rtl_TextEncoding eTextEnc, FontPortionModelList& rPortions ); - /** Create base text portions from the passed string and character formatting. */ void createTextPortions( const ::rtl::OUString& rText, FontPortionModelList& rPortions ); /** Create phonetic text portions from the passed string and portion data. */ void createPhoneticPortions( const ::rtl::OUString& rText, PhoneticPortionModelList& rPortions, sal_Int32 nBaseLen ); diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 511fc1348d92..02bfe3c0ca6f 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -122,9 +122,6 @@ public: /** Imports a 32-bit palette color identifier from the passed BIFF12 stream. */ void importColorId( SequenceInputStream& rStrm ); - /** Imports an 8-bit or 16-bit palette color identifier from the passed BIFF stream. */ - void importColorId( BiffInputStream& rStrm, bool b16Bit = true ); - /** Returns true, if the color is set to automatic. */ inline bool isAuto() const { return isPlaceHolder(); } }; @@ -337,8 +334,6 @@ struct AlignmentModel void setBiffHorAlign( sal_uInt8 nHorAlign ); /** Sets vertical alignment from the passed BIFF data. */ void setBiffVerAlign( sal_uInt8 nVerAlign ); - /** Sets rotation from the passed BIFF text orientation. */ - void setBiffTextOrient( sal_uInt8 nTextOrient ); }; // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index f66b8725d2c2..e527a72e40db 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -68,9 +68,6 @@ class WorksheetBuffer : public WorkbookHelper public: explicit WorksheetBuffer( const WorkbookHelper& rHelper ); - /** Returns the base file name without path and file extension. */ - static ::rtl::OUString getBaseFileName( const ::rtl::OUString& rUrl ); - /** Imports the attributes of a sheet element. */ void importSheet( const AttributeList& rAttribs ); /** Imports the SHEET record from the passed BIFF12 stream. */ diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index e6063962fbc9..90c916ce1036 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -158,14 +158,6 @@ void BinRangeList::read( SequenceInputStream& rStrm ) aIt->read( rStrm ); } -void BinRangeList::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) -{ - sal_uInt16 nCount = rStrm.readuInt16(); - resize( getLimitedValue< size_t, sal_Int64 >( nCount, 0, rStrm.getRemaining() / lclGetBiffRangeSize( bCol16Bit, bRow32Bit ) ) ); - for( iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt ) - aIt->read( rStrm, bCol16Bit, bRow32Bit ); -} - // ============================================================================ AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) : diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index c0f149814ae5..c2030da6fd1a 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -83,13 +83,6 @@ void BiffDecoderBase::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, // ============================================================================ -BiffDecoder_XOR::BiffDecoder_XOR( sal_uInt16 nKey, sal_uInt16 nHash ) : - maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ), - mnKey( nKey ), - mnHash( nHash ) -{ -} - BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ), @@ -169,13 +162,6 @@ sal_Int32 lclGetRcfOffset( sal_Int64 nStreamPos ) // ---------------------------------------------------------------------------- -BiffDecoder_RCF::BiffDecoder_RCF( sal_uInt8 pnSalt[ 16 ], sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) : - maSalt( pnSalt, pnSalt + 16 ), - maVerifier( pnVerifier, pnVerifier + 16 ), - maVerifierHash( pnVerifierHash, pnVerifierHash + 16 ) -{ -} - BiffDecoder_RCF::BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning maEncryptionData( rDecoder.maEncryptionData ), diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index e9946a809ecf..32217bf224c9 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -375,82 +375,6 @@ void Connection::importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId } } -void Connection::importDbQuery( BiffInputStream& rStrm ) -{ - sal_uInt16 nFlags, nSqlParamCount, nCommandCount, nPostMethodCount, nServerSqlCount, nOdbcConnCount; - rStrm >> nFlags >> nSqlParamCount >> nCommandCount >> nPostMethodCount >> nServerSqlCount >> nOdbcConnCount; - - // same type constants in all BIFF versions - maModel.mnType = extractValue< sal_Int32 >( nFlags, 0, 3 ); - maModel.mbSavePassword = getFlag( nFlags, BIFF_DBQUERY_SAVEPASSWORD ); - - OSL_ENSURE( getFlag( nFlags, BIFF_DBQUERY_ODBC ) == (maModel.mnType == BIFF12_CONNECTION_ODBC), "Connection::importDbQuery - wrong ODBC flag" ); - OSL_ENSURE( getFlag( nFlags, BIFF_DBQUERY_SQLQUERY ) != (maModel.mnType == BIFF12_CONNECTION_HTML), "Connection::importDbQuery - wrong SQL query flag" ); - OSL_ENSURE( getFlag( nFlags, BIFF_DBQUERY_HTML ) == (maModel.mnType == BIFF12_CONNECTION_HTML), "Connection::importDbQuery - wrong HTML flag" ); - - if( (maModel.mnType == BIFF12_CONNECTION_HTML) && getFlag( nFlags, BIFF_DBQUERY_HTML ) ) - { - WebPrModel& rWebPr = maModel.createWebPr(); - rWebPr.mbHtmlTables = getFlag( nFlags, BIFF_DBQUERY_HTMLTABLES ); - - // read HTML query URL and post method - rWebPr.maUrl = lclReadQueryString( rStrm, nCommandCount ); - rWebPr.maPostMethod = lclReadQueryString( rStrm, nPostMethodCount ); - } -} - -void Connection::importQueryTableSettings( BiffInputStream& rStrm ) -{ - rStrm.skip( 4 ); - // source data type, again - sal_uInt16 nType = rStrm.readuInt16(); - OSL_ENSURE( nType == maModel.mnType, "Connection::importQueryTableSettings - source data type mismatch" ); - if( nType == maModel.mnType ) - { - sal_uInt16 nFlags1, nFlags2, nFlags3, nHtmlFormat; - rStrm >> nFlags1 >> nFlags2 >> nFlags3; - rStrm.skip( 10 ); - maModel.mnInterval = rStrm.readuInt16(); - rStrm >> nHtmlFormat; - - // first flags field: generic connection flags - maModel.mbKeepAlive = getFlag( nFlags1, BIFF_QTSETTINGS_KEEPALIVE ); - maModel.mbNew = getFlag( nFlags1, BIFF_QTSETTINGS_NEW ); - - // meaning of second flags field is dependent on source data type - if( (maModel.mnType == BIFF12_CONNECTION_HTML) && maModel.mxWebPr.get() ) - { - WebPrModel& rWebPr = *maModel.mxWebPr; - - // HTML format is one-based in BIFF8 (but zero-based in BIFF12) - static const sal_Int32 spnHmlFormats[] = { XML_none, XML_none, XML_rtf, XML_all }; - rWebPr.mnHtmlFormat = STATIC_ARRAY_SELECT( spnHmlFormats, nHtmlFormat, XML_none ); - - rWebPr.mbXml = getFlag( nFlags1, BIFF_QTSETTINGS_XML ); - rWebPr.mbSourceData = getFlag( nFlags1, BIFF_QTSETTINGS_SOURCEDATA ); - rWebPr.mbParsePre = getFlag( nFlags2, BIFF_QTSETTINGS_PARSEPRE ); - rWebPr.mbConsecutive = getFlag( nFlags2, BIFF_QTSETTINGS_CONSECUTIVE ); - rWebPr.mbFirstRow = getFlag( nFlags2, BIFF_QTSETTINGS_FIRSTROW ); - rWebPr.mbXl97Created = getFlag( nFlags2, BIFF_QTSETTINGS_XL97CREATED ); - rWebPr.mbTextDates = getFlag( nFlags2, BIFF_QTSETTINGS_TEXTDATES ); - rWebPr.mbXl2000Refreshed = getFlag( nFlags2, BIFF_QTSETTINGS_XL2000REFRESHED ); - - // list of HTML table names or indexes - if( getFlag( nFlags3, BIFF_QTSETTINGS_TABLENAMES ) ) - { - // a QUERYTABLESTRING record containing the table names must follow - bool bHasQTString = (rStrm.getNextRecId() == BIFF_ID_QUERYTABLESTRING) && rStrm.startNextRecord(); - OSL_ENSURE( bHasQTString, "Connection::importQueryTableSettings - missing QUERYTABLESTRING record" ); - if( bHasQTString ) - { - rStrm.skip( 4 ); - lclParseTables( rWebPr.maTables, rStrm.readUniString() ); - } - } - } - } -} - // ============================================================================ ConnectionsBuffer::ConnectionsBuffer( const WorkbookHelper& rHelper ) : @@ -466,14 +390,6 @@ Connection& ConnectionsBuffer::createConnection() return *xConnection; } -Connection& ConnectionsBuffer::createConnectionWithId() -{ - ConnectionRef xConnection( new Connection( *this, mnUnusedId ) ); - maConnections.push_back( xConnection ); - insertConnectionToMap( xConnection ); - return *xConnection; -} - void ConnectionsBuffer::finalizeImport() { for( ConnectionVector::iterator aIt = maConnections.begin(), aEnd = maConnections.end(); aIt != aEnd; ++aIt ) diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 376476cc7ffe..330cadac1af6 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -191,13 +191,6 @@ void ShapeAnchor::importVmlAnchor( const OUString& rAnchor ) } } -void ShapeAnchor::importBiffAnchor( BinaryInputStream& rStrm ) -{ - meAnchorType = ANCHOR_TWOCELL; /// BIFF/DFF use two-cell anchors only - meCellAnchorType = CELLANCHOR_COLROW; /// BIFF/DFF use fraction of column/row for offset values - rStrm >> maFrom >> maTo; -} - EmuRectangle ShapeAnchor::calcAnchorRectEmu( const Size& rPageSizeHmm ) const { AddressConverter& rAddrConv = getAddressConverter(); diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index a667e88b727a..eeeef0cce7d2 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -544,20 +544,6 @@ void BiffDrawingObjectBase::implReadObjBiff8SubRec( BiffInputStream& /*rStrm*/, { } -// private -------------------------------------------------------------------- - -BiffPlaceholderObject::BiffPlaceholderObject( const WorksheetHelper& rHelper ) : - BiffDrawingObjectBase( rHelper ) -{ - setProcessShape( false ); -} - -Reference< XShape > BiffPlaceholderObject::implConvertAndInsert( BiffDrawingBase& /*rDrawing*/, - const Reference< XShapes >& /*rxShapes*/, const Rectangle& /*rShapeRect*/ ) const -{ - return Reference< XShape >(); -} - // ============================================================================ BiffGroupObject::BiffGroupObject( const WorksheetHelper& rHelper ) : @@ -624,70 +610,6 @@ Reference< XShape > BiffGroupObject::implConvertAndInsert( BiffDrawingBase& rDra // ============================================================================ -BiffLineObject::BiffLineObject( const WorksheetHelper& rHelper ) : - BiffDrawingObjectBase( rHelper ), - mnArrows( 0 ), - mnStartPoint( BIFF_OBJ_LINE_TL ) -{ - setAreaObj( false ); -} - -void BiffLineObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize ) -{ - rStrm >> maLineModel >> mnArrows >> mnStartPoint; - rStrm.skip( 1 ); - readMacroBiff3( rStrm, nMacroSize ); -} - -void BiffLineObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize ) -{ - rStrm >> maLineModel >> mnArrows >> mnStartPoint; - rStrm.skip( 1 ); - readMacroBiff4( rStrm, nMacroSize ); -} - -void BiffLineObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) -{ - rStrm >> maLineModel >> mnArrows >> mnStartPoint; - rStrm.skip( 1 ); - readNameBiff5( rStrm, nNameLen ); - readMacroBiff5( rStrm, nMacroSize ); -} - -Reference< XShape > BiffLineObject::implConvertAndInsert( BiffDrawingBase& rDrawing, - const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const -{ - ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() ); - convertLineProperties( aPropMap, maLineModel, mnArrows ); - - // create the line polygon - PointSequenceSequence aPoints( 1 ); - aPoints[ 0 ].realloc( 2 ); - Point& rBeg = aPoints[ 0 ][ 0 ]; - Point& rEnd = aPoints[ 0 ][ 1 ]; - sal_Int32 nL = rShapeRect.X; - sal_Int32 nT = rShapeRect.Y; - sal_Int32 nR = rShapeRect.X + ::std::max< sal_Int32 >( rShapeRect.Width - 1, 0 ); - sal_Int32 nB = rShapeRect.Y + ::std::max< sal_Int32 >( rShapeRect.Height - 1, 0 ); - switch( mnStartPoint ) - { - default: - case BIFF_OBJ_LINE_TL: rBeg.X = nL; rBeg.Y = nT; rEnd.X = nR; rEnd.Y = nB; break; - case BIFF_OBJ_LINE_TR: rBeg.X = nR; rBeg.Y = nT; rEnd.X = nL; rEnd.Y = nB; break; - case BIFF_OBJ_LINE_BR: rBeg.X = nR; rBeg.Y = nB; rEnd.X = nL; rEnd.Y = nT; break; - case BIFF_OBJ_LINE_BL: rBeg.X = nL; rBeg.Y = nB; rEnd.X = nR; rEnd.Y = nT; break; - } - aPropMap.setProperty( PROP_PolyPolygon, aPoints ); - aPropMap.setProperty( PROP_PolygonKind, PolygonKind_LINE ); - - // create the shape - Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.LineShape" ), rxShapes, rShapeRect ); - PropertySet( xShape ).setProperties( aPropMap ); - return xShape; -} - -// ============================================================================ - BiffRectObject::BiffRectObject( const WorksheetHelper& rHelper ) : BiffDrawingObjectBase( rHelper ), mnFrameFlags( 0 ) @@ -738,177 +660,6 @@ Reference< XShape > BiffRectObject::implConvertAndInsert( BiffDrawingBase& rDraw } // ============================================================================ - -BiffOvalObject::BiffOvalObject( const WorksheetHelper& rHelper ) : - BiffRectObject( rHelper ) -{ -} - -Reference< XShape > BiffOvalObject::implConvertAndInsert( BiffDrawingBase& rDrawing, - const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const -{ - ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() ); - convertRectProperties( aPropMap ); - - Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.EllipseShape" ), rxShapes, rShapeRect ); - PropertySet( xShape ).setProperties( aPropMap ); - return xShape; -} - -// ============================================================================ - -BiffArcObject::BiffArcObject( const WorksheetHelper& rHelper ) : - BiffDrawingObjectBase( rHelper ), - mnQuadrant( BIFF_OBJ_ARC_TR ) -{ - setAreaObj( false ); // arc may be 2-dimensional -} - -void BiffArcObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize ) -{ - rStrm >> maFillModel >> maLineModel >> mnQuadrant; - rStrm.skip( 1 ); - readMacroBiff3( rStrm, nMacroSize ); -} - -void BiffArcObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize ) -{ - rStrm >> maFillModel >> maLineModel >> mnQuadrant; - rStrm.skip( 1 ); - readMacroBiff4( rStrm, nMacroSize ); -} - -void BiffArcObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) -{ - rStrm >> maFillModel >> maLineModel >> mnQuadrant; - rStrm.skip( 1 ); - readNameBiff5( rStrm, nNameLen ); - readMacroBiff5( rStrm, nMacroSize ); -} - -Reference< XShape > BiffArcObject::implConvertAndInsert( BiffDrawingBase& rDrawing, - const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const -{ - ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() ); - convertLineProperties( aPropMap, maLineModel ); - convertFillProperties( aPropMap, maFillModel ); - - /* Simulate arc objects with ellipse sections. While the original arc - object uses the entire object rectangle, only one quarter of the - ellipse shape will be visible. Thus, the size of the ellipse shape - needs to be extended and its position adjusted according to the visible - quadrant. */ - Rectangle aNewRect( rShapeRect.X, rShapeRect.Y, rShapeRect.Width * 2, rShapeRect.Height * 2 ); - long nStartAngle = 0; - switch( mnQuadrant ) - { - default: - case BIFF_OBJ_ARC_TR: nStartAngle = 0; aNewRect.X -= rShapeRect.Width; break; - case BIFF_OBJ_ARC_TL: nStartAngle = 9000; break; - case BIFF_OBJ_ARC_BL: nStartAngle = 18000; aNewRect.Y -= rShapeRect.Height; break; - case BIFF_OBJ_ARC_BR: nStartAngle = 27000; aNewRect.X -= rShapeRect.Width; aNewRect.Y -= rShapeRect.Height; break; - } - long nEndAngle = (nStartAngle + 9000) % 36000; - aPropMap.setProperty( PROP_CircleKind, maFillModel.isFilled() ? CircleKind_SECTION : CircleKind_ARC ); - aPropMap.setProperty( PROP_CircleStartAngle, nStartAngle ); - aPropMap.setProperty( PROP_CircleEndAngle, nEndAngle ); - - // create the shape - Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.EllipseShape" ), rxShapes, aNewRect ); - PropertySet( xShape ).setProperties( aPropMap ); - return xShape; -} - -// ============================================================================ - -BiffPolygonObject::BiffPolygonObject( const WorksheetHelper& rHelper ) : - BiffRectObject( rHelper ), - mnPolyFlags( 0 ), - mnPointCount( 0 ) -{ - setAreaObj( false ); // polygon may be 2-dimensional -} - -void BiffPolygonObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize ) -{ - readFrameData( rStrm ); - rStrm >> mnPolyFlags; - rStrm.skip( 10 ); - rStrm >> mnPointCount; - rStrm.skip( 8 ); - readMacroBiff4( rStrm, nMacroSize ); - importCoordList( rStrm ); -} - -void BiffPolygonObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) -{ - readFrameData( rStrm ); - rStrm >> mnPolyFlags; - rStrm.skip( 10 ); - rStrm >> mnPointCount; - rStrm.skip( 8 ); - readNameBiff5( rStrm, nNameLen ); - readMacroBiff5( rStrm, nMacroSize ); - importCoordList( rStrm ); -} - -namespace { - -Point lclGetPolyPoint( const Rectangle& rAnchorRect, const Point& rPoint ) -{ - // polygon coordinates are given in 1/16384 of shape size - return Point( - rAnchorRect.X + static_cast< sal_Int32 >( rAnchorRect.Width * getLimitedValue< double >( static_cast< double >( rPoint.X ) / 16384.0, 0.0, 1.0 ) + 0.5 ), - rAnchorRect.Y + static_cast< sal_Int32 >( rAnchorRect.Height * getLimitedValue< double >( static_cast< double >( rPoint.Y ) / 16384.0, 0.0, 1.0 ) + 0.5 ) ); -} - -} // namespace - -Reference< XShape > BiffPolygonObject::implConvertAndInsert( BiffDrawingBase& rDrawing, - const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const -{ - Reference< XShape > xShape; - if( maCoords.size() >= 2 ) - { - ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() ); - convertRectProperties( aPropMap ); - - // create the polygon - PointVector aPolygon; - for( PointVector::const_iterator aIt = maCoords.begin(), aEnd = maCoords.end(); aIt != aEnd; ++aIt ) - aPolygon.push_back( lclGetPolyPoint( rShapeRect, *aIt ) ); - // close polygon if specified - if( getFlag( mnPolyFlags, BIFF_OBJ_POLY_CLOSED ) && ((maCoords.front().X != maCoords.back().X) || (maCoords.front().Y != maCoords.back().Y)) ) - aPolygon.push_back( aPolygon.front() ); - PointSequenceSequence aPoints( 1 ); - aPoints[ 0 ] = ContainerHelper::vectorToSequence( aPolygon ); - aPropMap.setProperty( PROP_PolyPolygon, aPoints ); - - // create the shape - OUString aService = maFillModel.isFilled() ? - CREATE_OUSTRING( "com.sun.star.drawing.PolyPolygonShape" ) : - CREATE_OUSTRING( "com.sun.star.drawing.PolyLineShape" ); - xShape = rDrawing.createAndInsertXShape( aService, rxShapes, rShapeRect ); - PropertySet( xShape ).setProperties( aPropMap ); - } - return xShape; -} - -void BiffPolygonObject::importCoordList( BiffInputStream& rStrm ) -{ - if( (rStrm.getNextRecId() == BIFF_ID_COORDLIST) && rStrm.startNextRecord() ) - { - OSL_ENSURE( rStrm.getRemaining() / 4 == mnPointCount, "BiffPolygonObject::importCoordList - wrong polygon point count" ); - while( rStrm.getRemaining() >= 4 ) - { - sal_uInt16 nX, nY; - rStrm >> nX >> nY; - maCoords.push_back( Point( nX, nY ) ); - } - } -} - -// ============================================================================ // BIFF drawing page // ============================================================================ diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index 83701776d888..cf0da1bcbcd2 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -68,13 +68,6 @@ BiffContextHandler::~BiffContextHandler() // ---------------------------------------------------------------------------- -BiffWorkbookContextBase::BiffWorkbookContextBase( const WorkbookHelper& rHelper ) : - WorkbookHelper( rHelper ) -{ -} - -// ---------------------------------------------------------------------------- - BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index c15e32f2dfe0..fe5f94f330e4 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -290,37 +290,6 @@ void lclSetSheetCacheIndex( SingleReference& orApiRef, sal_Int32 nCacheIdx ) } // namespace -void ExternalName::extractExternalReference( const ApiTokenSequence& rTokens ) -{ - OSL_ENSURE( (getFilterType() == FILTER_BIFF) && (getBiff() <= BIFF4), "ExternalName::setExternalReference - unexpected call" ); - sal_Int32 nDocLinkIdx = mrParentLink.getDocumentLinkIndex(); - sal_Int32 nCacheIdx = mrParentLink.getSheetCacheIndex(); - if( (nDocLinkIdx >= 0) && (nCacheIdx >= 0) ) - { - ExternalReference aExtApiRef; - aExtApiRef.Index = nDocLinkIdx; - - Any aRefAny = getFormulaParser().extractReference( rTokens ); - if( aRefAny.has< SingleReference >() ) - { - SingleReference aApiRef; - aRefAny >>= aApiRef; - lclSetSheetCacheIndex( aApiRef, nCacheIdx ); - aExtApiRef.Reference <<= aApiRef; - maRefAny <<= aExtApiRef; - } - else if( aRefAny.has< ComplexReference >() ) - { - ComplexReference aApiRef; - aRefAny >>= aApiRef; - lclSetSheetCacheIndex( aApiRef.Reference1, nCacheIdx ); - lclSetSheetCacheIndex( aApiRef.Reference2, nCacheIdx ); - aExtApiRef.Reference <<= aApiRef; - maRefAny <<= aExtApiRef; - } - } -} - void ExternalName::setResultSize( sal_Int32 nColumns, sal_Int32 nRows ) { OSL_ENSURE( (mrParentLink.getLinkType() == LINKTYPE_DDE) || (mrParentLink.getLinkType() == LINKTYPE_OLE) || diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 395c2a81e11b..0e6adcf97d5a 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -1330,29 +1330,6 @@ void PivotCache::importPCItemIndexList( BiffInputStream& rStrm, WorksheetHelper& // private -------------------------------------------------------------------- -void PivotCache::importDConUrl( BiffInputStream& rStrm ) -{ - // the URL with sheet name and optional URL of an external document - OUString aEncodedUrl; - if( getBiff() == BIFF8 ) - { - // empty string does not contain a flags byte, cannot use simple readUniString() here... - sal_uInt16 nChars = rStrm.readuInt16(); - if( nChars > 0 ) - aEncodedUrl = rStrm.readUniString( nChars ); - } - else - { - aEncodedUrl = rStrm.readByteStringUC( false, getTextEncoding() ); - } - - if( !aEncodedUrl.isEmpty() ) - { - OUString aClassName; - getAddressConverter().parseBiffTargetUrl( aClassName, maTargetUrl, maSheetSrcModel.maSheet, aEncodedUrl, true ); - } -} - void PivotCache::finalizeInternalSheetSource() { // resolve sheet name to sheet index diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 21659b15b675..f434a14a69de 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -434,21 +434,6 @@ void PivotTableField::importPTReferenceItem( SequenceInputStream& rStrm ) rStrm >> maModel.mnSortRefItem; } -void PivotTableField::importPTFItem( BiffInputStream& rStrm ) -{ - PTFieldItemModel aModel; - sal_uInt16 nType, nFlags; - sal_Int16 nCacheItem; - rStrm >> nType >> nFlags >> nCacheItem; - - aModel.setBiffType( nType ); - aModel.mnCacheItem = nCacheItem; - aModel.mbShowDetails = !getFlag( nFlags, BIFF_PTFITEM_HIDEDETAILS ); - aModel.mbHidden = getFlag( nFlags, BIFF_PTFITEM_HIDDEN ); - - maItems.push_back( aModel ); -} - void PivotTableField::finalizeImport( const Reference< XDataPilotDescriptor >& rxDPDesc ) { /* Process all fields based on source data, other fields (e.g. group diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 6fbaa5f482ee..f3b682e07431 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -259,14 +259,6 @@ void PhoneticSettings::importStringData( SequenceInputStream& rStrm ) maModel.setBiffData( extractValue< sal_Int32 >( nFlags, 0, 2 ), extractValue< sal_Int32 >( nFlags, 2, 2 ) ); } -void PhoneticSettings::importStringData( BiffInputStream& rStrm ) -{ - sal_uInt16 nFontId, nFlags; - rStrm >> nFontId >> nFlags; - maModel.mnFontId = nFontId; - maModel.setBiffData( extractValue< sal_Int32 >( nFlags, 0, 2 ), extractValue< sal_Int32 >( nFlags, 2, 2 ) ); -} - // ============================================================================ RichStringPhonetic::RichStringPhonetic( const WorkbookHelper& rHelper ) : @@ -484,37 +476,6 @@ RichStringPhoneticRef RichString::createPhonetic() return xPhonetic; } -void RichString::createTextPortions( const OString& rText, rtl_TextEncoding eTextEnc, FontPortionModelList& rPortions ) -{ - maTextPortions.clear(); - if( !rText.isEmpty()) - { - sal_Int32 nStrLen = rText.getLength(); - // add leading and trailing string position to ease the following loop - if( rPortions.empty() || (rPortions.front().mnPos > 0) ) - rPortions.insert( rPortions.begin(), FontPortionModel( 0, -1 ) ); - if( rPortions.back().mnPos < nStrLen ) - rPortions.push_back( FontPortionModel( nStrLen, -1 ) ); - - // create all string portions according to the font id vector - for( FontPortionModelList::const_iterator aIt = rPortions.begin(); aIt->mnPos < nStrLen; ++aIt ) - { - sal_Int32 nPortionLen = (aIt + 1)->mnPos - aIt->mnPos; - if( (0 < nPortionLen) && (aIt->mnPos + nPortionLen <= nStrLen) ) - { - // convert byte string to unicode string, using current font encoding - FontRef xFont = getStyles().getFont( aIt->mnFontId ); - rtl_TextEncoding eFontEnc = xFont.get() ? xFont->getFontEncoding() : eTextEnc; - OUString aUniStr = OStringToOUString( rText.copy( aIt->mnPos, nPortionLen ), eFontEnc ); - // create string portion - RichStringPortionRef xPortion = createPortion(); - xPortion->setText( aUniStr ); - xPortion->setFontId( aIt->mnFontId ); - } - } - } -} - void RichString::createTextPortions( const OUString& rText, FontPortionModelList& rPortions ) { maTextPortions.clear(); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 9b273722f441..2d3777f9b045 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -439,11 +439,6 @@ void Color::importColorId( SequenceInputStream& rStrm ) setIndexed( rStrm.readInt32() ); } -void Color::importColorId( BiffInputStream& rStrm, bool b16Bit ) -{ - setIndexed( b16Bit ? rStrm.readuInt16() : rStrm.readuInt8() ); -} - SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor ) { orColor.importColor( rStrm ); @@ -1292,14 +1287,6 @@ void AlignmentModel::setBiffVerAlign( sal_uInt8 nVerAlign ) mnVerAlign = STATIC_ARRAY_SELECT( spnVerAligns, nVerAlign, XML_bottom ); } -void AlignmentModel::setBiffTextOrient( sal_uInt8 nTextOrient ) -{ - static const sal_Int32 spnRotations[] = { - OOX_XF_ROTATION_NONE, OOX_XF_ROTATION_STACKED, - OOX_XF_ROTATION_90CCW, OOX_XF_ROTATION_90CW }; - mnRotation = STATIC_ARRAY_SELECT( spnRotations, nTextOrient, OOX_XF_ROTATION_NONE ); -} - // ---------------------------------------------------------------------------- ApiAlignmentData::ApiAlignmentData() : diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 36ee6e33a4a7..6397c5da8b4c 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -70,14 +70,6 @@ WorksheetBuffer::WorksheetBuffer( const WorkbookHelper& rHelper ) : { } -/*static*/ OUString WorksheetBuffer::getBaseFileName( const OUString& rUrl ) -{ - sal_Int32 nFileNamePos = ::std::max< sal_Int32 >( rUrl.lastIndexOf( '/' ) + 1, 0 ); - sal_Int32 nExtPos = rUrl.lastIndexOf( '.' ); - if( nExtPos <= nFileNamePos ) nExtPos = rUrl.getLength(); - return rUrl.copy( nFileNamePos, nExtPos - nFileNamePos ); -} - void WorksheetBuffer::importSheet( const AttributeList& rAttribs ) { SheetInfoModel aModel; diff --git a/svtools/inc/svtools/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx index 152649dbced2..fca0eaa0b6cf 100644 --- a/svtools/inc/svtools/scrwin.hxx +++ b/svtools/inc/svtools/scrwin.hxx @@ -90,8 +90,6 @@ public: void SetTotalSize( const Size& rNewSize ); Size GetTotalSize() { return PixelToLogic( aTotPixSz ); } - Rectangle GetVisibleArea() const; - using Window::Scroll; virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 5363db7f7fc8..26d799998aa9 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -329,15 +329,6 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize ) //------------------------------------------------------------------- -Rectangle ScrollableWindow::GetVisibleArea() const -{ - Point aTopLeft( PixelToLogic( Point() ) ); - Size aSz( GetOutputSize() ); - return Rectangle( aTopLeft, aSz ); -} - -//------------------------------------------------------------------- - void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 ) { if ( !bScrolling ) diff --git a/unusedcode.easy b/unusedcode.easy index 1bafd51e73b5..8e819c0462d2 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2,6 +2,7 @@ AboutDialog::LinkStubCancelHdl(void*, void*) CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char) CharAttribList::Clear() Dialog::Dialog(Window*, ResId const&) +EditEngine::GetNextVisPortion(ParaPortion const*) const FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short) FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&) FmEntryDataArray::Insert(FmEntryData* const*, unsigned short) @@ -360,9 +361,8 @@ _SwRedlineTbl::Insert(SwRedline* const*, unsigned short) _SwRedlineTbl::Insert(_SwRedlineTbl const*, unsigned short, unsigned short) _SwRedlineTbl::Remove(SwRedline* const&, unsigned short) basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&) -basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&, double const&) -basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, double const&) -basegfx::tools::getSignedArea(basegfx::B3DPolygon const&) +basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&, double const&) +basegfx::tools::equal(basegfx::B3DPolygon const&, basegfx::B3DPolygon const&, double const&) binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr const*, unsigned short, unsigned short, unsigned short) binfilter::B3dEdgeEntryBucketMemArr::Replace(char const*&, unsigned short) binfilter::B3dEdgeEntryBucketMemArr::Replace(char const**, unsigned short, unsigned short) @@ -758,10 +758,17 @@ 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::BiffDecoder_RCF::BiffDecoder_RCF(unsigned char*, unsigned char*, unsigned char*) -oox::xls::BiffDecoder_XOR::BiffDecoder_XOR(unsigned short, unsigned short) -oox::xls::BiffWorkbookContextBase::BiffWorkbookContextBase(oox::xls::WorkbookHelper const&) +oox::dump::RecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&) +oox::xls::BiffGroupObject::BiffGroupObject(oox::xls::WorksheetHelper const&) oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int) +oox::xls::CondFormatRule::importCfRule(oox::xls::BiffInputStream&, int) +oox::xls::DefinedNameBase::extractReference(com::sun::star::uno::Sequence<com::sun::star::sheet::FormulaToken> const&) +oox::xls::ExternalLink::getCalcSheetIndex(int) const +oox::xls::ExternalLink::parseBiffTargetUrl(rtl::OUString const&) +oox::xls::FontPortionModelList::importPortions(oox::xls::BiffInputStream&, bool) +oox::xls::PhoneticPortionModelList::importPortions(oox::xls::BiffInputStream&, int) +oox::xls::PivotTable::importFields(std::__debug::vector<int, std::allocator<int> >&, oox::xls::BiffInputStream&, int) +oox::xls::RefSheetsModel::readBiff8Data(oox::xls::BiffInputStream&) psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&) psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&) psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&) |