[Libreoffice-commits] core.git: 2 commits - cui/source oox/source

[Jochen Nitschke]

 cui/source/tabpages/tpline.cxx                 |    3 +--
 oox/source/drawingml/chart/objectformatter.cxx |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ea9da1dd7790de9a8057a00a22c9b28a4a7bc09c
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Thu Sep 15 00:17:41 2016 +0200

    add comment for raw number
    
    values are already in initial commit
    fd069bee7e57ad529c3c0974559fd2d84ec3151a
    (svx/source/dialog/tpline.cxx)
    
    corresponding chart2 commit
    668c6b0245b6076ac8fb3f5d734795117188675e
    (chart2/source/controller/dialogs/dlg_ObjectProperties.cxx)
    
    nNoArrowDlg = 1100 was initially commented out and removed later
    
    Change-Id: If11506c071cf18d06200032f3cd3b753bc0a4e59
    Reviewed-on: https://gerrit.libreoffice.org/28915
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index fa2398f..afd5858 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -672,8 +672,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
     }
     // Page does not yet exist in the ctor, that's why we do it here!
 
-    else if ( m_nDlgType == 1100 ||
-              m_nDlgType == 1101 )
+    else if (m_nDlgType == 1101) // nNoArrowNoShadowDlg from chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
     {
         m_pFlLineEnds->Hide();
         m_pFLEdgeStyle->Hide();
commit ae65dbbafe3a07a701f8f45059d0a3d55b1afc59
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Fri Sep 16 09:34:12 2016 +0200

    fix copy&paste in DownBarFills
    
    Change-Id: Id1e61caa2252c2d27560b8565abd3255faaf684b
    Reviewed-on: https://gerrit.libreoffice.org/28939
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 197867b..a26edfa 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -369,7 +369,7 @@ static const AutoFormatEntry spDownBarFills[] =
     AUTOFORMAT_ACCENTSMOD( 27,     THEMED_STYLE_INTENSE,          XML_shade, 25000 ),
     AUTOFORMAT_COLORMOD(   33, 33, THEMED_STYLE_SUBTLE,  XML_dk1, XML_tint,  85000 ),
     AUTOFORMAT_COLORMOD(   34, 34, THEMED_STYLE_SUBTLE,  XML_dk1, XML_tint,  95000 ),
-    AUTOFORMAT_ACCENTSMOD( 27,     THEMED_STYLE_SUBTLE,           XML_shade, 25000 ),
+    AUTOFORMAT_ACCENTSMOD( 35,     THEMED_STYLE_SUBTLE,           XML_shade, 25000 ),
     AUTOFORMAT_COLORMOD(   41, 41, THEMED_STYLE_INTENSE, XML_dk1, XML_tint,  85000 ),
     AUTOFORMAT_COLOR(      42, 42, THEMED_STYLE_INTENSE, XML_dk1 ),
     AUTOFORMAT_ACCENTSMOD( 43,     THEMED_STYLE_INTENSE,          XML_shade, 25000 ),