Kaydet (Commit) 5486dc71 authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

use a consistent log area for orcus styles

Change-Id: I8d020d541cbe1ccd4fbc38f2ba0ba63351ddfaa4
üst 2cf73ac4
...@@ -363,8 +363,9 @@ void ScOrcusSheet::set_date_time( ...@@ -363,8 +363,9 @@ void ScOrcusSheet::set_date_time(
cellInserted(); cellInserted();
} }
void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, size_t /*xf_index*/) void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, size_t xf_index)
{ {
SAL_INFO("sc.orcus.style", "set format: " << xf_index);
} }
void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/, void ScOrcusSheet::set_format(os::row_t /*row*/, os::col_t /*col*/,
...@@ -573,6 +574,18 @@ ScOrcusStyles::font::font(): ...@@ -573,6 +574,18 @@ ScOrcusStyles::font::font():
{ {
} }
/*
namespace {
std::ostream& operator<<(std::ostream& rStrm, const Color& rColor)
{
rStrm << "Red: " << rColor.GetRed() << ", Green: " << rColor.GetGreen() << ", Blue: " << rColor.GetBlue();
return rStrm;
}
}
*/
void ScOrcusStyles::font::applyToItemSet(SfxItemSet& rSet) const void ScOrcusStyles::font::applyToItemSet(SfxItemSet& rSet) const
{ {
FontItalic eItalic = mbItalic ? ITALIC_NORMAL : ITALIC_NONE; FontItalic eItalic = mbItalic ? ITALIC_NORMAL : ITALIC_NONE;
...@@ -624,7 +637,7 @@ void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet, const xf& rXf) ...@@ -624,7 +637,7 @@ void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet, const xf& rXf)
size_t nFontId = rXf.mnFontId; size_t nFontId = rXf.mnFontId;
if (nFontId >= maFonts.size()) if (nFontId >= maFonts.size())
{ {
SAL_WARN("sc.orcus.styles", "invalid font id"); SAL_WARN("sc.orcus.style", "invalid font id");
return; return;
} }
...@@ -634,28 +647,28 @@ void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet, const xf& rXf) ...@@ -634,28 +647,28 @@ void ScOrcusStyles::applyXfToItemSet(SfxItemSet& rSet, const xf& rXf)
size_t nFillId = rXf.mnFillId; size_t nFillId = rXf.mnFillId;
if (nFillId >= maFills.size()) if (nFillId >= maFills.size())
{ {
SAL_WARN("sc.orcus.styles", "invalid fill id"); SAL_WARN("sc.orcus.style", "invalid fill id");
return; return;
} }
size_t nBorderId = rXf.mnBorderId; size_t nBorderId = rXf.mnBorderId;
if (nBorderId >= maBorders.size()) if (nBorderId >= maBorders.size())
{ {
SAL_WARN("sc.orcus.styles", "invalid border id"); SAL_WARN("sc.orcus.style", "invalid border id");
return; return;
} }
size_t nProtectionId = rXf.mnProtectionId; size_t nProtectionId = rXf.mnProtectionId;
if (nProtectionId >= maProtections.size()) if (nProtectionId >= maProtections.size())
{ {
SAL_WARN("sc.orcus.styles", "invalid protection id"); SAL_WARN("sc.orcus.style", "invalid protection id");
return; return;
} }
size_t nNumberFormatId = rXf.mnNumberFormatId; size_t nNumberFormatId = rXf.mnNumberFormatId;
if (nNumberFormatId >= maNumberFormats.size()) if (nNumberFormatId >= maNumberFormats.size())
{ {
SAL_WARN("sc.orcus.styles", "invalid number format id"); SAL_WARN("sc.orcus.style", "invalid number format id");
return; return;
} }
} }
...@@ -771,7 +784,7 @@ void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t /*di ...@@ -771,7 +784,7 @@ void ScOrcusStyles::set_border_color(orcus::spreadsheet::border_direction_t /*di
size_t ScOrcusStyles::commit_border() size_t ScOrcusStyles::commit_border()
{ {
SAL_INFO("sc.orcus.styles", "commit border"); SAL_INFO("sc.orcus.style", "commit border");
return 0; return 0;
} }
...@@ -788,7 +801,7 @@ void ScOrcusStyles::set_cell_locked(bool b) ...@@ -788,7 +801,7 @@ void ScOrcusStyles::set_cell_locked(bool b)
size_t ScOrcusStyles::commit_cell_protection() size_t ScOrcusStyles::commit_cell_protection()
{ {
SAL_INFO("sc.orcus.styles", "commit cell protection"); SAL_INFO("sc.orcus.style", "commit cell protection");
maProtections.push_back(maCurrentProtection); maProtections.push_back(maCurrentProtection);
return maProtections.size() - 1; return maProtections.size() - 1;
} }
...@@ -809,7 +822,7 @@ void ScOrcusStyles::set_number_format_code(const char* s, size_t n) ...@@ -809,7 +822,7 @@ void ScOrcusStyles::set_number_format_code(const char* s, size_t n)
size_t ScOrcusStyles::commit_number_format() size_t ScOrcusStyles::commit_number_format()
{ {
SAL_INFO("sc.orcus.styles", "commit number format"); SAL_INFO("sc.orcus.style", "commit number format");
maNumberFormats.push_back(maCurrentNumberFormat); maNumberFormats.push_back(maCurrentNumberFormat);
return maNumberFormats.size() - 1; return maNumberFormats.size() - 1;
} }
...@@ -823,7 +836,7 @@ void ScOrcusStyles::set_cell_style_xf_count(size_t /*n*/) ...@@ -823,7 +836,7 @@ void ScOrcusStyles::set_cell_style_xf_count(size_t /*n*/)
size_t ScOrcusStyles::commit_cell_style_xf() size_t ScOrcusStyles::commit_cell_style_xf()
{ {
SAL_INFO("sc.orcus.styles", "commit cell style xf"); SAL_INFO("sc.orcus.style", "commit cell style xf");
maCellStyleXfs.push_back(maCurrentXF); maCellStyleXfs.push_back(maCurrentXF);
return maCellStyleXfs.size() - 1; return maCellStyleXfs.size() - 1;
} }
...@@ -837,7 +850,7 @@ void ScOrcusStyles::set_cell_xf_count(size_t /*n*/) ...@@ -837,7 +850,7 @@ void ScOrcusStyles::set_cell_xf_count(size_t /*n*/)
size_t ScOrcusStyles::commit_cell_xf() size_t ScOrcusStyles::commit_cell_xf()
{ {
SAL_INFO("sc.orcus.styles", "commit cell xf"); SAL_INFO("sc.orcus.style", "commit cell xf");
maCellXfs.push_back(maCurrentXF); maCellXfs.push_back(maCurrentXF);
return maCellXfs.size() - 1; return maCellXfs.size() - 1;
} }
...@@ -924,10 +937,10 @@ void ScOrcusStyles::set_cell_style_builtin(size_t index) ...@@ -924,10 +937,10 @@ void ScOrcusStyles::set_cell_style_builtin(size_t index)
size_t ScOrcusStyles::commit_cell_style() size_t ScOrcusStyles::commit_cell_style()
{ {
SAL_INFO("sc.orcus.styles", "commit cell styles"); SAL_INFO("sc.orcus.style", "commit cell style: " << maCurrentCellStyle.maName);
if (maCurrentCellStyle.mnXFId >= maCellStyleXfs.size()) if (maCurrentCellStyle.mnXFId >= maCellStyleXfs.size())
{ {
SAL_WARN("sc.orcus.styles", "invalid xf id for commit cell style"); SAL_WARN("sc.orcus.style", "invalid xf id for commit cell style");
return 0; return 0;
} }
......
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