diff options
Diffstat (limited to 'svx/inc/svx/galtheme.hxx')
-rw-r--r-- | svx/inc/svx/galtheme.hxx | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 6a51190ce6..8ddb7e0968 100644 --- a/svx/inc/svx/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,7 +60,12 @@ struct GalleryObject BOOL bDummy; }; -DECLARE_LIST( GalleryObjectList, GalleryObject* ) +typedef ::std::vector< GalleryObject* > GalleryObjectList; + +class GalleryThemeEntry; +class SgaObject; +class FmFormModel; +class ListBox; class GalleryThemeEntry; class SgaObject; @@ -85,8 +91,8 @@ struct GalDragParams class Gallery; class GalleryProgress; -namespace unogallery -{ +namespace unogallery +{ class GalleryTheme; class GalleryItem; } @@ -114,12 +120,20 @@ private: void ImplCreateSvDrawStorage(); SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry ); - BOOL ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry ); + BOOL ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); void ImplRead(); void ImplWrite(); - const GalleryObject* ImplGetGalleryObject( ULONG nPos ) const { return aObjectList.GetObject( nPos ); } + const GalleryObject* ImplGetGalleryObject( size_t nPos ) const + { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; } SVX_DLLPUBLIC const GalleryObject* ImplGetGalleryObject( const INetURLObject& rURL ); - ULONG ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); } + + size_t ImplGetGalleryObjectPos( const GalleryObject* pObj ) const + { + for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) + if ( pObj == aObjectList[ i ] ) + return i; + return size_t(-1); + } INetURLObject ImplGetURL( const GalleryObject* pObject ) const; INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN ); void ImplSetModified( BOOL bModified ); @@ -133,14 +147,14 @@ public: static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly ); - ULONG GetObjectCount() const { return aObjectList.Count(); } + size_t GetObjectCount() const { return aObjectList.size(); } - SVX_DLLPUBLIC SgaObject* AcquireObject( ULONG nPos ); + SVX_DLLPUBLIC SgaObject* AcquireObject( size_t nPos ); SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); SVX_DLLPUBLIC BOOL InsertObject( const SgaObject& rObj, ULONG nPos = LIST_APPEND ); - SVX_DLLPUBLIC BOOL RemoveObject( ULONG nPos ); - BOOL ChangeObjectPos( ULONG nOldPos, ULONG nNewPos ); + SVX_DLLPUBLIC BOOL RemoveObject( size_t nPos ); + BOOL ChangeObjectPos( size_t nOldPos, size_t nNewPos ); SVX_DLLPUBLIC const String& GetName() const; const String& GetRealName() const; @@ -166,7 +180,7 @@ public: void LockBroadcaster() { mnBroadcasterLockCount++; } SVX_DLLPUBLIC void UnlockBroadcaster( ULONG nUpdatePos = 0 ); BOOL IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; } - + void SetDragPos( ULONG nPos ) { nDragPos = nPos; } ULONG GetDragPos() const { return nDragPos; } @@ -229,3 +243,5 @@ SvStream& operator<<( SvStream& rOut, const GalleryTheme& rTheme ); SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |