summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-15 23:22:52 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-16 13:24:06 +0000
commitf24268cae353f00c0fc0c8e5fc51fbb43913f9ed (patch)
treee7fbf17133185eccb58c0483b248b40519bb7689 /tools
parentabf7cdac13c66778ea7deac7251e5b2a6d385a72 (diff)
we can drop unqid.hxx entirely post move to binfilter
Diffstat (limited to 'tools')
-rw-r--r--tools/Package_inc.mk1
-rw-r--r--tools/inc/tools/unqid.hxx110
-rw-r--r--tools/source/memtools/unqidx.cxx95
3 files changed, 0 insertions, 206 deletions
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index 4ccb7299d7b1..22f034c6e257 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/testtoolloader.hxx,tools/t
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/tools.h,tools/tools.h))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/toolsdllapi.h,tools/toolsdllapi.h))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqid.hxx,tools/unqid.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/unqidx.hxx,tools/unqidx.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/urlobj.hxx,tools/urlobj.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/vcompat.hxx,tools/vcompat.hxx))
diff --git a/tools/inc/tools/unqid.hxx b/tools/inc/tools/unqid.hxx
deleted file mode 100644
index 1ae6fa4344ae..000000000000
--- a/tools/inc/tools/unqid.hxx
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _UNQID_HXX
-#define _UNQID_HXX
-
-#include "tools/toolsdllapi.h"
-#include <tools/unqidx.hxx>
-
-// ---------------
-// - ImpUniqueId -
-// ---------------
-
-struct ImpUniqueId
-{
- sal_uIntPtr nId;
- sal_uInt16 nRefCount;
- void Release()
- {
- nRefCount--;
- if( 0 == nRefCount )
- delete this;
- }
-};
-
-// ------------
-// - UniqueId -
-// ------------
-
-class UniqueIdContainer;
-class UniqueItemId
-{
- friend class UniqueIdContainer;
- ImpUniqueId* pId;
-
- UniqueItemId( ImpUniqueId * pIdP )
- { pId = pIdP; pId->nRefCount++; }
-public:
- UniqueItemId() { pId = NULL; }
- UniqueItemId( const UniqueItemId & rId )
- { pId = rId.pId; if( pId ) pId->nRefCount++; }
- ~UniqueItemId()
- { if( pId ) pId->Release(); }
- UniqueItemId& operator = ( const UniqueItemId & rId )
- {
- if( rId.pId ) rId.pId->nRefCount++;
- if( pId ) pId->Release();
- pId = rId.pId;
- return *this;
- }
- sal_uIntPtr GetId() const { return pId ? pId->nId : 0; }
-};
-
-// ---------------------
-// - UniqueIdContainer -
-// ---------------------
-
-class TOOLS_DLLPUBLIC UniqueIdContainer : private UniqueIndex
-{
- sal_uInt16 nCollectCount;
-
-public: // Irgend etwas mit protected falsch
- void Clear( sal_Bool bAll );
-
-public:
- UniqueIdContainer( sal_uIntPtr _nStartIndex,
- sal_uIntPtr _nInitSize = 16,
- sal_uIntPtr _nReSize = 16 )
- : UniqueIndex( _nStartIndex, _nInitSize, _nReSize )
- , nCollectCount( 0 )
- {}
- UniqueIdContainer( const UniqueIdContainer& );
-
- ~UniqueIdContainer()
- { Clear( sal_True ); }
- UniqueIdContainer& operator = ( const UniqueIdContainer & );
-
- sal_Bool IsIndexValid( sal_uIntPtr nIndex ) const
- { return UniqueIndex::IsIndexValid( nIndex ); }
-
- UniqueItemId CreateId();
-};
-
-#endif // _UNQID_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx
index a60777d1b3f6..e85c87bcca54 100644
--- a/tools/source/memtools/unqidx.cxx
+++ b/tools/source/memtools/unqidx.cxx
@@ -30,7 +30,6 @@
#include "precompiled_tools.hxx"
#include <impcont.hxx>
#include <tools/unqidx.hxx>
-#include <tools/unqid.hxx>
/*************************************************************************
|*
@@ -351,99 +350,5 @@ sal_Bool UniqueIndex::operator ==( const UniqueIndex& rIdx ) const
else
return sal_False;
}
-/*************************************************************************
-|*
-|* UniqueIdContainer::UniqueIdContainer ()
-|*
-*************************************************************************/
-
-UniqueIdContainer::UniqueIdContainer( const UniqueIdContainer& rObj )
- : UniqueIndex( rObj )
- , nCollectCount( rObj.nCollectCount )
-{
- sal_uIntPtr nCur = GetCurIndex();
-
- ImpUniqueId * pEle = (ImpUniqueId *)First();
- while( pEle )
- {
- pEle->nRefCount++;
- pEle = (ImpUniqueId *)Next();
- }
- Seek( nCur );
-}
-
-/*************************************************************************
-|*
-|* UniqueIdContainer::operator = ()
-|*
-*************************************************************************/
-
-UniqueIdContainer& UniqueIdContainer::operator = ( const UniqueIdContainer & rObj )
-{
- UniqueIndex::operator = ( rObj );
- nCollectCount = rObj.nCollectCount;
-
- sal_uIntPtr nCur = GetCurIndex();
-
- ImpUniqueId * pEle = (ImpUniqueId *)First();
- while( pEle )
- {
- pEle->nRefCount++;
- pEle = (ImpUniqueId *)Next();
- }
- Seek( nCur );
- return *this;
-}
-
-/*************************************************************************
-|*
-|* UniqueIdContainer::Clear()
-|*
-*************************************************************************/
-
-void UniqueIdContainer::Clear( sal_Bool bAll )
-{
- sal_uInt16 nFree = bAll ? 0xFFFF : 1;
-
- ImpUniqueId* pId = (ImpUniqueId*)Last();
- sal_Bool bLast = sal_True;
- while ( pId )
- {
- if ( pId->nRefCount <= nFree )
- {
- ((ImpUniqueId *)Remove( pId->nId ))->Release();
- if( bLast )
- pId = (ImpUniqueId *)Last();
- else
- pId = (ImpUniqueId *)Prev();
- }
- else
- {
- pId = (ImpUniqueId *)Prev();
- bLast = sal_False;
- }
- }
-}
-
-/*************************************************************************
-|*
-|* UniqueIdContainer::CreateId()
-|*
-*************************************************************************/
-
-UniqueItemId UniqueIdContainer::CreateId()
-{
- if( nCollectCount > 50 )
- { // aufraeumen
- Clear( sal_False );
- nCollectCount = 0;
- }
- nCollectCount++;
-
- ImpUniqueId * pId = new ImpUniqueId;
- pId->nRefCount = 1;
- pId->nId = Insert( pId );
- return UniqueItemId( pId );
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */