diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:46:38 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-05 16:46:38 +0000 |
| commit | d1768216fcf19b6ee2be3640bc45b8eb2dbf1340 (patch) | |
| tree | ee4fadfb814902ce67636f10c9bdbb0b31b4c996 /svx | |
| parent | 888b48a3ce61e6aa4cfb3d7a8f779e038de26e65 (diff) | |
INTEGRATION: CWS ause083 (1.17.22); FILE MERGED
2007/07/17 10:30:33 hjs 1.17.22.1: #i79470# cleanup to survive pch
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 1791d92fac0f..ef94eec80306 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: linectrl.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: hr $ $Date: 2007-06-27 19:18:29 $ + * last change: $Author: kz $ $Date: 2007-09-05 17:46:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -371,7 +371,7 @@ void SvxLineColorToolBoxControl::Update( const SfxPoolItem* pState ) DBG_ASSERT( pBox, "Window not found" ); // Die Liste der Farben (ColorTable) hat sich geaendert: - Color aTmpColor( pBox->GetSelectEntryColor() ); + ::Color aTmpColor( pBox->GetSelectEntryColor() ); pBox->Clear(); pBox->Fill( ( (SvxColorTableItem*)pState )->GetColorTable() ); pBox->SelectEntry( aTmpColor ); |