diff options
| -rw-r--r-- | cui/source/customize/cfg.cxx | 6 | ||||
| -rw-r--r-- | cui/source/customize/selector.cxx | 1 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 4 | ||||
| -rw-r--r-- | cui/source/inc/selector.hxx | 16 |
4 files changed, 10 insertions, 17 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 7eadd5a16952..36f39974812b 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2589,8 +2589,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton ) // beside the menu contents list and does not obscure it m_pSelectorDlg->SetPosPixel( m_pAddCommandsButton->GetPosPixel() ); - m_pSelectorDlg->SetImageProvider( - static_cast< ImageProvider* >( GetSaveInData() ) ); + m_pSelectorDlg->SetImageProvider( GetSaveInData() ); m_pSelectorDlg->Show(); return 1; @@ -4503,8 +4502,7 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton ) LINK( this, SvxToolbarConfigPage, AddFunctionHdl ) ); } - m_pSelectorDlg->SetImageProvider( - static_cast< ImageProvider* >( GetSaveInData() ) ); + m_pSelectorDlg->SetImageProvider( GetSaveInData() ); m_pSelectorDlg->Show(); return 1; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 781ddbfbefaa..99b17e2984fa 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -23,6 +23,7 @@ #include <vcl/vclmedit.hxx> #include <vcl/builderfactory.hxx> #include "selector.hxx" +#include "cfg.hxx" #include <dialmgr.hxx> #include <svx/fmresids.hrc> #include <svx/dialmgr.hxx> diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 73b0514ca4b2..4cb324e85186 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -70,7 +70,7 @@ public: void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); }; -class SaveInData : public ImageProvider +class SaveInData { private: @@ -138,7 +138,7 @@ public: com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > m_aSeparatorSeq; - Image GetImage( const OUString& rCommandURL ) SAL_OVERRIDE; + Image GetImage( const OUString& rCommandURL ); virtual bool HasURL( const OUString& aURL ) = 0; virtual bool HasSettings() = 0; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 898314dd2c66..6d0e7dac345a 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -32,6 +32,8 @@ #include <boost/ptr_container/ptr_vector.hpp> +class SaveInData; + #define SVX_CFGGROUP_FUNCTION 1 #define SVX_CFGFUNCTION_SLOT 2 #define SVX_CFGGROUP_SCRIPTCONTAINER 3 @@ -80,14 +82,6 @@ struct SvxGroupInfo_Impl typedef boost::ptr_vector<SvxGroupInfo_Impl> SvxGroupInfoArr_Impl; -class ImageProvider -{ -public: - virtual ~ImageProvider() {} - - virtual Image GetImage( const OUString& rCommandURL ) = 0; -}; - class SvxConfigFunctionListBox : public SvTreeListBox { friend class SvxConfigGroupListBox; @@ -124,7 +118,7 @@ class SvxConfigGroupListBox : public SvTreeListBox bool m_bShowSlots; VclPtr<SvxConfigFunctionListBox> pFunctionListBox; - ImageProvider* m_pImageProvider; + SaveInData* m_pImageProvider; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; @@ -175,7 +169,7 @@ public: void SetFunctionListBox( SvxConfigFunctionListBox *pBox ) { pFunctionListBox = pBox; } - void SetImageProvider( ImageProvider* provider ) + void SetImageProvider( SaveInData* provider ) { m_pImageProvider = provider; } }; @@ -211,7 +205,7 @@ public: void SetAddHdl( const Link<>& rLink ) { m_aAddHdl = rLink; } const Link<>& GetAddHdl() const { return m_aAddHdl; } - void SetImageProvider(ImageProvider* provider) + void SetImageProvider(SaveInData* provider) { m_pCategories->SetImageProvider(provider); } |