diff options
Diffstat (limited to 'svtools/inc/svtools/ctrltool.hxx')
| -rw-r--r-- | svtools/inc/svtools/ctrltool.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx index 8444951a8623..e5df9eaa8852 100644 --- a/svtools/inc/svtools/ctrltool.hxx +++ b/svtools/inc/svtools/ctrltool.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. @@ -28,15 +29,12 @@ #ifndef _CTRLTOOL_HXX #define _CTRLTOOL_HXX +#include <boost/ptr_container/ptr_vector.hpp> + #include "svtools/svtdllapi.h" -#ifndef _SAL_TYPES_H #include <sal/types.h> -#endif -#include <tools/list.hxx> -#ifndef _METRIC_HXX #include <vcl/metric.hxx> -#endif class ImplFontListNameInfo; class OutputDevice; @@ -153,7 +151,7 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden. #define FONTLIST_FONTNAMETYPE_SCREEN ((sal_uInt16)0x0002) #define FONTLIST_FONTNAMETYPE_SCALABLE ((sal_uInt16)0x0004) -class SVT_DLLPUBLIC FontList : private List +class SVT_DLLPUBLIC FontList { private: XubString maMapBoth; @@ -173,7 +171,7 @@ private: long* mpSizeAry; OutputDevice* mpDev; OutputDevice* mpDev2; - + boost::ptr_vector<ImplFontListNameInfo> maEntries; #ifdef CTRLTOOL_CXX SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, sal_uLong* pIndex ) const; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; @@ -209,7 +207,7 @@ public: sal_Bool IsAvailable( const XubString& rName ) const; sal_uInt16 GetFontNameCount() const - { return (sal_uInt16)List::Count(); } + { return (sal_uInt16)maEntries.size(); } const FontInfo& GetFontName( sal_uInt16 nFont ) const; sal_uInt16 GetFontNameType( sal_uInt16 nFont ) const; sal_Handle GetFirstFontInfo( const XubString& rName ) const; @@ -232,7 +230,7 @@ private: class SVT_DLLPUBLIC FontSizeNames { private: - struct ImplFSNameItem* mpArray; + const struct ImplFSNameItem* mpArray; sal_uLong mnElem; public: @@ -249,3 +247,5 @@ public: }; #endif // _CTRLTOOL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |