Kaydet (Commit) 6670cc35 authored tarafından Jaskaran Singh's avatar Jaskaran Singh Kaydeden (comit) Markus Mohrhard

Add diagonal borders to calc orcus interface

Change-Id: Ia0d41baa4e4d6fdb5872c8ec3f462ff02a32f518
üst 57f71f19
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <editeng/prntitem.hxx> #include <editeng/prntitem.hxx>
#include <editeng/fontitem.hxx> #include <editeng/fontitem.hxx>
#include <editeng/fhgtitem.hxx> #include <editeng/fhgtitem.hxx>
#include <editeng/lineitem.hxx>
#include <formula/token.hxx> #include <formula/token.hxx>
#include <tools/datetime.hxx> #include <tools/datetime.hxx>
...@@ -877,16 +878,33 @@ SvxBoxItemLine getDirection(os::border_direction_t dir) ...@@ -877,16 +878,33 @@ SvxBoxItemLine getDirection(os::border_direction_t dir)
void ScOrcusStyles::border::applyToItemSet(SfxItemSet& rSet) const void ScOrcusStyles::border::applyToItemSet(SfxItemSet& rSet) const
{ {
SvxBoxItem aItem(ATTR_BORDER); SvxBoxItem aBoxItem(ATTR_BORDER);
SvxLineItem aDiagonal_TLBR(ATTR_BORDER_TLBR);
SvxLineItem aDiagonal_BLTR(ATTR_BORDER_BLTR);
for (auto& current_border_line : border_lines) for (auto& current_border_line : border_lines)
{ {
SvxBoxItemLine eDir = getDirection(current_border_line.first); SvxBoxItemLine eDir = getDirection(current_border_line.first);
editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.mestyle);
aItem.SetLine(&aLine, eDir);
}
rSet.Put(aItem); 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);
aDiagonal_BLTR.SetLine(&aLine);
}
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);
aDiagonal_TLBR.SetLine(&aLine);
}
else
{
editeng::SvxBorderLine aLine(&current_border_line.second.maColor, current_border_line.second.mnWidth, current_border_line.second.mestyle);
aBoxItem.SetLine(&aLine, eDir);
}
}
rSet.Put(aDiagonal_BLTR);
rSet.Put(aDiagonal_TLBR);
rSet.Put(aBoxItem);
} }
void ScOrcusStyles::number_format::applyToItemSet(SfxItemSet& rSet) const void ScOrcusStyles::number_format::applyToItemSet(SfxItemSet& rSet) const
......
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