handle new color picker correctly in chart sidebar

This implements the basics for that and implements it in the AreaPanel.

Change-Id: I6d9e5012bbcc2c953d478a09a839f35f2ef64c5b

1 files changed, 8 insertions, 2 deletions

diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 658348fcf3eb..8f0ff658bf30 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -36,7 +36,8 @@ PaletteManager::PaletteManager() :
     mnCurrentPalette(0),
     mnColorCount(0),
     mpBtnUpdater(NULL),
-    mLastColor(COL_AUTO)
+    mLastColor(COL_AUTO),
+    maColorSelectFunction(PaletteManager::DispatchColorCommand)
 {
     LoadPalettes();
     mnNumOfPalettes += m_Palettes.size();
@@ -217,6 +218,11 @@ void PaletteManager::SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater)
     mpBtnUpdater = pBtnUpdater;
 }
 
+void PaletteManager::SetColorSelectFunction(std::function<void(const OUString&, const Color&)> aColorSelectFunction)
+{
+    maColorSelectFunction = aColorSelectFunction;
+}
+
 void PaletteManager::PopupColorPicker(const OUString& aCommand)
 {
     // The calling object goes away during aColorDlg.Execute(), so we must copy this
@@ -230,7 +236,7 @@ void PaletteManager::PopupColorPicker(const OUString& aCommand)
             mpBtnUpdater->Update( aColorDlg.GetColor() );
         mLastColor = aColorDlg.GetColor();
         AddRecentColor( mLastColor );
-        DispatchColorCommand(aCommandCopy, mLastColor);
+        maColorSelectFunction(aCommandCopy, mLastColor);
     }
 }