From bb37a6dffa4e7c1634a282e6a52b7b1eb5e91480 Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Thu, 3 Jul 2014 08:32:24 +0000 Subject: [PATCH] =?UTF-8?q?(1.0.1.200):=20ASCOfficeOdfFile=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D0=B2=D0=B5=D1=80=D1=82=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B4?= =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=20=D1=81=20=D0=BF?= =?UTF-8?q?=D1=83=D1=81=D1=82=D1=8B=D0=BC=D0=B8=20=D1=81=D0=B5=D1=80=D0=B8?= =?UTF-8?q?=D1=8F=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57127 954022d7-b5bf-4e40-9824-e11837661b57 --- ASCOfficeOdfFile/ASCOfficeOdfFile/version.h | 6 +++--- ASCOfficeOdfFile/src/odf/chart_build_oox.cpp | 5 +++++ ASCOfficeOdfFile/src/odf/datatypes/borderstyle.cpp | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ASCOfficeOdfFile/ASCOfficeOdfFile/version.h b/ASCOfficeOdfFile/ASCOfficeOdfFile/version.h index 0464ca4602..6d730ddb41 100644 --- a/ASCOfficeOdfFile/ASCOfficeOdfFile/version.h +++ b/ASCOfficeOdfFile/ASCOfficeOdfFile/version.h @@ -2,6 +2,6 @@ //1 //0 //1 -//199 -#define INTVER 1,0,1,199 -#define STRVER "1,0,1,199\0" +//200 +#define INTVER 1,0,1,200 +#define STRVER "1,0,1,200\0" diff --git a/ASCOfficeOdfFile/src/odf/chart_build_oox.cpp b/ASCOfficeOdfFile/src/odf/chart_build_oox.cpp index 8c57fb07b4..b077cdfcef 100644 --- a/ASCOfficeOdfFile/src/odf/chart_build_oox.cpp +++ b/ASCOfficeOdfFile/src/odf/chart_build_oox.cpp @@ -194,6 +194,11 @@ void chart_build::oox_convert(oox::oox_chart_context & chart) int series_id =0; + if (series_.empty()) + { + chart.add_chart(class_); + } + BOOST_FOREACH(series & s, series_) { if (s.class_!=last_set_type) diff --git a/ASCOfficeOdfFile/src/odf/datatypes/borderstyle.cpp b/ASCOfficeOdfFile/src/odf/datatypes/borderstyle.cpp index fcd0986086..20c72a4b28 100644 --- a/ASCOfficeOdfFile/src/odf/datatypes/borderstyle.cpp +++ b/ASCOfficeOdfFile/src/odf/datatypes/borderstyle.cpp @@ -9,7 +9,7 @@ border_style::border_style(const std::wstring & Value) : initialized_(false), no std::wstring tmp = boost::algorithm::trim_copy(Value); boost::algorithm::to_lower(tmp); - if (L"none" == tmp) + if (L"none" == tmp || tmp.length() < 1) { none_ = true; }