diff options
| author | Marcin eXine M <exine@jun.pl> | 2010-11-02 13:40:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-02 14:54:40 +0000 |
| commit | f525717534829abb4ca618e0fcb394ae4b95755a (patch) | |
| tree | 0ce6c9179fd1c97b55f50a890a4ec232c54e7960 /cui/source/dialogs/iconcdlg.cxx | |
| parent | 4fd29f3d182f2c651b0923e8a58d7df74e47b0a4 (diff) | |
removed unnecessary comments and whitespaces, dead code
Diffstat (limited to 'cui/source/dialogs/iconcdlg.cxx')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 140338916149..f52674d6a432 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -268,12 +268,12 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, const EIconChoicePos ePos, - const SfxItemSet *pItemSet )//, BOOL bEditFmt, const String *pUserButtonText = 0 ) + const SfxItemSet *pItemSet ) : ModalDialog ( pParent, rResId ), meChoicePos ( ePos ), maIconCtrl ( this, WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | - /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP ), + WB_NODRAGSELECTION | WB_TABSTOP ), mnCurrentPageId ( USHRT_MAX ), aOKBtn ( this, WB_DEFBUTTON ), @@ -292,10 +292,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, bModified ( FALSE ), bItemsReset ( FALSE ) { - // IconChoiceCtrl-Settings - //maIconCtrl.SetBackground ( Wallpaper( Color (146, 146, 186) ) ); - maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /* WB_NOSELECTION | */ WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); + maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); SetCtrlPos ( meChoicePos ); maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) ); maIconCtrl.Show(); @@ -327,26 +325,6 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // ----------------------------------------------------------------------- -/* -IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId, - const SfxItemSet * = 0, BOOL bEditFmt = FALSE, - const String *pUserButtonText = 0 ) -: meChoicePos ( PosLeft ), // Default erst ma Links - maIconCtrl ( this, Die_Winbits ), - aOKBtn ( this ), - pUserBtn ( pUserButtonText? new PushButton(this): 0 ), - aCancelBtn ( this ), - aHelpBtn ( this ), - aResetBtn ( this ), - aBaseFmtBtn ( this ), - mnCurrentPageId ( 0 ) -{ - FreeResource(); -} -*/ - -// ----------------------------------------------------------------------- - IconChoiceDialog ::~IconChoiceDialog () { ULONG i; @@ -381,18 +359,6 @@ IconChoiceDialog ::~IconChoiceDialog () delete pData; } - // remove Pagelist -/* for ( i=0; i<maPageList.Count(); i++ ) - { - IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i ); - - if ( pData->bOnDemand ) - delete ( SfxItemSet * )&( pData->pPage->GetItemSet() ); - - delete pData->pPage; - delete pData; - }*/ - // remove Userdata from Icons for ( i=0; i<maIconCtrl.GetEntryCount(); i++) { @@ -1250,7 +1216,7 @@ void IconChoiceDialog::Start_Impl() USHORT nActPage; if ( mnCurrentPageId == 0 || mnCurrentPageId == USHRT_MAX ) - nActPage = maPageList.GetObject(0)->nId;//First()->nId; + nActPage = maPageList.GetObject(0)->nId; else nActPage = mnCurrentPageId; |