commit 351a97ce6bda3075677b59fa1387ba3d1ab17d7a
author Caolán McNamara <caolanm@redhat.com> Fri Nov 04 15:06:55 2016 +0000
committer Caolán McNamara <caolanm@redhat.com> Fri Nov 04 17:14:29 2016 +0000
tree e880a743677b7a69bcf3c8ac4d77700615df6394
parent df738e0f8ceedb4bad756960be14d9c41adc165d

simplify, its just a vector of colors

Change-Id: I7d388739225d371090872a33d30aa3178b20ca6e

cui/source/options/optchart.cxx

diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index ddc3e06..aefd2672 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -28,12 +28,7 @@

class ColorLB : public ListBox
{
    ImpColorList*   pColorList; // separate liste, in case of user data are required from outside
    Size            aImageSize;

    using Window::ImplInit;
    SVT_DLLPRIVATE void         ImplInit();
    SVT_DLLPRIVATE void         ImplDestroyColorEntries();
    ImpColorList  aColorList; // separate liste, in case of user data are required from outside

public:
    ColorLB(vcl::Window* pParent, WinBits nWinStyle = WB_BORDER);
@@ -76,35 +71,9 @@ VCL_BUILDER_DECL_FACTORY(ColorLB)
    rRet = pListBox;
}

class ImplColorListData
{
public:
    Color       aColor;
    bool        bColor;

                ImplColorListData() : aColor( COL_BLACK ) { bColor = false; }
                explicit ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = true; }
};

void ColorLB::ImplInit()
{
    pColorList = new ImpColorList();

    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
    aImageSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();
}

void ColorLB::ImplDestroyColorEntries()
{
    for ( size_t n = pColorList->size(); n; )
        delete (*pColorList)[ --n ];
    pColorList->clear();
}

ColorLB::ColorLB( vcl::Window* pParent, WinBits nWinStyle ) :
    ListBox( pParent, nWinStyle )
{
    ImplInit();
    SetEdgeBlending(true);
}

@@ -115,12 +84,6 @@ ColorLB::~ColorLB()

void ColorLB::dispose()
{
    if ( pColorList )
    {
        ImplDestroyColorEntries();
        delete pColorList;
        pColorList = nullptr;
    }
    ListBox::dispose();
}

@@ -128,6 +91,7 @@ sal_Int32 ColorLB::InsertEntry( const Color& rColor, const OUString& rStr,
                                sal_Int32 nPos )
{
    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
    Size aImageSize = rStyleSettings.GetListBoxPreviewDefaultPixelSize();

    VclPtr<VirtualDevice> xDevice = VclPtr<VirtualDevice>::Create();
    xDevice->SetOutputSize(aImageSize);
@@ -140,17 +104,16 @@ sal_Int32 ColorLB::InsertEntry( const Color& rColor, const OUString& rStr,
    nPos = ListBox::InsertEntry(rStr, Image(aBitmap), nPos);
    if ( nPos != LISTBOX_ERROR )
    {
        ImplColorListData* pData = new ImplColorListData( rColor );
        if ( static_cast<size_t>(nPos) < pColorList->size() )
        if ( static_cast<size_t>(nPos) < aColorList.size() )
        {
            ImpColorList::iterator it = pColorList->begin();
            ImpColorList::iterator it = aColorList.begin();
            ::std::advance( it, nPos );
            pColorList->insert( it, pData );
            aColorList.insert( it, rColor );
        }
        else
        {
            pColorList->push_back( pData );
            nPos = pColorList->size() - 1;
            aColorList.push_back( rColor );
            nPos = aColorList.size() - 1;
        }
    }
    return nPos;
@@ -159,28 +122,25 @@ sal_Int32 ColorLB::InsertEntry( const Color& rColor, const OUString& rStr,
void ColorLB::RemoveEntry( sal_Int32 nPos )
{
    ListBox::RemoveEntry( nPos );
    if ( 0 <= nPos && static_cast<size_t>(nPos) < pColorList->size() )
    if ( 0 <= nPos && static_cast<size_t>(nPos) < aColorList.size() )
    {
            ImpColorList::iterator it = pColorList->begin();
            ::std::advance( it, nPos );
            delete *it;
            pColorList->erase( it );
        ImpColorList::iterator it = aColorList.begin();
        std::advance(it, nPos);
        aColorList.erase(it);
    }
}

void ColorLB::Clear()
{
    ImplDestroyColorEntries();
    aColorList.clear();
    ListBox::Clear();
}

Color ColorLB::GetEntryColor( sal_Int32 nPos ) const
{
    Color aColor;
    ImplColorListData* pData = ( 0 <= nPos && static_cast<size_t>(nPos) < pColorList->size() ) ?
        (*pColorList)[ nPos ] : nullptr;
    if ( pData && pData->bColor )
        aColor = pData->aColor;
    if (0 <= nPos && static_cast<size_t>(nPos) < aColorList.size())
        aColor = aColorList[nPos];
    return aColor;
}

cui/source/options/optchart.hxx

diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 30f3196..ff8102a 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -29,11 +29,11 @@

#include "cfgchart.hxx"

typedef std::vector<Color> ImpColorList;
class ColorLB;

class SvxDefaultColorOptPage : public SfxTabPage
{

private:
    VclPtr<ColorLB>                m_pLbChartColors;
    VclPtr<ValueSet>               m_pValSetColorBox;

include/svtools/ctrlbox.hxx

diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 28d1a34..cb5e29d 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -33,10 +33,8 @@
#include <o3tl/typed_flags_set.hxx>

class FontList;
class ImplColorListData;
class ImpLineListData;

typedef ::std::vector< ImplColorListData*    > ImpColorList;
typedef ::std::vector< ImpLineListData*      > ImpLineList;
typedef ::std::vector< FontMetric         > ImplFontList;