summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rentz <dr@openoffice.org>2002-04-22 13:10:38 +0000
committerDaniel Rentz <dr@openoffice.org>2002-04-22 13:10:38 +0000
commit5d6c7a44d19e1be54891ebcb76f848cd0f5a0028 (patch)
treefc4e7d1a953fb3d889f55b84a6d431e752f88168
parentbfe9fbaa2c3b6f5152adacf8707243edd1460211 (diff)
#98252# DP controls with system colors
-rw-r--r--sc/inc/global.hxx6
-rw-r--r--sc/source/core/data/global.cxx12
2 files changed, 12 insertions, 6 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index d7297a0aac9a..d00e9d9bd593 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: global.hxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: nn $ $Date: 2001-11-12 20:01:05 $
+ * last change: $Author: dr $ $Date: 2002-04-22 14:10:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -616,7 +616,7 @@ public:
static void InitTextHeight(SfxItemPool* pPool);
static SvxBrushItem* GetEmptyBrushItem() { return pEmptyBrushItem; }
- static SvxBrushItem* GetButtonBrushItem() { return pButtonBrushItem; }
+ static SvxBrushItem* GetButtonBrushItem();
static SvxBrushItem* GetEmbeddedBrushItem() { return pEmbeddedBrushItem; }
static SvxBrushItem* GetProtectedBrushItem() { return pProtectedBrushItem; }
static const String& GetEmptyString();
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 434d08ecb3d1..0622e0b2aa38 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: global.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: nn $ $Date: 2002-03-11 14:01:15 $
+ * last change: $Author: dr $ $Date: 2002-04-22 14:10:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -598,6 +598,12 @@ String ScGlobal::GetLongErrorString(USHORT nErrNumber)
return aRes;
}
+SvxBrushItem* ScGlobal::GetButtonBrushItem()
+{
+ pButtonBrushItem->SetColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
+ return pButtonBrushItem;
+}
+
const String& ScGlobal::GetEmptyString()
{
return *pEmptyString;
@@ -646,7 +652,7 @@ void ScGlobal::Init()
for( USHORT nC = 0 ; nC <= STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL;
pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ) );
- pButtonBrushItem = new SvxBrushItem( Color( COL_LIGHTGRAY ) );
+ pButtonBrushItem = new SvxBrushItem( Color() );
pEmbeddedBrushItem = new SvxBrushItem( Color( COL_LIGHTCYAN ) );
pProtectedBrushItem = new SvxBrushItem( Color( COL_LIGHTGRAY ) );