Kaydet (Commit) 05bc203c authored tarafından Kohei Yoshida's avatar Kohei Yoshida Kaydeden (comit) Kohei Yoshida

Fix inconsistent naming of a variable.

Change-Id: I769d95a9800919b2241d48de246bee7fdbaa7996
Reviewed-on: https://gerrit.libreoffice.org/46170Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKohei Yoshida <libreoffice@kohei.us>
üst 202f46bf
...@@ -296,7 +296,7 @@ private: ...@@ -296,7 +296,7 @@ private:
{ {
struct border_line struct border_line
{ {
SvxBorderLineStyle mestyle; SvxBorderLineStyle meStyle;
Color maColor; Color maColor;
double mnWidth; double mnWidth;
......
...@@ -863,7 +863,7 @@ ScOrcusStyles::border::border(): ...@@ -863,7 +863,7 @@ ScOrcusStyles::border::border():
} }
ScOrcusStyles::border::border_line::border_line(): ScOrcusStyles::border::border_line::border_line():
mestyle(SvxBorderLineStyle::SOLID), meStyle(SvxBorderLineStyle::SOLID),
maColor(COL_WHITE), maColor(COL_WHITE),
mnWidth(0) mnWidth(0)
{ {
...@@ -907,17 +907,17 @@ void ScOrcusStyles::border::applyToItemSet(SfxItemSet& rSet) const ...@@ -907,17 +907,17 @@ void ScOrcusStyles::border::applyToItemSet(SfxItemSet& rSet) const
if (current_border_line.first == orcus::spreadsheet::border_direction_t::diagonal_tl_br) 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); aDiagonal_TLBR.SetLine(&aLine);
} }
else if (current_border_line.first == orcus::spreadsheet::border_direction_t::diagonal_bl_tr) 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); aDiagonal_BLTR.SetLine(&aLine);
} }
else 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); aBoxItem.SetLine(&aLine, eDir);
} }
} }
...@@ -1305,32 +1305,32 @@ void ScOrcusStyles::set_border_style( ...@@ -1305,32 +1305,32 @@ void ScOrcusStyles::set_border_style(
case orcus::spreadsheet::border_style_t::medium: case orcus::spreadsheet::border_style_t::medium:
case orcus::spreadsheet::border_style_t::thick: case orcus::spreadsheet::border_style_t::thick:
case orcus::spreadsheet::border_style_t::thin: case orcus::spreadsheet::border_style_t::thin:
current_line.mestyle = SvxBorderLineStyle::SOLID; current_line.meStyle = SvxBorderLineStyle::SOLID;
break; break;
case orcus::spreadsheet::border_style_t::dash_dot: case orcus::spreadsheet::border_style_t::dash_dot:
current_line.mestyle = SvxBorderLineStyle::DASH_DOT; current_line.meStyle = SvxBorderLineStyle::DASH_DOT;
break; break;
case orcus::spreadsheet::border_style_t::dash_dot_dot: case orcus::spreadsheet::border_style_t::dash_dot_dot:
current_line.mestyle = SvxBorderLineStyle::DASH_DOT_DOT; current_line.meStyle = SvxBorderLineStyle::DASH_DOT_DOT;
break; break;
case orcus::spreadsheet::border_style_t::dashed: case orcus::spreadsheet::border_style_t::dashed:
current_line.mestyle = SvxBorderLineStyle::DASHED; current_line.meStyle = SvxBorderLineStyle::DASHED;
break; break;
case orcus::spreadsheet::border_style_t::dotted: case orcus::spreadsheet::border_style_t::dotted:
current_line.mestyle = SvxBorderLineStyle::DOTTED; current_line.meStyle = SvxBorderLineStyle::DOTTED;
break; break;
case orcus::spreadsheet::border_style_t::double_border: case orcus::spreadsheet::border_style_t::double_border:
current_line.mestyle = SvxBorderLineStyle::DOUBLE; current_line.meStyle = SvxBorderLineStyle::DOUBLE;
break; break;
case orcus::spreadsheet::border_style_t::medium_dash_dot: case orcus::spreadsheet::border_style_t::medium_dash_dot:
case orcus::spreadsheet::border_style_t::slant_dash_dot: case orcus::spreadsheet::border_style_t::slant_dash_dot:
current_line.mestyle = SvxBorderLineStyle::DASH_DOT; current_line.meStyle = SvxBorderLineStyle::DASH_DOT;
break; break;
case orcus::spreadsheet::border_style_t::medium_dash_dot_dot: 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; break;
case orcus::spreadsheet::border_style_t::medium_dashed: case orcus::spreadsheet::border_style_t::medium_dashed:
current_line.mestyle = SvxBorderLineStyle::DASHED; current_line.meStyle = SvxBorderLineStyle::DASHED;
break; break;
default: default:
; ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment