diff options
25 files changed, 1 insertions, 556 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 5a28c172a8ff..7e730bfb22b2 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -694,16 +694,6 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const; ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const; - /** Decorate metafile output with verbose text comments - - This method is used to wrap SvxFont::QuickDrawText, to - determine character-by-character wise, which logical text - units like characters, words and sentences are contained in - the output string at hand. This is necessary for slideshow - text effects. - */ - void ImplFillTextMarkingVector(const ::com::sun::star::lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const; - SpellInfo * CreateSpellInfo( const EditSelection &rSel, bool bMultipleDocs ); protected: diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 41f8fd2f4d58..58ee78c99a41 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4610,45 +4610,4 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* aCompressedPortions.Remove( 0, aCompressedPortions.Count() ); } -// redesigned to work with TextMarkingVector -void ImpEditEngine::ImplFillTextMarkingVector(const lang::Locale& rLocale, EEngineData::TextMarkingVector& rTextMarkingVector, const String& rTxt, const sal_uInt16 nIdx, const sal_uInt16 nLen) const -{ - // determine relevant logical text elements for the just-rendered - // string of characters. - Reference< i18n::XBreakIterator > _xBI(ImplGetBreakIterator()); - - if(_xBI.is()) - { - sal_Int32 nDone; - sal_Int32 nNextCellBreak(_xBI->nextCharacters(rTxt, nIdx, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone)); - i18n::Boundary nNextWordBoundary(_xBI->getWordBoundary(rTxt, nIdx, rLocale, i18n::WordType::ANY_WORD, sal_True)); - sal_Int32 nNextSentenceBreak(_xBI->endOfSentence(rTxt, nIdx, rLocale)); - - const sal_Int32 nEndPos(nIdx + nLen); - sal_Int32 i; - - for(i = nIdx; i < nEndPos; i++) - { - // create the entries for the respective break positions - if(i == nNextCellBreak) - { - rTextMarkingVector.push_back(EEngineData::TextMarkingClass(EEngineData::EndOfCaracter, i - nIdx)); - nNextCellBreak = _xBI->nextCharacters(rTxt, i, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 1, nDone); - } - if(i == nNextWordBoundary.endPos) - { - rTextMarkingVector.push_back(EEngineData::TextMarkingClass(EEngineData::EndOfWord, i - nIdx)); - nNextWordBoundary = _xBI->getWordBoundary(rTxt, i + 1, rLocale, i18n::WordType::ANY_WORD, sal_True); - } - if(i == nNextSentenceBreak) - { - rTextMarkingVector.push_back(EEngineData::TextMarkingClass(EEngineData::EndOfSentence, i - nIdx)); - nNextSentenceBreak = _xBI->endOfSentence(rTxt, i + 1, rLocale); - } - } - } -} - -// eof - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index f6a8b192b28b..99dd4ed05fd1 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -138,17 +138,8 @@ uno::Reference< XInterface > LWPFilterImportFilter_CreateInstance( return uno::Reference< XInterface > ( (OWeakObject* )p ); } -Sequence< OUString > LWPFilterImportFilter::getSupportedServiceNames_Static( void ) throw () -{ - Sequence< OUString > aRet(1); - aRet.getArray()[0] = LWPFilterImportFilter::getImplementationName_Static(); - return aRet; -} - LWPFilterImportFilter::LWPFilterImportFilter( const uno::Reference< XMultiServiceFactory >& xFact ) { - //OUString sService = OUString( SwXMLImport_getImplementationName ); //STR_WRITER_IMPORTER_NAME - try { uno::Reference< XDocumentHandler > xDoc( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( STR_WRITER_IMPORTER_NAME )) ), UNO_QUERY ); diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index 3471ad379616..c95619255ab4 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -137,8 +137,6 @@ public: ~LWPFilterImportFilter(); public: - static Sequence< OUString > getSupportedServiceNames_Static( void ) throw(); - static OUString getImplementationName_Static() throw(); public: /** diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx index 31d471bb6ed8..e3acb2c874ff 100644 --- a/sc/source/filter/inc/lotattr.hxx +++ b/sc/source/filter/inc/lotattr.hxx @@ -83,8 +83,6 @@ private: ScPatternAttr* pPattAttr; sal_uInt32 nHash0; - ENTRY (const ScPatternAttr &r); - ENTRY (ScPatternAttr* p); ~ENTRY (); diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index d15ff3c6c066..1f3a5cc780b9 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -46,11 +46,6 @@ #include "root.hxx" #include "scitems.hxx" -LotAttrCache::ENTRY::ENTRY (const ScPatternAttr &r) - : pPattAttr(new ScPatternAttr(r)) -{ -} - LotAttrCache::ENTRY::ENTRY (ScPatternAttr* p) : pPattAttr(p) { diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx index 98a7f583cfb2..32836ca8cc21 100644 --- a/sfx2/inc/bitset.hxx +++ b/sfx2/inc/bitset.hxx @@ -46,9 +46,7 @@ public: sal_Bool operator!() const; BitSet(); BitSet( const BitSet& rOrig ); - BitSet( sal_uInt16* pArray, sal_uInt16 nSize ); ~BitSet(); - BitSet( const Range& rRange ); sal_uInt16 Count() const; BitSet& operator=( const BitSet& rOrig ); BitSet& operator=( sal_uInt16 nBit ); diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index c95b31b4f38f..e1fff9a494fb 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -105,7 +105,6 @@ private: SfxPopupMenuManager& operator=( const SfxPopupMenuManager& ); public: - SfxPopupMenuManager( const ResId&, SfxBindings& ); SfxPopupMenuManager( PopupMenu*, SfxBindings& ); ~SfxPopupMenuManager(); static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow ); @@ -116,22 +115,8 @@ public: sal_uInt16 Execute( const Point& rPos, Window *pWindow ); sal_uInt16 Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ); - sal_uInt16 Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1 ... ); - - // @deprecated (start)!! - // Don't use these methods any longer. The whole class will be removed in the future. - // Changing code which relies on these methods would need much more effort! - void StartInsert(); - void EndInsert(); - void CheckItem( sal_uInt16, sal_Bool ); - void RemoveItem( sal_uInt16 ); - void InsertItem( sal_uInt16, const String&, MenuItemBits, const rtl::OString& rHelpId, - sal_uInt16 nPos = MENU_APPEND ); - void InsertSeparator( sal_uInt16 nPos = MENU_APPEND ); - // @deprecated (end) void RemoveDisabledEntries(); - void AddClipboardFunctions(); Menu* GetSVMenu(); }; diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index 6dead7468b30..9faab1d54ad4 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -138,51 +138,6 @@ BitSet::BitSet( const BitSet& rOrig ) //-------------------------------------------------------------------- -// creates a bitset from an array - -BitSet::BitSet( sal_uInt16* pArray, sal_uInt16 nSize ): - nCount(nSize) -{ - DBG_MEMTEST(); - // find the highest bit to set - sal_uInt16 nMax = 0; - for ( sal_uInt16 n = 0; n < nCount; ++n ) - if ( pArray[n] > nMax ) - nMax = pArray[n]; - - // if there are bits at all - if ( nMax > 0 ) - { - // allocate memory for all blocks needed - nBlocks = nMax / 32 + 1; - pBitmap = new sal_uIntPtr[nBlocks]; - memset( pBitmap, 0, 4 * nBlocks ); - - // set all the bits - for ( sal_uInt16 n = 0; n < nCount; ++n ) - { - // compute the block no. and bitvalue - sal_uInt16 nBlock = n / 32; - sal_uIntPtr nBitVal = 1L << (n % 32); - - // set a single bit - if ( ( *(pBitmap+nBlock) & nBitVal ) == 0 ) - { - *(pBitmap+nBlock) |= nBitVal; - ++nCount; - } - } - } - else - { - // initalize emtpy set - nBlocks = 0; - pBitmap = 0; - } -} - -//-------------------------------------------------------------------- - // frees the storage BitSet::~BitSet() @@ -193,15 +148,6 @@ BitSet::~BitSet() //-------------------------------------------------------------------- -// creates a bitmap with all bits in rRange set - -BitSet::BitSet( const Range& ) -{ - DBG_MEMTEST(); -} - -//-------------------------------------------------------------------- - // assignment from another bitset BitSet& BitSet::operator=( const BitSet& rOrig ) diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index d8e01e4c2e54..454b2ee17d05 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -298,16 +298,6 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu ) return sal_True; } -//-------------------------------------------------------------------- - -// don't insert Popups into ConfigManager, they are not configurable at the moment ! -SfxPopupMenuManager::SfxPopupMenuManager(const ResId& rResId, SfxBindings &rBindings ) - : SfxMenuManager( rResId, rBindings ) - , pSVMenu( NULL ) -{ - DBG_MEMTEST(); -} - SfxPopupMenuManager::~SfxPopupMenuManager() { } @@ -356,74 +346,8 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, v return nId; } -//-------------------------------------------------------------------- - -sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, const SfxPoolItem *pArg1, ... ) -{ - DBG_MEMTEST(); - - va_list pArgs; - va_start(pArgs, pArg1); - sal_uInt16 nRet = Execute( rPoint, pWindow, pArgs, pArg1 ); - va_end(pArgs); - - return (nRet); -} - -//------------------------------------------------------------------------- - -void SfxPopupMenuManager::StartInsert() -{ - ResId aResId(GetType(),*pResMgr); - aResId.SetRT(RSC_MENU); - pSVMenu = new PopupMenu( aResId ); - TryToHideDisabledEntries_Impl( pSVMenu ); -} - //------------------------------------------------------------------------- -void SfxPopupMenuManager::EndInsert() -{ - pBindings->ENTERREGISTRATIONS(); - pMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True ); - Construct( *pMenu ); - pBindings->LEAVEREGISTRATIONS(); -} - -//------------------------------------------------------------------------- - -void SfxPopupMenuManager::InsertSeparator( sal_uInt16 nPos ) -{ - pSVMenu->InsertSeparator( nPos ); -} - -//------------------------------------------------------------------------- - -void SfxPopupMenuManager::InsertItem( sal_uInt16 nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, sal_uInt16 nPos ) -{ - pSVMenu->InsertItem( nId, rName, nBits,nPos ); - pSVMenu->SetHelpId( nId, rHelpId ); -} - -//------------------------------------------------------------------------- - -void SfxPopupMenuManager::RemoveItem( sal_uInt16 nId ) -{ - pSVMenu->RemoveItem( nId ); -} - -//------------------------------------------------------------------------- - -void SfxPopupMenuManager::CheckItem( sal_uInt16 nId, sal_Bool bCheck ) -{ - pSVMenu->CheckItem( nId, bCheck ); -} - -void SfxPopupMenuManager::AddClipboardFunctions() -{ - bAddClipboardFuncs = sal_True; -} - SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) : pMenu(0), pOldMenu(0), diff --git a/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx index 06988af9704b..d2c45867844d 100644 --- a/svtools/inc/svtools/FilterConfigItem.hxx +++ b/svtools/inc/svtools/FilterConfigItem.hxx @@ -76,8 +76,6 @@ class SVT_DLLPUBLIC FilterConfigItem // 3. given default sal_Bool ReadBool( const ::rtl::OUString& rKey, sal_Bool bDefault ); sal_Int32 ReadInt32( const ::rtl::OUString& rKey, sal_Int32 nDefault ); - ::com::sun::star::awt::Size - ReadSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rDefault ); ::rtl::OUString ReadString( const ::rtl::OUString& rKey, const ::rtl::OUString& rDefault ); ::com::sun::star::uno::Any @@ -87,7 +85,6 @@ class SVT_DLLPUBLIC FilterConfigItem // and always stores into the FilterData sequence void WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue ); void WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue ); - void WriteSize( const ::rtl::OUString& rKey, const ::com::sun::star::awt::Size& rSize ); void WriteString( const ::rtl::OUString& rKey, const ::rtl::OUString& rString ); void WriteAny( const rtl::OUString& rKey, const ::com::sun::star::uno::Any& rAny ); diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx index 3ea92f72635b..32674cc9850c 100644 --- a/svtools/source/filter/FilterConfigCache.cxx +++ b/svtools/source/filter/FilterConfigCache.cxx @@ -67,11 +67,6 @@ const char* FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameLi "epp", "ira", "era", "itg", "iti", "eti", "exp", NULL }; -sal_Bool FilterConfigCache::FilterConfigCacheEntry::IsValid() -{ - return sFilterName.Len() != 0; -} - sal_Bool FilterConfigCache::bInitialized = sal_False; sal_Int32 FilterConfigCache::nIndType = -1; sal_Int32 FilterConfigCache::nIndUIName = -1; @@ -466,11 +461,6 @@ sal_Bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; } -sal_Bool FilterConfigCache::IsImportDialog( sal_uInt16 nFormat ) -{ - return (nFormat < aImport.size()) && aImport[ nFormat ].bHasDialog; -} - // ------------------------------------------------------------------------ String FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) diff --git a/svtools/source/filter/FilterConfigCache.hxx b/svtools/source/filter/FilterConfigCache.hxx index b1579bec092a..a944a6d0253e 100644 --- a/svtools/source/filter/FilterConfigCache.hxx +++ b/svtools/source/filter/FilterConfigCache.hxx @@ -66,7 +66,6 @@ class SVT_DLLPUBLIC FilterConfigCache sal_Bool bIsInternalFilter : 1; sal_Bool bIsPixelFormat : 1; - sal_Bool IsValid(); sal_Bool CreateFilterName( const ::rtl::OUString& rUserDataEntry ); String GetShortName( ); @@ -116,7 +115,6 @@ class SVT_DLLPUBLIC FilterConfigCache sal_Bool IsImportInternalFilter( sal_uInt16 nFormat ); sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); - sal_Bool IsImportDialog( sal_uInt16 nFormat ); sal_uInt16 GetExportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aExport.size()); }; diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx index fddeec1f0482..10428c6a2456 100644 --- a/svtools/source/filter/FilterConfigItem.cxx +++ b/svtools/source/filter/FilterConfigItem.cxx @@ -333,51 +333,6 @@ sal_Int32 FilterConfigItem::ReadInt32( const OUString& rKey, sal_Int32 nDefault return nRetValue; } - -Size FilterConfigItem::ReadSize( const OUString& rKey, const Size& rDefault ) -{ - Any aAny; - Size aRetValue( rDefault ); - - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ); - const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ); - - Reference< XPropertySet > aXPropSet; - try - { - PropertyValue* pPropWidth = GetPropertyValue( aFilterData, sWidth ); - PropertyValue* pPropHeight= GetPropertyValue( aFilterData, sHeight ); - if ( pPropWidth && pPropHeight ) - { - pPropWidth->Value >>= aRetValue.Width; - pPropHeight->Value >>= aRetValue.Height; - } - else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) - { - if ( aAny >>= aXPropSet ) - { - if ( ImplGetPropertyValue( aAny, aXPropSet, sWidth, sal_True ) ) - aAny >>= aRetValue.Width; - if ( ImplGetPropertyValue( aAny, aXPropSet, sHeight, sal_True ) ) - aAny >>= aRetValue.Height; - } - } - } - catch ( ::com::sun::star::uno::Exception& ) - { - OSL_FAIL( "FilterConfigItem::ReadSize - could not read PropertyValue" ); - } - PropertyValue aWidth; - aWidth.Name = sWidth; - aWidth.Value <<= aRetValue.Width; - WritePropertyValue( aFilterData, aWidth ); - PropertyValue aHeight; - aHeight.Name = sHeight; - aHeight.Value <<= aRetValue.Height; - WritePropertyValue( aFilterData, aHeight ); - return aRetValue; -} - OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDefault ) { Any aAny; @@ -484,56 +439,6 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) } } -void FilterConfigItem::WriteSize( const OUString& rKey, const Size& rNewValue ) -{ - const OUString sWidth( RTL_CONSTASCII_USTRINGPARAM( "LogicalWidth" ) ); - const OUString sHeight( RTL_CONSTASCII_USTRINGPARAM( "LogicalHeight" ) ); - - PropertyValue aWidth; - aWidth.Name = sWidth; - aWidth.Value <<= rNewValue.Width; - WritePropertyValue( aFilterData, aWidth ); - - PropertyValue aHeight; - aHeight.Name = sHeight; - aHeight.Value <<= rNewValue.Height; - WritePropertyValue( aFilterData, aHeight ); - - if ( xPropSet.is() ) - { - Any aAny; - sal_Int32 nOldWidth = rNewValue.Width; - sal_Int32 nOldHeight = rNewValue.Height; - - if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) - { - try - { - Reference< XPropertySet > aXPropSet; - if ( aAny >>= aXPropSet ) - { - if ( ImplGetPropertyValue( aAny, aXPropSet, sWidth, sal_True ) ) - aAny >>= nOldWidth; - if ( ImplGetPropertyValue( aAny, aXPropSet, sHeight, sal_True ) ) - aAny >>= nOldHeight; - } - if ( ( nOldWidth != rNewValue.Width ) || ( nOldHeight != rNewValue.Height ) ) - { - aAny <<= rNewValue.Width; - aXPropSet->setPropertyValue( sWidth, aAny ); - aAny <<= rNewValue.Height; - aXPropSet->setPropertyValue( sHeight, aAny ); - bModified = sal_True; - } - } - catch ( ::com::sun::star::uno::Exception& ) - { - OSL_FAIL( "FilterConfigItem::WriteSize - could not read PropertyValue" ); - } - } - } -} - void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewValue ) { PropertyValue aString; diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx index c39e1e478af8..72fc266b7df6 100644 --- a/svtools/source/filter/filter.cxx +++ b/svtools/source/filter/filter.cxx @@ -2086,7 +2086,6 @@ sal_Bool GraphicFilter::Setup( sal_uInt16 ) sal_Bool GraphicFilter::HasImportDialog( sal_uInt16 ) { return sal_True; -// return pConfig->IsImportDialog( nFormat ); } // ------------------------------------------------------------------------ diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx index ea70c1756f3a..d086d32ba2f4 100644 --- a/tools/inc/tools/contnr.hxx +++ b/tools/inc/tools/contnr.hxx @@ -69,7 +69,6 @@ protected: void* ImpGetObject( sal_uIntPtr nIndex ) const; void** ImpGetOnlyNodes() const; #endif - void** GetObjectPtr( sal_uIntPtr nIndex ); public: Container( sal_uInt16 nBlockSize, @@ -81,14 +80,12 @@ public: void Insert( void* p ); void Insert( void* p, sal_uIntPtr nIndex ); - void Insert( void* pNew, void* pOld ); void* Remove(); void* Remove( sal_uIntPtr nIndex ); void* Remove( void* p ) { return Remove( GetPos( p ) ); } - void* Replace( void* p ); void* Replace( void* p, sal_uIntPtr nIndex ); void* Replace( void* pNew, void* pOld ) { return Replace( pNew, GetPos( pOld ) ); } @@ -103,8 +100,6 @@ public: sal_uIntPtr GetCurPos() const; void* GetObject( sal_uIntPtr nIndex ) const; sal_uIntPtr GetPos( const void* p ) const; - sal_uIntPtr GetPos( const void* p, sal_uIntPtr nStartIndex, - sal_Bool bForward = sal_True ) const; void* Seek( sal_uIntPtr nIndex ); void* Seek( void* p ) { return Seek( GetPos( p ) ); } diff --git a/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx index fb2fcce0d17b..7e174555c1eb 100644 --- a/tools/inc/tools/dynary.hxx +++ b/tools/inc/tools/dynary.hxx @@ -55,9 +55,6 @@ public: sal_uIntPtr GetIndex( const void* p ) const { return Container::GetPos( p ); } - sal_uIntPtr GetIndex( const void* p, sal_uIntPtr nStartIndex, - sal_Bool bForward = sal_True ) const - { return Container::GetPos( p, nStartIndex, bForward ); } DynArray& operator =( const DynArray& rAry ) { Container::operator =( rAry ); return *this; } @@ -92,11 +89,6 @@ public: \ \ sal_uIntPtr GetIndex( const Type p ) const \ { return DynArray::GetIndex( (const void*)p ); } \ - sal_uIntPtr GetIndex( const Type p, sal_uIntPtr nStartIndex, \ - sal_Bool bForward = sal_True ) const \ - { return DynArray::GetIndex( (const void*)p, \ - nStartIndex, \ - bForward ); } \ \ ClassName& operator =( const ClassName& rClassName ) \ { DynArray::operator =( rClassName ); \ diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx index 9f920356b489..22cb0be6a340 100644 --- a/tools/inc/tools/list.hxx +++ b/tools/inc/tools/list.hxx @@ -105,8 +105,6 @@ public: \ { return (Type)List::Remove( nIndex ); } \ Type Remove( Type p ) \ { return (Type)List::Remove( (void*)p ); } \ - Type Replace( Type p ) \ - { return (Type)List::Replace( (void*)p ); } \ Type Replace( Type p, sal_uIntPtr nIndex ) \ { return (Type)List::Replace( (void*)p, nIndex ); } \ Type Replace( Type pNew, Type pOld ) \ @@ -119,10 +117,6 @@ public: \ { return (Type)List::GetObject( nIndex ); } \ sal_uIntPtr GetPos( const Type p ) const \ { return List::GetPos( (const void*)p ); } \ - sal_uIntPtr GetPos( const Type p, sal_uIntPtr nStartIndex, \ - sal_Bool bForward = sal_True ) const \ - { return List::GetPos( (const void*)p, nStartIndex, \ - bForward ); } \ \ Type Seek( sal_uIntPtr nIndex ) \ { return (Type)List::Seek( nIndex ); } \ diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx index 9ef9fd0d1776..6629a4f162a6 100644 --- a/tools/inc/tools/ref.hxx +++ b/tools/inc/tools/ref.hxx @@ -127,14 +127,11 @@ inline void Insert( EN p )\ { CN##List::Insert( p ); p->AddRef();}\ inline void Insert( EN p, sal_uIntPtr nIndex )\ { CN##List::Insert( p, nIndex ); p->AddRef();}\ -inline void Insert( EN p, EN pOld )\ -{ CN##List::Insert( p, pOld ); p->AddRef();}\ inline void Append( EN p )\ { Insert( p, LIST_APPEND );}\ inline EN Remove();\ inline EN Remove( sal_uIntPtr nIndex );\ inline EN Remove( EN p );\ -inline EN Replace( EN p );\ inline EN Replace( EN p, sal_uIntPtr nIndex );\ inline EN Replace( EN pNew, EN pOld );\ inline void Append( const CN##MemberList & );\ @@ -197,11 +194,6 @@ inline EN CN##MemberList::Remove( EN p ) \ p = CN##List::Remove( p ); \ if( p ) p->ReleaseReference(); return p; \ }\ -inline EN CN##MemberList::Replace( EN p ) \ -{\ - p->AddRef(); p = CN##List::Replace( p ); \ - if( p ) p->ReleaseReference(); return p; \ -}\ inline EN CN##MemberList::Replace( EN p, sal_uIntPtr nIndex ) \ {\ p->AddRef(); p = CN##List::Replace( p, nIndex ); \ @@ -229,19 +221,15 @@ inline void CN##MemberList::Append( const CN##MemberList & rList )\ inline Class##MemberList(sal_uInt16 nInitSz,sal_uInt16 nResize);\ inline void Insert( EntryName p ); \ inline void Insert( EntryName p, sal_uIntPtr nIndex ); \ -inline void Insert( EntryName p, EntryName pOld ); \ inline void Append( EntryName p ); \ inline EntryName Remove(); \ inline EntryName Remove( sal_uIntPtr nIndex ); \ inline EntryName Remove( EntryName p ); \ -inline EntryName Replace( EntryName p ); \ inline EntryName Replace( EntryName p, sal_uIntPtr nIndex );\ inline EntryName Replace( EntryName pNew, EntryName pOld );\ inline EntryName GetCurObject() const;\ inline EntryName GetObject( sal_uIntPtr nIndex ) const;\ inline sal_uIntPtr GetPos( const EntryName ) const;\ -inline sal_uIntPtr GetPos( const EntryName, sal_uIntPtr nStartIndex,\ - sal_Bool bForward = sal_True ) const;\ inline EntryName Seek( sal_uIntPtr nIndex );\ inline EntryName Seek( EntryName p );\ inline EntryName First();\ @@ -258,8 +246,6 @@ inline void ClassName##MemberList::Insert( EntryName p )\ {BaseList::Insert(p);}\ inline void ClassName##MemberList::Insert( EntryName p, sal_uIntPtr nIdx )\ {BaseList::Insert(p,nIdx);}\ -inline void ClassName##MemberList::Insert( EntryName p, EntryName pOld )\ - {BaseList::Insert(p,pOld);}\ inline void ClassName##MemberList::Append( EntryName p )\ {BaseList::Append(p);}\ inline EntryName ClassName##MemberList::Remove()\ @@ -268,8 +254,6 @@ inline EntryName ClassName##MemberList::Remove( sal_uIntPtr nIdx )\ {return (EntryName)BaseList::Remove(nIdx);}\ inline EntryName ClassName##MemberList::Remove( EntryName p )\ {return (EntryName)BaseList::Remove(p);}\ -inline EntryName ClassName##MemberList::Replace( EntryName p )\ - {return (EntryName)BaseList::Replace(p);}\ inline EntryName ClassName##MemberList::Replace( EntryName p, sal_uIntPtr nIdx )\ {return (EntryName)BaseList::Replace(p,nIdx);}\ inline EntryName ClassName##MemberList::Replace( EntryName p, EntryName pOld )\ @@ -293,10 +277,7 @@ inline EntryName ClassName##MemberList::Prev()\ inline void ClassName##MemberList::Append( const ClassName##MemberList & rList )\ {BaseList::Append(rList);}\ inline sal_uIntPtr ClassName##MemberList::GetPos( const EntryName p) const\ - {return BaseList::GetPos( p );}\ -inline sal_uIntPtr ClassName##MemberList::GetPos\ - ( const EntryName p, sal_uIntPtr nStart, sal_Bool bForward ) const\ - {return BaseList::GetPos( p, nStart, bForward );} + {return BaseList::GetPos( p );} #define SV_DECL_MEMBER_LIST(ClassName,EntryName)\ class ClassName##MemberList : public SvRefBaseMemberList\ diff --git a/tools/inc/tools/stack.hxx b/tools/inc/tools/stack.hxx index d3c76d1a0165..a8f8cb5395e3 100644 --- a/tools/inc/tools/stack.hxx +++ b/tools/inc/tools/stack.hxx @@ -87,11 +87,6 @@ public: \ { return (Type)Stack::GetObject( nIndex ); } \ sal_uIntPtr GetPos( const Type p ) const \ { return Stack::GetPos( (const void*)p ); } \ - sal_uIntPtr GetPos( const Type p, sal_uIntPtr nStartIndex, \ - sal_Bool bForward = sal_True ) const \ - { return Stack::GetPos( (const void*)p, \ - nStartIndex, \ - bForward ); } \ \ ClassName& operator =( const ClassName& rClassName ) \ { Stack::operator =( rClassName ); \ diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx index 6bd65878d7cb..2c18004b7cec 100644 --- a/tools/inc/tools/urlobj.hxx +++ b/tools/inc/tools/urlobj.hxx @@ -548,11 +548,6 @@ public: inline bool IsEmptyUser() const { return m_aUser.isPresent() && m_aUser.isEmpty(); } - bool hasPassword() const; - - inline bool IsEmptyPass() const - { return hasPassword() && m_aAuth.isEmpty(); } - inline rtl::OUString GetUser(DecodeMechanism eMechanism = DECODE_TO_IURI, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) const diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 760d84d3287e..52b90f37afac 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -4288,12 +4288,6 @@ INetProtocol INetURLObject::CompareProtocolScheme(rtl::OUString const & } //============================================================================ -bool INetURLObject::hasPassword() const -{ - return m_aAuth.isPresent() && getSchemeInfo().m_bPassword; -} - -//============================================================================ rtl::OUString INetURLObject::GetHostPort(DecodeMechanism eMechanism, rtl_TextEncoding eCharset) { diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx index 9fe9babc5f05..3430ca7eb8c0 100644 --- a/tools/source/memtools/contnr.cxx +++ b/tools/source/memtools/contnr.cxx @@ -824,19 +824,6 @@ void Container::Insert( void* p, sal_uIntPtr nIndex ) /************************************************************************* |* -|* Container::Insert() -|* -*************************************************************************/ - -void Container::Insert( void* pNew, void* pOld ) -{ - sal_uIntPtr nIndex = GetPos( pOld ); - if ( nIndex != CONTAINER_ENTRY_NOTFOUND ) - Insert( pNew, nIndex ); -} - -/************************************************************************* -|* |* Container::ImpRemove() |* |* Beschreibung Interne Methode zum Entfernen eines Pointers @@ -956,22 +943,6 @@ void* Container::Remove( sal_uIntPtr nIndex ) |* *************************************************************************/ -void* Container::Replace( void* p ) -{ - DBG_CHKTHIS( Container, DbgCheckContainer ); - - if ( !nCount ) - return NULL; - else - return pCurBlock->Replace( p, nCurIndex ); -} - -/************************************************************************* -|* -|* Container::Replace() -|* -*************************************************************************/ - void* Container::Replace( void* p, sal_uIntPtr nIndex ) { DBG_CHKTHIS( Container, DbgCheckContainer ); @@ -1207,36 +1178,6 @@ sal_uIntPtr Container::GetCurPos() const /************************************************************************* |* -|* Container::GetObjectPtr() -|* -|* Beschreibung Interne Methode fuer Referenz-Container -|* -*************************************************************************/ - -void** Container::GetObjectPtr( sal_uIntPtr nIndex ) -{ - DBG_CHKTHIS( Container, DbgCheckContainer ); - - // Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben - if ( nCount <= nIndex ) - return NULL; - else - { - // Block suchen - CBlock* pTemp = pFirstBlock; - while ( pTemp->Count() <= nIndex ) - { - nIndex -= pTemp->Count(); - pTemp = pTemp->GetNextBlock(); - } - - // Item innerhalb des gefundenen Blocks zurueckgeben - return pTemp->GetObjectPtr( (sal_uInt16)nIndex ); - } -} - -/************************************************************************* -|* |* Container::GetObject() |* *************************************************************************/ @@ -1303,97 +1244,6 @@ sal_uIntPtr Container::GetPos( const void* p ) const /************************************************************************* |* -|* Container::GetPos() -|* -*************************************************************************/ - -sal_uIntPtr Container::GetPos( const void* p, sal_uIntPtr nStartIndex, - sal_Bool bForward ) const -{ - DBG_CHKTHIS( Container, DbgCheckContainer ); - - // Ist Index nicht innerhalb des Containers, dann NOTFOUND zurueckgeben - if ( nCount <= nStartIndex ) - return CONTAINER_ENTRY_NOTFOUND; - else - { - void** pNodes; - sal_uInt16 nBlockCount; - sal_uInt16 i; - - // Block suchen - CBlock* pTemp = pFirstBlock; - sal_uIntPtr nTemp = 0; - while ( nTemp+pTemp->Count() <= nStartIndex ) - { - nTemp += pTemp->Count(); - pTemp = pTemp->GetNextBlock(); - } - - // Jetzt den Pointer suchen - if ( bForward ) - { - // Alle Bloecke durchrsuchen - i = (sal_uInt16)(nStartIndex - nTemp); - pNodes = pTemp->GetObjectPtr( i ); - do - { - nBlockCount = pTemp->Count(); - while ( i < nBlockCount ) - { - if ( p == *pNodes ) - return nTemp+i; - pNodes++; - i++; - } - nTemp += nBlockCount; - pTemp = pTemp->GetNextBlock(); - if ( pTemp ) - { - i = 0; - pNodes = pTemp->GetNodes(); - } - else - break; - } - while ( sal_True ); - } - else - { - // Alle Bloecke durchrsuchen - i = (sal_uInt16)(nStartIndex-nTemp)+1; - pNodes = pTemp->GetObjectPtr( i-1 ); - do - { - do - { - if ( p == *pNodes ) - return nTemp+i-1; - pNodes--; - i--; - } - while ( i ); - nTemp -= pTemp->Count(); - pTemp = pTemp->GetPrevBlock(); - if ( pTemp ) - { - i = pTemp->Count(); - // Leere Bloecke in der Kette darf es nicht geben. Nur - // wenn ein Block existiert, darf dieser leer sein - pNodes = pTemp->GetObjectPtr( i-1 ); - } - else - break; - } - while ( sal_True ); - } - } - - return CONTAINER_ENTRY_NOTFOUND; -} - -/************************************************************************* -|* |* Container::Seek() |* *************************************************************************/ diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx index 69a53950507c..515e6e6e8659 100644 --- a/tools/workben/urltest.cxx +++ b/tools/workben/urltest.cxx @@ -1505,7 +1505,6 @@ int SAL_CALL main() url, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a-b.3:/%2F?x#y")), rtl::OUString(urlobj.GetMainURL(INetURLObject::NO_DECODE))); bSuccess &= assertEqual(url, false, urlobj.HasUserData()); - bSuccess &= assertEqual(url, false, urlobj.hasPassword()); bSuccess &= assertEqual(url, false, urlobj.HasPort()); bSuccess &= assertEqual( url, rtl::OUString(), rtl::OUString(urlobj.GetHost())); diff --git a/unusedcode.easy b/unusedcode.easy index db585582ca34..28d716a49b16 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,8 +1,6 @@ (anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&) (anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&) BasicIDEDLL::~BasicIDEDLL() -BitSet::BitSet(Range const&) -BitSet::BitSet(unsigned short*, unsigned short) BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const BitmapLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&) BitmapPalette::IsGreyPalette() const @@ -86,10 +84,6 @@ CommunicationLinkList::Insert(CommunicationLink const*&, unsigned short&) CommunicationLinkList::Insert(CommunicationLink const**, unsigned short) CommunicationLinkList::Insert(CommunicationLinkList const*, unsigned short, unsigned short) CommunicationLinkList::Remove(CommunicationLink const*&, unsigned short) -Container::GetObjectPtr(unsigned long) -Container::GetPos(void const*, unsigned long, unsigned char) const -Container::Insert(void*, void*) -Container::Replace(void*) Control::GetLineCount() const ControlItem::ControlItem(ControlData*) CurrencyBox::CurrencyBox(Window*, ResId const&) @@ -192,10 +186,6 @@ FileStat::SetDateTime(String const&, DateTime const&) FileStream::FileStream(rtl::OString const&, FileAccessMode) FillAttrLB::FillAttrLB(Window*, ResId) FillAttrLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&) -FilterConfigCache::FilterConfigCacheEntry::IsValid() -FilterConfigCache::IsImportDialog(unsigned short) -FilterConfigItem::ReadSize(rtl::OUString const&, com::sun::star::awt::Size const&) -FilterConfigItem::WriteSize(rtl::OUString const&, com::sun::star::awt::Size const&) FilterConfigItem::WriteString(rtl::OUString const&, rtl::OUString const&) FixedBitmap::GetModeBitmap() const FixedBitmap::SetModeBitmap(Bitmap const&) @@ -276,7 +266,6 @@ HeaderBar::SetItemImage(unsigned short, Image const&) HelpTextWindow::RegisterAccessibleParent() HelpTextWindow::RevokeAccessibleParent() IMapWindow::GetSdrObj(IMapObject const*) const -INetURLObject::hasPassword() const IconChoiceDialog::RemoveResetButton() IconChoiceDialog::RemoveTabPage(unsigned short) ImageAryData::ImageAryData() @@ -289,7 +278,6 @@ ImageList::ReplaceImage(unsigned short, Image const&) ImageMap::GetBoundRect() const ImpBitmap::ImplDestroy() ImpDefaultMapper::ImpDefaultMapper(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyState>&) -ImpEditEngine::ImplFillTextMarkingVector(com::sun::star::lang::Locale const&, std::vector<EEngineData::TextMarkingClass, std::allocator<EEngineData::TextMarkingClass> >&, String const&, unsigned short, unsigned short) const ImpEditEngine::Repeat(EditView*) ImpEditView::CalcSelectedRegion() ImpLabelList::ImplFirst() @@ -324,7 +312,6 @@ KeyCode::GetSymbolName(String const&, Window*) const KeyEvent::InitKeyEvent(com::sun::star::awt::KeyEvent&) const KeyEvent::KeyEvent(com::sun::star::awt::KeyEvent const&) KeyboardSettings::CopyData() -LWPFilterImportFilter::getSupportedServiceNames_Static() Line::Enum(Link const&) Line::NearestPoint(Point const&) const LineInfo::isDashDotOrFatLineUsed() const @@ -350,7 +337,6 @@ LongCurrencyFormatter::Denormalize(BigInt) const LongCurrencyFormatter::IsValueModified() const LongCurrencyFormatter::Normalize(BigInt) const LongCurrencyFormatter::SetEmptyValue() -LotAttrCache::ENTRY::ENTRY(ScPatternAttr const&) MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short) MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&) MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short) @@ -933,15 +919,6 @@ SfxOleString16Property::SfxOleString16Property(int, String const&) SfxOrganizeDlg_Impl::OkHdl(Button*) SfxPartChildWnd_Impl::GetChildWindowId() SfxPasswordDialog::SetMaxLen(unsigned short) -SfxPopupMenuManager::AddClipboardFunctions() -SfxPopupMenuManager::CheckItem(unsigned short, unsigned char) -SfxPopupMenuManager::EndInsert() -SfxPopupMenuManager::Execute(Point const&, Window*, SfxPoolItem const*, ...) -SfxPopupMenuManager::InsertItem(unsigned short, String const&, unsigned short, rtl::OString const&, unsigned short) -SfxPopupMenuManager::InsertSeparator(unsigned short) -SfxPopupMenuManager::RemoveItem(unsigned short) -SfxPopupMenuManager::SfxPopupMenuManager(ResId const&, SfxBindings&) -SfxPopupMenuManager::StartInsert() SfxPopupWindow::EndCascading() SfxPopupWindow::LinkStubDelete(void*, void*) SfxPopupWindow::RemoveStatusListener(rtl::OUString const&) |