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

[Maxim Monastirsky]

 svx/source/tbxctrls/tbcontrl.cxx       |    2 +-
 svx/source/tbxctrls/tbxcolorupdate.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c4b520160cc1e3caac836cc2ad64df10d93a6dbc
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Sep 12 22:28:40 2016 +0300

    tdf#90721 Line color initial behavior similar to fill color
    
    Change-Id: Icf6d35d188f57e1b91da1ce5947f35c97c4f2e78

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 469ad68..a1aa174 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2677,7 +2677,7 @@ SvxColorToolBoxControl::SvxColorToolBoxControl(
 
         case SID_ATTR_LINE_COLOR:
             addStatusListener( ".uno:XLineColor");
-            mPaletteManager.SetLastColor( COL_BLACK );
+            mPaletteManager.SetLastColor( COL_DEFAULT_SHAPE_STROKE );
             break;
 
         case SID_ATTR_FILL_COLOR:
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index c773a1c..ef16fc1 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -63,7 +63,7 @@ namespace svx
                 Update(COL_YELLOW);
                 break;
             case SID_ATTR_LINE_COLOR:
-                Update(COL_BLACK);
+                Update(COL_DEFAULT_SHAPE_STROKE);
                 break;
             case SID_ATTR_FILL_COLOR:
                 Update(COL_DEFAULT_SHAPE_FILLING);