summaryrefslogtreecommitdiff
path: root/vcl/source/app/settings.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-07-05 14:41:11 +0000
committerOliver Bolte <obo@openoffice.org>2004-07-05 14:41:11 +0000
commit60410b41f28ea36649b7269c48e2b6d86c7e2ad5 (patch)
tree5e31ceefccc210bc24b2c406a94f1b80032d5728 /vcl/source/app/settings.cxx
parent48327e5b7d21af8300556382686a5b53db9717b1 (diff)
INTEGRATION: CWS frmcontrols04 (1.41.68); FILE MERGED
2004/06/16 05:02:59 fs 1.41.68.3: RESYNC: (1.42-1.44); FILE MERGED 2004/03/31 12:23:48 dv 1.41.68.2: RESYNC: (1.41-1.42); FILE MERGED 2004/03/10 14:11:52 dv 1.41.68.1: #i24693# Added support for border color
Diffstat (limited to 'vcl/source/app/settings.cxx')
-rw-r--r--vcl/source/app/settings.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index db1be14b0a67..23a17f28c60e 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: settings.cxx,v $
*
- * $Revision: 1.47 $
+ * $Revision: 1.48 $
*
- * last change: $Author: obo $ $Date: 2004-07-05 09:18:09 $
+ * last change: $Author: obo $ $Date: 2004-07-05 15:41:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -534,6 +534,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maWindowColor( rData.maWindowColor ),
maWindowTextColor( rData.maWindowTextColor ),
maWorkspaceColor( rData.maWorkspaceColor ),
+ maMonoColor( rData.maMonoColor ),
maAppFont( rData.maAppFont ),
maHelpFont( rData.maAppFont ),
maTitleFont( rData.maTitleFont ),
@@ -622,6 +623,7 @@ void ImplStyleData::SetStandardStyles()
maDialogColor = Color( COL_LIGHTGRAY );
maDialogTextColor = Color( COL_BLACK );
maWorkspaceColor = Color( COL_GRAY );
+ maMonoColor = Color( COL_BLACK );
maFieldColor = Color( COL_WHITE );
maFieldTextColor = Color( COL_BLACK );
maActiveColor = Color( COL_BLUE );
@@ -896,6 +898,7 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
(mpData->maDialogColor == rSet.mpData->maDialogColor) &&
(mpData->maDialogTextColor == rSet.mpData->maDialogTextColor) &&
(mpData->maWorkspaceColor == rSet.mpData->maWorkspaceColor) &&
+ (mpData->maMonoColor == rSet.mpData->maMonoColor) &&
(mpData->maFieldColor == rSet.mpData->maFieldColor) &&
(mpData->maFieldTextColor == rSet.mpData->maFieldTextColor) &&
(mpData->maActiveColor == rSet.mpData->maActiveColor) &&