diff options
Diffstat (limited to 'sd/source/ui/inc/navigatr.hxx')
| -rw-r--r-- | sd/source/ui/inc/navigatr.hxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index b01bbe12aa9f..b67f3e4303d1 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_NAVIGATR_HXX #define INCLUDED_SD_SOURCE_UI_INC_NAVIGATR_HXX -#include <vcl/lstbox.hxx> #include <vcl/toolbox.hxx> #include <sfx2/ctrlitem.hxx> #include <svx/sidebar/PanelLayout.hxx> @@ -102,7 +101,7 @@ public: bool InsertFile(const OUString& rFileName); NavigatorDragType GetNavigatorDragType(); - VclPtr<SdPageObjsTLB> const & GetObjects() const; + SdPageObjsTLV& GetObjects(); protected: virtual bool EventNotify(NotifyEvent& rNEvt) override; @@ -112,9 +111,11 @@ private: friend class SdNavigatorControllerItem; friend class SdPageNameControllerItem; - VclPtr<ToolBox> maToolbox; - VclPtr<SdPageObjsTLB> maTlbObjects; - VclPtr<ListBox> maLbDocs; + std::unique_ptr<weld::Toolbar> mxToolbox; + std::unique_ptr<SdPageObjsTLV> mxTlbObjects; + std::unique_ptr<weld::ComboBox> mxLbDocs; + std::unique_ptr<weld::Menu> mxDragModeMenu; + std::unique_ptr<weld::Menu> mxShapeMenu; bool mbDocImported; OUString maDropFileName; @@ -129,23 +130,21 @@ private: */ // bool mbShowAllShapes; - static const char* GetDragTypeSdStrId(NavigatorDragType eDT); static OUString GetDragTypeSdBmpId(NavigatorDragType eDT); NavDocInfo* GetDocInfo(); - DECL_LINK( SelectToolboxHdl, ToolBox *, void ); - DECL_LINK( DropdownClickToolBoxHdl, ToolBox *, void ); - DECL_LINK( ClickObjectHdl, SvTreeListBox*, bool ); - DECL_LINK( SelectDocumentHdl, ListBox&, void ); - DECL_LINK( MenuSelectHdl, Menu *, bool ); - DECL_LINK( ShapeFilterCallback, Menu *, bool ); + DECL_LINK( SelectToolboxHdl, const OString&, void ); + DECL_LINK( DropdownClickToolBoxHdl, const OString&, void ); + DECL_LINK( ClickObjectHdl, weld::TreeView&, bool ); + DECL_LINK( SelectDocumentHdl, weld::ComboBox&, void ); + DECL_LINK( MenuSelectHdl, const OString&, void ); + DECL_LINK( ShapeFilterCallback, const OString&, void ); void SetDragImage(); public: //when object is marked , fresh the corresponding entry tree . void FreshTree ( const SdDrawDocument* pDoc ); - void FreshEntry( ); }; /** |