[Libreoffice-commits] core.git: svx/source

Michael Stahl mstahl at redhat.com
Tue Jul 28 03:36:02 PDT 2015


 svx/source/sidebar/line/LinePropertyPanel.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d10de0360f08e847056fb8abb0c32da403444db3
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 28 12:28:53 2015 +0200

    svx: fix crash in JunitTest_svx_unoapi
    
    618fd9d91a87113a1fbb5f829bd0d61207ff78af added a mpLBColor widget with
    a type that does not match what is in the .ui file.
    
    Change-Id: I17c58448c1d6cf43652702d60d5600ce8de64224

diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index 3e7938f..33e2c34 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -23,6 +23,7 @@
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
+#include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <vcl/layout.hxx>
@@ -97,7 +98,7 @@ private:
     VclPtr<FixedText>   mpFTWidth;
     VclPtr<ToolBox>     mpTBWidth;
     VclPtr<FixedText>   mpFTColor;
-    VclPtr<ListBox>     mpLBColor;
+    VclPtr<sfx2::sidebar::SidebarToolBox> mpLBColor;
     VclPtr<FixedText>   mpFTStyle;
     VclPtr<ListBox>     mpLBStyle;
     VclPtr<FixedText>   mpFTTransparency;


More information about the Libreoffice-commits mailing list