diff options
Diffstat (limited to 'extensions/source/bibliography/toolbar.hxx')
| -rw-r--r-- | extensions/source/bibliography/toolbar.hxx | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index afd1bd3ace38..d4e45b2e0b80 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_TOOLBAR_HXX -#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_TOOLBAR_HXX +#pragma once #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -36,7 +35,7 @@ class BibToolBarListener: public cppu::WeakImplHelper < css::frame::XStatusListe { private: - sal_uInt16 nIndex; + ToolBoxItemId nIndex; OUString aCommand; protected: @@ -45,7 +44,7 @@ protected: public: - BibToolBarListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); + BibToolBarListener(BibToolBar *pTB, OUString aStr, ToolBoxItemId nId); virtual ~BibToolBarListener() override; const OUString& GetCommand() const { return aCommand;} @@ -63,7 +62,7 @@ class BibTBListBoxListener: public BibToolBarListener { public: - BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); + BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, ToolBoxItemId nId); virtual ~BibTBListBoxListener() override; virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override; @@ -74,7 +73,7 @@ class BibTBEditListener: public BibToolBarListener { public: - BibTBEditListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); + BibTBEditListener(BibToolBar *pTB, const OUString& aStr, ToolBoxItemId nId); virtual ~BibTBEditListener() override; virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override; @@ -85,7 +84,7 @@ class BibTBQueryMenuListener: public BibToolBarListener { public: - BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId); + BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, ToolBoxItemId nId); virtual ~BibTBQueryMenuListener() override; virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) override; @@ -148,20 +147,21 @@ class BibToolBar: public ToolBox weld::ComboBox* pLbSource; VclPtr<EditControl> xQuery; weld::Entry* pEdQuery; - ScopedVclPtr<PopupMenu> pPopupMenu; + std::unique_ptr<weld::Builder> xBuilder; + std::unique_ptr<weld::Menu> xPopupMenu; sal_uInt16 nMenuId; - sal_uInt16 nSelMenuItem; + OUString sSelMenuItem; OUString aQueryField; Link<void*,void> aLayoutManager; sal_Int16 nSymbolsSize; - sal_uInt16 nTBC_SOURCE; - sal_uInt16 nTBC_QUERY; - sal_uInt16 nTBC_BT_AUTOFILTER; - sal_uInt16 nTBC_BT_COL_ASSIGN; - sal_uInt16 nTBC_BT_CHANGESOURCE; - sal_uInt16 nTBC_BT_FILTERCRIT; - sal_uInt16 nTBC_BT_REMOVEFILTER; + ToolBoxItemId nTBC_SOURCE; + ToolBoxItemId nTBC_QUERY; + ToolBoxItemId nTBC_BT_AUTOFILTER; + ToolBoxItemId nTBC_BT_COL_ASSIGN; + ToolBoxItemId nTBC_BT_CHANGESOURCE; + ToolBoxItemId nTBC_BT_FILTERCRIT; + ToolBoxItemId nTBC_BT_REMOVEFILTER; BibDataManager* pDatMan; DECL_LINK( SelHdl, weld::ComboBox&, void ); @@ -188,7 +188,7 @@ class BibToolBar: public ToolBox virtual ~BibToolBar() override; virtual void dispose() override; - sal_uInt16 GetChangeSourceId() const { return nTBC_BT_CHANGESOURCE; } + ToolBoxItemId GetChangeSourceId() const { return nTBC_BT_CHANGESOURCE; } void SetXController(const css::uno::Reference< css::frame::XController > &); @@ -210,10 +210,8 @@ class BibToolBar: public ToolBox void statusChanged(const css::frame::FeatureStateEvent& Event); void SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;} - void SendDispatch(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue >& rArgs); + void SendDispatch(ToolBoxItemId nId, const css::uno::Sequence< css::beans::PropertyValue >& rArgs); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |