diff options
29 files changed, 24 insertions, 467 deletions
diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index 7c77fe94ce6e..c1ccabe7396b 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -33,11 +33,6 @@ class SOT_DLLPUBLIC FileList : public SvDataCopyStream protected: - // SvData-Methoden - virtual void Load( SvStream& ) SAL_OVERRIDE; - virtual void Save( SvStream& ) SAL_OVERRIDE; - virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; - // Liste loeschen; void ClearAll(); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 9b43de5628b8..4aca5db8b269 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -329,10 +329,6 @@ protected: SvStream* GetSwapStream() const; void SetSwapState(); - virtual void Load( SvStream& ) SAL_OVERRIDE; - virtual void Save( SvStream& ) SAL_OVERRIDE; - virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; - public: GraphicObject( const GraphicManager* pMgr = NULL ); GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL ); diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx index f9a3e50ef1b6..454773c74ecd 100644 --- a/include/tools/b3dtrans.hxx +++ b/include/tools/b3dtrans.hxx @@ -118,10 +118,6 @@ public: void Reset(); - // ObjectTrans - const basegfx::B3DHomMatrix& GetObjectTrans() { return maObjectTrans; } - const basegfx::B3DHomMatrix& GetInvObjectTrans() { return maInvObjectTrans; } - // Orientation void SetOrientation( const basegfx::B3DPoint& rVRP = basegfx::B3DPoint(0.0,0.0,1.0), @@ -135,26 +131,22 @@ public: const basegfx::B3DHomMatrix& GetProjection(); // Texture - const basegfx::B2DHomMatrix& GetTexture() { return maTexture; } // aspect ratio accessors and the defined method of keeping defined aspect ratio double GetRatio() { return mfRatio; } void SetRatio(double fNew=1.0); - Base3DRatio GetRatioMode() { return meRatio; } // Parameters of ViewportTransformation void SetDeviceRectangle(double fL=-1.0, double fR=1.0, double fB=-1.0, double fT=1.0, bool bBroadCastChange=true); double GetDeviceRectangleWidth() const { return mfRightBound - mfLeftBound; } - double GetDeviceRectangleHeight() const { return mfTopBound - mfBottomBound; } - double GetFrontClippingPlane() { return mfNearBound; } - double GetBackClippingPlane() { return mfFarBound; } + void SetPerspective(bool bNew); - bool GetPerspective() { return mbPerspective; } + void SetViewportRectangle(Rectangle& rRect, Rectangle& rVisible); void SetViewportRectangle(Rectangle& rRect) { SetViewportRectangle(rRect, rRect); } - const Rectangle& GetViewportRectangle() { return maViewportRectangle; } + void CalcViewport(); // Direct accessors for miscellaneous transformations @@ -236,16 +228,6 @@ public: bool bUseFocLen = false); virtual ~B3dCamera(); - const basegfx::B3DPoint& GetPosition() const { return aPosition; } - const basegfx::B3DVector& GetLookAt() const { return aLookAt; } - - // Focal length in mm - double GetFocalLength() const { return fFocalLength; } - - double GetBankAngle() const { return fBankAngle; } - - bool GetUseFocalLength() const { return (bool)bUseFocalLength; } - protected: void CalcNewViewportValues(); bool CalcFocalLength(); diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx index ac0cb9297d56..a6e621e9a253 100644 --- a/include/tools/bigint.hxx +++ b/include/tools/bigint.hxx @@ -36,7 +36,7 @@ private: long nVal; unsigned short nNum[MAX_DIGITS]; sal_uInt8 nLen : 5; // current length - bool bIsNeg : 1, // Is Sign negative? + bool bIsNeg : 1, // Is Sign negative? bIsBig : 1, // sal_True == BigInt bIsSet : 1; // Not "Null" (not "not 0") @@ -114,13 +114,11 @@ public: operator sal_uInt16() const; operator sal_uIntPtr() const; - void Set( bool bSet ) { bIsSet = bSet; } + bool IsSet() const { return bIsSet; } + bool IsNeg() const; + bool IsZero() const; + bool IsLong() const { return !bIsBig; } - bool IsSet() const { return (bool)bIsSet; } - bool IsNeg() const; - bool IsZero() const; - bool IsOne() const; - bool IsLong() const { return !((bool)bIsBig); } void Abs(); BigInt& operator =( const BigInt& rVal ); @@ -235,14 +233,6 @@ inline bool BigInt::IsZero() const return (nVal == 0); } -inline bool BigInt::IsOne() const -{ - if ( bIsBig ) - return false; - else - return (nVal == 1); -} - inline void BigInt::Abs() { if ( bIsBig ) diff --git a/include/tools/config.hxx b/include/tools/config.hxx index d4b503064a1b..772c1c7da8f9 100644 --- a/include/tools/config.hxx +++ b/include/tools/config.hxx @@ -43,30 +43,23 @@ public: Config( const OUString& rFileName ); ~Config(); - const OUString& GetPathName() const { return maFileName; } + void SetGroup(const OString& rGroup); + const OString& GetGroup() const { return maGroupName; } + void DeleteGroup(const OString& rGroup); + OString GetGroupName(sal_uInt16 nGroup) const; + sal_uInt16 GetGroupCount() const; + bool HasGroup(const OString& rGroup) const; - void SetGroup(const OString& rGroup); - const OString& GetGroup() const { return maGroupName; } - void DeleteGroup(const OString& rGroup); - OString GetGroupName(sal_uInt16 nGroup) const; - sal_uInt16 GetGroupCount() const; - bool HasGroup(const OString& rGroup) const; - - OString ReadKey(const OString& rKey) const; - OString ReadKey(const OString& rKey, const OString& rDefault) const; + OString ReadKey(const OString& rKey) const; + OString ReadKey(const OString& rKey, const OString& rDefault) const; void WriteKey(const OString& rKey, const OString& rValue); - void DeleteKey(const OString& rKey); - OString GetKeyName(sal_uInt16 nKey) const; - OString ReadKey(sal_uInt16 nKey) const; - sal_uInt16 GetKeyCount() const; + void DeleteKey(const OString& rKey); + OString GetKeyName(sal_uInt16 nKey) const; + OString ReadKey(sal_uInt16 nKey) const; + sal_uInt16 GetKeyCount() const; - bool IsLocked() const { return (mnLockCount != 0); } void Flush(); - void EnablePersistence( bool bPersistence = true ) - { mbPersistence = bPersistence; } - bool IsPersistenceEnabled() const { return mbPersistence; } - private: Config( const Config& rConfig ) SAL_DELETED_FUNCTION; Config& operator = ( const Config& rConfig ) SAL_DELETED_FUNCTION; diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 3e3ec8ecf97b..32e488ac63ff 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -95,10 +95,6 @@ public: long& Y() { return nB; } void Move( long nHorzMove, long nVertMove ); - bool IsAbove( const Point& rPoint ) const; - bool IsBelow( const Point& rPoint ) const; - bool IsLeft( const Point& rPoint ) const; - bool IsRight( const Point& rPoint ) const; void RotateAround( long& rX, long& rY, short nOrientation ) const; @@ -133,26 +129,6 @@ inline void Point::Move( long nHorzMove, long nVertMove ) nB += nVertMove; } -inline bool Point::IsAbove( const Point& rPoint ) const -{ - return (nB > rPoint.nB); -} - -inline bool Point::IsBelow( const Point& rPoint ) const -{ - return (nB < rPoint.nB); -} - -inline bool Point::IsLeft( const Point& rPoint ) const -{ - return (nA < rPoint.nA); -} - -inline bool Point::IsRight( const Point& rPoint ) const -{ - return (nA > rPoint.nA); -} - inline Point& Point::operator += ( const Point& rPoint ) { nA += rPoint.nA; @@ -322,7 +298,6 @@ public: bool operator !() const { return !Len(); } long getMin() const { return Min(); } - long getMax() const { return Max(); } void setMin(long nMin) { Min() = nMin; } void setMax(long nMax) { Max() = nMax; } }; @@ -450,7 +425,7 @@ public: /** * Contracts the rectangle in all directions by the input value. */ - inline void contract(long nContractBy); + ; private: long nLeft; @@ -706,13 +681,7 @@ inline void Rectangle::expand(long nExpandBy) nBottom += nExpandBy; } -inline void Rectangle::contract(long nContractBy) -{ - nLeft += nContractBy; - nTop += nContractBy; - nRight -= nContractBy; - nBottom -= nContractBy; -} + template< typename charT, typename traits > inline std::basic_ostream<charT, traits> & operator <<( diff --git a/include/tools/inetmime.hxx b/include/tools/inetmime.hxx index 45bf02a5878e..b791060586ee 100644 --- a/include/tools/inetmime.hxx +++ b/include/tools/inetmime.hxx @@ -715,11 +715,6 @@ public: sal_uInt32 getLineLengthLimit() const { return m_nLineLengthLimit; } - void setLineLengthLimit(sal_uInt32 nTheLineLengthLimit) - { m_nLineLengthLimit = nTheLineLengthLimit; } - - virtual ErrCode getError() const; - /** Write a sequence of octets. @param pBegin Points to the start of the sequence, must not be null. @@ -730,15 +725,6 @@ public: /** Write a sequence of octets. - @param pBegin Points to the start of the sequence, must not be null. - - @param nLength The length of the sequence. - */ - void write(const sal_Char * pBegin, sal_Size nLength) - { write(pBegin, pBegin + nLength); } - - /** Write a sequence of octets. - @descr The supplied sequence of Unicode characters is interpreted as a sequence of octets. It is an error if any of the elements of the sequence has a numerical value greater than 255. @@ -749,20 +735,6 @@ public: */ inline void write(const sal_Unicode * pBegin, const sal_Unicode * pEnd); - /** Write a sequence of octets. - - @param rOctets A OString, interpreted as a sequence of octets. - - @param nBegin The offset of the first character to write. - - @param nEnd The offset past the last character to write. - */ - void write(const OString& rOctets, sal_Int32 nBegin, sal_Int32 nEnd) - { - writeSequence(rOctets.getStr() + nBegin, rOctets.getStr() + nEnd); - m_nColumn += nEnd - nBegin; - } - /** Write a single octet. @param nOctet Some octet. @@ -877,8 +849,6 @@ public: = INetMIME::SOFT_LINE_LENGTH_LIMIT): INetMIMEOutputSink(nColumn, nLineLengthLimit) {} - virtual ErrCode getError() const SAL_OVERRIDE; - OString takeBuffer() { return m_aBuffer.makeStringAndClear(); @@ -935,8 +905,6 @@ public: INetMIMEEncodedWordOutputSink & WriteUInt32(sal_uInt32 nChar); - inline void write(const sal_Char * pBegin, const sal_Char * pEnd); - inline void write(const sal_Unicode * pBegin, const sal_Unicode * pEnd); inline bool flush(); @@ -963,15 +931,7 @@ inline INetMIMEEncodedWordOutputSink::INetMIMEEncodedWordOutputSink( m_pBufferEnd = m_pBuffer; } -inline void INetMIMEEncodedWordOutputSink::write(const sal_Char * pBegin, - const sal_Char * pEnd) -{ - DBG_ASSERT(pBegin && pBegin <= pEnd, - "INetMIMEEncodedWordOutputSink::write(): Bad sequence"); - while (pBegin != pEnd) - WriteUInt32(*pBegin++); -} inline void INetMIMEEncodedWordOutputSink::write(const sal_Unicode * pBegin, const sal_Unicode * pEnd) @@ -1051,21 +1011,11 @@ public: void Clear(); - void Insert(INetContentTypeParameter * pParameter, sal_uIntPtr nIndex) - { - maEntries.insert(maEntries.begin()+nIndex,pParameter); - } - void Append(INetContentTypeParameter *pParameter) { maEntries.push_back(pParameter); } - inline const INetContentTypeParameter * GetObject(sal_uIntPtr nIndex) const - { - return &(maEntries[nIndex]); - } - const INetContentTypeParameter * find(const OString& rAttribute) const; private: diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx index 95952c042478..3bca8fa723ee 100644 --- a/include/tools/inetmsg.hxx +++ b/include/tools/inetmsg.hxx @@ -213,11 +213,6 @@ public: sal_uIntPtr GetHeaderCount() const { return m_aHeaderList.size(); } - OUString GetHeaderName (sal_uIntPtr nIndex) const - { - return GetHeaderName_Impl (nIndex, RTL_TEXTENCODING_ASCII_US); - } - OUString GetHeaderValue (sal_uIntPtr nIndex) const { return GetHeaderValue_Impl (nIndex, INetMIME::HEADER_FIELD_TEXT); @@ -240,149 +235,17 @@ public: sal_uIntPtr GetDocumentSize() const { return m_nDocSize; } void SetDocumentSize (sal_uIntPtr nSize) { m_nDocSize = nSize; } - const OUString& GetDocumentName() const { return m_aDocName; } - void SetDocumentName (const OUString& rName) { m_aDocName = rName; } - SvLockBytes* GetDocumentLB() const { return m_xDocLB; } void SetDocumentLB (SvLockBytes *pDocLB) { m_xDocLB = pDocLB; } static bool ParseDateField ( const OUString& rDateField, DateTime& rDateTime); - bool HeaderParsed() const { return bHeaderParsed; } - static INetMIMEMessage* CreateMessage ( const INetMIMEMessage& rMsg); - // Header fields. - - OUString GetBCC() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::BCC), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetCC() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::CC), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetComments() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::COMMENTS), - INetMIME::HEADER_FIELD_TEXT); - } - - OUString GetDate() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::DATE), - INetMIME::HEADER_FIELD_STRUCTURED); - } - - OUString GetFrom() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::FROM), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetInReplyTo() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::REPLY_TO), - INetMIME::HEADER_FIELD_ADDRESS); // ??? MESSAGE_ID ??? - } - - OUString GetKeywords() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::KEYWORDS), - INetMIME::HEADER_FIELD_PHRASE); - } - - OUString GetMessageID() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::MESSAGE_ID), - INetMIME::HEADER_FIELD_MESSAGE_ID); - } - - OUString GetReferences() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::REFERENCES), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetReplyTo() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::REPLY_TO), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetReturnPath() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::RETURN_PATH), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetReturnReceiptTo() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::RETURN_RECEIPT_TO), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetSender() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::SENDER), - INetMIME::HEADER_FIELD_ADDRESS); - } - - OUString GetSubject() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::SUBJECT), - INetMIME::HEADER_FIELD_TEXT); - } - - OUString GetTo() const - { - return GetHeaderValue_Impl ( - m_nRFC822Index.at(InetMessageField::TO), - INetMIME::HEADER_FIELD_TEXT); - } - void SetMIMEVersion (const OUString& rVersion); - OUString GetMIMEVersion() const - { - return GetHeaderValue (m_nMIMEIndex.at(InetMessageMime::VERSION)); - } - - OUString GetContentDescription() const - { - return GetHeaderValue (m_nMIMEIndex.at(InetMessageMime::CONTENT_DESCRIPTION)); - } - void SetContentDisposition (const OUString& rDisposition); - OUString GetContentDisposition() const - { - return GetHeaderValue (m_nMIMEIndex.at(InetMessageMime::CONTENT_DISPOSITION)); - } - - OUString GetContentID() const - { - return GetHeaderValue (m_nMIMEIndex.at(InetMessageMime::CONTENT_ID)); - } - void SetContentType (const OUString& rType); OUString GetContentType() const { diff --git a/include/tools/line.hxx b/include/tools/line.hxx index 25356716337c..7508a8fbb468 100644 --- a/include/tools/line.hxx +++ b/include/tools/line.hxx @@ -38,11 +38,6 @@ public: void SetEnd( const Point& rEndPt ) { maEnd = rEndPt; } const Point& GetEnd() const { return maEnd; } - long Left() const { return ( maStart.X() < maEnd.X() ) ? maStart.X() : maEnd.X(); } - long Top() const { return ( maStart.Y() < maEnd.Y() ) ? maStart.Y() : maEnd.Y(); } - long Right() const { return ( maStart.X() > maEnd.X() ) ? maStart.X() : maEnd.X(); } - long Bottom() const { return ( maStart.Y() > maEnd.Y() ) ? maStart.Y() : maEnd.Y(); } - double GetLength() const; bool Intersection( const Line& rLine, double& rIntersectionX, double& rIntersectionY ) const; diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index bac6fe8e8ff6..3a8c75287865 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -73,8 +73,6 @@ public: void Remove( long nIndex ); const Range& GetTotalRange() const { return aTotRange; } - bool IsCurValid() const { return bCurValid; } - long GetCurSelected() const { return nCurIndex; } long FirstSelected( bool bInverse = false ); long LastSelected(); long NextSelected(); diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx index af157b2137f7..559b8d88b086 100644 --- a/include/tools/poly.hxx +++ b/include/tools/poly.hxx @@ -210,8 +210,6 @@ private: ImplPolyPolygon* mpImplPolyPolygon; TOOLS_DLLPRIVATE void ImplDoOperation( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rResult, sal_uIntPtr nOperation ) const; - TOOLS_DLLPRIVATE void *ImplCreateArtVpath() const; - TOOLS_DLLPRIVATE void ImplSetFromArtVpath( void *pVpath ); public: PolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ); diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 8fc54703c86b..8b69c8afc0f9 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -144,7 +144,6 @@ class TOOLS_DLLPUBLIC SvPersistStream : public SvStream SvPersistUIdx aPUIdx; sal_uIntPtr nStartIdx; const SvPersistStream * pRefStm; - sal_uInt32 nFlags; virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ) SAL_OVERRIDE; @@ -156,8 +155,6 @@ protected: sal_uInt32 ReadObj( SvPersistBase * & rpObj, bool bRegister ); public: - bool IsStreamed( SvPersistBase * pObj ) const - { return 0 != GetIndex( pObj ); } virtual void ResetError() SAL_OVERRIDE; SvPersistStream( SvClassManager &, SvStream * pStream, @@ -170,9 +167,6 @@ public: SvPersistBase * GetObject( sal_uIntPtr nIdx ) const; sal_uIntPtr GetIndex( SvPersistBase * ) const; - void SetContextFlags( sal_uInt32 n ) { nFlags = n; } - sal_uInt32 GetContextFlags() const { return nFlags; } - static void WriteCompressed( SvStream & rStm, sal_uInt32 nVal ); static sal_uInt32 ReadCompressed( SvStream & rStm ); diff --git a/include/tools/rc.hxx b/include/tools/rc.hxx index 943ff482eaee..7b8a175348ad 100644 --- a/include/tools/rc.hxx +++ b/include/tools/rc.hxx @@ -51,10 +51,6 @@ protected: static sal_uInt32 GetObjSizeRes( RSHEADER_TYPE * pHT ) { return ResMgr::GetObjSize( pHT ); } - // return the remaining size of this Resource's data - sal_uInt32 GetRemainSizeRes() - { return m_pResMgr->GetRemainSize(); } - // get a 32bit value from Resource data static sal_Int32 GetLongRes( void * pLong ) { return ResMgr::GetLong( pLong ); } diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx index 6d9bb9204e6b..eea1e64aabd2 100644 --- a/include/tools/resid.hxx +++ b/include/tools/resid.hxx @@ -66,7 +66,6 @@ public: ImplInit( nId, rMgr, NULL ); } - sal_uInt32 GetWinBits() const { return m_nWinBits; } void SetWinBits( sal_uInt32 nBits ) const { m_nWinBits = nBits; } RESOURCE_TYPE GetRT() const { return m_nRT; } @@ -99,18 +98,6 @@ public: return (RSC_NOTYPE == m_nRT2) ? m_nRT : m_nRT2; } - /** Set the superceding type. Ask spcifically for it with GetRT2() - - SetRT2() may only be called if no derived class calls SetRT in its - Resource constructor. - */ - const ResId & SetRT2( RESOURCE_TYPE nTyp ) const - { - if( RSC_NOTYPE == m_nRT2 ) - m_nRT2 = nTyp; - return *this; - } - ResMgr * GetResMgr() const { return m_pResMgr; } const ResId & SetResMgr( ResMgr * pMgr ) const { diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 544a5fed8d8e..202e3ff5a6ff 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -160,10 +160,6 @@ public: virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, sal_Size * pWritten) = 0; - virtual sal_uInt64 Tell() const = 0; - - virtual sal_uInt64 Seek(sal_uInt64 nPos) = 0; - virtual void Terminate() = 0; }; @@ -189,10 +185,6 @@ public: virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount, sal_Size * pWritten) SAL_OVERRIDE; - virtual sal_uInt64 Tell() const SAL_OVERRIDE { return m_nSize; } - - virtual sal_uInt64 Seek(sal_uInt64 nPos) SAL_OVERRIDE; - virtual void Terminate() SAL_OVERRIDE { m_bTerminated = true; } }; @@ -287,7 +279,6 @@ public: SvStreamCompressFlags GetCompressMode() const { return nCompressMode; } void SetCryptMaskKey(const OString& rCryptMaskKey); - const OString& GetCryptMaskKey() const { return m_aCryptMaskKey; } void SetStreamCharSet( rtl_TextEncoding eCharSet ) { eStreamCharSet = eCharSet; } @@ -449,7 +440,6 @@ public: sal_uInt16 GetBufferSize() const { return nBufSize; } void RefreshBuffer(); - SvStream& PutBack( char aCh ); bool IsWritable() const { return bIsWritable; } StreamMode GetStreamMode() const { return eStreamMode; } @@ -664,7 +654,6 @@ public: void Open( const OUString& rFileName, StreamMode eOpenMode ); void Close(); bool IsOpen() const { return bIsOpen; } - bool IsLocked() const { return ( nLockCounter!=0 ); } const OUString& GetFileName() const { return aFilename; } }; @@ -676,8 +665,6 @@ class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream SvMemoryStream (const SvMemoryStream&) SAL_DELETED_FUNCTION; SvMemoryStream & operator= (const SvMemoryStream&) SAL_DELETED_FUNCTION; - sal_Size GetBufSize() const { return nSize; } - protected: sal_Size nSize; sal_Size nResize; @@ -728,9 +715,7 @@ public: bool bOwnsData=true, sal_Size nEOF=0 ); void ObjectOwnsMemory( bool bOwn ) { bOwnsData = bOwn; } - bool IsObjectMemoryOwner() { return bOwnsData; } void SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; } - sal_Size GetResizeOffset() const { return nResize; } virtual sal_uInt64 remainingSize() SAL_OVERRIDE { return GetEndOfData() - Tell(); } }; @@ -757,9 +742,6 @@ class TOOLS_DLLPUBLIC SvDataCopyStream public: // repeated execution of Load or Assign is allowed virtual ~SvDataCopyStream(){} - virtual void Load( SvStream & ) = 0; - virtual void Save( SvStream & ) = 0; - virtual void Assign( const SvDataCopyStream & ); }; #endif diff --git a/include/tools/svborder.hxx b/include/tools/svborder.hxx index ed39f84991ac..e30853d702c1 100644 --- a/include/tools/svborder.hxx +++ b/include/tools/svborder.hxx @@ -75,11 +75,6 @@ public: Bottom() -= rBorder.Bottom(); return *this; } - bool IsInside( const SvBorder & rInside ) - { - return nTop >= rInside.nTop && nRight >= rInside.nRight && - nBottom >= rInside.nBottom && nLeft >= rInside.nLeft; - } long & Top() { return nTop; } long & Right() { return nRight; } long & Bottom() { return nBottom; } diff --git a/include/tools/time.hxx b/include/tools/time.hxx index e25b2de73f53..5b72b9f179b6 100644 --- a/include/tools/time.hxx +++ b/include/tools/time.hxx @@ -104,9 +104,6 @@ public: /// 12 hours == 0.5 days double GetTimeInDays() const; - bool IsBetween( const tools::Time& rFrom, const tools::Time& rTo ) const - { return ((nTime >= rFrom.nTime) && (nTime <= rTo.nTime)); } - bool IsEqualIgnoreNanoSec( const tools::Time& rTime ) const; bool operator ==( const tools::Time& rTime ) const @@ -127,9 +124,6 @@ public: /// Elapsed time since epoch in milliseconds static sal_uInt64 GetSystemTicks(); - void ConvertToUTC() { *this -= Time::GetUTCOffset(); } - void ConvertToLocalTime() { *this += Time::GetUTCOffset(); } - tools::Time& operator =( const tools::Time& rTime ); Time operator -() const { return Time( -nTime ); } diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index f138514bded9..96bc0cd30953 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -431,9 +431,6 @@ public: inline bool HasUserData() const { return m_aUser.isPresent(); } - inline bool IsEmptyUser() const - { return m_aUser.isPresent() && m_aUser.isEmpty(); } - inline OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const diff --git a/include/tools/vector2d.hxx b/include/tools/vector2d.hxx index 187bdebd8fb7..7211bdca805d 100644 --- a/include/tools/vector2d.hxx +++ b/include/tools/vector2d.hxx @@ -36,27 +36,12 @@ public: inline Vector2D( const Pair& rPair ) : mfX( rPair.A() ), mfY( rPair.B() ) {}; inline ~Vector2D() {} - inline const double& X() const { return mfX; } - inline const double& Y() const { return mfY; } - inline double& X() { return mfX; } - inline double& Y() { return mfY; } inline const double& operator[] (int nPos) const { return (nPos ? mfY : mfX); } inline double& operator[] (int nPos) { return (nPos ? mfY : mfX); } inline double GetLength() const { return hypot( mfX, mfY ); } inline Vector2D& Normalize(); - inline void Min(const Vector2D& rVec) { if(rVec.mfX < mfX) mfX = rVec.mfX; if(rVec.mfY < mfY) mfY = rVec.mfY; } - inline void Max(const Vector2D& rVec) { if(rVec.mfX > mfX) mfX = rVec.mfX; if(rVec.mfY > mfY) mfY = rVec.mfY; } - inline void Abs() { if(mfX < 0.0) mfX = -mfX; if(mfY < 0.0) mfY = -mfY; } - - inline void CalcInBetween(Vector2D& rOld1, Vector2D& rOld2, double t) - { mfX = ((rOld2.mfX - rOld1.mfX) + t) + rOld1.mfX; mfY = ((rOld2.mfY - rOld1.mfY) + t) + rOld1.mfY; } - inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2) - { mfX = (rOld1.mfX + rOld2.mfX) / 2.0; mfY = (rOld1.mfY + rOld2.mfY) / 2.0; } - inline void CalcMiddle(Vector2D& rOld1, Vector2D& rOld2, Vector2D& rOld3) - { mfX = (rOld1.mfX + rOld2.mfX + rOld3.mfX) / 3.0; mfY = (rOld1.mfY + rOld2.mfY + rOld3.mfY) / 3.0; } - inline Vector2D& operator+=( const Vector2D& rVec ) { mfX += rVec.mfX, mfY += rVec.mfY; return *this; } inline Vector2D& operator-=( const Vector2D& rVec ) { mfX -= rVec.mfX, mfY -= rVec.mfY; return *this; } inline Vector2D operator+(const Vector2D& rVec) const { Vector2D aSum(*this); aSum += rVec; return aSum; } diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 373629807563..7e0104055dbc 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -188,10 +188,6 @@ public: public: - virtual void Load( SvStream& ) SAL_OVERRIDE; - virtual void Save( SvStream& ) SAL_OVERRIDE; - virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; - const SvgDataPtr& getSvgData() const; static css::uno::Sequence<sal_Int8> getUnoTunnelId(); diff --git a/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx index 8d182c598001..80ae479b1601 100644 --- a/sot/source/base/filelist.cxx +++ b/sot/source/base/filelist.cxx @@ -56,27 +56,6 @@ FileList& FileList::operator=( const FileList& rFileList ) /****************************************************************************** |* -|* virtuelle SvData-Methoden -|* -\******************************************************************************/ - -void FileList::Load( SvStream& rIStm ) -{ - ReadFileList( rIStm, *this ); -} - -void FileList::Save( SvStream& rOStm ) -{ - WriteFileList( rOStm, *this ); -} - -void FileList::Assign( const SvDataCopyStream& rCopyStream ) -{ - *this = static_cast<const FileList&>(rCopyStream); -} - -/****************************************************************************** -|* |* Stream-Operatoren |* \******************************************************************************/ diff --git a/svl/source/inc/strmadpt.hxx b/svl/source/inc/strmadpt.hxx index c5e99087d993..dfb61f88e4c2 100644 --- a/svl/source/inc/strmadpt.hxx +++ b/svl/source/inc/strmadpt.hxx @@ -55,10 +55,6 @@ public: virtual ErrCode FillAppend(const void * pBuffer, sal_uLong nCount, sal_uLong * pWritten) SAL_OVERRIDE; - virtual sal_uInt64 Tell() const SAL_OVERRIDE; - - virtual sal_uInt64 Seek(sal_uInt64) SAL_OVERRIDE; - virtual void Terminate() SAL_OVERRIDE; }; diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index df8b901706ee..c24291ecc501 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -209,18 +209,6 @@ ErrCode SvOutputStreamOpenLockBytes::FillAppend(void const * pBuffer, } // virtual -sal_uInt64 SvOutputStreamOpenLockBytes::Tell() const -{ - return m_nPosition; -} - -// virtual -sal_uInt64 SvOutputStreamOpenLockBytes::Seek(sal_uInt64) -{ - return m_nPosition; -} - -// virtual void SvOutputStreamOpenLockBytes::Terminate() { if (m_xOutputStream.is()) diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 63e2af509d40..0881c8f8cbfc 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -363,21 +363,6 @@ bool GraphicObject::operator==( const GraphicObject& rGraphicObj ) const ( rGraphicObj.GetLink() == GetLink() ) ); } -void GraphicObject::Load( SvStream& rIStm ) -{ - ReadGraphicObject( rIStm, *this ); -} - -void GraphicObject::Save( SvStream& rOStm ) -{ - WriteGraphicObject( rOStm, *this ); -} - -void GraphicObject::Assign( const SvDataCopyStream& rCopyStream ) -{ - *this = static_cast<const GraphicObject&>(rCopyStream); -} - OString GraphicObject::GetUniqueID() const { if ( !IsInSwapIn() && IsEPS() ) diff --git a/tools/qa/cppunit/test_bigint.cxx b/tools/qa/cppunit/test_bigint.cxx index 87ebed67bd1d..5b2be39c97fb 100644 --- a/tools/qa/cppunit/test_bigint.cxx +++ b/tools/qa/cppunit/test_bigint.cxx @@ -31,18 +31,13 @@ namespace tools class BigIntTest : public CppUnit::TestFixture { public: -#if SAL_TYPES_SIZEOFLONG < SAL_TYPES_SIZEOFLONGLONG void testConstructionFromLongLong(); -#endif CPPUNIT_TEST_SUITE(BigIntTest); -#if SAL_TYPES_SIZEOFLONG < SAL_TYPES_SIZEOFLONGLONG CPPUNIT_TEST(testConstructionFromLongLong); -#endif CPPUNIT_TEST_SUITE_END(); }; -#if SAL_TYPES_SIZEOFLONG < SAL_TYPES_SIZEOFLONGLONG void BigIntTest::testConstructionFromLongLong() { // small positive number @@ -65,6 +60,7 @@ void BigIntTest::testConstructionFromLongLong() CPPUNIT_ASSERT_EQUAL(-42L, static_cast<long>(bi)); } +#if SAL_TYPES_SIZEOFLONG < SAL_TYPES_SIZEOFLONGLONG // positive number just fitting to long { BigInt bi(static_cast<sal_Int64>(std::numeric_limits<long>::max())); @@ -102,8 +98,8 @@ void BigIntTest::testConstructionFromLongLong() CPPUNIT_ASSERT(bi.IsNeg()); CPPUNIT_ASSERT(!bi.IsLong()); } -} #endif +} CPPUNIT_TEST_SUITE_REGISTRATION(BigIntTest); diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index d1ec8379489b..bfb06b814dc5 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -2869,12 +2869,6 @@ void INetMIMEOutputSink::writeSequence(const sal_Unicode * pBegin, delete[] pBufferBegin; } -// virtual -ErrCode INetMIMEOutputSink::getError() const -{ - return ERRCODE_NONE; -} - void INetMIMEOutputSink::writeLineEnd() { static const sal_Char aCRLF[2] = { 0x0D, 0x0A }; @@ -2894,12 +2888,6 @@ void INetMIMEStringOutputSink::writeSequence(const sal_Char * pBegin, m_aBuffer.append(pBegin, pEnd - pBegin); } -// virtual -ErrCode INetMIMEStringOutputSink::getError() const -{ - return ERRCODE_NONE; -} - // INetMIMEEncodedWordOutputSink static const sal_Char aEscape[128] diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index 0698c18b98e6..eec07612f3f3 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -60,7 +60,6 @@ SvPersistStream::SvPersistStream( SvClassManager & rMgr, SvStream * pStream, sal , aPUIdx( nStartIdxP ) , nStartIdx( nStartIdxP ) , pRefStm( NULL ) - , nFlags( 0 ) { DBG_ASSERT( nStartIdx != 0, "zero index not allowed" ); bIsWritable = true; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index 39b3d085e4b8..8cda7c3bd8d2 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -305,16 +305,6 @@ ErrCode SvAsyncLockBytes::FillAppend(const void * pBuffer, sal_Size nCount, return nError; } -// virtual -sal_uInt64 SvAsyncLockBytes::Seek(sal_uInt64 const nPos) -{ - // check if a truncated STREAM_SEEK_TO_END was passed - assert(nPos != SAL_MAX_UINT32); - if (nPos != STREAM_SEEK_TO_END) - m_nSize = nPos; - return m_nSize; -} - // class SvStream sal_Size SvStream::GetData( void* pData, sal_Size nSize ) @@ -2028,10 +2018,6 @@ bool SvScriptStream::good() const return mpHandle != NULL; } -void SvDataCopyStream::Assign( const SvDataCopyStream& ) -{ -} - //Create a OString of nLen bytes from rStream OString read_uInt8s_ToOString(SvStream& rStrm, sal_Size nLen) { diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 393a8d63ca60..cd7cfc36a203 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -302,21 +302,6 @@ bool Graphic::operator!() const return( GRAPHIC_NONE == mpImpGraphic->ImplGetType() ); } -void Graphic::Load( SvStream& rIStm ) -{ - ReadGraphic( rIStm, *this ); -} - -void Graphic::Save( SvStream& rOStm ) -{ - WriteGraphic( rOStm, *this ); -} - -void Graphic::Assign( const SvDataCopyStream& rCopyStream ) -{ - *this = static_cast<const Graphic&>( rCopyStream ); -} - void Graphic::Clear() { ImplTestRefCount(); |