[Libreoffice-commits] .: 5 commits - binfilter/bf_svx binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Tue Aug 30 21:28:09 PDT 2011
binfilter/bf_svx/source/inc/XPropertyTable.hxx | 3
binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx | 39 ---
binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx | 6
binfilter/bf_svx/source/unodraw/svx_unontabl.cxx | 19 -
binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx | 14 -
binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx | 186 ++++++++---------
binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx | 14 -
binfilter/bf_svx/source/xoutdev/svx_xtable.cxx | 185 ----------------
binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx | 14 -
binfilter/inc/bf_svx/xtable.hxx | 58 -----
10 files changed, 105 insertions(+), 433 deletions(-)
New commits:
commit d11e8131f560420dcac791e5ef5a7afc760ddee5
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Aug 30 21:22:47 2011 -0700
unusedcode.easy: Cleanup some of the XPropertyList based classes
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
index 83e1025..b26d8c0 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabbtmp.cxx
@@ -83,20 +83,6 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
/************************************************************************/
-/*N*/ XBitmapEntry* XBitmapList::Replace(XBitmapEntry* pEntry, long nIndex )
-/*N*/ {
-/*N*/ return (XBitmapEntry*) XPropertyList::Replace(pEntry, nIndex);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XBitmapEntry* XBitmapList::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XBitmapEntry*) XPropertyList::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XBitmapEntry* XBitmapList::Get(long nIndex) const
/*N*/ {
/*N*/ return (XBitmapEntry*) XPropertyList::Get(nIndex, 0);
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
index b6c8ad5..6b08e05 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
@@ -90,13 +90,6 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ XColorEntry* XColorTable::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XColorEntry*) XPropertyList::Remove( 0, nIndex );
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XColorEntry* XColorTable::Get(long nIndex) const
/*N*/ {
/*N*/ return (XColorEntry*) XPropertyList::Get( 0, nIndex );
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
index bdef862..538d902 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
@@ -99,20 +99,6 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ XDashEntry* XDashList::Replace(XDashEntry* pEntry, long nIndex )
-/*N*/ {
-/*N*/ return (XDashEntry*) XPropertyList::Replace(pEntry, nIndex);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XDashEntry* XDashList::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XDashEntry*) XPropertyList::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XDashEntry* XDashList::Get(long nIndex) const
/*N*/ {
/*N*/ return (XDashEntry*) XPropertyList::Get(nIndex, 0);
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
index 6a995fd..c91beff 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
@@ -108,20 +108,6 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/************************************************************************/
-/*N*/ XLineEndEntry* XLineEndList::Replace(XLineEndEntry* pEntry, long nIndex )
-/*N*/ {
-/*N*/ return (XLineEndEntry*) XPropertyList::Replace(pEntry, nIndex);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ XLineEndEntry* XLineEndList::Remove(long nIndex)
-/*N*/ {
-/*N*/ return (XLineEndEntry*) XPropertyList::Remove(nIndex, 0);
-/*N*/ }
-
-/************************************************************************/
-
/*N*/ XLineEndEntry* XLineEndList::Get(long nIndex) const
/*N*/ {
/*N*/ return (XLineEndEntry*) XPropertyList::Get(nIndex, 0);
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index fafb7fb..114048b 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -258,7 +258,6 @@ public:
virtual ~XColorTable();
XColorEntry* Replace(long nIndex, XColorEntry* pEntry );
- XColorEntry* Remove(long nIndex);
XColorEntry* Get(long nIndex) const;
virtual BOOL Load();
@@ -291,8 +290,6 @@ public:
USHORT nReSize = 16 );
virtual ~XLineEndList();
- XLineEndEntry* Replace(XLineEndEntry* pEntry, long nIndex );
- XLineEndEntry* Remove(long nIndex);
XLineEndEntry* Get(long nIndex) const;
virtual BOOL Load();
@@ -325,8 +322,6 @@ public:
USHORT nReSize = 16 );
virtual ~XDashList();
- XDashEntry* Replace(XDashEntry* pEntry, long nIndex );
- XDashEntry* Remove(long nIndex);
XDashEntry* Get(long nIndex) const;
virtual BOOL Load();
@@ -416,8 +411,6 @@ public:
USHORT nReSize = 16 );
virtual ~XBitmapList();
- XBitmapEntry* Replace(XBitmapEntry* pEntry, long nIndex );
- XBitmapEntry* Remove(long nIndex);
XBitmapEntry* Get(long nIndex) const;
virtual BOOL Load();
commit 347199420512a333ed459fb2f71bf56a484d8c3b
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Aug 30 21:12:07 2011 -0700
Remove class XPropertyTable
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
index 1e4ba3c..ade9dfa 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtable.cxx
@@ -48,191 +48,6 @@ namespace binfilter {
/*N*/ return aRGBColor;
/*N*/ }
-// ---------------------
-// class XPropertyTable
-// ---------------------
-
-/*************************************************************************
-|*
-|* XPropertyTable::XPropertyTable()
-|*
-*************************************************************************/
-
-/*N*/ XPropertyTable::XPropertyTable( const String& rPath,
-/*N*/ XOutdevItemPool* pInPool,
-/*N*/ USHORT nInitSize, USHORT nReSize ) :
-/*N*/ aName ( pszStandard, 8 ),
-/*N*/ aPath ( rPath ),
-/*N*/ pXPool ( pInPool ),
-/*N*/ aTable ( nInitSize, nReSize ),
-/*N*/ pBmpTable ( NULL ),
-/*N*/ bTableDirty ( TRUE ),
-/*N*/ bBitmapsDirty ( TRUE ),
-/*N*/ bOwnPool ( FALSE )
-/*N*/ {
-/*N*/ if( !pXPool )
-/*N*/ {
-/*N*/ bOwnPool = TRUE;
-/*N*/ pXPool = new XOutdevItemPool;
-/*N*/ DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
-/*N*/ }
-/*N*/ }
-
-/*************************************************************************
-|*
-|* XPropertyTable::~XPropertyTable()
-|*
-*************************************************************************/
-
-/*N*/ XPropertyTable::~XPropertyTable()
-/*N*/ {
-/*N*/ XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
-/*N*/ Bitmap* pBitmap = NULL;
-/*N*/ for (ULONG nIndex = 0; nIndex < aTable.Count(); nIndex++)
-/*N*/ {
-/*N*/ delete pEntry;
-/*N*/ pEntry = (XPropertyEntry*)aTable.Next();
-/*N*/ }
-/*N*/ // Hier wird die Bitmaptabelle geloescht
-/*N*/ if( pBmpTable )
-/*N*/ {
-/*N*/ pBitmap = (Bitmap*) pBmpTable->First();
-/*N*/
-/*N*/ for( ULONG nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
-/*N*/ {
-/*N*/ delete pBitmap;
-/*N*/ pBitmap = (Bitmap*) pBmpTable->Next();
-/*N*/ }
-/*N*/ delete pBmpTable;
-/*N*/ pBmpTable = NULL;
-/*N*/ }
-/*N*/ // Eigener Pool wird geloescht
-/*N*/ if( bOwnPool && pXPool )
-/*N*/ {
-/*N*/ delete pXPool;
-/*N*/ }
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ long XPropertyTable::Count() const
-/*N*/ {
-/*N*/ if( bTableDirty )
-/*N*/ {
-/*N*/ // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
-/*N*/ if( !( (XPropertyTable*) this )->Load() )
-/*N*/ ( (XPropertyTable*) this )->Create();
-/*N*/ }
-/*N*/ return( aTable.Count() );
-/*N*/ }
-
-/*************************************************************************
-|*
-|* XPropertyEntry* XPropertyTable::Get()
-|*
-*************************************************************************/
-
-/*N*/ XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/ ) const
-/*N*/ {
-/*N*/ if( bTableDirty )
-/*N*/ {
-/*N*/ // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
-/*N*/ if( !( (XPropertyTable*) this )->Load() )
-/*N*/ ( (XPropertyTable*) this )->Create();
-/*N*/ }
-/*N*/ return (XPropertyEntry*) aTable.GetObject( (ULONG) nIndex );
-/*N*/ }
-
-/*************************************************************************
-|*
-|* long XPropertyTable::Get(const String& rName)
-|*
-*************************************************************************/
-
-/*N*/ long XPropertyTable::Get(const XubString& rName)
-/*N*/ {
-/*N*/ if( bTableDirty )
-/*N*/ {
-/*N*/ // bTableDirty = FALSE;
-/*N*/ if( !Load() )
-/*N*/ Create();
-/*N*/ }
-/*N*/ long nPos = 0;
-/*N*/ XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
-/*N*/ while (pEntry && pEntry->GetName() != rName)
-/*N*/ {
-/*N*/ nPos++;
-/*N*/ pEntry = (XPropertyEntry*)aTable.Next();
-/*N*/ }
-/*N*/ if (!pEntry) nPos = -1;
-/*N*/ return nPos;
-/*N*/ }
-
-/*************************************************************************
-|*
-|* void XPropertyTable::Insert()
-|*
-*************************************************************************/
-
-/*N*/ BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
-/*N*/ {
-/*N*/ BOOL bReturn = aTable.Insert( (ULONG) nIndex, pEntry );
-/*N*/
-/*N*/ if( pBmpTable && !bBitmapsDirty )
-/*N*/ {
-/*N*/ Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-/*N*/ pBmpTable->Insert( (ULONG) nIndex, pBmp );
-/*N*/ }
-/*N*/ return bReturn;
-/*N*/ }
-
-/*************************************************************************
-|*
-|* void XPropertyTable::Replace()
-|*
-*************************************************************************/
-
-/*N*/ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
-/*N*/ {
-/*N*/ XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (ULONG) nIndex, pEntry );
-/*N*/
-/*N*/ if( pBmpTable && !bBitmapsDirty )
-/*N*/ {
-/*N*/ Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
-/*N*/ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (ULONG) nIndex, pBmp );
-/*N*/ if( pOldBmp )
-/*N*/ delete pOldBmp;
-/*N*/ }
-/*N*/ return pOldEntry;
-/*N*/ }
-
-/*************************************************************************
-|*
-|* void XPropertyTable::Remove()
-|*
-*************************************************************************/
-
-/*N*/ XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/ )
-/*N*/ {
-/*N*/ if( pBmpTable && !bBitmapsDirty )
-/*N*/ {
-/*N*/ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (ULONG) nIndex );
-/*N*/ if( pOldBmp )
-/*N*/ delete pOldBmp;
-/*N*/ }
-/*N*/ return (XPropertyEntry*) aTable.Remove((ULONG)nIndex);
-/*N*/ }
-
-/************************************************************************/
-
-/*N*/ void XPropertyTable::SetName( const String& rString )
-/*N*/ {
-/*N*/ if(rString.Len())
-/*N*/ {
-/*N*/ aName = rString;
-/*N*/ }
-/*N*/ }
-
// --------------------
// class XPropertyList
// --------------------
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 81cc517..fafb7fb 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -190,55 +190,6 @@ public:
XOBitmap& GetXBitmap() { return aXOBitmap; }
};
-// ---------------------
-// class XPropertyTable
-// ---------------------
-
-class XPropertyTable
-{
-protected:
- String aName; // nicht persistent !
- String aPath;
- XOutdevItemPool* pXPool;
-
- Table aTable;
- Table* pBmpTable;
-
- BOOL bTableDirty;
- BOOL bBitmapsDirty;
- BOOL bOwnPool;
-
- XPropertyTable( const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
-public:
- virtual ~XPropertyTable();
-
- long Count() const;
-
- BOOL Insert(long nIndex, XPropertyEntry* pEntry);
- XPropertyEntry* Replace(long nIndex, XPropertyEntry* pEntry);
- XPropertyEntry* Remove(long nIndex, USHORT nDummy);
- XPropertyEntry* Get( long nIndex, USHORT nDummy ) const;
-
- long Get(const String& rName);
-
- const String& GetName() const { return aName; }
- void SetName( const String& rString );
- const String& GetPath() const { return aPath; }
- void SetPath( const String& rString ) { aPath = rString; }
- BOOL IsDirty() const { return bTableDirty && bBitmapsDirty; }
- void SetDirty( BOOL bDirty = TRUE )
- { bTableDirty = bDirty; bBitmapsDirty = bDirty; }
-
- virtual BOOL Load() = 0;
- virtual BOOL Save() = 0;
- virtual BOOL Create() = 0;
- virtual BOOL CreateBitmapsForUI() = 0;
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0;
-};
-
// --------------------
// class XPropertyList
// --------------------
commit 3ba95e9147c3cc48102b8f9308c436303d7dcfd6
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Aug 30 21:06:34 2011 -0700
class SvxUnoXPropertyTable doesn't need a XPropertyTable member.
diff --git a/binfilter/bf_svx/source/inc/XPropertyTable.hxx b/binfilter/bf_svx/source/inc/XPropertyTable.hxx
index 6de9057..b981d92 100644
--- a/binfilter/bf_svx/source/inc/XPropertyTable.hxx
+++ b/binfilter/bf_svx/source/inc/XPropertyTable.hxx
@@ -33,7 +33,6 @@
namespace binfilter {
class XPropertyList;
-class XPropertyTable;
com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw();
com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw();
diff --git a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
index e1426fd..78a3db3 100644
--- a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
@@ -60,13 +60,11 @@ class SvxUnoXPropertyTable : public WeakImplHelper2< XNameContainer, XServiceInf
private:
sal_Int16 mnWhich;
XPropertyList* mpList;
- XPropertyTable* mpTable;
- long getCount() const { return mpList ? mpList->Count() : (mpTable?mpTable->Count():0); }
+ long getCount() const { return mpList ? mpList->Count() : 0; }
XPropertyEntry* get( long index ) const;
public:
SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw();
- SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyTable* pTable ) throw();
virtual ~SvxUnoXPropertyTable() throw();
@@ -92,17 +90,9 @@ public:
virtual sal_Bool SAL_CALL hasElements( ) throw( RuntimeException);
};
-SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyTable* pTable ) throw()
- : mnWhich( nWhich )
- , mpList( NULL )
- , mpTable( pTable )
-{
-}
-
SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw()
: mnWhich( nWhich )
, mpList( pList )
- , mpTable( NULL )
{
}
@@ -112,9 +102,7 @@ SvxUnoXPropertyTable::~SvxUnoXPropertyTable() throw()
XPropertyEntry* SvxUnoXPropertyTable::get( long index ) const
{
- if( mpTable )
- return mpTable->Get( index, 0 );
- else if( mpList )
+ if( mpList )
return mpList->Get( index, 0 );
else
return NULL;
@@ -143,7 +131,7 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const
{
SolarMutexGuard aGuard;
- if( NULL == mpList && NULL == mpTable )
+ if( NULL == mpList )
throw IllegalArgumentException();
if( hasByName( aName ) )
@@ -156,10 +144,7 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const
if( NULL == pNewEntry )
throw IllegalArgumentException();
- if( mpList )
- mpList->Insert( pNewEntry );
- else
- mpTable->Insert( mpTable->Count(), pNewEntry );
+ mpList->Insert( pNewEntry );
}
void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name )
@@ -178,10 +163,7 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name )
pEntry = get( i );
if( pEntry && pEntry->GetName() == aInternalName )
{
- if( mpList )
- delete mpList->Remove( i, 0 );
- else
- delete mpTable->Remove( i, 0 );
+ delete mpList->Remove( i, 0 );
return;
}
}
@@ -210,10 +192,7 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const
if( NULL == pNewEntry )
throw IllegalArgumentException();
- if( mpList )
- delete mpList->Replace( pNewEntry, i );
- else
- delete mpTable->Replace( i, pNewEntry );
+ delete mpList->Replace( pNewEntry, i );
return;
}
}
commit fcb5f09fccdd11148ce8e7e0c47d6010af85b362
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Aug 30 21:00:14 2011 -0700
Remove some comments that refer to XPropertyTable
diff --git a/binfilter/bf_svx/source/unodraw/svx_unontabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unontabl.cxx
index 3f75f76..f309b20 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unontabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unontabl.cxx
@@ -164,31 +164,12 @@ void SAL_CALL SvxUnoNumberingRuleTable::insertByName( const OUString& aName, con
void SAL_CALL SvxUnoNumberingRuleTable::removeByName( const OUString& Name )
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{
- /* Currently, don't know how to do this ?
- long nIndex = pTable ? ((XPropertyTable*)pTable)->Get( Name ) : -1;
- if( nIndex == -1 )
- throw container::NoSuchElementException();
-
- pTable->Remove( nIndex );
- */
}
// XNameReplace
void SAL_CALL SvxUnoNumberingRuleTable::replaceByName( const OUString& aName, const uno::Any& aElement )
throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
{
- /* Currently, don't know how to do this ?
- INT32 nColor;
- if( aElement >>= nColor )
- throw lang::IllegalArgumentException();
-
- long nIndex = pTable ? ((XPropertyTable*)pTable)->Get( aName ) : -1;
- if( nIndex == -1 )
- throw container::NoSuchElementException();
-
- XColorEntry* pEntry = new XColorEntry( Color( (ColorData)nColor ), aName );
- delete pTable->Replace( nIndex, pEntry );
- */
}
SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const OUString& aName ) throw()
commit 264ab2f12455203e0b46a30519124c405796e693
Author: Joseph Powers <jpowers27 at cox.net>
Date: Tue Aug 30 20:59:41 2011 -0700
Rebase binfilter::XColorTable from XPropertyTable to XPropertyList
I'm not going to rename it like I did in core... too much work for
something we're going to kill anyways.
diff --git a/binfilter/bf_svx/source/inc/XPropertyTable.hxx b/binfilter/bf_svx/source/inc/XPropertyTable.hxx
index c59a1ec..6de9057 100644
--- a/binfilter/bf_svx/source/inc/XPropertyTable.hxx
+++ b/binfilter/bf_svx/source/inc/XPropertyTable.hxx
@@ -35,7 +35,7 @@ namespace binfilter {
class XPropertyList;
class XPropertyTable;
-com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyTable* pTable ) throw();
+com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw();
com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pList ) throw();
com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pList ) throw();
com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pList ) throw();
diff --git a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
index f9ee374..e1426fd 100644
--- a/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_XPropertyTable.cxx
@@ -303,7 +303,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( )
class SvxUnoXColorTable : public SvxUnoXPropertyTable
{
public:
- SvxUnoXColorTable( XPropertyTable* pTable ) throw() : SvxUnoXPropertyTable( XATTR_LINECOLOR, pTable ) {};
+ SvxUnoXColorTable( XPropertyList* pList ) throw() : SvxUnoXPropertyTable( XATTR_LINECOLOR, pList ) {};
// SvxUnoXPropertyTable
virtual Any getAny( const XPropertyEntry* pEntry ) const throw();
@@ -317,9 +317,9 @@ public:
virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException);
};
-Reference< XInterface > SvxUnoXColorTable_createInstance( XPropertyTable* pTable ) throw()
+Reference< XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw()
{
- return (OWeakObject*) new SvxUnoXColorTable( pTable );
+ return (OWeakObject*) new SvxUnoXColorTable( pList );
}
// SvxUnoXPropertyTable
diff --git a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
index d7c4f65..e995431 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
@@ -134,7 +134,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno::
if( pTable )
{
XColorEntry* pEntry = new XColorEntry( Color( (ColorData)nColor ), aName );
- pTable->Insert( pTable->Count(), pEntry );
+ pTable->Insert( pEntry, pTable->Count() );
}
}
@@ -151,7 +151,7 @@ void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno:
if( aElement >>= nColor )
throw lang::IllegalArgumentException();
- long nIndex = pTable ? ((XPropertyTable*)pTable)->Get( aName ) : -1;
+ long nIndex = pTable ? ((XPropertyList*)pTable)->Get( aName ) : -1;
if( nIndex == -1 )
throw container::NoSuchElementException();
@@ -178,7 +178,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getElementNames( )
sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName )
throw( uno::RuntimeException )
{
- long nIndex = pTable ? ((XPropertyTable*)pTable)->Get( aName ) : -1;
+ long nIndex = pTable ? ((XPropertyList*)pTable)->Get( aName ) : -1;
return nIndex != -1;
}
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
index 8c76a42..b6c8ad5 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xtabcolr.cxx
@@ -69,7 +69,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XColorTable::XColorTable( const String& rPath,
/*N*/ XOutdevItemPool* pInPool,
/*N*/ USHORT nInitSize, USHORT nReSize ) :
-/*N*/ XPropertyTable( rPath, pInPool, nInitSize, nReSize)
+/*N*/ XPropertyList( rPath, pInPool, nInitSize, nReSize)
/*N*/ {
/*N*/ // ColorTable braucht keine eigene BmpTable
/*N*/ // pBmpTable = new Table( nInitSize, nReSize );
@@ -85,21 +85,21 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ XColorEntry* XColorTable::Replace(long nIndex, XColorEntry* pEntry )
/*N*/ {
-/*N*/ return (XColorEntry*) XPropertyTable::Replace(nIndex, pEntry);
+/*N*/ return (XColorEntry*) XPropertyList::Replace( pEntry, nIndex );
/*N*/ }
/************************************************************************/
/*N*/ XColorEntry* XColorTable::Remove(long nIndex)
/*N*/ {
-/*N*/ return (XColorEntry*) XPropertyTable::Remove(nIndex, 0);
+/*N*/ return (XColorEntry*) XPropertyList::Remove( 0, nIndex );
/*N*/ }
/************************************************************************/
/*N*/ XColorEntry* XColorTable::Get(long nIndex) const
/*N*/ {
-/*N*/ return (XColorEntry*) XPropertyTable::Get(nIndex, 0);
+/*N*/ return (XColorEntry*) XPropertyList::Get( 0, nIndex );
/*N*/ }
/************************************************************************/
@@ -107,9 +107,9 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ BOOL XColorTable::Load()
/*N*/ {
/*N*/ #ifndef SVX_LIGHT
-/*N*/ if( bTableDirty )
+/*N*/ if( bListDirty )
/*N*/ {
-/*N*/ bTableDirty = FALSE;
+/*N*/ bListDirty = FALSE;
/*N*/
/*N*/ INetURLObject aURL( aPath );
/*N*/
@@ -226,202 +226,205 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/
/*N*/ for( USHORT n = 0; n < 16; ++n )
/*N*/ {
-/*N*/ Insert( n, new XColorEntry( Color( aColTab[n] ),
-/*N*/ String( ResId( aResId[ n ], rRes )) ) );
+/*N*/ Insert( new XColorEntry(
+ Color( aColTab[n] ),
+ String( ResId( aResId[ n ], rRes ) )
+ ),
+ n
+ );
/*N*/ }
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_GREY );
/*N*/ aStr.AppendAscii(" 80%");
/*N*/ nLen = aStr.Len() - 3;
-/*N*/ Insert(16, new XColorEntry( Color( 51, 51, 51 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 51, 51, 51 ), aStr ), 16 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('7'));
-/*N*/ Insert(17, new XColorEntry( Color( 76, 76, 76 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 76, 76, 76 ), aStr ), 17 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('6'));
-/*N*/ Insert(18, new XColorEntry( Color(102,102,102 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(102,102,102 ), aStr ), 18 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(19, new XColorEntry( Color(153,153,153 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(153,153,153 ), aStr ), 19 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(20, new XColorEntry( Color(179,179,179 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(179,179,179 ), aStr ), 20 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(21, new XColorEntry( Color(204,204,204 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(204,204,204 ), aStr ), 21 );
/*N*/ // BM: new 15%
/*N*/ aStr.SetChar(nLen, sal_Unicode('1'));
/*N*/ aStr.SetChar(nLen + 1, sal_Unicode('5'));
-/*N*/ Insert(22, new XColorEntry( Color(217,217,217 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(217,217,217 ), aStr ), 22 );
/*N*/ aStr.SetChar(nLen + 1, sal_Unicode('0'));
-/*N*/ Insert(23, new XColorEntry( Color(230,230,230 ), aStr ) );
-/*N*/ Insert(24, new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ) );
+/*N*/ Insert( new XColorEntry( Color(230,230,230 ), aStr ), 23 );
+/*N*/ Insert( new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ), 24 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_RED );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(25, new XColorEntry( Color(255, 51,102 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(255, 51,102 ), aStr ), 25 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(26, new XColorEntry( Color(220, 35, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(220, 35, 0 ), aStr ), 26 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(27, new XColorEntry( Color(184, 71, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(184, 71, 0 ), aStr ), 27 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(28, new XColorEntry( Color(255, 51, 51 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(255, 51, 51 ), aStr ), 28 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('5'));
-/*N*/ Insert(29, new XColorEntry( Color(235, 97, 61 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(235, 97, 61 ), aStr ), 29 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('6'));
-/*N*/ Insert(30, new XColorEntry( Color(184, 71, 71 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(184, 71, 71 ), aStr ), 30 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('7'));
-/*N*/ Insert(31, new XColorEntry( Color(184, 0, 71 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(184, 0, 71 ), aStr ), 31 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('8'));
-/*N*/ Insert(32, new XColorEntry( Color(153, 40, 76 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(153, 40, 76 ), aStr ), 32 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_MAGENTA );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(33, new XColorEntry( Color(148, 0,107 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(148, 0,107 ), aStr ), 33 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(34, new XColorEntry( Color(148, 71,107 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(148, 71,107 ), aStr ), 34 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(35, new XColorEntry( Color(148, 71,148 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(148, 71,148 ), aStr ), 35 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(36, new XColorEntry( Color(153,102,204 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(153,102,204 ), aStr ), 36 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('5'));
-/*N*/ Insert(37, new XColorEntry( Color(107, 71,148 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(107, 71,148 ), aStr ), 37 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('6'));
-/*N*/ Insert(38, new XColorEntry( Color(107, 35,148 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(107, 35,148 ), aStr ), 38 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('7'));
-/*N*/ Insert(39, new XColorEntry( Color(107, 0,148 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(107, 0,148 ), aStr ), 39 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('8'));
-/*N*/ Insert(40, new XColorEntry( Color( 94, 17,166 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 94, 17,166 ), aStr ), 40 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_BLUE );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(41, new XColorEntry( Color( 40, 0,153 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 40, 0,153 ), aStr ), 41 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(42, new XColorEntry( Color( 71, 0,184 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 71, 0,184 ), aStr ), 42 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(43, new XColorEntry( Color( 35, 0,220 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 35, 0,220 ), aStr ), 43 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(44, new XColorEntry( Color( 35, 35,220 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 35, 35,220 ), aStr ), 44 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('5'));
-/*N*/ Insert(45, new XColorEntry( Color( 0, 71,255 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0, 71,255 ), aStr ), 45 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('6'));
-/*N*/ Insert(46, new XColorEntry( Color( 0,153,255 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0,153,255 ), aStr ), 46 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('7'));
-/*N*/ Insert(47, new XColorEntry( Color( 0,184,255 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0,184,255 ), aStr ), 47 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('8'));
-/*N*/ Insert(48, new XColorEntry( Color(153,204,255 ), aStr ) );
-/*N*/ //Insert(48, new XColorEntry( Color( 46,215,255 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(153,204,255 ), aStr ), 48 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_CYAN );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(49, new XColorEntry( Color( 0,220,255 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0,220,255 ), aStr ), 49 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(50, new XColorEntry( Color( 0,204,204 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0,204,204 ), aStr ), 50 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(51, new XColorEntry( Color( 35,184,220 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 35,184,220 ), aStr ), 51 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(52, new XColorEntry( Color( 71,184,184 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 71,184,184 ), aStr ), 52 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('5'));
-/*N*/ Insert(53, new XColorEntry( Color( 51,163,163 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 51,163,163 ), aStr ), 53 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('6'));
-/*N*/ Insert(54, new XColorEntry( Color( 25,138,138 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 25,138,138 ), aStr ), 54 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('7'));
-/*N*/ Insert(55, new XColorEntry( Color( 0,107,107 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0,107,107 ), aStr ), 55 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('8'));
-/*N*/ Insert(56, new XColorEntry( Color( 0, 74, 74 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0, 74, 74 ), aStr ), 56 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_GREEN );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(57, new XColorEntry( Color( 53, 94, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 53, 94, 0 ), aStr ), 57 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(58, new XColorEntry( Color( 92,133, 38 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 92,133, 38 ), aStr ), 58 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(59, new XColorEntry( Color(125,166, 71 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(125,166, 71 ), aStr ), 59 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(60, new XColorEntry( Color(148,189, 94 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(148,189, 94 ), aStr ), 60 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('5'));
-/*N*/ Insert(61, new XColorEntry( Color( 0,174, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0,174, 0 ), aStr ), 61 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('6'));
-/*N*/ Insert(62, new XColorEntry( Color( 51,204,102 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 51,204,102 ), aStr ), 62 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('7'));
-/*N*/ Insert(63, new XColorEntry( Color( 61,235, 61 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 61,235, 61 ), aStr ), 63 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('8'));
-/*N*/ Insert(64, new XColorEntry( Color( 35,255, 35 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 35,255, 35 ), aStr ), 64 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_YELLOW );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(65, new XColorEntry( Color(230,255, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(230,255, 0 ), aStr ), 65 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(66, new XColorEntry( Color(255,255,153 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(255,255,153 ), aStr ), 66 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(67, new XColorEntry( Color(255,255,102 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(255,255,102 ), aStr ), 67 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(68, new XColorEntry( Color(230,230, 76 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(230,230, 76 ), aStr ), 68 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('5'));
-/*N*/ Insert(69, new XColorEntry( Color(204,204, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(204,204, 0 ), aStr ), 69 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('6'));
-/*N*/ Insert(70, new XColorEntry( Color(179,179, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(179,179, 0 ), aStr ), 70 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('7'));
-/*N*/ Insert(71, new XColorEntry( Color(128,128, 25 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(128,128, 25 ), aStr ), 71 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('8'));
-/*N*/ Insert(72, new XColorEntry( Color(102,102, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(102,102, 0 ), aStr ), 72 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_BROWN );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(73, new XColorEntry( Color( 76, 25, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 76, 25, 0 ), aStr ), 73 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(74, new XColorEntry( Color(102, 51, 0 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(102, 51, 0 ), aStr ), 74 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(75, new XColorEntry( Color(128, 76, 25 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(128, 76, 25 ), aStr ), 75 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(76, new XColorEntry( Color(153,102, 51 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(153,102, 51 ), aStr ), 76 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_ORANGE );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert(77, new XColorEntry( Color(204,102, 51 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(204,102, 51 ), aStr ), 77 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert(78, new XColorEntry( Color(255,102, 51 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(255,102, 51 ), aStr ), 78 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert(79, new XColorEntry( Color(255,153,102 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(255,153,102 ), aStr ), 79 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert(80, new XColorEntry( Color(255,204,153 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color(255,204,153 ), aStr ), 80 );
/*N*/
/*N*/ // new chart colors
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_VIOLET );
-/*N*/ Insert( 81, new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ), 81 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_BORDEAUX );
-/*N*/ Insert( 82, new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ), 82 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_PALE_YELLOW );
-/*N*/ Insert( 83, new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ), 83 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_PALE_GREEN );
-/*N*/ Insert( 84, new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ), 84 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_DKVIOLET );
-/*N*/ Insert( 85, new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ), 85 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_SALMON );
-/*N*/ Insert( 86, new XColorEntry( Color( 0xff, 0x80, 0x80 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0xff, 0x80, 0x80 ), aStr ), 86 );
/*N*/
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_SEABLUE );
-/*N*/ Insert( 87, new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ), 87 );
/*N*/
/*N*/ // Sun colors
/*N*/ aStr = SVX_RESSTR( RID_SVXSTR_COLOR_SUN );
/*N*/ aStr.AppendAscii(" 1");
/*N*/ nLen = aStr.Len() - 1;
-/*N*/ Insert( 88, new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ), 88 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('2'));
-/*N*/ Insert( 89, new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ), 89 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('3'));
-/*N*/ Insert( 90, new XColorEntry( Color( 0x99, 0x99, 0xcc ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0x99, 0x99, 0xcc ), aStr ), 90 );
/*N*/ aStr.SetChar(nLen, sal_Unicode('4'));
-/*N*/ Insert( 91, new XColorEntry( Color( 0xcc, 0xcc, 0xff ), aStr ) );
+/*N*/ Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xff ), aStr ), 91 );
/*N*/
/*N*/ return( Count() == 92 );
/*N*/ }
@@ -525,8 +528,8 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ // Lesen
/*N*/ rIn.SetStreamCharSet( RTL_TEXTENCODING_IBM_850 );
/*N*/
-/*N*/ delete pBmpTable;
-/*N*/ pBmpTable = new Table( 16, 16 );
+/*N*/ delete pBmpList;
+/*N*/ pBmpList = new List( 16, 16 );
/*N*/
/*N*/ XColorEntry* pEntry = NULL;
/*N*/ long nType;
@@ -560,7 +563,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ (BYTE) ( nGreen >> 8 ),
/*N*/ (BYTE) ( nBlue >> 8 ) );
/*N*/ pEntry = new XColorEntry( aColor, aLclName);
-/*N*/ Insert (nIndex, pEntry);
+/*N*/ Insert ( pEntry, nIndex );
/*N*/ }
/*N*/ }
/*N*/ else // Version ab 3.00a
@@ -588,7 +591,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
/*N*/ }
/*N*/
/*N*/ pEntry = new XColorEntry( aColor, aLclName );
-/*N*/ Insert( nIndex, pEntry );
+/*N*/ Insert( pEntry, nIndex );
/*N*/ }
/*N*/ }
/*N*/ return( rIn );
diff --git a/binfilter/inc/bf_svx/xtable.hxx b/binfilter/inc/bf_svx/xtable.hxx
index 8426802..81cc517 100644
--- a/binfilter/inc/bf_svx/xtable.hxx
+++ b/binfilter/inc/bf_svx/xtable.hxx
@@ -292,7 +292,7 @@ public:
// class XColorTable
// ------------------
-class XColorTable : public XPropertyTable
+class XColorTable : public XPropertyList
{
protected:
SvStream& ImpRead( SvStream& rIn );
More information about the Libreoffice-commits
mailing list