pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/bug76636' (#592) from fix/bug76636 into release/v9.3.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/592
This commit is contained in:
Elena Subbotina
2025-12-29 18:45:28 +00:00
parent 33fa3fa38b bc076fb5b6
commit 7eabfd0838
4 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OdfFile/Reader/Converter/oox_chart_series.cpp
View File

@ -347,9 +347,9 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
double val = 0;
if (oox::IsNumber(v))
{
{
try { val = boost::lexical_cast<double>(v);}
catch(...){}
catch(...){}
}
CP_XML_NODE(L"c:v")
{

14
OdfFile/Reader/Converter/oox_data_labels.cpp
View File

@ -56,6 +56,16 @@ void oox_data_labels::set_common_dLbl ( odf_reader::text_format_properties_ptr t
textPr_ = text_properties;
}
void oox_data_labels::set_general_dLbls_status( bool flag )
{
set_genereal_dLbls = flag;
}
bool oox_data_labels::get_general_dLbls_status() const
{
return set_genereal_dLbls;
}
void oox_data_labels::add_dLbl(int ind, odf_reader::text_format_properties_ptr text_properties)
{
dLbls_.insert(std::make_pair(ind, text_properties));
@ -67,6 +77,10 @@ void oox_data_labels::oox_serialize(std::wostream & _Wostream)
{
CP_XML_NODE(L"c:dLbls")
{
if( set_genereal_dLbls == false )
{
set_genereal_dLbls = true;
}
if (position_ >= 0 && position_ < 13)
{
CP_XML_NODE(L"c:dLblPos")

7
OdfFile/Reader/Converter/oox_data_labels.h
View File

@ -76,6 +76,11 @@ public:
void add_dLbl (int ind, odf_reader::text_format_properties_ptr text_properties);
void set_common_dLbl ( odf_reader::text_format_properties_ptr text_properties);
void set_general_dLbls_status( bool flag );
bool get_general_dLbls_status() const;
private:
@ -89,6 +94,8 @@ private:
bool showSerName_; // (Show Series Name) §21.2.2.188
bool showVal_; // (Show Value) §21.2.2.189
bool set_genereal_dLbls = false;
int position_;
odf_reader::text_format_properties_ptr textPr_;

5
OdfFile/Reader/Converter/oox_types_chart.cpp
View File

@ -129,7 +129,10 @@ void oox_chart::oox_serialize_common(std::wostream & _Wostream)
CP_XML_ATTR(L"val", axisId_[i]);
}
}
data_labels_.oox_serialize(_Wostream);
if( false == data_labels_.get_general_dLbls_status() )
{
data_labels_.oox_serialize(_Wostream);
}
}
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////