diff options
Diffstat (limited to 'starmath/inc/utility.hxx')
| -rw-r--r-- | starmath/inc/utility.hxx | 122 |
1 files changed, 8 insertions, 114 deletions
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 3c2f8b1f61c8..a4e70e1b648d 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.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,9 +29,7 @@ #define UTILITY_HXX #include <sfx2/minarray.hxx> -#ifndef _FONT_HXX //autogen #include <vcl/font.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> @@ -93,8 +92,8 @@ SmViewShell * SmGetActiveView(); // SmFace // -sal_Bool IsItalic( const Font &rFont ); -sal_Bool IsBold( const Font &rFont ); +bool IsItalic( const Font &rFont ); +bool IsBold( const Font &rFont ); class SmFace : public Font { @@ -130,29 +129,6 @@ public: SmFace & operator *= (SmFace &rFace, const Fraction &rFrac); -#ifdef NEVER -//////////////////////////////////////////////////////////// -// -// SmInfoText -// - -class SmInfoText : public FixedText -{ -protected: - sal_uInt16 nMaxLen; - String aText; - -public: - SmInfoText(Window* pParent, WinBits nWinStyle = 0, sal_uInt16 nMax = 128); - SmInfoText(Window* pParent, const ResId& rResId, sal_uInt16 nMax = 128); - - void SetText(const String& rStr); - - XubString GetText() const { return (aText); } -}; -#endif - - //////////////////////////////////////////////////////////// // // SmPickList @@ -167,7 +143,7 @@ protected: virtual void *CreateItem(const void *pItem) = 0; virtual void DestroyItem(void *pItem) = 0; - virtual sal_Bool CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0; + virtual bool CompareItem(const void *pFirstItem, const void *pSecondItem) const = 0; virtual String GetStringItem(void *pItem) = 0; @@ -201,63 +177,6 @@ public: //////////////////////////////////////////////////////////// // -// SmStringPickList -// -#ifdef NEVER -class SmStringPickList : public SmPickList -{ -protected: - virtual void *CreateItem(const String& rString); - virtual void *CreateItem(const void *pItem); - virtual void DestroyItem(void *pItem); - - virtual sal_Bool CompareItem(const void *pFirstItem, const void *pSecondItem) const; - - virtual String GetStringItem(void *pItem); - -public: - SmStringPickList() - : SmPickList(0, 5) {} - SmStringPickList(sal_uInt16 nInitSize, sal_uInt16 nMaxSize) - : SmPickList(nInitSize, nMaxSize) {} - SmStringPickList(const SmPickList& rOrig ) - : SmPickList(rOrig) {} - virtual ~SmStringPickList() { Clear(); } - - virtual void Insert(const String &rString); - virtual void Update(const String &rString, const String &rNewString); - virtual void Remove(const String &rString); - - inline sal_Bool Contains(const String &rString) const; - inline String Get(sal_uInt16 nPos = 0) const; - - inline SmStringPickList& operator = (const SmStringPickList& rList); - inline String operator [] (sal_uInt16 nPos) const; -}; - -inline SmStringPickList& SmStringPickList::operator = (const SmStringPickList& rList) -{ - *(SmPickList *)this = *(SmPickList *)&rList; return *this; -} - -inline String SmStringPickList::operator [] (sal_uInt16 nPos) const -{ - return *((String *)SmPickList::operator[](nPos)); -} - -inline String SmStringPickList::Get(sal_uInt16 nPos) const -{ - return nPos < Count() ? *((String *)SmPickList::Get(nPos)) : String(); -} - -inline sal_Bool SmStringPickList::Contains(const String &rString) const -{ - return SmPickList::Contains((void *)&rString); -} -#endif - -//////////////////////////////////////////////////////////// -// // SmFontPickList // @@ -270,7 +189,7 @@ protected: virtual void *CreateItem(const void *pItem); virtual void DestroyItem(void *pItem); - virtual sal_Bool CompareItem(const void *pFirstItem, const void *pSecondItem) const; + virtual bool CompareItem(const void *pFirstItem, const void *pSecondItem) const; virtual String GetStringItem(void *pItem); @@ -291,7 +210,7 @@ public: virtual void Remove(const Font &rFont); using SmPickList::Contains; - inline sal_Bool Contains(const Font &rFont) const; + inline bool Contains(const Font &rFont) const; inline Font Get(sal_uInt16 nPos = 0) const; inline SmFontPickList& operator = (const SmFontPickList& rList); @@ -317,7 +236,7 @@ inline Font SmFontPickList::Get(sal_uInt16 nPos) const return nPos < Count() ? *((Font *)SmPickList::Get(nPos)) : Font(); } -inline sal_Bool SmFontPickList::Contains(const Font &rFont) const +inline bool SmFontPickList::Contains(const Font &rFont) const { return SmPickList::Contains((void *)&rFont); } @@ -325,32 +244,6 @@ inline sal_Bool SmFontPickList::Contains(const Font &rFont) const //////////////////////////////////////////////////////////// // -// SmStringPickComboBox -// -#ifdef NEVER -class SmStringPickComboBox : public SmStringPickList, public ComboBox -{ -protected: - virtual void LoseFocus(); - - DECL_LINK(SelectHdl, ComboBox *); - -public: - SmStringPickComboBox(Window* pParent, WinBits nWinStyle = 0, sal_uInt16 nMax = 4); - SmStringPickComboBox(Window* pParent, const ResId& rResId, sal_uInt16 nMax = 4); - - SmStringPickComboBox& operator = (const SmStringPickList& rList); - - void SetText(const String& rStr); - - virtual void Insert(const String &rString); - virtual void Update(const String &rString, const String &rNewString); - virtual void Remove(const String &rString); -}; -#endif - -//////////////////////////////////////////////////////////// -// // SmFontPickListBox // @@ -374,3 +267,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |