summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/source/dialog/numfmt.cxx72
-rw-r--r--svx/source/dialog/numfmt.hrc5
-rw-r--r--svx/source/dialog/numfmt.src16
3 files changed, 33 insertions, 60 deletions
diff --git a/svx/source/dialog/numfmt.cxx b/svx/source/dialog/numfmt.cxx
index 2cc4f3f534b8..0900ff315a81 100644
--- a/svx/source/dialog/numfmt.cxx
+++ b/svx/source/dialog/numfmt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: numfmt.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: er $ $Date: 2001-08-28 12:05:32 $
+ * last change: $Author: gt $ $Date: 2002-06-11 08:03:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -249,10 +249,10 @@ void SvxNumberPreviewImpl::StateChanged( StateChangedType nType )
void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
{
+ Window::DataChanged( rDCEvt );
+
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
InitSettings( TRUE, TRUE );
- else
- Window::DataChanged( rDCEvt );
}
// class SvxNumberFormatTabPage ------------------------------------------
@@ -311,7 +311,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
aFlOptions ( this, ResId( FL_OPTIONS ) ),
aFtComment ( this, ResId( FT_COMMENT ) ),
aStrEurope ( ResId( STR_EUROPE) ),
- aIconList ( ResId( IL_ICON ) ),
+// aIconList ( ResId( IL_ICON ) ), -> done Init_Impl
nInitFormat ( ULONG_MAX ),
pNumItem ( NULL ),
pNumFmtShell ( NULL ),
@@ -363,6 +363,9 @@ SvxNumberFormatTabPage::~SvxNumberFormatTabPage()
void SvxNumberFormatTabPage::Init_Impl()
{
+ ImageList aIconList( ResId( IL_ICON ) );
+ ImageList aIconListHC( ResId( IL_ICON_HC ) );
+
bNumItemFlag=TRUE;
bOneAreaFlag=FALSE;
@@ -373,9 +376,14 @@ void SvxNumberFormatTabPage::Init_Impl()
nStdFormatY =aLbCurrency.GetPosPixel().Y();
nStdFormatHeight=nCurFormatY-nStdFormatY+nCurFormatHeight;
- aIbAdd. SetImage(aIconList.GetImage(IID_ADD));
- aIbRemove.SetImage(aIconList.GetImage(IID_REMOVE));
- aIbInfo. SetImage(aIconList.GetImage(IID_INFO));
+ aIbAdd. SetImage( aIconList.GetImage( IID_ADD ) );
+ aIbAdd. SetModeImage( aIconListHC.GetImage( IID_ADD ), BMP_COLOR_HIGHCONTRAST );
+
+ aIbRemove. SetImage( aIconList.GetImage( IID_REMOVE ) );
+ aIbRemove. SetModeImage( aIconListHC.GetImage( IID_REMOVE ), BMP_COLOR_HIGHCONTRAST );
+
+ aIbInfo. SetImage( aIconList.GetImage( IID_INFO ) );
+ aIbInfo. SetModeImage( aIconListHC.GetImage( IID_INFO ), BMP_COLOR_HIGHCONTRAST );
aIbAdd.Enable(FALSE );
aIbRemove.Enable(FALSE );
@@ -431,7 +439,6 @@ void SvxNumberFormatTabPage::Init_Impl()
}
}
-
/*************************************************************************
#* Methode: GetRanges Datum:02.10.97
#*------------------------------------------------------------------------
@@ -905,20 +912,6 @@ BOOL SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
}
-/*************************************************************************
-#* Methode: DeactivatePage Datum:02.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvxNumberFormatTabPage
-#*
-#* Funktion: Deaktiviert die Seite
-#*
-#* Input: Pointer auf ItemSet
-#*
-#* Output: LEAVE_PAGE
-#*
-#************************************************************************/
-
int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* pSet )
{
/* if ( (ULONG_MAX != nInitFormat) && pSet )
@@ -938,23 +931,6 @@ int SvxNumberFormatTabPage::DeactivatePage( SfxItemSet* pSet )
return LEAVE_PAGE;
}
-
-/*************************************************************************
-#* Methode: SetInfoItem Datum:02.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvxNumberFormatTabPage
-#*
-#* Funktion: Wenn die Klasse den NumInfoItem nicht ueber den
-#* SfxItem beim Reset erhaelt MUSS ueber diese Funktion
-#* der Item gesetzt werden.
-#*
-#* Input: ---
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem )
{
if(pNumItem==NULL)
@@ -963,22 +939,6 @@ void SvxNumberFormatTabPage::SetInfoItem( const SvxNumberInfoItem& rItem )
}
}
-
-/*************************************************************************
-#* Methode: FillFormatListBox_Impl Datum:02.10.97
-#*------------------------------------------------------------------------
-#*
-#* Klasse: SvxNumberFormatTabPage
-#*
-#* Funktion: Fuellt die Format- Listbox mit den entsprechend
-#* formatierten Zahlenwerten.
-#*
-#* Input: Liste der Formatstrings
-#*
-#* Output: ---
-#*
-#************************************************************************/
-
void SvxNumberFormatTabPage::FillFormatListBox_Impl( SvxDelStrgs& rEntries )
{
String* pEntry;
diff --git a/svx/source/dialog/numfmt.hrc b/svx/source/dialog/numfmt.hrc
index be554f401e3e..25ff5964ae8c 100644
--- a/svx/source/dialog/numfmt.hrc
+++ b/svx/source/dialog/numfmt.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: numfmt.hrc,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: er $ $Date: 2001-05-29 12:32:24 $
+ * last change: $Author: gt $ $Date: 2002-06-11 08:03:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,6 +97,7 @@
#define LB_CURRENCY 33
#define STR_EUROPE 34
#define CB_SOURCEFORMAT 35
+#define IL_ICON_HC 36
#define TBX_ADDREMOVE 1
#define IID_ADD 1
diff --git a/svx/source/dialog/numfmt.src b/svx/source/dialog/numfmt.src
index 8078a15ab24a..bd942379a12b 100644
--- a/svx/source/dialog/numfmt.src
+++ b/svx/source/dialog/numfmt.src
@@ -2,9 +2,9 @@
*
* $RCSfile: numfmt.src,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: os $ $Date: 2002-03-27 08:33:26 $
+ * last change: $Author: gt $ $Date: 2002-06-11 08:03:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1000,6 +1000,18 @@ TabPage RID_SVXPAGE_NUMBERFORMAT
};
IdCount = { 3 ; };
};
+ ImageList IL_ICON_HC
+ {
+ ImageBitmap = Bitmap { File = "nuh_numfmt.bmp" ; };
+ MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+ IdList =
+ {
+ IID_ADD ;
+ IID_REMOVE ;
+ IID_INFO ;
+ };
+ IdCount = { 3 ; };
+ };
String STR_EUROPE
{
generated by cgit (git 2.34.1) at 2025-02-04 00:59:03 +0000