diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:46:00 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:46:00 +0000 |
| commit | a6f61d3369bb68a4f0d2a40bea8fedbbb6701571 (patch) | |
| tree | 6bedbed7ec1ace472487762fa315e7a8d2943182 /svx | |
| parent | 4a0522e25f46f46a02aeec76c9f80b79cba4594f (diff) | |
INTEGRATION: CWS ause083 (1.18.22); FILE MERGED
2007/07/17 10:30:32 hjs 1.18.22.1: #i79470# cleanup to survive pch
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 900969a1237d..87ceeeec849a 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fillctrl.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2007-06-27 19:16:12 $ + * last change: $Author: kz $ $Date: 2007-09-05 17:46:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -268,7 +268,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) if ( pColorItem ) { String aString( pColorItem->GetName() ); - Color aColor = pColorItem->GetColorValue(); + ::Color aColor = pColorItem->GetColorValue(); pFillAttrLB->SelectEntry( aString ); @@ -475,7 +475,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) if( pState->ISA( SvxColorTableItem ) && eXFS == XFILL_SOLID ) { - Color aTmpColor( pFillAttrLB->GetSelectEntryColor() ); + ::Color aTmpColor( pFillAttrLB->GetSelectEntryColor() ); pFillAttrLB->Clear(); pFillAttrLB->Fill( ( (SvxColorTableItem*)pState )->GetColorTable() ); pFillAttrLB->SelectEntry( aTmpColor ); |