diff options
Diffstat (limited to 'formula/source/ui')
-rw-r--r-- | formula/source/ui/dlg/formdlgs.hrc | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/formdlgs.src | 61 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.hrc | 1 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.src | 25 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 16 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 3 | ||||
-rw-r--r-- | formula/source/ui/inc/ForResId.hrc | 4 |
10 files changed, 5 insertions, 123 deletions
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc index 9e6378a53d2c..4f76ba9681e1 100644 --- a/formula/source/ui/dlg/formdlgs.hrc +++ b/formula/source/ui/dlg/formdlgs.hrc @@ -68,10 +68,6 @@ #define BMP_STR_OPEN 2 #define BMP_STR_END 3 #define BMP_STR_ERROR 4 -#define BMP_STR_CLOSE_H 11 -#define BMP_STR_OPEN_H 12 -#define BMP_STR_END_H 13 -#define BMP_STR_ERROR_H 14 // Texte #define STR_STRUCT_ERR1 1 diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src index c85aa561ced8..fde1a7d44ca7 100644 --- a/formula/source/ui/dlg/formdlgs.src +++ b/formula/source/ui/dlg/formdlgs.src @@ -111,41 +111,21 @@ TabPage RID_FORMULATAB_STRUCT ImageBitmap = Bitmap { File = "fapclose.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image BMP_STR_CLOSE_H - { - ImageBitmap = Bitmap { File = "fapclose_h.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; Image BMP_STR_OPEN { ImageBitmap = Bitmap { File = "fapopen.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image BMP_STR_OPEN_H - { - ImageBitmap = Bitmap { File = "fapopen_h.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; Image BMP_STR_END { ImageBitmap = Bitmap { File = "fapok.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image BMP_STR_END_H - { - ImageBitmap = Bitmap { File = "fapok_h.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; Image BMP_STR_ERROR { ImageBitmap = Bitmap { File = "faperror.bmp"; }; MaskColor = STD_MASKCOLOR; }; - Image BMP_STR_ERROR_H - { - ImageBitmap = Bitmap { File = "faperror_h.bmp"; }; - MaskColor = STD_MASKCOLOR; - }; String STR_STRUCT_ERR1 { Text [ en-US ] = "=?" ; @@ -485,15 +465,6 @@ Image RID_BMP_REFBTN1 MaskColor = STD_MASKCOLOR; }; -Image RID_BMP_REFBTN1_H -{ - ImageBitmap = Bitmap - { - File = "refinp1_h.bmp"; - }; - MaskColor = STD_MASKCOLOR; -}; - Image RID_BMP_REFBTN2 { ImageBitmap = Bitmap @@ -502,35 +473,3 @@ Image RID_BMP_REFBTN2 }; MaskColor = STD_MASKCOLOR; }; - -Image RID_BMP_REFBTN2_H -{ - ImageBitmap = Bitmap - { - File = "refinp2_h.bmp"; - }; - MaskColor = STD_MASKCOLOR; -}; - - - - - - - - - - - - - - - - - - - - - - - diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index bc4449f7c40d..d52217be5e18 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1665,7 +1665,7 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula) aTabCtrl.SetCurPageId(TP_STRUCT); return bMatrix; } -IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP ) +IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG ) { bStructUpdate=FALSE; if(pStructPage->IsVisible()) aBtnForward.Enable(FALSE); //@New diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 41b89fd34491..0e294a284f76 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -1032,9 +1032,7 @@ IMPL_LINK( RefEdit, UpdateHdl, Timer*, EMPTYARG ) RefButton::RefButton( Window* _pParent, const ResId& rResId) : ImageButton( _pParent, rResId ), aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), - aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ), aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), - aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ), pAnyRefDlg( NULL ), pRefEdit( NULL ) { @@ -1044,9 +1042,7 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) : RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, IControlReferenceHandler* _pDlg ) : ImageButton( _pParent, rResId ), aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), - aImgRefStartHC( ModuleRes( RID_BMP_REFBTN1_H ) ), aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), - aImgRefDoneHC( ModuleRes( RID_BMP_REFBTN2_H ) ), pAnyRefDlg( _pDlg ), pRefEdit( pEdit ) { @@ -1056,13 +1052,11 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, ICo void RefButton::SetStartImage() { SetModeImage( aImgRefStart ); - SetModeImage( aImgRefStartHC, BMP_COLOR_HIGHCONTRAST ); } void RefButton::SetEndImage() { SetModeImage( aImgRefDone ); - SetModeImage( aImgRefDoneHC, BMP_COLOR_HIGHCONTRAST ); } void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ) diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index e651dec89ee4..520b8ebfdbb6 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -82,7 +82,6 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos): m_sRequired ( ModuleRes( STR_REQUIRED ) ), bRefMode (FALSE) { - Image aFxHC( ModuleRes( IMG_FX_H ) ); FreeResource(); aDefaultString=aFtEditDesc.GetText(); @@ -95,11 +94,6 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos): aSlider.SetEndScrollHdl( LINK( this, ParaWin, ScrollHdl ) ); aSlider.SetScrollHdl( LINK( this, ParaWin, ScrollHdl ) ); - aBtnFx1.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST ); - aBtnFx2.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST ); - aBtnFx3.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST ); - aBtnFx4.SetModeImage( aFxHC, BMP_COLOR_HIGHCONTRAST ); - InitArgInput( 0, aFtArg1, aBtnFx1, aEdArg1, aRefBtn1); InitArgInput( 1, aFtArg2, aBtnFx2, aEdArg2, aRefBtn2); InitArgInput( 2, aFtArg3, aBtnFx3, aEdArg3, aRefBtn3); diff --git a/formula/source/ui/dlg/parawin.hrc b/formula/source/ui/dlg/parawin.hrc index f6367c6259db..e7ef4c43c5b6 100644 --- a/formula/source/ui/dlg/parawin.hrc +++ b/formula/source/ui/dlg/parawin.hrc @@ -47,7 +47,6 @@ #define RB_ARG3 18 #define RB_ARG4 19 #define WND_SLIDER 20 -#define IMG_FX_H 30 #define STR_OPTIONAL 1 #define STR_REQUIRED 2 diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src index eda2bfcecda9..8af91786d699 100644 --- a/formula/source/ui/dlg/parawin.src +++ b/formula/source/ui/dlg/parawin.src @@ -161,29 +161,4 @@ TabPage RID_FORMULATAB_PARAMETER { Text [ en-US ] = "(required)" ; }; - - Image IMG_FX_H - { - ImageBitmap = Bitmap { File = "fx_h.bmp" ; }; - MaskColor = STD_MASKCOLOR; - }; - }; - - - - - - - - - - - - - - - - - - diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index ea2569248823..537b0ec6b720 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -61,14 +61,10 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ): SvLBoxEntry* StructListBox::InsertStaticEntry( const XubString& rText, - const Image& rEntryImg, const Image& rEntryImgHC, + const Image& rEntryImg, SvLBoxEntry* pParent, ULONG nPos, IFormulaToken* pToken ) { SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, FALSE, nPos, pToken ); - SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) ); - DBG_ASSERT( pBmpItem, "StructListBox::InsertStaticEntry - missing item" ); - pBmpItem->SetBitmap1( rEntryImgHC, BMP_COLOR_HIGHCONTRAST ); - pBmpItem->SetBitmap2( rEntryImgHC, BMP_COLOR_HIGHCONTRAST ); return pEntry; } @@ -109,18 +105,14 @@ StructPage::StructPage(Window* pParent): aTlbStruct ( this, ModuleRes( TLB_STRUCT ) ), maImgEnd ( ModuleRes( BMP_STR_END ) ), maImgError ( ModuleRes( BMP_STR_ERROR ) ), - maImgEndHC ( ModuleRes( BMP_STR_END_H ) ), - maImgErrorHC ( ModuleRes( BMP_STR_ERROR_H ) ), pSelectedToken ( NULL ) { aTlbStruct.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN| WB_HASBUTTONS|WB_HSCROLL|WB_NOINITIALSELECTION); aTlbStruct.SetNodeDefaultImages(); - aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN ) ) ); + aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN ) ) ); aTlbStruct.SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE ) ) ); - aTlbStruct.SetDefaultExpandedEntryBmp( Image( ModuleRes( BMP_STR_OPEN_H ) ), BMP_COLOR_HIGHCONTRAST ); - aTlbStruct.SetDefaultCollapsedEntryBmp( Image( ModuleRes( BMP_STR_CLOSE_H ) ), BMP_COLOR_HIGHCONTRAST ); FreeResource(); @@ -145,10 +137,10 @@ SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pPare pEntry = aTlbStruct.InsertEntry( rText, pParent, FALSE, nPos, pIFormulaToken ); break; case STRUCT_END: - pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, maImgEndHC, pParent, nPos, pIFormulaToken ); + pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, pParent, nPos, pIFormulaToken ); break; case STRUCT_ERROR: - pEntry = aTlbStruct.InsertStaticEntry( rText, maImgError, maImgErrorHC, pParent, nPos, pIFormulaToken ); + pEntry = aTlbStruct.InsertStaticEntry( rText, maImgError, pParent, nPos, pIFormulaToken ); break; } diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 98a0be4b84cc..6146e2bca535 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -63,7 +63,6 @@ public: SvLBoxEntry* InsertStaticEntry( const XubString& rText, const Image& rEntryImg, - const Image& rEntryImgHC, SvLBoxEntry* pParent = NULL, ULONG nPos = LIST_APPEND, IFormulaToken* pToken = NULL ); @@ -87,8 +86,6 @@ private: StructListBox aTlbStruct; Image maImgEnd; Image maImgError; - Image maImgEndHC; - Image maImgErrorHC; IFormulaToken* pSelectedToken; diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index 32b59f296cec..bf2e4c3f750a 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -55,9 +55,7 @@ // bitmap #define RID_BMP_REFBTN1 (RID_BITMAP_START + 0) -#define RID_BMP_REFBTN1_H (RID_BITMAP_START + 1) #define RID_BMP_REFBTN2 (RID_BITMAP_START + 2) -#define RID_BMP_REFBTN2_H (RID_BITMAP_START + 3) // pages @@ -67,8 +65,6 @@ #define RID_FORMULATAB_PARAMETER (RID_PAGE_START + 3) #define RID_FORMULADLG_FORMULA_MODAL (RID_PAGE_START + 4) -// misc - // ----------------------------------------------------------------------- #endif // FORMULA_FORRESID_HRC |