diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2021-03-21 20:31:39 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-03-26 08:18:19 +0100 |
| commit | b849373b2bd2c41ab03e2fd5e3fa5e9c48b47e51 (patch) | |
| tree | f7f03c37f8956b73302f4c9aab77ba0189302c82 /filter | |
| parent | de746cd639513f498c93aced200ad9a80975bda5 (diff) | |
vcl: add initializer_list constructor to BitmapPalette and use it
Change-Id: Ib24266e435765bd5e05193aea5cee61d7a9346b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113133
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/util.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index d821b8f2e6c7..2ee9bf6edb08 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -1334,15 +1334,12 @@ sal_uInt8 TransColToIco( const Color& rCol ) case sal_uInt32(COL_AUTO): nCol = 0; break; default: - static const Color aColArr[ 16 ] = { + static const BitmapPalette aBmpPal { COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN, COL_LIGHTMAGENTA,COL_LIGHTRED, COL_YELLOW, COL_WHITE, COL_BLUE, COL_CYAN, COL_GREEN, COL_MAGENTA, COL_RED, COL_BROWN, COL_GRAY, COL_LIGHTGRAY }; - BitmapPalette aBmpPal(16); - for( sal_uInt16 i = 0; i < 16; ++i ) - aBmpPal[i] = aColArr[ i ]; nCol = static_cast< sal_uInt8 >(GetBestIndex(aBmpPal, rCol) + 1); break; |