diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-11-13 21:02:02 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-14 10:11:32 +0000 |
commit | a94b6ec2d57cab51d79329ea62d908f3b3713505 (patch) | |
tree | 68dd3fe95d4e46e24fb68b225d5ef93310593cda /cui | |
parent | add a way to extract variables from config_host/build and shell-export them (diff) | |
download | core-a94b6ec2d57cab51d79329ea62d908f3b3713505.tar.gz core-a94b6ec2d57cab51d79329ea62d908f3b3713505.zip |
callcatcher: update unused code post binfilter death
Change-Id: I5b25d14ef2769126f98523551597f43812b9feb7
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/selector.cxx | 43 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 34 | ||||
-rw-r--r-- | cui/source/inc/scriptdlg.hxx | 3 | ||||
-rw-r--r-- | cui/source/inc/selector.hxx | 9 |
4 files changed, 8 insertions, 81 deletions
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 039c14ec967e..c3e31567d2f4 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -70,25 +70,11 @@ using namespace ::com::sun::star::container; * The implementations of SvxConfigFunctionListBox and * SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx */ -SvxConfigFunctionListBox::SvxConfigFunctionListBox( Window* pParent, const ResId& rResId) - : SvTreeListBox( pParent, rResId ) - , pCurEntry( 0 ) - , m_pDraggingEntry( 0 ) -{ - SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT ); - Init(); -} - SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent) : SvTreeListBox(pParent, WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT) , pCurEntry(0) , m_pDraggingEntry(0) { - Init(); -} - -void SvxConfigFunctionListBox::Init() -{ GetModel()->SetSortMode( SortAscending ); // Timer for the BallonHelp @@ -198,35 +184,6 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) return DND_ACTION_NONE; } -SvxConfigGroupListBox::SvxConfigGroupListBox( - Window* pParent, const ResId& rResId, - bool _bShowSlots, const Reference< frame::XFrame >& xFrame ) - : SvTreeListBox( pParent, rResId ) - , m_bShowSlots( _bShowSlots ) - , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) - , m_libImage(CUI_RES(RID_CUIIMG_LIB)) - , m_macImage(CUI_RES(RID_CUIIMG_MACRO)) - , m_docImage(CUI_RES(RID_CUIIMG_DOC)) - , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) - , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) -{ - FreeResource(); - - if ( xFrame != NULL ) - { - m_xFrame.set( xFrame ); - } - - SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ); - - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - - SetNodeBitmaps( - aNavigatorImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), - aNavigatorImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) - ); -} - SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent) : SvTreeListBox(pParent, WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index d601623859b5..df3575fe87e0 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -71,31 +71,6 @@ void ShowErrorDialog( const Any& aException ) delete pDlg; } -void SFTreeListBox::Init() -{ - SetSelectionMode( SINGLE_SELECTION ); - - SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | - WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | - WB_HASLINES | WB_HASLINESATROOT ); - SetNodeDefaultImages(); - - nMode = 0xFF; // everything -} - -SFTreeListBox::SFTreeListBox(Window* pParent, const ResId& rResId) - : SvTreeListBox(pParent, ResId(rResId.GetId(),*rResId.GetResMgr())) - , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) - , m_libImage(CUI_RES(RID_CUIIMG_LIB)) - , m_macImage(CUI_RES(RID_CUIIMG_MACRO)) - , m_docImage(CUI_RES(RID_CUIIMG_DOC)) - , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) - , m_sProdMacros(CUI_RES(RID_SVXSTR_PRODMACROS)) -{ - FreeResource(); - Init(); -} - SFTreeListBox::SFTreeListBox(Window* pParent) : SvTreeListBox(pParent) , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) @@ -105,7 +80,14 @@ SFTreeListBox::SFTreeListBox(Window* pParent) , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) { - Init(); + SetSelectionMode( SINGLE_SELECTION ); + + SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | + WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HIDESELECTION | + WB_HASLINES | WB_HASLINESATROOT ); + SetNodeDefaultImages(); + + nMode = 0xFF; // everything } extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSFTreeListBox(Window *pParent, VclBuilder::stringmap &) diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 34d85aa35cd0..bfbe49f59cc2 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -69,8 +69,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName ); - void Init(); - protected: void ExpandTree( SvTreeListEntry* pRootEntry ); virtual void RequestingChildren( SvTreeListEntry* pParent ); @@ -80,7 +78,6 @@ public: void Init( const ::rtl::OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); - SFTreeListBox(Window* pParent, const ResId& rRes); SFTreeListBox(Window* pParent); ~SFTreeListBox(); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 28459b33594b..508ca7c76387 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -100,10 +100,7 @@ friend class SvxConfigGroupListBox; DECL_LINK(TimerHdl, void *); virtual void MouseMove( const MouseEvent& rMEvt ); - void Init(); - public: - SvxConfigFunctionListBox(Window*, const ResId&); SvxConfigFunctionListBox(Window* pParent); ~SvxConfigFunctionListBox(); void ClearAll(); @@ -165,12 +162,6 @@ protected: using SvListView::Expand; public: - SvxConfigGroupListBox ( - Window* pParent, const ResId&, - bool _bShowSlots, - const ::com::sun::star::uno::Reference - < ::com::sun::star::frame::XFrame >& xFrame - ); SvxConfigGroupListBox(Window* pParent); ~SvxConfigGroupListBox(); |