diff options
Diffstat (limited to 'basctl/source/inc')
-rw-r--r-- | basctl/source/inc/baside3.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/basidesh.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/bastype2.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/bastypes.hxx | 12 | ||||
-rw-r--r-- | basctl/source/inc/sbxitem.hxx | 22 |
5 files changed, 20 insertions, 20 deletions
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 14fc68f07951..23bffd38eba3 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -108,7 +108,7 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; virtual OUString GetHid () const override; - virtual ItemType GetType () const override; + virtual SbxItemType GetSbxType () const override; }; diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index f907abe6f214..a8b3b9061b7c 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -196,7 +196,7 @@ public: bool CallBasicErrorHdl( StarBASIC const * pBasic ); BasicDebugFlags CallBasicBreakHdl( StarBASIC const * pBasic ); - VclPtr<BaseWindow> FindWindow( const ScriptDocument& rDocument, std::u16string_view rLibName, std::u16string_view rName, ItemType nType, bool bFindSuspended = false ); + VclPtr<BaseWindow> FindWindow( const ScriptDocument& rDocument, std::u16string_view rLibName, std::u16string_view rName, SbxItemType nSbxType, bool bFindSuspended = false ); VclPtr<DialogWindow> FindDlgWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rName, bool bCreateIfNotExist = false, bool bFindSuspended = false ); VclPtr<ModulWindow> FindBasWin( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName, bool bCreateIfNotExist = false, bool bFindSuspended = false ); VclPtr<BaseWindow> FindApplicationWindow(); diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx index 0161797f16a2..dc9526ce3256 100644 --- a/basctl/source/inc/bastype2.hxx +++ b/basctl/source/inc/bastype2.hxx @@ -221,7 +221,7 @@ public: bool FindEntry(std::u16string_view rText, EntryType eType, weld::TreeIter& rIter); EntryDescriptor GetEntryDescriptor(const weld::TreeIter* pEntry); - static ItemType ConvertType (EntryType eType); + static SbxItemType ConvertType (EntryType eType); bool IsValidEntry(const weld::TreeIter& rEntry); void AddEntry(const OUString& rText, const OUString& rImage, const weld::TreeIter* pParent, bool bChildrenOnDemand, diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 513fbce3a41c..ecd744528056 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -238,9 +238,9 @@ public: virtual void OnNewDocument (); virtual OUString GetHid () const = 0; - virtual ItemType GetType () const = 0; + virtual SbxItemType GetSbxType () const = 0; void InsertLibInfo () const; - bool Is (ScriptDocument const&, std::u16string_view, std::u16string_view, ItemType, bool bFindSuspended); + bool Is (ScriptDocument const&, std::u16string_view, std::u16string_view, SbxItemType, bool bFindSuspended); virtual bool HasActiveEditor () const; }; @@ -252,7 +252,7 @@ public: LibInfo (); ~LibInfo (); public: - void InsertInfo (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, ItemType eCurrentType); + void InsertInfo (ScriptDocument const&, OUString const& rLibName, OUString const& rCurrentName, SbxItemType eCurrentType); void RemoveInfoFor (ScriptDocument const&); Item const* GetInfo (ScriptDocument const&, OUString const& rLibName); @@ -279,12 +279,12 @@ public: { private: OUString m_aCurrentName; - ItemType m_eCurrentType; + SbxItemType m_eCurrentType; public: - Item (OUString aCurrentName, ItemType eCurrentType); + Item (OUString aCurrentName, SbxItemType eCurrentType); const OUString& GetCurrentName() const { return m_aCurrentName; } - ItemType GetCurrentType() const { return m_eCurrentType; } + SbxItemType GetCurrentType() const { return m_eCurrentType; } }; private: typedef std::unordered_map<Key, Item, Key::Hash> Map; diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index 941ffd3e0ee9..a21e792742ca 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -24,14 +24,14 @@ namespace basctl { -enum ItemType +enum SbxItemType { - TYPE_UNKNOWN, - TYPE_SHELL, - TYPE_LIBRARY, - TYPE_MODULE, - TYPE_DIALOG, - TYPE_METHOD + SBX_TYPE_UNKNOWN, + SBX_TYPE_SHELL, + SBX_TYPE_LIBRARY, + SBX_TYPE_MODULE, + SBX_TYPE_DIALOG, + SBX_TYPE_METHOD }; class SbxItem : public SfxPoolItem @@ -40,12 +40,12 @@ class SbxItem : public SfxPoolItem const OUString m_aLibName; const OUString m_aName; const OUString m_aMethodName; - ItemType m_eType; + SbxItemType m_eSbxType; public: static SfxPoolItem* CreateDefault(); - SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, ItemType); - SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, OUString aMethodName, ItemType eType); + SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, SbxItemType); + SbxItem(sal_uInt16 nWhich, ScriptDocument aDocument, OUString aLibName, OUString aName, OUString aMethodName, SbxItemType eSbxType); virtual SbxItem* Clone(SfxItemPool *pPool = nullptr) const override; virtual bool operator==(const SfxPoolItem&) const override; @@ -54,7 +54,7 @@ public: OUString const& GetLibName () const { return m_aLibName; } OUString const& GetName () const { return m_aName; } OUString const& GetMethodName () const { return m_aMethodName; } - ItemType GetType () const { return m_eType; } + SbxItemType GetSbxType () const { return m_eSbxType; } }; } // namespace basctl |