diff options
Diffstat (limited to 'framework/inc/uielement')
-rw-r--r-- | framework/inc/uielement/buttontoolbarcontroller.hxx | 7 | ||||
-rw-r--r-- | framework/inc/uielement/comboboxtoolbarcontroller.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/complextoolbarcontroller.hxx | 5 | ||||
-rw-r--r-- | framework/inc/uielement/dropdownboxtoolbarcontroller.hxx | 3 | ||||
-rw-r--r-- | framework/inc/uielement/edittoolbarcontroller.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/generictoolbarcontroller.hxx | 11 | ||||
-rw-r--r-- | framework/inc/uielement/spinfieldtoolbarcontroller.hxx | 3 | ||||
-rw-r--r-- | framework/inc/uielement/statusbar.hxx | 1 | ||||
-rw-r--r-- | framework/inc/uielement/statusbaritem.hxx | 3 | ||||
-rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 11 | ||||
-rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/toolbarmerger.hxx | 2 |
12 files changed, 29 insertions, 23 deletions
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 561ef253f587..8949b58e90c1 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -34,6 +34,7 @@ #include <comphelper/broadcasthelper.hxx> #include <cppuhelper/weak.hxx> +#include <vcl/vclptr.hxx> class ToolBox; @@ -84,13 +85,13 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener, virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - bool m_bInitialized : 1, + bool m_bInitialized : 1, m_bDisposed : 1; - OUString m_aCommandURL; + OUString m_aCommandURL; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ToolBox* m_pToolbar; + VclPtr<ToolBox> m_pToolbar; }; } diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index d04537495217..1850c45eb669 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -78,7 +78,7 @@ class ComboboxToolbarController : public IComboBoxListener, virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const SAL_OVERRIDE; private: - ComboBoxControl* m_pComboBox; + VclPtr<ComboBoxControl> m_pComboBox; }; } diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx index 88084f8d1661..b24186f644bf 100644 --- a/framework/inc/uielement/complextoolbarcontroller.hxx +++ b/framework/inc/uielement/complextoolbarcontroller.hxx @@ -28,6 +28,7 @@ #include <svtools/toolboxcontroller.hxx> #include <tools/link.hxx> +#include <vcl/vclptr.hxx> class ToolBox; namespace vcl { class Window; } @@ -87,9 +88,9 @@ class ComplexToolbarController : public svt::ToolboxController void notifyFocusLost(); void notifyTextChanged( const OUString& aText ); - ToolBox* m_pToolbar; + VclPtr<ToolBox> m_pToolbar; sal_uInt16 m_nID; - bool m_bMadeInvisible; + bool m_bMadeInvisible; mutable ::com::sun::star::util::URL m_aURL; ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; }; diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index e9e09f27e813..9b3703687dc4 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -26,6 +26,7 @@ #include <uielement/complextoolbarcontroller.hxx> #include <vcl/lstbox.hxx> +#include <vcl/vclptr.hxx> class ToolBox; @@ -74,7 +75,7 @@ class DropdownToolbarController : public IListBoxListener, virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const SAL_OVERRIDE; private: - ListBoxControl* m_pListBoxControl; + VclPtr<ListBoxControl> m_pListBoxControl; }; } diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 8ebdca95a37c..0b8f9b6c90dc 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -75,7 +75,7 @@ class EditToolbarController : public IEditListener, virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const SAL_OVERRIDE; private: - EditControl* m_pEditControl; + VclPtr<EditControl> m_pEditControl; }; } diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index c6d867b3b261..26ebeb61ab46 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -23,6 +23,7 @@ #include <svtools/toolboxcontroller.hxx> #include <tools/link.hxx> +#include <vcl/vclptr.hxx> class PopupMenu; class ToolBox; @@ -53,11 +54,11 @@ class GenericToolbarController : public svt::ToolboxController DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, ExecuteInfo* ); protected: - ToolBox* m_pToolbar; - sal_uInt16 m_nID; - bool m_bEnumCommand : 1, - m_bMadeInvisible : 1; - OUString m_aEnumCommand; + VclPtr<ToolBox> m_pToolbar; + sal_uInt16 m_nID; + bool m_bEnumCommand : 1, + m_bMadeInvisible : 1; + OUString m_aEnumCommand; }; class MenuToolbarController : public GenericToolbarController diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index ebef21894081..7d9a8e86eec7 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -26,6 +26,7 @@ #include <uielement/complextoolbarcontroller.hxx> #include <vcl/spinfld.hxx> +#include <vcl/vclptr.hxx> class ToolBox; @@ -97,7 +98,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, double m_nMin; double m_nValue; double m_nStep; - SpinfieldControl* m_pSpinfieldControl; + VclPtr<SpinfieldControl> m_pSpinfieldControl; OUString m_aOutFormat; }; diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx index be957eaedfb7..c192d50b48b2 100644 --- a/framework/inc/uielement/statusbar.hxx +++ b/framework/inc/uielement/statusbar.hxx @@ -33,7 +33,6 @@ class FrameworkStatusBar : public StatusBar FrameworkStatusBar( vcl::Window* pParent, WinBits nWinBits ); - virtual ~FrameworkStatusBar(); void SetStatusBarManager( StatusBarManager* pStatusBarManager ); diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx index e5afc02c5480..e05cd37ded3c 100644 --- a/framework/inc/uielement/statusbaritem.hxx +++ b/framework/inc/uielement/statusbaritem.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/ui/XStatusbarItem.hpp> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/basemutex.hxx> +#include <vcl/vclptr.hxx> class StatusBar; @@ -67,7 +68,7 @@ public: virtual void SAL_CALL repaint( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - StatusBar *m_pStatusBar; + VclPtr<StatusBar> m_pStatusBar; AddonStatusbarItemData *m_pItemData; sal_uInt16 m_nId; sal_uInt16 m_nStyle; diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index efbe5486b0db..2167b0cc9e3d 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -37,6 +37,7 @@ #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <vcl/status.hxx> +#include <vcl/vclptr.hxx> #include <map> namespace framework @@ -98,13 +99,13 @@ class StatusBarManager : public ::cppu::WeakImplHelper3< protected: typedef std::map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusbarController > > StatusBarControllerMap; - bool m_bDisposed : 1, + bool m_bDisposed : 1, m_bFrameActionRegistered : 1, m_bUpdateControllers : 1; - bool m_bModuleIdentified; - StatusBar* m_pStatusBar; - OUString m_aModuleIdentifier; - OUString m_aResourceName; + bool m_bModuleIdentified; + VclPtr<StatusBar> m_pStatusBar; + OUString m_aModuleIdentifier; + OUString m_aResourceName; com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; StatusBarControllerMap m_aControllerMap; diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 90b68ac4a139..95381c3120a4 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -189,7 +189,7 @@ class ToolBarManager : public ToolbarManager_Base long m_lImageRotation; - ToolBox* m_pToolBar; + VclPtr<ToolBox> m_pToolBar; OUString m_aModuleIdentifier; OUString m_aResourceName; diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 8a595a9878fa..0902ff36a9e1 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -61,7 +61,7 @@ typedef ::std::vector< AddonToolbarItem > AddonToolbarItemContainer; struct ReferenceToolbarPathInfo { - ToolBox* pToolbar; + VclPtr<ToolBox> pToolbar; sal_uInt16 nPos; bool bResult; }; |