[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/memtools/tl_contnr.cxx | 26 -
binfilter/inc/bf_tools/contnr.hxx |2 -
2 files changed, 28 deletions(-)
New commits:
commit baa2838ed4a0d1a9dd4b2ff88e5e033a37bf31cd
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 19 17:29:48 2012 +0100
callcatcher: strip Container down
diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00..2719d61 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock,
sal_uInt16 nIndex )
|*
*/
-void Container::Insert( void* p )
-{
-ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Insert()
-|*
-*/
-
void Container::Insert( void* p, sal_uIntPtr nIndex )
{
if ( nCount = nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16
nIndex )
|*
*/
-void* Container::Remove()
-{
-// Wenn kein Item vorhanden ist, NULL zurueckgeben
-if ( !nCount )
-return NULL;
-else
-return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Remove()
-|*
-*/
-
void* Container::Remove( sal_uIntPtr nIndex )
{
// Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
diff --git a/binfilter/inc/bf_tools/contnr.hxx
b/binfilter/inc/bf_tools/contnr.hxx
index 6d7e70f..9267e5e 100644
--- a/binfilter/inc/bf_tools/contnr.hxx
+++ b/binfilter/inc/bf_tools/contnr.hxx
@@ -79,10 +79,8 @@ public:
Container( const Container rContainer );
~Container();
-voidInsert( void* p );
voidInsert( void* p, sal_uIntPtr nIndex );
-void* Remove();
void* Remove( sal_uIntPtr nIndex );
void* Remove( void* p )
{ return Remove( GetPos( p ) ); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/items/svt_rngitem.cxx |6 -- binfilter/bf_svtools/source/items1/svt_itemset.cxx |8 binfilter/bf_svtools/util/svt.flt |3 --- binfilter/inc/bf_svtools/nranges.hxx |4 binfilter/inc/bf_svtools/rngitem.hxx | 10 -- 5 files changed, 31 deletions(-) New commits: commit f89f0d123f9155e0832d1186eb1bd64bbfddd3f1 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 12 11:05:37 2012 + ditch SfxULongRanges from binfilter diff --git a/binfilter/bf_svtools/source/items/svt_rngitem.cxx b/binfilter/bf_svtools/source/items/svt_rngitem.cxx index 401926b..1964e71 100644 --- a/binfilter/bf_svtools/source/items/svt_rngitem.cxx +++ b/binfilter/bf_svtools/source/items/svt_rngitem.cxx @@ -36,12 +36,6 @@ #include bf_svtools/rngitem.hxx #include svt_rngitem_inc.cxx -#define NUMTYPE sal_uInt32 -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include bf_svtools/rngitem.hxx -#include svt_rngitem_inc.cxx - #else // We leave this condition just in case NUMTYPE has been defined externally to this diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx index c525349..cfb3ada 100644 --- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx +++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx @@ -66,14 +66,6 @@ DBG_NAME(SfxItemSet) #undef SvNums #undef SfxNumRanges -#define NUMTYPE ULONG -#define SvNums SvULongs -#define SfxNumRangesSfxULongRanges -#include svt_nranges.cxx -#undef NUMTYPE -#undef SvNums -#undef SfxNumRanges - // #ifdef DBG_UTIL diff --git a/binfilter/bf_svtools/util/svt.flt b/binfilter/bf_svtools/util/svt.flt index 693a888..5032849 100644 --- a/binfilter/bf_svtools/util/svt.flt +++ b/binfilter/bf_svtools/util/svt.flt @@ -53,9 +53,6 @@ Sdbyy_scan SfxListUndoAction SfxPointerEntry SfxUINT32s -SfxULongRangeItem -SfxULongRanges -SfxULongRangesItem SgfFontLst SgfFontOne SqlInternalNode diff --git a/binfilter/inc/bf_svtools/nranges.hxx b/binfilter/inc/bf_svtools/nranges.hxx index 194a158..9abd313 100644 --- a/binfilter/inc/bf_svtools/nranges.hxx +++ b/binfilter/inc/bf_svtools/nranges.hxx @@ -39,11 +39,7 @@ #define NUMTYPE USHORT #define SfxNumRanges SfxUShortRanges #include bf_svtools/nranges.hxx - #undef NUMTYPE -#define NUMTYPE ULONG -#define SfxNumRanges SfxULongRanges -#include bf_svtools/nranges.hxx #define _SFXNRANGES_HXX diff --git a/binfilter/inc/bf_svtools/rngitem.hxx b/binfilter/inc/bf_svtools/rngitem.hxx index 7768d23..39dfebb 100644 --- a/binfilter/inc/bf_svtools/rngitem.hxx +++ b/binfilter/inc/bf_svtools/rngitem.hxx @@ -38,16 +38,6 @@ #undef SfxXRangeItem #undef SfxXRangesItem -#ifndef _SFXITEMS_HXX -#define NUMTYPE ULONG -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include bf_svtools/rngitem.hxx -#undef NUMTYPE -#undef SfxXRangeItem -#undef SfxXRangesItem -#endif - #define _SFXRNGITEM_HXX #else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/memtools/tl_contnr.cxx | 81 -
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 26 --
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 26 ++
binfilter/inc/bf_svx/svdetc.hxx|1
binfilter/inc/bf_svx/svdlayer.hxx |3
binfilter/inc/bf_svx/svdmark.hxx |2
binfilter/inc/bf_tools/contnr.hxx |9 --
binfilter/inc/bf_tools/stack.hxx |3
binfilter/inc/bf_tools/string.hxx |1
binfilter/inc/bf_tools/unqidx.hxx |2
10 files changed, 26 insertions(+), 128 deletions(-)
New commits:
commit 271e19336e594195ac6e40dd01ba62d2592f24e8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 13:41:31 2012 +
callcatcher: shrink unused inlines
diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00..f0b48a9 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock,
sal_uInt16 nIndex )
|*
*/
-void Container::Insert( void* p )
-{
-ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Insert()
-|*
-*/
-
void Container::Insert( void* p, sal_uIntPtr nIndex )
{
if ( nCount = nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16
nIndex )
|*
*/
-void* Container::Remove()
-{
-// Wenn kein Item vorhanden ist, NULL zurueckgeben
-if ( !nCount )
-return NULL;
-else
-return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Remove()
-|*
-*/
-
void* Container::Remove( sal_uIntPtr nIndex )
{
// Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
@@ -1133,23 +1107,6 @@ void Container::Clear()
/*
|*
-|*Container::GetCurObject()
-|*
-*/
-
-void* Container::GetCurObject() const
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-// NULL, wenn Container leer
-if ( !nCount )
-return NULL;
-else
-return pCurBlock-GetObject( nCurIndex );
-}
-
-/*
-|*
|*Container::GetCurPos()
|*
*/
@@ -1206,44 +1163,6 @@ void* Container::GetObject( sal_uIntPtr nIndex ) const
/*
|*
-|*Container::GetPos()
-|*
-*/
-
-sal_uIntPtr Container::GetPos( const void* p ) const
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-void** pNodes;
-CBlock* pTemp;
-sal_uIntPtr nTemp;
-sal_uInt16 nBlockCount;
-sal_uInt16 i;
-
-// Block suchen
-pTemp = pFirstBlock;
-nTemp = 0;
-while ( pTemp )
-{
-pNodes = pTemp-GetNodes();
-i = 0;
-nBlockCount = pTemp-Count();
-while ( i nBlockCount )
-{
-if ( p == *pNodes )
-return nTemp+i;
-pNodes++;
-i++;
-}
-nTemp += nBlockCount;
-pTemp = pTemp-GetNextBlock();
-}
-
-return CONTAINER_ENTRY_NOTFOUND;
-}
-
-/*
-|*
|*Container::Seek()
|*
*/
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 83ca2c0..5ced5bc 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -738,32 +738,6 @@ STRING STRING::ToLowerAscii()
// ---
-STRING STRING::ToUpperAscii()
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-sal_Int32 nIndex = 0;
-sal_Int32 nLen = mpData-mnLen;
-STRCODE*pStr = mpData-maStr;
-while ( nIndex nLen )
-{
-// Ist das Zeichen zwischen 'a' und 'z' dann umwandeln
-if ( (*pStr = 97) (*pStr = 122) )
-{
-// Daten kopieren, wenn noetig
-pStr = ImplCopyStringData( pStr );
-*pStr -= 32;
-
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/memtools/tl_unqidx.cxx | 20
binfilter/inc/bf_tools/unqidx.hxx |1 -
2 files changed, 21 deletions(-)
New commits:
commit 359bd679b9cc9849e9336c6b6fc289e900a18fdf
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 2 08:18:16 2012 +
reduce UniqueIndex
diff --git a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
index 66ebdf8..9bba4c2 100644
--- a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
@@ -138,26 +138,6 @@ sal_uIntPtr UniqueIndex::GetCurIndex() const
/*
|*
-|*UniqueIndex::GetIndex()
-|*
-*/
-
-sal_uIntPtr UniqueIndex::GetIndex( const void* p ) const
-{
-// Wird ein NULL-Pointer uebergeben, dann wurde Pointer nicht gefunden
-if ( !p )
-return UNIQUEINDEX_ENTRY_NOTFOUND;
-
-sal_uIntPtr nIndex = Container::GetPos( p );
-
-if ( nIndex != CONTAINER_ENTRY_NOTFOUND )
-return nIndex+nStartIndex;
-else
-return UNIQUEINDEX_ENTRY_NOTFOUND;
-}
-
-/*
-|*
|*UniqueIndex::IsIndexValid()
|*
*/
diff --git a/binfilter/inc/bf_tools/unqidx.hxx
b/binfilter/inc/bf_tools/unqidx.hxx
index 273f670..3bf63ae 100644
--- a/binfilter/inc/bf_tools/unqidx.hxx
+++ b/binfilter/inc/bf_tools/unqidx.hxx
@@ -65,7 +65,6 @@ public:
sal_uIntPtr Count() const { return nCount; }
sal_uIntPtr GetCurIndex() const;
-sal_uIntPtr GetIndex( const void* p ) const;
sal_BoolIsIndexValid( sal_uIntPtr nIndex ) const;
void* Seek( sal_uIntPtr nIndex );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 46 ---
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 46 +++
binfilter/inc/bf_tools/string.hxx|6 +--
3 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 6c7344599885a7528a5c06a4e2a0b15e0adb35fd
Author: Caolán McNamara caol...@redhat.com
Date: Sat Feb 18 21:12:34 2012 +
ditch extra ByteString code
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index b0d7279..64eef56 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -383,52 +383,6 @@ STRING STRING::Assign( const STRCODE* pCharStr )
// ---
-STRING STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-DBG_ASSERT( pCharStr, String::Assign() - pCharStr is NULL );
-
-if ( nLen == STRING_LEN )
-nLen = ImplStringLen( pCharStr );
-
-#ifdef DBG_UTIL
-if ( DbgIsAssert() )
-{
-for ( xub_StrLen i = 0; i nLen; i++ )
-{
-if ( !pCharStr[i] )
-{
-OSL_FAIL( String::Assign() : nLen is wrong );
-}
-}
-}
-#endif
-
-if ( !nLen )
-{
-STRING_NEW((STRING_TYPE **)mpData);
-}
-else
-{
-// Wenn String genauso lang ist, wie der String, dann direkt kopieren
-if ( (nLen == mpData-mnLen) (mpData-mnRefCount == 1) )
-memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
-else
-{
-// Alte Daten loeschen
-STRING_RELEASE((STRING_TYPE *)mpData);
-
-// Daten initialisieren und String kopieren
-mpData = ImplAllocData( nLen );
-memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
-}
-}
-
-return *this;
-}
-
-// ---
-
STRING STRING::Assign( STRCODE c )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index 4657cd8..803b36e 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -627,6 +627,52 @@ STRING::STRING( const ::STRING rStr )
mpData = temp.mpData;
}
+// ---
+
+STRING STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
+{
+DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+DBG_ASSERT( pCharStr, String::Assign() - pCharStr is NULL );
+
+if ( nLen == STRING_LEN )
+nLen = ImplStringLen( pCharStr );
+
+#ifdef DBG_UTIL
+if ( DbgIsAssert() )
+{
+for ( xub_StrLen i = 0; i nLen; i++ )
+{
+if ( !pCharStr[i] )
+{
+OSL_FAIL( String::Assign() : nLen is wrong );
+}
+}
+}
+#endif
+
+if ( !nLen )
+{
+STRING_NEW((STRING_TYPE **)mpData);
+}
+else
+{
+// Wenn String genauso lang ist, wie der String, dann direkt kopieren
+if ( (nLen == mpData-mnLen) (mpData-mnRefCount == 1) )
+memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
+else
+{
+// Alte Daten loeschen
+STRING_RELEASE((STRING_TYPE *)mpData);
+
+// Daten initialisieren und String kopieren
+mpData = ImplAllocData( nLen );
+memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
+}
+}
+
+return *this;
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 872136e..6036737 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -125,10 +125,11 @@ private:
sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making something to fit
ByteString( const sal_Unicode* pUniStr, xub_StrLen
nLen,
rtl_TextEncoding eTextEncoding,
-sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making somethiing to fit
+sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making something to fit
ByteString( const UniString rUniStr,
rtl_TextEncoding eTextEncoding,
-sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS );
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/misc/tl_strucvt.cxx | 16
binfilter/inc/bf_tools/string.hxx |2 --
2 files changed, 18 deletions(-)
New commits:
commit 34eccca5a0c9f2f7e0e1bc655ad0195a5d69c1ed
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 13 10:20:54 2012 +
drop InitStringRes
diff --git a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
index d5bc082..00d2869 100644
--- a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
@@ -31,22 +31,6 @@ namespace binfilter
// ===
-void UniString::InitStringRes( const char* pUTF8Str, sal_Int32 nLen )
-{
-DBG_CTOR( UniString, DbgCheckUniString );
-OSL_ENSURE(nLen = STRING_MAXLEN, Overflowing UniString);
-
-mpData = NULL;
-rtl_string2UString( (rtl_uString **)(mpData),
-pUTF8Str, nLen,
-RTL_TEXTENCODING_UTF8,
-RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |
-RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
-RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
-}
-
-// ===
-
UniString::UniString( const ByteString rByteStr, rtl_TextEncoding
eTextEncoding, sal_uInt32 nCvtFlags )
{
DBG_CTOR( UniString, DbgCheckUniString );
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 3c2cd96..cb28021 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -354,8 +354,6 @@ class TOOLS_DLLPUBLIC UniString
{
friend class ByteString;
-TOOLS_DLLPRIVATE void InitStringRes( const sal_Char* pUTF8Str, sal_Int32
nLen );
-
private:
UniStringData* mpData;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx |1
binfilter/inc/bf_starmath/dynary.hxx | 105 ++
binfilter/inc/bf_starmath/node.hxx|3
binfilter/inc/bf_starmath/symbol.hxx |2
4 files changed, 107 insertions(+), 4 deletions(-)
New commits:
commit da4705764d8192f5ee2a02fe19fd31d5ebf955bd
Author: Michael Stahl mst...@redhat.com
Date: Sat Nov 19 18:00:17 2011 +0100
binfilter: move dynary.hxx from tools here
should fix breakage from 89a783cde071d63120bfa63768b4680dd2e58fee
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
index 31b2235..eee90f4 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -42,7 +42,6 @@
#include tools/debug.hxx
#include tools/stack.hxx
#include tools/table.hxx
-#include tools/dynary.hxx
#include vcl/graph.hxx
#include vcl/virdev.hxx
#include tools/poly.hxx
diff --git a/binfilter/inc/bf_starmath/dynary.hxx
b/binfilter/inc/bf_starmath/dynary.hxx
new file mode 100644
index 000..7e17455
--- /dev/null
+++ b/binfilter/inc/bf_starmath/dynary.hxx
@@ -0,0 +1,105 @@
+/* -*- 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 _DYNARY_HXX
+#define _DYNARY_HXX
+
+#include tools/solar.h
+#include tools/contnr.hxx
+
+//
+// - DynArray -
+//
+
+#define DYNARRAY_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
+
+class DynArray : private Container
+{
+public:
+using Container::SetSize;
+using Container::GetSize;
+using Container::Clear;
+
+DynArray( sal_uIntPtr nSize = 16 ) : Container( nSize ) {}
+DynArray( const DynArray rAry ) : Container( rAry ) {}
+
+void* Put( sal_uIntPtr nIndex, void* p )
+{ return Container::Replace( p, nIndex ); }
+void* Get( sal_uIntPtr nIndex ) const
+{ return Container::GetObject( nIndex ); }
+
+sal_uIntPtr GetIndex( const void* p ) const
+{ return Container::GetPos( p ); }
+
+DynArray operator =( const DynArray rAry )
+{ Container::operator =( rAry ); return *this; }
+
+sal_Booloperator ==( const DynArray rAry ) const
+{ return Container::operator ==( rAry ); }
+sal_Booloperator !=( const DynArray rAry ) const
+{ return Container::operator !=( rAry ); }
+};
+
+//
+// - DECLARE_DYNARRAY -
+//
+
+#define DECLARE_DYNARRAY( ClassName, Type ) \
+class ClassName : private DynArray \
+{ \
+public: \
+using DynArray::SetSize;\
+using DynArray::GetSize;\
+using DynArray::Clear; \
+\
+ClassName( sal_uIntPtr nSize = 16 ) : \
+DynArray( nSize ) {}\
+ClassName( const ClassName rClassName ) : \
+DynArray( rClassName ) {} \
+\
+TypePut( sal_uIntPtr nIndex, Type p ) \
+{ return (Type)DynArray::Put( nIndex, (void*)p ); } \
+
