diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2013-09-14 15:13:08 +0200 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-09-17 16:56:57 +0400 |
| commit | 338ccf09e3d02dfd872464bb78c4e2d44aecf0b2 (patch) | |
| tree | db9a2689c00a546abaae3b7acfd041d279572032 | |
| parent | ed9a82918b87e6c82ba4fbc3324e6aaf21784468 (diff) | |
fdo#64455 Handle unknown color in color line
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b
| -rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 4514d4276997..daa035b3e654 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -28,6 +28,9 @@ #include <svx/dialogs.hrc> +#define TMP_STR_BEGIN '[' +#define TMP_STR_END ']' + #define DELAY_TIMEOUT 100 #include <svx/xlnclit.hxx> @@ -295,7 +298,40 @@ SvxColorBox::~SvxColorBox() void SvxColorBox::Update( const XLineColorItem* pItem ) { if ( pItem ) - SelectEntry( pItem->GetColorValue() ); + { + // fdo#64455 + ::Color aColor = pItem->GetColorValue(); + String aString( pItem->GetName() ); + SelectEntry(aString); + if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND || + GetSelectEntryColor() != aColor ) + { + SelectEntry( aColor ); + } + // Check if the entry is not in the list + if( GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND || + GetSelectEntryColor() != aColor ) + { + sal_uInt16 nCount = GetEntryCount(); + String aTmpStr; + if( nCount > 0 ) + { + // Last entry gets tested against temporary color + aTmpStr = GetEntry( nCount - 1 ); + if( aTmpStr.GetChar(0) == TMP_STR_BEGIN && + aTmpStr.GetChar(aTmpStr.Len()-1) == TMP_STR_END ) + { + RemoveEntry( nCount - 1 ); + } + } + aTmpStr = TMP_STR_BEGIN; + aTmpStr += aString; + aTmpStr += TMP_STR_END; + + sal_uInt16 nPos = InsertEntry( aColor, aTmpStr ); + SelectEntryPos( nPos ); + } + } else SetNoSelection(); } |