diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-26 15:14:41 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2015-01-09 18:48:44 +0100 |
| commit | 83d36cb14b1ee016f78ccdd974050db3ba59cf58 (patch) | |
| tree | ec64fd7ecc37dac98ac48725a89e7ded0c73f168 | |
| parent | 5305e3c95b5bb1b601be4bb212b94188053aacf7 (diff) | |
import font underline
Change-Id: I4857d9d49b9f6ef1b92a1d5f61f9f9e852620949
| -rw-r--r-- | sc/source/filter/inc/orcusinterface.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/orcus/interface.cxx | 21 |
2 files changed, 21 insertions, 2 deletions
diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index 0e6988248862..2f84f3a0ba31 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -14,6 +14,7 @@ #include "documentimport.hxx" #include <tools/color.hxx> +#include <tools/fontenum.hxx> #include "sharedformulagroups.hxx" @@ -167,6 +168,7 @@ private: OUString maName; double mnSize; Color maColor; + FontUnderline meUnderline; font(); diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index d41d30740ea9..9ffdd4566a42 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -24,6 +24,7 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/colritem.hxx> +#include <editeng/udlnitem.hxx> #include <formula/token.hxx> #include <tools/datetime.hxx> @@ -475,7 +476,8 @@ ScOrcusStyles::ScOrcusStyles(ScDocument& rDoc): ScOrcusStyles::font::font(): mbBold(false), mbItalic(false), - mnSize(10) + mnSize(10), + meUnderline(UNDERLINE_NONE) { } @@ -488,6 +490,7 @@ void ScOrcusStyles::font::applyToItemSet(SfxItemSet& rSet) const rSet.Put(SvxWeightItem(eWeight, ATTR_FONT_WEIGHT)); rSet.Put(SvxColorItem(maColor, ATTR_FONT_COLOR)); + rSet.Put(SvxUnderlineItem(meUnderline, ATTR_FONT_UNDERLINE)); } ScOrcusStyles::protection::protection(): @@ -583,8 +586,22 @@ void ScOrcusStyles::set_font_size(double point) maCurrentFont.mnSize = point; } -void ScOrcusStyles::set_font_underline(orcus::spreadsheet::underline_t /*e*/) +void ScOrcusStyles::set_font_underline(orcus::spreadsheet::underline_t e) { + switch(e) + { + case orcus::spreadsheet::underline_single: + case orcus::spreadsheet::underline_single_accounting: + maCurrentFont.meUnderline = UNDERLINE_SINGLE; + break; + case orcus::spreadsheet::underline_double: + case orcus::spreadsheet::underline_double_accounting: + maCurrentFont.meUnderline = UNDERLINE_DOUBLE; + break; + case orcus::spreadsheet::underline_none: + maCurrentFont.meUnderline = UNDERLINE_NONE; + break; + } } void ScOrcusStyles::set_font_color(orcus::spreadsheet::color_elem_t alpha, |