sc/source/filter/orcus/interface.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
New commits: commit 3d9f4313a446e9e0007a0a7e02b52ae092ed4b1a Author: Markus Mohrhard <[email protected]> Date: Sun Jan 11 22:04:42 2015 +0100 apply fill properties to item set Change-Id: I89d8d84d199a991d75b9c613fd72d66c18642b12 diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index c043a3b..c53a3a4 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -659,6 +659,9 @@ void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet, const xf& rXf) return; } + const fill& rFill = maFills[nFillId]; + rFill.applyToItemSet(rSet); + size_t nBorderId = rXf.mnBorderId; if (nBorderId >= maBorders.size()) { commit 77c3aaf173a96400d3d03f50d0b980db7f8b95d7 Author: Markus Mohrhard <[email protected]> Date: Sun Jan 11 21:38:50 2015 +0100 import the background color Change-Id: I63dfc5b879abcb63cc4d0d67389467d76f94bca9 diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 1088260..c043a3b 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -606,9 +606,12 @@ void ScOrcusStyles::font::applyToItemSet(SfxItemSet& rSet) const void ScOrcusStyles::fill::applyToItemSet(SfxItemSet& rSet) const { if (maPattern.equalsIgnoreAsciiCase("none")) + { + SAL_INFO("sc.orcus.style", "no fill style"); return; + } - rSet.Put(SvxBrushItem(maFgColor, ATTR_BACKGROUND)); + rSet.Put(SvxBrushItem(maBgColor, ATTR_BACKGROUND)); } ScOrcusStyles::protection::protection(): commit 3bdd41b10b9b7117d4654b96376daece9eb58c96 Author: Markus Mohrhard <[email protected]> Date: Sun Jan 11 21:37:52 2015 +0100 make sure to print numbers as ints and not as characters Change-Id: I8409ac35a6368c80d0f9bf6b49619a63ce502a5a diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index fff1c29..1088260 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -585,7 +585,7 @@ namespace { std::ostream& operator<<(std::ostream& rStrm, const Color& rColor) { - rStrm << "Red: " << rColor.GetRed() << ", Green: " << rColor.GetGreen() << ", Blue: " << rColor.GetBlue(); + rStrm << "Red: " << (int)rColor.GetRed() << ", Green: " << (int)rColor.GetGreen() << ", Blue: " << (int)rColor.GetBlue(); return rStrm; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
