diff options
38 files changed, 3 insertions, 494 deletions
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 8b0c9c58593d..c9b68c7f6761 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -246,7 +246,6 @@ namespace framework virtual void resetAll() SAL_OVERRIDE; virtual void listActionEntered( const OUString& i_comment ) SAL_OVERRIDE; virtual void listActionLeft( const OUString& i_comment ) SAL_OVERRIDE; - virtual void listActionLeftAndMerged() SAL_OVERRIDE; virtual void listActionCancelled() SAL_OVERRIDE; virtual void undoManagerDying() SAL_OVERRIDE; @@ -840,20 +839,6 @@ namespace framework notify( i_comment, &XUndoManagerListener::leftContext ); } - void UndoManagerHelper_Impl::listActionLeftAndMerged() - { -#if OSL_DEBUG_LEVEL > 0 - const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top(); - m_aContextAPIFlags.pop(); - OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, "UndoManagerHelper_Impl::listActionLeftAndMerged: API and non-API contexts interwoven!" ); -#endif - - if ( m_bAPIActionRunning ) - return; - - notify( &XUndoManagerListener::leftHiddenContext ); - } - void UndoManagerHelper_Impl::listActionCancelled() { #if OSL_DEBUG_LEVEL > 0 diff --git a/include/svl/adrparse.hxx b/include/svl/adrparse.hxx index e6c08e84cb24..b4e4f1b2e678 100644 --- a/include/svl/adrparse.hxx +++ b/include/svl/adrparse.hxx @@ -65,12 +65,6 @@ public: return nIndex == 0 ? m_aFirst.m_aAddrSpec : m_aRest[ nIndex - 1 ]->m_aAddrSpec; } - - const OUString& GetRealName(sal_Int32 nIndex) const - { - return nIndex == 0 ? m_aFirst.m_aRealName : - m_aRest[ nIndex - 1 ]->m_aRealName; - } }; #endif // INCLUDED_SVL_ADRPARSE_HXX diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index abb900003f54..11a4e97f8129 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -50,7 +50,6 @@ public: void SetValue( const OUString& rNewVal ); using SfxPoolItem::Compare; - virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/svl/currencytable.hxx b/include/svl/currencytable.hxx index ed2e5f47fd47..44ead72418b7 100644 --- a/include/svl/currencytable.hxx +++ b/include/svl/currencytable.hxx @@ -23,7 +23,6 @@ public: typedef DataType::const_iterator const_iterator; iterator begin(); - const_iterator begin() const; NfCurrencyEntry& operator[] ( size_t i ); const NfCurrencyEntry& operator[] ( size_t i ) const; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 0897ab5d43d1..e8e321caf1e5 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -48,9 +48,6 @@ public: virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; - virtual int Compare(SfxPoolItem const & rWith, - IntlWrapper const & rIntlWrapper) const SAL_OVERRIDE; - virtual bool GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index f66634d1ba40..cd949fb02003 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -89,7 +89,6 @@ public: inline SvStream& operator*() const; - inline void Reset(); sal_uInt32 Close( bool bSeekToEndOfRec = true ); private: @@ -258,9 +257,6 @@ public: SfxMiniRecordReader( SvStream *pStream, sal_uInt8 nTag ); inline ~SfxMiniRecordReader(); - inline sal_uInt8 GetTag() const; - inline bool IsValid() const; - inline SvStream& operator*() const; inline void Skip(); @@ -303,8 +299,6 @@ protected: sal_uInt16 nTag, sal_uInt8 nCurVer ); public: - inline void Reset(); - sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; @@ -335,14 +329,6 @@ protected: pStream, SFX_REC_PRETAG_EXT ); } bool FindHeader_Impl( sal_uInt16 nTypes, sal_uInt16 nTag ); - bool ReadHeader_Impl( sal_uInt16 nTypes ); - -public: - - inline sal_uInt16 GetTag() const; - - inline sal_uInt8 GetVersion() const; - inline bool HasVersion( sal_uInt16 nVersion ) const; }; /** @@ -406,10 +392,6 @@ protected: public: inline ~SfxMultiFixRecordWriter(); - inline void NewContent(); - - inline void Reset(); - sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; @@ -512,9 +494,6 @@ public: sal_uInt8 nRecordVer ); void NewContent( sal_uInt16 nTag, sal_uInt8 nVersion ); -// private: not possible, since some compilers then make the previous also private - void NewContent() - { OSL_FAIL( "NewContent() only allowed with args" ); } }; /** Read multiple content items of an existing record @@ -571,9 +550,6 @@ public: bool GetContent(); inline sal_uInt16 GetContentTag(); inline sal_uInt8 GetContentVersion() const; - inline bool HasContentVersion( sal_uInt16 nVersion ) const; - - inline sal_uInt32 ContentCount() const; }; /** create a mini record @@ -613,12 +589,6 @@ inline SvStream& SfxMiniRecordWriter::operator*() const return *_pStream; } -inline void SfxMiniRecordWriter::Reset() -{ - _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI ); - _bHeaderOk = false; -} - /** The dtor moves the stream automatically to the position directly behind the record */ inline SfxMiniRecordReader::~SfxMiniRecordReader() { @@ -633,28 +603,6 @@ inline void SfxMiniRecordReader::Skip() _bSkipped = true; } -/** Get the pre-tag of this record - * - * The pre-tag might also be SFX_REC_PRETAG_EXT or SFX_REC_PRETAG_EOR. - * The latter means that in the stream the error code ERRCODE_IO_WRONGFORMAT - * is set. The former is valid, since extended records are just building on - * top of SfxMiniRecord. - * - * @return The pre-tag - */ -inline sal_uInt8 SfxMiniRecordReader::GetTag() const -{ - return _nPreTag; -} - -/** This method allows to check if the record could be recreated successfully - * from the stream and, hence, was correct for this record type. - */ -inline bool SfxMiniRecordReader::IsValid() const -{ - return _nPreTag != SFX_REC_PRETAG_EOR; -} - /** get the owning stream * * This method returns the stream in which the record is contained. @@ -691,30 +639,6 @@ inline sal_uInt32 SfxSingleRecordWriter::Close( bool bSeekToEndOfRec ) return nRet; } -inline void SfxSingleRecordWriter::Reset() -{ - _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + - SFX_REC_HEADERSIZE_SINGLE ); - _bHeaderOk = false; -} - -/** @returns the tag for the overall record (stored in the record's head) */ -inline sal_uInt16 SfxSingleRecordReader::GetTag() const -{ - return _nRecordTag; -} - -/** @returns version of the record */ -inline sal_uInt8 SfxSingleRecordReader::GetVersion() const -{ - return _nRecordVer; -} - -/** determine if the read record has at least the given version */ -inline bool SfxSingleRecordReader::HasVersion( sal_uInt16 nVersion ) const -{ - return _nRecordVer >= nVersion; -} /** The destructor closes the record automatically if not done earlier */ inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter() @@ -724,33 +648,6 @@ inline SfxMultiFixRecordWriter::~SfxMultiFixRecordWriter() Close(); } -/** add a new content into a record - * - * @note each, also the first record, must be initialized by this method - */ -inline void SfxMultiFixRecordWriter::NewContent() -{ - #ifdef DBG_UTIL - sal_uLong nOldStartPos; - // store starting position of the current content - CAUTION: sub classes! - nOldStartPos = _nContentStartPos; - #endif - _nContentStartPos = _pStream->Tell(); - -#ifdef DBG_UTIL - // is there a previous content? - if ( _nContentCount ) - { - // check if the previous content stays in specified max. size - DBG_ASSERT( _nContentStartPos - nOldStartPos == _nContentSize, - "wrong content size detected" ); - } -#endif - - // count how many - ++_nContentCount; -} - /** * Creates a SfxMultiMixRecord in the given stream with a separate tags and * versions of its content parts. The sizes of each part are calculated @@ -767,14 +664,6 @@ inline SfxMultiMixRecordWriter::SfxMultiMixRecordWriter( SvStream* pStream, { } -inline void SfxMultiFixRecordWriter::Reset() -{ - _pStream->Seek( _nStartPos + SFX_REC_HEADERSIZE_MINI + - SFX_REC_HEADERSIZE_SINGLE + - SFX_REC_HEADERSIZE_MULTI ); - _bHeaderOk = false; -} - /** @returns the tag of the last opened content * @see SfxMultiRecordReder::GetContent() */ @@ -791,26 +680,6 @@ inline sal_uInt8 SfxMultiRecordReader::GetContentVersion() const return _nContentVer; } -/** Determines if the given version is in the last opened content - * - * This method checks if the version is contained in the last version of the - * content that was opened with SfxMultiRecordReder::GetContent(). - * - * @param nVersion The version to find - * @return true, if found - * @see SfxMultiRecordReder::GetContent() - */ -inline bool SfxMultiRecordReader::HasContentVersion( sal_uInt16 nVersion ) const -{ - return _nContentVer >= nVersion; -} - -/** @returns number of this record's contents */ -inline sal_uInt32 SfxMultiRecordReader::ContentCount() const -{ - return _nContentCount; -} - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index cabfd16f6013..0271f2353427 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -55,7 +55,6 @@ public: nVal = nNewVal; } bool GetFlag( sal_uInt8 nFlag ) const { return ( (nVal & ( 1<<nFlag))); } - void SetFlag( sal_uInt8 nFlag, bool bVal ) { if(bVal) { nVal |= (1<<nFlag); } else { nVal &= ~(1<<nFlag);};} }; #endif diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index 3fcca5eb0d49..fd4ff0356274 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -96,14 +96,6 @@ public: if (QueryProtocol (rUrl.GetProtocol())) PutUrl_Impl (rUrl); } - - void PutUrl (const OUString &rUrl) - { - INetProtocol eProto = - INetURLObject::CompareProtocolScheme (rUrl); - if (QueryProtocol (eProto)) - PutUrl_Impl (INetURLObject (rUrl)); - } }; // broadcasted from PutUrl(). diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 9c7ebd5b125d..45e6a8aabd76 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -27,7 +27,6 @@ public: virtual bool operator== ( const SfxPoolItem& rItem ) const SAL_OVERRIDE; virtual int Compare( const SfxPoolItem& r ) const SAL_OVERRIDE; - virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; virtual bool GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, diff --git a/include/svl/itemiter.hxx b/include/svl/itemiter.hxx index 691a734501f2..30b6bd13d00d 100644 --- a/include/svl/itemiter.hxx +++ b/include/svl/itemiter.hxx @@ -43,18 +43,12 @@ public: m_nCurrent = m_nStart; return m_rSet.m_nCount ? *(m_rSet.m_pItems + m_nCurrent) : nullptr; } - const SfxPoolItem* LastItem() - { - m_nCurrent = m_nEnd; - return m_rSet.m_nCount ? *(m_rSet.m_pItems + m_nCurrent) : nullptr; - } const SfxPoolItem* GetCurItem() { return m_rSet.m_nCount ? *(m_rSet.m_pItems + m_nCurrent) : nullptr; } const SfxPoolItem* NextItem(); - bool IsAtStart() const { return m_nCurrent == m_nStart; } bool IsAtEnd() const { return m_nCurrent == m_nEnd; } sal_uInt16 GetCurPos() const { return m_nCurrent; } diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 39f0b797fa4a..efc1c4a254c1 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -210,7 +210,6 @@ public: sal_uInt16 nOldStart, sal_uInt16 nOldEnd, const sal_uInt16 *pWhichIdTab ); sal_uInt16 GetNewWhich( sal_uInt16 nOldWhich ) const; - sal_uInt16 GetVersion() const; void SetFileFormatVersion( sal_uInt16 nFileFormatVersion ); bool IsCurrentVersionLoading() const; diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx index 1dbf15a698c7..ed809faa4974 100644 --- a/include/svl/listener.hxx +++ b/include/svl/listener.hxx @@ -51,7 +51,6 @@ public: bool StartListening( SvtBroadcaster& rBroadcaster ); bool EndListening( SvtBroadcaster& rBroadcaster ); void EndListeningAll(); - bool IsListening( SvtBroadcaster& rBroadcaster ) const; void CopyAllBroadcasters( const SvtListener& r ); bool HasBroadcaster() const; diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index a4ab2a710c26..8046edaea427 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -88,9 +88,6 @@ public: SvxMacroTableDtor& operator=( const SvxMacroTableDtor &rCpy ); bool operator==( const SvxMacroTableDtor& rOther ) const; - // deletes all entries - void clear() { aSvxMacroTable.clear(); } - SvStream& Read( SvStream &, sal_uInt16 nVersion = SVX_MACROTBL_AKTVERSION ); SvStream& Write( SvStream & ) const; @@ -145,7 +142,6 @@ public: inline const SvxMacro& GetMacro( sal_uInt16 nEvent ) const; inline bool HasMacro( sal_uInt16 nEvent ) const; void SetMacro( sal_uInt16 nEvent, const SvxMacro& ); - inline bool DelMacro( sal_uInt16 nEvent ); private: SvxMacroTableDtor aMacroTable; @@ -170,10 +166,6 @@ inline const SvxMacro& SvxMacroItem::GetMacro( sal_uInt16 nEvent ) const { return *(aMacroTable.Get(nEvent)); } -inline bool SvxMacroItem::DelMacro( sal_uInt16 nEvent ) -{ - return aMacroTable.Erase(nEvent); -} #endif diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx index 2da0414aeb92..9e9ddbb83b7f 100644 --- a/include/svl/ondemand.hxx +++ b/include/svl/ondemand.hxx @@ -94,8 +94,6 @@ public: bool isInitialized() const { return bInitialized; } - bool is() const { return pCurrent != NULL; } - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag @@ -138,21 +136,6 @@ public: LanguageType getCurrentLanguage() const { return eCurrentLanguage; } - LocaleDataWrapper* getAnyLocale() - { - if ( !pAny ) - { - pAny = new LocaleDataWrapper( m_xContext, pCurrent->getLanguageTag() ); - eLastAnyLanguage = eCurrentLanguage; - } - else if ( pCurrent != pAny ) - { - pAny->setLanguageTag( pCurrent->getLanguageTag() ); - eLastAnyLanguage = eCurrentLanguage; - } - return pAny; - } - const LocaleDataWrapper* get() const { return pCurrent; } const LocaleDataWrapper* operator->() const { return get(); } const LocaleDataWrapper& operator*() const { return *get(); } @@ -191,10 +174,6 @@ public: delete pPtr; } - bool isInitialized() const { return bInitialized; } - - bool is() const { return pPtr != NULL; } - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::lang::Locale& rLocale @@ -271,8 +250,6 @@ public: bool isInitialized() const { return bInitialized; } - bool is() const { return pPtr != NULL; } - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, LanguageType eLang, @@ -308,15 +285,6 @@ public: return pPtr; } - const ::utl::TransliterationWrapper* getForModule( const OUString& rModule, LanguageType eLang ) const - { - if ( !pPtr ) - pPtr = new ::utl::TransliterationWrapper( m_xContext, nType ); - pPtr->loadModuleByImplName( rModule, eLang ); - bValid = false; // reforce settings change in get() - return pPtr; - } - const ::utl::TransliterationWrapper* operator->() const { return get(); } const ::utl::TransliterationWrapper& operator*() const { return *get(); } }; @@ -352,8 +320,6 @@ public: delete pPtr; } - bool isInitialized() const { return bInitialized; } - void init( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) @@ -367,8 +333,6 @@ public: bInitialized = true; } - bool is() const { return pPtr != NULL; } - NativeNumberWrapper* get() const { if ( !pPtr ) diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 8a687bfaa358..06c7f7f6d323 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -170,7 +170,6 @@ public: bool operator!=( const SfxPoolItem& rItem ) const { return !(*this == rItem); } virtual int Compare( const SfxPoolItem &rWith ) const; - virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const; /** @return true if it has a valid string representation */ virtual bool GetPresentation( SfxItemPresentation ePresentation, @@ -270,7 +269,6 @@ public: // create a copy of itself virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - void SetWhich(sal_uInt16 nWh) { m_nWhich = nWh; } }; class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index dd6826ecf841..61fcdc833b3b 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -49,10 +49,6 @@ public: virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; const Rectangle& GetValue() const { return aVal; } - void SetValue( const Rectangle& rNewVal ) { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - aVal = rNewVal; - } virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index ac5bd12904aa..1fc7692edd43 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -45,10 +45,6 @@ public: const IntlWrapper * = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline sal_uInt16& From() { return nFrom; } - inline sal_uInt16 From() const { return nFrom; } - inline sal_uInt16& To() { return nTo; } - inline sal_uInt16 To() const { return nTo; } - inline bool HasRange() const { return nTo>nFrom; } virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; @@ -73,7 +69,6 @@ public: OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - inline const sal_uInt16* GetRanges() const { return _pRanges; } virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 9c6be0c491eb..9f2ab1a058da 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -136,9 +136,6 @@ public: bool GetPattern() const { return m_bPattern; } void SetPattern(bool bNewPattern) { m_bPattern = bNewPattern; } - bool IsContent() const { return m_bContent; } - void SetContent( bool bNew ) { m_bContent = bNew; } - SfxStyleFamily GetFamily() const { return m_eFamily; } void SetFamily( SfxStyleFamily eNewFamily ) { m_eFamily = eNewFamily; } diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 5798b4936285..43849dd4977c 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -124,9 +124,6 @@ public: virtual bool HasParentSupport() const; // Default true virtual bool HasClearParentSupport() const; // Default false virtual bool IsUsed() const; // Default true - // Default from the Itemset; either from the passed one - // or from the Set returned by GetItemSet() - virtual OUString GetDescription(); virtual OUString GetDescription( SfxMapUnit eMetric ); SfxStyleSheetBasePool& GetPool() { return *pPool; } @@ -173,7 +170,6 @@ protected: private: - sal_uInt16 GetPos() { return nAktPosition; } SVL_DLLPRIVATE bool IsTrivialSearch(); SfxStyleSheetBase* pAktStyle; @@ -235,9 +231,6 @@ public: SfxStyleFamily eFam, sal_uInt16 nMask = SFXSTYLEBIT_ALL); - virtual void Replace( - SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget ); - virtual void Remove( SfxStyleSheetBase* ); void Insert( SfxStyleSheetBase* ); @@ -246,8 +239,6 @@ public: SfxStyleSheetBasePool& operator=( const SfxStyleSheetBasePool& ); SfxStyleSheetBasePool& operator+=( const SfxStyleSheetBasePool& ); - unsigned GetNumberOfStyles(); - SfxStyleSheetBase* First(); SfxStyleSheetBase* Next(); virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); @@ -318,12 +309,8 @@ enum SfxStyleSheetHintId class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint { - SfxStyleSheetHintId nHint; - public: - SfxStyleSheetPoolHint(SfxStyleSheetHintId nArgHint) : nHint(nArgHint){} - SfxStyleSheetHintId GetHint() const - { return nHint; } + SfxStyleSheetPoolHint(SfxStyleSheetHintId ) {} }; diff --git a/include/svl/stylepool.hxx b/include/svl/stylepool.hxx index 61eca0bac67d..18f3bef940e1 100644 --- a/include/svl/stylepool.hxx +++ b/include/svl/stylepool.hxx @@ -67,10 +67,6 @@ public: IStylePoolIteratorAccess* createIterator( const bool bSkipUnusedItemSets = false, const bool bSkipIgnorableItems = false ); - /** Returns the number of styles - */ - sal_Int32 getCount() const; - virtual ~StylePool(); static OUString nameOf( SfxItemSet_Pointer_t pSet ); @@ -83,7 +79,6 @@ public: If there is no more SfxItemSet, the delivered share_pointer is empty. */ virtual StylePool::SfxItemSet_Pointer_t getNext() = 0; - virtual OUString getName() = 0; virtual ~IStylePoolIteratorAccess() {}; }; #endif diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index e807a553baf8..b7aeff9574c5 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -52,11 +52,6 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - - const Size& GetValue() const { return aVal; } - void SetValue( const Size& rNewVal ) { - DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); - aVal = rNewVal; } }; #endif diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 19f190140aa7..bbae41f66cfb 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -177,7 +177,6 @@ public: virtual void resetAll() = 0; virtual void listActionEntered( const OUString& i_comment ) = 0; virtual void listActionLeft( const OUString& i_comment ) = 0; - virtual void listActionLeftAndMerged() = 0; virtual void listActionCancelled() = 0; virtual void undoManagerDying() = 0; diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 9a9351efc116..109b631f93fc 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -71,8 +71,6 @@ public: OUString GetValueTextByVal(bool bTheValue) const; bool GetValue() const { return m_nValue.bVisible; } - - void SetValue(bool bVisible) { m_nValue.bVisible = bVisible; } }; #endif // INCLUDED_SVL_VISITEM_HXX diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 0127662ebcfb..df4391f2c37a 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -247,7 +247,6 @@ public: sal_uInt16 GetPositiveFormat() const { return nPositiveFormat; } sal_uInt16 GetNegativeFormat() const { return nNegativeFormat; } sal_uInt16 GetDigits() const { return nDigits; } - sal_Unicode GetZeroChar() const { return cZeroChar; } /** [$DM-407] (bBank==false) or [$DEM] (bBank==true) is returned. If bBank==false and @@ -602,9 +601,6 @@ public: @ATTENTION! Also clears the old table using ClearMergeTable() */ SvNumberFormatterMergeMap ConvertMergeTableToMap(); - /// Return the last used position ever of a language/country combination - sal_uInt16 GetLastInsertKey(sal_uInt32 CLOffset); - /** Return the format index of a builtin format for a specific language/country. If nFormat is not a builtin format nFormat is returned. */ sal_uInt32 GetFormatForLanguageIfBuiltIn( sal_uInt32 nFormat, diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx index 403ba2936ccd..21c106ce9bfe 100644 --- a/include/svl/zformat.hxx +++ b/include/svl/zformat.hxx @@ -87,10 +87,9 @@ public: SvNumberNatNum() : eLang( LANGUAGE_DONTKNOW ), nNum(0), bDBNum(false), bDate(false), bSet(false) {} bool IsComplete() const { return bSet && eLang != LANGUAGE_DONTKNOW; } - sal_uInt8 GetRawNum() const { return nNum; } - sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; } + sal_uInt8 GetNatNum() const { return bDBNum ? MapDBNumToNatNum( nNum, eLang, bDate ) : nNum; } #ifdef THE_FUTURE - sal_uInt8 GetDBNum() const { return bDBNum ? nNum : MapNatNumToDBNum( nNum, eLang, bDate ); } + sal_uInt8 GetDBNum() const { return bDBNum ? nNum : MapNatNumToDBNum( nNum, eLang, bDate ); } #endif LanguageType GetLang() const { return eLang; } void SetLang( LanguageType e ) { eLang = e; } @@ -200,9 +199,6 @@ public: const LocaleDataWrapper& rLoc, bool bDontQuote = false ) const; - void SetUsed(const bool b) { bIsUsed = b; } - bool GetUsed() const { return bIsUsed; } - bool IsStarFormatSupported() const { return bStarFlag; } void SetStarFormatSupport( bool b ) { bStarFlag = b; } /** @@ -384,8 +380,6 @@ public: or: MM/YY => ('M' << 8) | 'Y' */ sal_uInt32 GetExactDateOrder() const; - ImpSvNumberformatScan& ImpGetScan() const { return rScan; } - // used in XML export void GetConditions( SvNumberformatLimitOps& rOper1, double& rVal1, SvNumberformatLimitOps& rOper2, double& rVal2 ) const; @@ -398,16 +392,6 @@ public: ::com::sun::star::i18n::NativeNumberXmlAttributes& rAttr, sal_uInt16 nNumFor ) const; - /** @returns <TRUE/> if E,EE,R,RR,AAA,AAAA in format code of subformat - nNumFor (0..3) and <b>no</b> preceding calendar was specified and the - currently loaded calendar is "gregorian". */ - bool IsOtherCalendar( sal_uInt16 nNumFor ) const - { - if ( nNumFor < 4 ) - return ImpIsOtherCalendar( NumFor[nNumFor] ); - return false; - } - /** Switches to the first non-"gregorian" calendar, but only if the current calendar is "gregorian"; original calendar name and date/time returned, but only if calendar switched and rOrgCalendar was empty. */ diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index c68a8c6cad6e..c703193518da 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -32,7 +32,6 @@ #define SFX_REC_PRE(n) ( ((n) & 0x000000FF) ) #define SFX_REC_OFS(n) ( ((n) & 0xFFFFFF00) >> 8 ) #define SFX_REC_TYP(n) ( ((n) & 0x000000FF) ) -#define SFX_REC_VER(n) ( ((n) & 0x0000FF00) >> 8 ) #define SFX_REC_TAG(n) ( ((n) & 0xFFFF0000) >> 16 ) #define SFX_REC_CONTENT_VER(n) ( ((n) & 0x000000FF) ) @@ -224,37 +223,6 @@ SfxSingleRecordWriter::SfxSingleRecordWriter(sal_uInt8 nRecordType, /** * - * Internal method for reading an SfxMultiRecord header, after - * the base class has been initialized and its header has been read. - * Set an error code on the stream if needed, but don't seek back - * in case of error. - */ -inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes ) -{ - bool bRet; - - // read header of the base class - sal_uInt32 nHeader=0; - _pStream->ReadUInt32( nHeader ); - if ( !SetHeader_Impl( nHeader ) ) - bRet = false; - else - { - // read own header - _pStream->ReadUInt32( nHeader ); - _nRecordVer = sal::static_int_cast< sal_uInt8 >(SFX_REC_VER(nHeader)); - _nRecordTag = sal::static_int_cast< sal_uInt16 >(SFX_REC_TAG(nHeader)); - - // wrong record type? - _nRecordType = sal::static_int_cast< sal_uInt8 >(SFX_REC_TYP(nHeader)); - bRet = 0 != ( nTypes & _nRecordType); - } - return bRet; -} - - -/** - * * @param nTypes arithmetic OR of allowed record types * @param nTag record tag to find * diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 89961e36ff8b..fdef4f422327 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -403,8 +403,6 @@ public: RW_SvMemoryStream( sal_uLong InitSize=512, sal_uLong Resize=64 ): SvMemoryStream( InitSize, Resize ){} - - sal_uLong getActualSize(){ return nEndOfData; } }; diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index a5427df0b2f8..36eaa98faa02 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -121,16 +121,6 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal ) CntUnencodedStringItem::SetValue( rNewVal ); } -int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const -{ - OUString aOwnText, aWithText; - GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS, - SFX_MAPUNIT_APPFONT, SFX_MAPUNIT_APPFONT, aOwnText, &rIntlWrapper ); - rWith.GetPresentation( SFX_ITEM_PRESENTATION_NAMELESS, - SFX_MAPUNIT_APPFONT, SFX_MAPUNIT_APPFONT, aWithText, &rIntlWrapper ); - return rIntlWrapper.getCollator()->compareString( aOwnText, aWithText ); -} - bool CntContentTypeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 2adf2c7d6dcc..2ed6d6a4ba94 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -48,17 +48,6 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith) const } // virtual -int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith, - IntlWrapper const & rIntlWrapper) - const -{ - DBG_ASSERT(rWith.ISA(CntUnencodedStringItem), - "CntUnencodedStringItem::Compare(): Bad type"); - return rIntlWrapper.getCollator()->compareString( m_aValue, - static_cast< CntUnencodedStringItem const * >(&rWith)->m_aValue ); -} - -// virtual bool CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper *) const diff --git a/svl/source/items/int64item.cxx b/svl/source/items/int64item.cxx index b9be4fb280aa..f884106aa3db 100644 --- a/svl/source/items/int64item.cxx +++ b/svl/source/items/int64item.cxx @@ -46,11 +46,6 @@ int SfxInt64Item::Compare( const SfxPoolItem& r ) const return 0; } -int SfxInt64Item::Compare( const SfxPoolItem& r, const IntlWrapper& /*rIntlWrapper*/ ) const -{ - return Compare(r); -} - bool SfxInt64Item::GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString& rText, const IntlWrapper* /*pIntlWrapper*/ ) const diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index d6480b01cd41..d5bcc71cc4cf 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -129,12 +129,6 @@ int SfxPoolItem::Compare( const SfxPoolItem& ) const } -int SfxPoolItem::Compare( const SfxPoolItem& rWith, const IntlWrapper& ) const -{ - return Compare( rWith ); -} - - bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const { return rCmp.Type() == Type(); diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index a9a9ce3ce7c5..4404a2543d03 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -337,14 +337,6 @@ bool SfxStyleSheetBase::IsUsed() const /** * Return set attributes */ -OUString SfxStyleSheetBase::GetDescription() -{ - return GetDescription( SFX_MAPUNIT_CM ); -} - -/** - * Return set attributes - */ OUString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric ) { SfxItemIter aIter( GetItemSet() ); @@ -569,16 +561,6 @@ sal_uInt16 SfxStyleSheetIterator::GetSearchMask() const } -void SfxStyleSheetBasePool::Replace( SfxStyleSheetBase& rSource, SfxStyleSheetBase& rTarget ) -{ - rTarget.SetFollow( rSource.GetFollow() ); - rTarget.SetParent( rSource.GetParent() ); - SfxItemSet& rSourceSet = rSource.GetItemSet(); - SfxItemSet& rTargetSet = rTarget.GetItemSet(); - rTargetSet.Intersect( rSourceSet ); - rTargetSet.Put( rSourceSet ); -} - SfxStyleSheetIterator& SfxStyleSheetBasePool::GetIterator_Impl() { if( !pImp->pIter || (pImp->pIter->GetSearchMask() != nMask) || (pImp->pIter->GetSearchFamily() != nSearchFamily) ) diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 31fbaf3119ec..dfd564a61b09 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -292,7 +292,6 @@ namespace { mbSkipIgnorable( bSkipIgnorable ) {} virtual StylePool::SfxItemSet_Pointer_t getNext() SAL_OVERRIDE; - virtual OUString getName() SAL_OVERRIDE; }; StylePool::SfxItemSet_Pointer_t Iterator::getNext() @@ -327,16 +326,6 @@ namespace { return pReturn; } - OUString Iterator::getName() - { - OUString aString; - if( mpNode && mpNode->hasItemSet( false ) ) - { - aString = StylePool::nameOf( mpNode->getUsedOrLastAddedItemSet() ); - } - return aString; - } - } /** @@ -386,7 +375,6 @@ public: // #i86923# IStylePoolIteratorAccess* createIterator( bool bSkipUnusedItemSets = false, bool bSkipIgnorableItems = false ); - sal_Int32 getCount() const { return mnCount; } }; StylePool::SfxItemSet_Pointer_t StylePoolImpl::insertItemSet( const SfxItemSet& rSet ) @@ -479,9 +467,6 @@ IStylePoolIteratorAccess* StylePool::createIterator( const bool bSkipUnusedItemS return pImpl->createIterator( bSkipUnusedItemSets, bSkipIgnorableItems ); } -sal_Int32 StylePool::getCount() const -{ return pImpl->getCount(); } - StylePool::~StylePool() { delete pImpl; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx index 9c2a3921404f..52adeb948de9 100644 --- a/svl/source/notify/listener.cxx +++ b/svl/source/notify/listener.cxx @@ -77,11 +77,6 @@ void SvtListener::EndListeningAll() } -bool SvtListener::IsListening( SvtBroadcaster& rBroadcaster ) const -{ - return maBroadcasters.count(&rBroadcaster) > 0; -} - void SvtListener::CopyAllBroadcasters( const SvtListener& r ) { BroadcastersType aCopy(r.maBroadcasters); diff --git a/svl/source/numbers/currencytable.cxx b/svl/source/numbers/currencytable.cxx index 77745e44db84..91be75e1b5b1 100644 --- a/svl/source/numbers/currencytable.cxx +++ b/svl/source/numbers/currencytable.cxx @@ -14,11 +14,6 @@ NfCurrencyTable::iterator NfCurrencyTable::begin() return maData.begin(); } -NfCurrencyTable::const_iterator NfCurrencyTable::begin() const -{ - return maData.begin(); -} - NfCurrencyEntry& NfCurrencyTable::operator[] ( size_t i ) { return maData[i]; diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index 9e8816b8c628..c5933200013a 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.hxx @@ -76,7 +76,6 @@ public: } const OUString& GetTrueString() const { return GetSpecialKeyword( NF_KEY_TRUE ); } const OUString& GetFalseString() const { return GetSpecialKeyword( NF_KEY_FALSE ); } - const OUString& GetColorString() const { return GetKeywords()[NF_KEY_COLOR]; } const OUString& GetRedString() const { return GetKeywords()[NF_KEY_RED]; } const OUString& GetBooleanString() const { return GetKeywords()[NF_KEY_BOOLEAN]; } const OUString& GetErrorString() const { return sErrStr; } diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 1298cc618467..05076412653c 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -122,7 +122,6 @@ public: virtual bool HasFollowSupport() const SAL_OVERRIDE; virtual bool HasParentSupport() const SAL_OVERRIDE; virtual bool HasClearParentSupport() const SAL_OVERRIDE; - virtual OUString GetDescription() SAL_OVERRIDE; virtual OUString GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE; SwCharFormat* GetCharFormat(); @@ -199,8 +198,6 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool public: SwDocStyleSheetPool( SwDoc&, bool bOrganizer = false ); - virtual void Replace( SfxStyleSheetBase& rSource, - SfxStyleSheetBase& rTarget ) SAL_OVERRIDE; virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily, sal_uInt16 nMask) SAL_OVERRIDE; diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 6aeb0fbfb5f5..6c1411a0f4ea 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -935,11 +935,6 @@ OUString SwDocStyleSheet::GetDescription(SfxMapUnit eUnit) return SfxStyleSheetBase::GetDescription(eUnit); } -OUString SwDocStyleSheet::GetDescription() -{ - return GetDescription(SFX_MAPUNIT_CM); -} - // Set names bool SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow) { @@ -2239,100 +2234,6 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Create( const OUString &, return NULL; } -void SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource, - SfxStyleSheetBase& rTarget ) -{ - SfxStyleFamily eFamily( rSource.GetFamily() ); - if( rSource.HasParentSupport()) - { - const OUString sParentName = rSource.GetParent(); - if (!sParentName.isEmpty()) - { - SfxStyleSheetBase* pParentOfNew = Find( sParentName, eFamily ); - if( pParentOfNew ) - rTarget.SetParent( sParentName ); - } - } - if( rSource.HasFollowSupport()) - { - const OUString sFollowName = rSource.GetFollow(); - if (!sFollowName.isEmpty()) - { - SfxStyleSheetBase* pFollowOfNew = Find( sFollowName, eFamily ); - if( pFollowOfNew ) - rTarget.SetFollow( sFollowName ); - } - } - - SwImplShellAction aTmpSh( rDoc ); - - bool bSwSrcPool = GetAppName() == rSource.GetPool().GetAppName(); - if( SFX_STYLE_FAMILY_PAGE == eFamily && bSwSrcPool ) - { - // deal with separately! - SwPageDesc* pDestDsc = - const_cast<SwPageDesc*>(static_cast<SwDocStyleSheet&>(rTarget).GetPageDesc()); - SwPageDesc* pCpyDsc = - const_cast<SwPageDesc*>(static_cast<SwDocStyleSheet&>(rSource).GetPageDesc()); - rDoc.CopyPageDesc( *pCpyDsc, *pDestDsc ); - } - else - { - const SwFormat *pSourceFormat = 0; - SwFormat *pTargetFormat = 0; - size_t nPgDscPos = SIZE_MAX; - switch( eFamily ) - { - case SFX_STYLE_FAMILY_CHAR : - if( bSwSrcPool ) - pSourceFormat = static_cast<SwDocStyleSheet&>(rSource).GetCharFormat(); - pTargetFormat = static_cast<SwDocStyleSheet&>(rTarget).GetCharFormat(); - break; - case SFX_STYLE_FAMILY_PARA : - if( bSwSrcPool ) - pSourceFormat = static_cast<SwDocStyleSheet&>(rSource).GetCollection(); - pTargetFormat = static_cast<SwDocStyleSheet&>(rTarget).GetCollection(); - break; - case SFX_STYLE_FAMILY_FRAME: - if( bSwSrcPool ) - pSourceFormat = static_cast<SwDocStyleSheet&>(rSource).GetFrameFormat(); - pTargetFormat = static_cast<SwDocStyleSheet&>(rTarget).GetFrameFormat(); - break; - case SFX_STYLE_FAMILY_PAGE: - { - SwPageDesc *pDesc = rDoc.FindPageDesc( - static_cast<SwDocStyleSheet&>(rTarget).GetPageDesc()->GetName(), - &nPgDscPos ); - - if( pDesc ) - pTargetFormat = &pDesc->GetMaster(); - } - break; - case SFX_STYLE_FAMILY_PSEUDO: - // A NumRule only consists of one Item, so nothing has - // to be deleted here. - break; - default:; //prevent warning - } - if( pTargetFormat ) - { - if( pSourceFormat ) - pTargetFormat->DelDiffs( *pSourceFormat ); - else if( SIZE_MAX != nPgDscPos ) - pTargetFormat->ResetFormatAttr( RES_PAGEDESC, RES_FRMATR_END-1 ); - else - { - // #i73790# - method renamed - pTargetFormat->ResetAllFormatAttr(); - } - if( SIZE_MAX != nPgDscPos ) - rDoc.ChgPageDesc( nPgDscPos, - rDoc.GetPageDesc(nPgDscPos) ); - } - static_cast<SwDocStyleSheet&>(rTarget).SetItemSet( rSource.GetItemSet() ); - } -} - SfxStyleSheetIteratorPtr SwDocStyleSheetPool::CreateIterator( SfxStyleFamily eFam, sal_uInt16 _nMask ) { return SfxStyleSheetIteratorPtr(new SwStyleSheetIterator( this, eFam, _nMask )); |