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

[Kohei Yoshida]

 sc/source/filter/inc/orcusinterface.hxx |    2 +-
 sc/source/filter/orcus/interface.cxx    |   26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 05bc203c3aa15ec01cc71a18ff8928c62e06eb9e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Sat Dec 9 15:23:12 2017 -0500

    Fix inconsistent naming of a variable.
    
    Change-Id: I769d95a9800919b2241d48de246bee7fdbaa7996
    Reviewed-on: https://gerrit.libreoffice.org/46170
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index 465014b0caf4..af5020c8ace4 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -296,7 +296,7 @@ private:
     {
         struct border_line
         {
-            SvxBorderLineStyle mestyle;
+            SvxBorderLineStyle meStyle;
             Color maColor;
             double mnWidth;
 
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 50b009cae3b9..4a2f5567f583 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -863,7 +863,7 @@ ScOrcusStyles::border::border():
 }
 
 ScOrcusStyles::border::border_line::border_line():
-    mestyle(SvxBorderLineStyle::SOLID),
+    meStyle(SvxBorderLineStyle::SOLID),
     maColor(COL_WHITE),
     mnWidth(0)
 {
@@ -907,17 +907,17 @@ void ScOrcusStyles::border::applyToItemSet(SfxItemSet& rSet) const
 
         if (current_border_line.first == orcus::spreadsheet::border_direction_t::diagonal_tl_br)
         {
-            editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.mestyle);
+            editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.meStyle);
             aDiagonal_TLBR.SetLine(&aLine);
         }
         else if (current_border_line.first == orcus::spreadsheet::border_direction_t::diagonal_bl_tr)
         {
-            editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.mestyle);
+            editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.meStyle);
             aDiagonal_BLTR.SetLine(&aLine);
         }
         else
         {
-            editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.mestyle);
+            editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.meStyle);
             aBoxItem.SetLine(&aLine, eDir);
         }
     }
@@ -1305,32 +1305,32 @@ void ScOrcusStyles::set_border_style(
         case orcus::spreadsheet::border_style_t::medium:
         case orcus::spreadsheet::border_style_t::thick:
         case orcus::spreadsheet::border_style_t::thin:
-            current_line.mestyle = SvxBorderLineStyle::SOLID;
+            current_line.meStyle = SvxBorderLineStyle::SOLID;
             break;
         case orcus::spreadsheet::border_style_t::dash_dot:
-            current_line.mestyle = SvxBorderLineStyle::DASH_DOT;
+            current_line.meStyle = SvxBorderLineStyle::DASH_DOT;
             break;
         case orcus::spreadsheet::border_style_t::dash_dot_dot:
-            current_line.mestyle = SvxBorderLineStyle::DASH_DOT_DOT;
+            current_line.meStyle = SvxBorderLineStyle::DASH_DOT_DOT;
             break;
         case orcus::spreadsheet::border_style_t::dashed:
-            current_line.mestyle = SvxBorderLineStyle::DASHED;
+            current_line.meStyle = SvxBorderLineStyle::DASHED;
             break;
         case orcus::spreadsheet::border_style_t::dotted:
-            current_line.mestyle = SvxBorderLineStyle::DOTTED;
+            current_line.meStyle = SvxBorderLineStyle::DOTTED;
             break;
         case orcus::spreadsheet::border_style_t::double_border:
-            current_line.mestyle = SvxBorderLineStyle::DOUBLE;
+            current_line.meStyle = SvxBorderLineStyle::DOUBLE;
             break;
         case orcus::spreadsheet::border_style_t::medium_dash_dot:
         case orcus::spreadsheet::border_style_t::slant_dash_dot:
-            current_line.mestyle = SvxBorderLineStyle::DASH_DOT;
+            current_line.meStyle = SvxBorderLineStyle::DASH_DOT;
             break;
         case orcus::spreadsheet::border_style_t::medium_dash_dot_dot:
-            current_line.mestyle = SvxBorderLineStyle::DASH_DOT_DOT;
+            current_line.meStyle = SvxBorderLineStyle::DASH_DOT_DOT;
             break;
         case orcus::spreadsheet::border_style_t::medium_dashed:
-            current_line.mestyle = SvxBorderLineStyle::DASHED;
+            current_line.meStyle = SvxBorderLineStyle::DASHED;
             break;
         default:
             ;