[Libreoffice-commits] core.git: 2 commits - chart2/source sfx2/source

[Markus Mohrhard]

 chart2/source/controller/sidebar/ChartAreaPanel.cxx |    5 +++++
 sfx2/source/sidebar/SidebarController.cxx           |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 15fcf82a116288a98460647786f603b30f0123bb
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Thu Aug 20 02:14:17 2015 +0200

    also need to call updateFillColor to get the UI in order
    
    Change-Id: I689d84ef58faeb4b36159c6370b5e97a13d39736

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 6377e64..9ff480a 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -435,6 +435,11 @@ void ChartAreaPanel::updateData()
     updateFillFloatTransparence(false, true, &aFillFloatTransparenceItem);
 
     maFillColorWrapper.updateData();
+
+    sal_uInt32 nFillColor;
+    xPropSet->getPropertyValue("FillColor") >>= nFillColor;
+    XFillColorItem aFillColorItem("", Color(nFillColor));
+    updateFillColor(true, &aFillColorItem);
 }
 
 void ChartAreaPanel::modelInvalid()
commit 89c03990a8be2101632b872a5d21b276f316a457
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Thu Aug 20 00:15:33 2015 +0200

    better warning message for failed panel creation
    
    Change-Id: I631120903f15256997e082e0d079da7c5ee9944b

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index f99be6c..afb8449 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -816,7 +816,7 @@ Reference<ui::XUIElement> 
SidebarController::CreateUIElement (
     }
     catch(const Exception& rException)
     {
-        SAL_WARN("sfx.sidebar", "Cannot create panel: " << rException.Message);
+        SAL_WARN("sfx.sidebar", "Cannot create panel " << rsImplementationURL 
<< ": " << rException.Message);
         return NULL;
     }
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits