diff options
24 files changed, 36 insertions, 563 deletions
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 039c14ec967e..c3e31567d2f4 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -70,25 +70,11 @@ using namespace ::com::sun::star::container; * The implementations of SvxConfigFunctionListBox and * SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx */ -SvxConfigFunctionListBox::SvxConfigFunctionListBox( Window* pParent, const ResId& rResId) - : SvTreeListBox( pParent, rResId ) - , pCurEntry( 0 ) - , m_pDraggingEntry( 0 ) -{ - SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT ); - Init(); -} - SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent) : SvTreeListBox(pParent, WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT) , pCurEntry(0) , m_pDraggingEntry(0) { - Init(); -} - -void SvxConfigFunctionListBox::Init() -{ GetModel()->SetSortMode( SortAscending ); // Timer for the BallonHelp @@ -198,35 +184,6 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) return DND_ACTION_NONE; } -SvxConfigGroupListBox::SvxConfigGroupListBox( - Window* pParent, const ResId& rResId, - bool _bShowSlots, const Reference< frame::XFrame >& xFrame ) - : SvTreeListBox( pParent, rResId ) - , m_bShowSlots( _bShowSlots ) - , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) - , m_libImage(CUI_RES(RID_CUIIMG_LIB)) - , m_macImage(CUI_RES(RID_CUIIMG_MACRO)) - , m_docImage(CUI_RES(RID_CUIIMG_DOC)) - , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) - , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) -{ - FreeResource(); - - if ( xFrame != NULL ) - { - m_xFrame.set( xFrame ); - } - - SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ); - - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - - SetNodeBitmaps( - aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) - ); -} - SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent) : SvTreeListBox(pParent, WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index d601623859b5..df3575fe87e0 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -71,31 +71,6 @@ void ShowErrorDialog( const Any& aException ) delete pDlg; } -void SFTreeListBox::Init() -{ - SetSelectionMode( SINGLE_SELECTION ); - - SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | - WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | - WB_HASLINES | WB_HASLINESATROOT ); - SetNodeDefaultImages(); - - nMode = 0xFF; // everything -} - -SFTreeListBox::SFTreeListBox(Window* pParent, const ResId& rResId) - : SvTreeListBox(pParent, ResId(rResId.GetId(),*rResId.GetResMgr())) - , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) - , m_libImage(CUI_RES(RID_CUIIMG_LIB)) - , m_macImage(CUI_RES(RID_CUIIMG_MACRO)) - , m_docImage(CUI_RES(RID_CUIIMG_DOC)) - , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) - , m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS)) -{ - FreeResource(); - Init(); -} - SFTreeListBox::SFTreeListBox(Window* pParent) : SvTreeListBox(pParent) , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) @@ -105,7 +80,14 @@ SFTreeListBox::SFTreeListBox(Window* pParent) , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) { - Init(); + SetSelectionMode( SINGLE_SELECTION ); + + SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | + WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | + WB_HASLINES | WB_HASLINESATROOT ); + SetNodeDefaultImages(); + + nMode = 0xFF; // everything } extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSFTreeListBox(Window *pParent, VclBuilder::stringmap &) diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 34d85aa35cd0..bfbe49f59cc2 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -69,8 +69,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); - void Init(); - protected: void ExpandTree( SvTreeListEntry* pRootEntry ); virtual void RequestingChildren( SvTreeListEntry* pParent ); @@ -80,7 +78,6 @@ public: void Init( const ::rtl::OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); - SFTreeListBox(Window* pParent, const ResId& rRes); SFTreeListBox(Window* pParent); ~SFTreeListBox(); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 28459b33594b..508ca7c76387 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -100,10 +100,7 @@ friend class SvxConfigGroupListBox; DECL_LINK(TimerHdl, void *); virtual void MouseMove( const MouseEvent& rMEvt ); - void Init(); - public: - SvxConfigFunctionListBox(Window*, const ResId&); SvxConfigFunctionListBox(Window* pParent); ~SvxConfigFunctionListBox(); void ClearAll(); @@ -165,12 +162,6 @@ protected: using SvListView::Expand; public: - SvxConfigGroupListBox ( - Window* pParent, const ResId&, - bool _bShowSlots, - const ::com::sun::star::uno::Reference - < ::com::sun::star::frame::XFrame >& xFrame - ); SvxConfigGroupListBox(Window* pParent); ~SvxConfigGroupListBox(); diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx index 49ab5b67ccfc..6e7511699d95 100644 --- a/desktop/source/deployment/gui/descedit.cxx +++ b/desktop/source/deployment/gui/descedit.cxx @@ -80,12 +80,4 @@ void DescriptionEdit::Clear() pVScrBar->Hide(); } -// ----------------------------------------------------------------------- - -void DescriptionEdit::SetDescription( const String& rDescription ) -{ - SetText( rDescription ); - UpdateScrollBar(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx index fadbea0d8368..7c8eb3e20a25 100644 --- a/desktop/source/deployment/gui/descedit.hxx +++ b/desktop/source/deployment/gui/descedit.hxx @@ -40,7 +40,6 @@ namespace dp_gui inline ~DescriptionEdit() {} void Clear(); - void SetDescription( const String& rDescription ); }; } // namespace dp_gui diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 442f34991774..25e7c7607380 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -160,8 +160,6 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual long Notify( NotifyEvent& rNEvt ); - const Size GetMinOutputSizePixel() const; - virtual void RecalcAll(); virtual void selectEntry( const long nPos ); //----------------- @@ -227,20 +225,6 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl() delete m_pRemoveBtn; } -//------------------------------------------------------------------------------ -const Size ExtBoxWithBtns_Impl::GetMinOutputSizePixel() const -{ - Size aMinSize( ExtensionBox_Impl::GetMinOutputSizePixel() ); - long nHeight = aMinSize.Height(); - nHeight += m_pOptionsBtn->GetSizePixel().Height(); - nHeight += 2 * TOP_OFFSET; - long nWidth = m_pOptionsBtn->GetSizePixel().Width(); - nWidth *= 3; - nWidth += 5*TOP_OFFSET + 20; - - return Size( nWidth, nHeight ); -} - // ----------------------------------------------------------------------- void ExtBoxWithBtns_Impl::RecalcAll() { diff --git a/filter/inc/filter/msfilter/dffpropset.hxx b/filter/inc/filter/msfilter/dffpropset.hxx index a11b3822bd3f..ae838c3d7ee5 100644 --- a/filter/inc/filter/msfilter/dffpropset.hxx +++ b/filter/inc/filter/msfilter/dffpropset.hxx @@ -59,7 +59,6 @@ class MSFILTER_DLLPUBLIC DffPropSet bool GetPropertyBool( sal_uInt32 nId, bool bDefault = false ) const; /** Returns a string property. */ ::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const; - void SetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) const; sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const; void InitializePropSet( sal_uInt16 nPropSetType ) const; diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index ef1946bdba65..b798be049f25 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -548,8 +548,6 @@ public: sal_uInt32 nMaxLen, bool bUniCode = sal_False); - static bool ReadCommonRecordHeader( DffRecordHeader& rRec, - SvStream& rIn) SAL_WARN_UNUSED_RESULT; static bool ReadCommonRecordHeader( SvStream& rSt, sal_uInt8& rVer, sal_uInt16& rInst, diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index c3ade4dfc055..495bf4caa968 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1316,13 +1316,6 @@ bool DffPropSet::GetPropertyBool( sal_uInt32 nId, bool bDefault ) const return aBuffer.makeStringAndClear(); } -void DffPropSet::SetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) const -{ - nId &= 0x3ff; - mpPropSetEntries[ nId ].aFlags.bSet = true; - mpPropSetEntries[ nId ].nContent = nValue; -}; - sal_Bool DffPropSet::SeekToContent( sal_uInt32 nRecType, SvStream& rStrm ) const { nRecType &= 0x3ff; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 9081122bb4ce..861be9d81b95 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6240,15 +6240,6 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, return ( GRFILTER_OK == nRes ); // Ergebniss melden } -/* static */ -bool SvxMSDffManager::ReadCommonRecordHeader(DffRecordHeader& rRec, - SvStream& rIn) -{ - rRec.nFilePos = rIn.Tell(); - return SvxMSDffManager::ReadCommonRecordHeader(rIn,rRec.nRecVer, - rRec.nRecInstance, rRec.nRecType, rRec.nRecLen); -} - /* also static */ bool SvxMSDffManager::ReadCommonRecordHeader(SvStream& rSt, sal_uInt8& rVer, sal_uInt16& rInst, sal_uInt16& rFbt, sal_uInt32& rLength) diff --git a/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx index 0424b0d81fa4..81d3d3739dee 100644 --- a/sot/inc/sot/object.hxx +++ b/sot/inc/sot/object.hxx @@ -269,7 +269,6 @@ class SOT_DLLPUBLIC SotObject : virtual public SvRefBase { friend class SotFactory; friend class SvObject; - sal_uInt16 nStrongLockCount; sal_uInt16 nOwnerLockCount; sal_Bool bOwner:1, bSVObject:1, // Ist Proxy, dann TRUE wenn andere Seite SV ist @@ -290,9 +289,7 @@ public: void* CastAndAddRef( const SotFactory * pFact ); - sal_uInt16 Lock( sal_Bool bLock ); // affects nStrongLockCount sal_uInt16 GetOwnerLockCount() const { return nOwnerLockCount; } - sal_uInt16 GetStrongLockCount() const { return nStrongLockCount; } void OwnerLock( sal_Bool bLock ); sal_Bool DoClose(); diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index 012799069fea..3a01028df107 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -75,9 +75,6 @@ public: virtual sal_Bool Commit(); virtual sal_Bool Revert(); sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); - sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - GetXInputStream() const; virtual sal_Size remainingSize(); }; @@ -127,7 +124,6 @@ public: SO2_DECL_BASIC_CLASS_DLL(SotStorage,SOTDATA()) SvMemoryStream * CreateMemoryStream(); - const SvStream * GetSvStream(); static sal_Bool IsStorageFile( const String & rFileName ); static sal_Bool IsStorageFile( SvStream* pStream ); @@ -136,8 +132,7 @@ public: virtual sal_Bool Validate(); - void SetKey( const rtl::OString& rKey ); - const rtl::OString& GetKey() const { return m_aKey; } + const rtl::OString& GetKey() const; void SetVersion( long nVers ) { @@ -172,7 +167,6 @@ public: virtual sal_uLong GetFormat(); virtual String GetUserName(); virtual sal_Bool ShouldConvert(); - void SetName( const String& rName ); // Liste aller Elemente virtual void FillInfoList( SvStorageInfoList * ) const; @@ -189,9 +183,6 @@ public: SotStorage * OpenSotStorage( const String & rEleName, StreamMode = STREAM_STD_READWRITE, StorageMode = STORAGE_TRANSACTED ); - SotStorage * OpenUCBStorage( const String & rEleName, - StreamMode = STREAM_STD_READWRITE, - StorageMode = STORAGE_TRANSACTED ); // Abfrage auf Storage oder Stream virtual sal_Bool IsStream( const String & rEleName ) const; virtual sal_Bool IsStorage( const String & rEleName ) const; @@ -207,7 +198,6 @@ public: const String & rNewName ); sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); - sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); sal_Bool IsOLEStorage() const; static sal_Bool IsOLEStorage( const String & rFileName ); static sal_Bool IsOLEStorage( SvStream* pStream ); diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 3264015d21f6..3bf6d92bda14 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -44,8 +44,7 @@ SO2_IMPL_BASIC_CLASS_DLL(SotObject,SotObjectFactory, |* Beschreibung *************************************************************************/ SotObject::SotObject() - : nStrongLockCount( 0 ) - , nOwnerLockCount( 0 ) + : nOwnerLockCount( 0 ) , bOwner ( sal_True ) , bSVObject ( sal_False ) , bInClose ( sal_False ) @@ -87,28 +86,6 @@ void* SotObject::CastAndAddRef( const SotFactory * pFact ) } //========================================================================= -sal_uInt16 SotObject::Lock( sal_Bool bLock ) -{ - SotObjectRef xHoldAlive( this ); - sal_uInt16 nRet; - if( bLock ) - { - AddRef(); - nRet = ++nStrongLockCount; - } - else - { - nRet = --nStrongLockCount; - ReleaseRef(); - } - - if( !nRet && !nOwnerLockCount ) - DoClose(); - - return nRet; -} - -//========================================================================= void SotObject::OwnerLock ( sal_Bool bLock /* sal_True, lock. sal_False, unlock. */ diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index bc0ab823386b..5fd1efa0b8b0 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -360,36 +360,6 @@ sal_Bool SotStorageStream::SetProperty( const String& rName, const ::com::sun::s } } -sal_Bool SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ) -{ - UCBStorageStream* pStg = PTR_CAST( UCBStorageStream, pOwnStm ); - if ( pStg ) - { - return pStg->GetProperty( rName, rValue ); - } - else - { - OSL_FAIL("Not implemented!"); - return sal_False; - } -} - -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SotStorageStream::GetXInputStream() const -{ - UCBStorageStream* pStg = PTR_CAST( UCBStorageStream, pOwnStm ); - if ( pStg ) - { - return pStg->GetXInputStream(); - } - else - { - OSL_FAIL("Not implemented!"); - return ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >(); - } -} - - - /************** class SotStorage ****************************************** *************************************************************************/ class SotStorageFactory : public SotFactory @@ -732,13 +702,9 @@ const String & SotStorage::GetName() const return m_aName; } -void SotStorage::SetName( const String& rName ) +const rtl::OString& SotStorage::GetKey() const { - // This method is necessary because most storages will not be opened with a FileName, but an external stream instead - // This stream is a stream opened by a UCP and so aName is only used as a transport for all client code of the SotStorage - // class that depends on the fact that a root storage has a name - DBG_ASSERT( !GetName().Len(), "SetName() must not be called when the storage already has a name!" ); - m_aName = rName; + return m_aKey; } /************************************************************************* @@ -960,27 +926,6 @@ SotStorage * SotStorage::OpenSotStorage( const String & rEleName, return NULL; } -SotStorage * SotStorage::OpenUCBStorage( const String & rEleName, - StreamMode nMode, - StorageMode nStorageMode ) -{ - SotStorage * pStor = NULL; - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - { - nMode |= STREAM_SHARE_DENYALL; - ErrCode nE = m_pOwnStg->GetError(); - BaseStorage * p = m_pOwnStg->OpenUCBStorage( rEleName, nMode, - (nStorageMode & STORAGE_TRANSACTED) ? sal_False : sal_True ); - pStor = new SotStorage( p ); - if( !nE ) - m_pOwnStg->ResetError(); // kein Fehler setzen - } - else - SetError( SVSTREAM_GENERALERROR ); - return pStor; -} - /************************************************************************* |* SotStorage::IsStream() |* SotStorage::IsStorage() @@ -1093,15 +1038,6 @@ sal_Bool SotStorage::MoveTo( const String & rEleName, return SVSTREAM_OK == GetError(); } -const SvStream* SotStorage::GetSvStream() -{ - const SvStream* pResult = 0; - DBG_ASSERT( Owner(), "must be owner" ); - if( m_pOwnStg ) - pResult = m_pOwnStg->GetSvStream(); - return pResult; -} - sal_Bool SotStorage::Validate() { DBG_ASSERT( m_bIsRoot, "Validate nur an Rootstorage" ); @@ -1125,29 +1061,6 @@ sal_Bool SotStorage::SetProperty( const String& rName, const ::com::sun::star::u } } -sal_Bool SotStorage::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ) -{ - UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg ); - if ( pStg ) - { - return pStg->GetProperty( rName, rValue ); - } - else if ( rName.CompareToAscii("MediaType") == COMPARE_EQUAL ) - { - String aStr = SotExchange::GetFormatMimeType( GetFormat() ); - sal_uInt16 nPos = aStr.Search(';'); - if ( nPos != STRING_NOTFOUND ) - aStr = aStr.Copy( 0, nPos ); - rValue <<= (::rtl::OUString) aStr; - return sal_True; - } - else - { - DBG_WARNING("W1:Not implemented!"); - return sal_False; - } -} - sal_Bool SotStorage::IsOLEStorage() const { UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg ); @@ -1164,24 +1077,6 @@ sal_Bool SotStorage::IsOLEStorage( SvStream* pStream ) return Storage::IsStorageFile( pStream ); } -void SotStorage::SetKey( const rtl::OString& rKey ) -{ - m_aKey = rKey; - if ( !IsOLEStorage() ) - { - sal_uInt8 aBuffer[RTL_DIGEST_LENGTH_SHA1]; - rtlDigestError nError = rtl_digest_SHA1( m_aKey.getStr(), m_aKey.getLength(), aBuffer, RTL_DIGEST_LENGTH_SHA1 ); - if ( nError == rtl_Digest_E_None ) - { - sal_uInt8* pBuffer = aBuffer; - ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( (sal_Int8*) pBuffer, RTL_DIGEST_LENGTH_SHA1 ); - ::com::sun::star::uno::Any aAny; - aAny <<= aSequ; - SetProperty( ::rtl::OUString("EncryptionKey"), aAny ); - } - } -} - SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const String& rEleName, StreamMode nMode ) { diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx index 5131f995900c..2e0e483fde2e 100644 --- a/tools/inc/tools/inetmime.hxx +++ b/tools/inc/tools/inetmime.hxx @@ -452,11 +452,6 @@ public: sal_Size & rLength, bool & rModify); - static sal_Char const * scanParameters(sal_Char const * pBegin, - sal_Char const * pEnd, - INetContentTypeParameterList * - pParameters); - static sal_Unicode const * scanParameters(sal_Unicode const * pBegin, sal_Unicode const * pEnd, INetContentTypeParameterList * diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx index fc6c57e5bd5d..980840f66008 100644 --- a/tools/inc/tools/poly.hxx +++ b/tools/inc/tools/poly.hxx @@ -247,8 +247,6 @@ public: void GetIntersection( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; void GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; - void GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const; void Move( long nHorzMove, long nVertMove ); void Translate( const Point& rTrans ); diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index 732f9b4b4060..a6dff0239a24 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -319,16 +319,6 @@ void PolyPolygon::GetUnion( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_UNION ); } -void PolyPolygon::GetDifference( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const -{ - ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_DIFF ); -} - -void PolyPolygon::GetXOR( const PolyPolygon& rPolyPoly, PolyPolygon& rResult ) const -{ - ImplDoOperation( rPolyPoly, rResult, POLY_CLIP_XOR ); -} - void PolyPolygon::ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, sal_uIntPtr nOperation ) const { // Convert to B2DPolyPolygon, temporarily. It might be diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index ae1bdb8f0fa0..2def17c82266 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -825,211 +825,6 @@ const sal_Unicode * INetMIME::scanQuotedBlock(const sal_Unicode * pBegin, } // static -sal_Char const * INetMIME::scanParameters(sal_Char const * pBegin, - sal_Char const * pEnd, - INetContentTypeParameterList * - pParameters) -{ - ParameterList aList; - sal_Char const * pParameterBegin = pBegin; - for (sal_Char const * p = pParameterBegin;; pParameterBegin = p) - { - pParameterBegin = skipLinearWhiteSpaceComment(p, pEnd); - if (pParameterBegin == pEnd || *pParameterBegin != ';') - break; - p = pParameterBegin + 1; - - sal_Char const * pAttributeBegin = skipLinearWhiteSpaceComment(p, - pEnd); - p = pAttributeBegin; - bool bDowncaseAttribute = false; - while (p != pEnd && isTokenChar(*p) && *p != '*') - { - bDowncaseAttribute = bDowncaseAttribute || isUpperCase(*p); - ++p; - } - if (p == pAttributeBegin) - break; - rtl::OString aAttribute(pAttributeBegin, (p - pAttributeBegin)); - if (bDowncaseAttribute) - aAttribute = aAttribute.toAsciiLowerCase(); - - sal_uInt32 nSection = 0; - if (p != pEnd && *p == '*') - { - ++p; - if (p != pEnd && isDigit(*p) - && !scanUnsigned(p, pEnd, false, nSection)) - break; - } - - bool bPresent; - Parameter ** pPos = aList.find(aAttribute, nSection, bPresent); - - bool bExtended = false; - if (p != pEnd && *p == '*') - { - ++p; - bExtended = true; - } - - p = skipLinearWhiteSpaceComment(p, pEnd); - - if (p == pEnd || *p != '=') - break; - - p = skipLinearWhiteSpaceComment(p + 1, pEnd); - - rtl::OString aCharset; - rtl::OString aLanguage; - rtl::OStringBuffer aValue; - if (bExtended) - { - if (nSection == 0) - { - sal_Char const * pCharsetBegin = p; - bool bDowncaseCharset = false; - while (p != pEnd && isTokenChar(*p) && *p != '\'') - { - bDowncaseCharset = bDowncaseCharset || isUpperCase(*p); - ++p; - } - if (p == pCharsetBegin) - break; - if (pParameters) - { - aCharset = rtl::OString( - pCharsetBegin, p - pCharsetBegin); - if (bDowncaseCharset) - aCharset = aCharset.toAsciiLowerCase(); - } - - if (p == pEnd || *p != '\'') - break; - ++p; - - sal_Char const * pLanguageBegin = p; - bool bDowncaseLanguage = false; - int nLetters = 0; - for (; p != pEnd; ++p) - if (isAlpha(*p)) - { - if (++nLetters > 8) - break; - bDowncaseLanguage = bDowncaseLanguage - || isUpperCase(*p); - } - else if (*p == '-') - { - if (nLetters == 0) - break; - nLetters = 0; - } - else - break; - if (nLetters == 0 || nLetters > 8) - break; - if (pParameters) - { - aLanguage = rtl::OString( - pLanguageBegin, p - pLanguageBegin); - if (bDowncaseLanguage) - aLanguage = aLanguage.toAsciiLowerCase(); - } - - if (p == pEnd || *p != '\'') - break; - ++p; - } - if (pParameters) - { - while (p != pEnd && (isTokenChar(*p) || !isUSASCII(*p))) - { - if (*p == '%') - { - if (p + 2 < pEnd) - { - int nWeight1 = getHexWeight(p[1]); - int nWeight2 = getHexWeight(p[2]); - if (nWeight1 >= 0 && nWeight2 >= 0) - { - aValue.append(sal_Char(nWeight1 << 4 | nWeight2)); - p += 3; - continue; - } - } - } - aValue.append(*p++); - } - } - else - while (p != pEnd && (isTokenChar(*p) || !isUSASCII(*p))) - ++p; - } - else if (p != pEnd && *p == '"') - { - if (pParameters) - { - bool bInvalid = false; - for (++p;;) - { - if (p == pEnd) - { - bInvalid = true; - break; - } - else if (*p == '"') - { - ++p; - break; - } - else if (*p == 0x0D) // CR - { - if (pEnd - p < 3 || p[1] != 0x0A // LF - || !isWhiteSpace(p[2])) - { - bInvalid = true; - break; - } - p += 2; - } - else if (*p == '\\' && ++p == pEnd) - { - bInvalid = true; - break; - } - aValue.append(*p++); - } - if (bInvalid) - break; - } - else - { - sal_Char const * pStringEnd = skipQuotedString(p, pEnd); - if (p == pStringEnd) - break; - p = pStringEnd; - } - } - else - { - sal_Char const * pTokenBegin = p; - while (p != pEnd && (isTokenChar(*p) || !isUSASCII(*p))) - ++p; - if (p == pTokenBegin) - break; - if (pParameters) - aValue.append(pTokenBegin, static_cast< sal_Int32 >(p - pTokenBegin)); - } - - if (!bPresent) - *pPos = new Parameter(*pPos, aAttribute, aCharset, aLanguage, - aValue.makeStringAndClear(), nSection, bExtended); - } - return parseParameters(aList, pParameters) ? pParameterBegin : pBegin; -} - -// static sal_Unicode const * INetMIME::scanParameters(sal_Unicode const * pBegin, sal_Unicode const * pEnd, INetContentTypeParameterList * diff --git a/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx index 7c090b72dd84..6e264fc453af 100644 --- a/unotools/inc/unotools/ucblockbytes.hxx +++ b/unotools/inc/unotools/ucblockbytes.hxx @@ -121,13 +121,6 @@ protected: public: // properties: Referer, PostMimeType static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent, - const ::rtl::OUString& rReferer, - const ::rtl::OUString& rMediaType, - const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xPostData, - const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter, - UcbLockBytesHandler* pHandler=0 ); - - static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent, const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps, StreamMode eMode, const ::com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionHandler >& xInter, @@ -150,8 +143,6 @@ public: ErrCode GetError() const { return m_nError; } - void Cancel(); // is alive only for compatibility reasons - // the following properties are available when and after the first DataAvailable callback has been executed String GetContentType() const; String GetRealURL() const; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 758aef20670c..ee5e86122380 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1572,13 +1572,6 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const } //---------------------------------------------------------------------------- -void UcbLockBytes::Cancel() -{ - // is alive only for compatibility reasons - OSL_ENSURE( m_bTerminated, "UcbLockBytes is not thread safe so it can be used only syncronously!\n" ); -} - -//---------------------------------------------------------------------------- IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl) { if ( hasInputStream_Impl() && m_xHandler.Is() ) @@ -1611,45 +1604,6 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre return xLockBytes; } -UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xContent, const ::rtl::OUString& rReferer, const ::rtl::OUString& rMediaType, - const Reference < XInputStream >& xPostData, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler ) -{ - if( !xContent.is() ) - return NULL; - - UcbLockBytesRef xLockBytes = new UcbLockBytes( pHandler ); - xLockBytes->SetSynchronMode( !pHandler ); - Reference< XActiveDataControl > xSink = (XActiveDataControl*) new UcbDataSink_Impl( xLockBytes ); - - PostCommandArgument2 aArgument; - aArgument.Source = xPostData; - aArgument.Sink = xSink; - aArgument.MediaType = rMediaType; - aArgument.Referer = rReferer; - - Command aCommand; - aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("post")); - aCommand.Argument <<= aArgument; - - Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) ); - - sal_Bool bError = UCBOpenContentSync( xLockBytes, - xContent, - aCommand, - xSink, - xInteractionHandler, - xProgressHdl, - pHandler ); - - if ( xLockBytes->GetError() == ERRCODE_NONE && ( bError || !xLockBytes->getInputStream().is() ) ) - { - OSL_FAIL("No InputStream, but no error set!" ); - xLockBytes->SetError( ERRCODE_IO_GENERAL ); - } - - return xLockBytes; -} - UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xContent, const Sequence < PropertyValue >& rProps, StreamMode eOpenMode, const Reference < XInteractionHandler >& xInteractionHandler, UcbLockBytesHandler* pHandler ) { diff --git a/unusedcode.easy b/unusedcode.easy index e805913aabb5..bedbdf7b2c6b 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,4 +1,9 @@ +FileStream::open(rtl::OString const&, FileAccessMode) FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool) +GraphicObject::SwapIn(SvStream*) +LiblantagDataRef::presetDataPath(rtl::OUString const&) +Line::GetLength() const +Line::Intersection(Rectangle const&, Line&) const RelatedMultipart::getIds() SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) ScFiltersTest::testColorScaleODS() @@ -8,9 +13,16 @@ ScVbaFormat<ooo::vba::excel::XRange>::setNumberFormat(com::sun::star::lang::Loca ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) ScVbaFormat<ooo::vba::excel::XStyle>::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const&) -SvTreeEntryList::front() +SotFactory::CastAndAddRef(SotObject*) const +String::String(unsigned short) +SvListView::GetModel() const +SvTreeList::GetChildIterators(SvTreeListEntry const*) const +SvTreeListEntry::GetChildEntries() +SvTreeListEntry::GetChildEntries() const +SvtGraphicStroke::toString() const TextEngine::GetLeftMargin() const ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) +UnoControl::UnoControl() VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction const&, Point const&, boost::shared_array<unsigned char> const&) Window::PostUserEvent(unsigned long&, unsigned long, void*) XclExpPivotCache::GetFieldAcc(rtl::OUString const&) @@ -32,18 +44,15 @@ apitest::XPropertySet::testAddVetoableChangeListener() apitest::XPropertySet::testRemovePropertyChangeListener() apitest::XPropertySet::testRemoveVetoableChangeListener() apitest::XSpreadsheetDocument::testGetSheets() -cairocanvas::CanvasHelper::flush() const -cairocanvas::CanvasHelper::getPalette() -cairocanvas::SpriteDeviceHelper::getSurface() -cairocanvas::TextLayout::draw(_cairo*) +cairocanvas::TextLayout::useFont(_cairo*) canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&) comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const connectivity::file::OStatement_Base::reset() +connectivity::mork::MQueryHelper::next() connectivity::mork::MQueryHelperResultEntry::insert(rtl::OString const&, rtl::OUString&) connectivity::mork::OColumnAlias::OColumnAlias() -connectivity::mozab::MQueryHelper::next() connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) @@ -51,6 +60,7 @@ framework::OReadMenuDocumentHandler::getServiceFactory() jfw_plugin::VendorBase::createInstance() oox::drawingml::TextListStyle::dump() const oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) +oox::xls::FormulaProcessorBase::generateRangeList2dString(oox::xls::ApiCellRangeList const&, bool, unsigned short, bool) sc_apitest::main() sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) @@ -58,3 +68,11 @@ sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*) std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector() std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector() +svgio::svgreader::SvgDocument::removeSvgStyleAttributesFromMapper(rtl::OUString const&) +svgio::svgreader::SvgStyleAttributes::setFillRule(bool const*) +svgio::svgreader::pathTextBreakupHelper::getLength(rtl::OUString const&) const +test::BootstrapFixtureBase::getPathFromWorkdir(char const*) +test::BootstrapFixtureBase::getURLFromWorkdir(char const*) +writerfilter::analyzerIds() +writerfilter::createAnalyzer() +writerfilter::createStreamHandler() diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index 620de4d6c68b..b0b1a2be4e16 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -172,8 +172,6 @@ public: const String& GetDocFileName() const; sal_uLong GetDocFilePos() const; - sal_Bool ReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False ); - sal_Bool SwapOut(); sal_Bool SwapOut( SvStream* pOStm ); sal_Bool SwapIn(); diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index baba03386689..c659274c006d 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -625,14 +625,6 @@ sal_uLong Graphic::GetDocFilePos() const // ------------------------------------------------------------------------ -sal_Bool Graphic::ReadEmbedded( SvStream& rIStream, sal_Bool bSwap ) -{ - ImplTestRefCount(); - return mpImpGraphic->ImplReadEmbedded( rIStream, bSwap ); -} - -// ------------------------------------------------------------------------ - sal_Bool Graphic::SwapOut() { ImplTestRefCount(); |