mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-04-07 13:55:33 +08:00
Compare commits
13 Commits
core-windo
...
core/devel
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b7ad03465 | |||
| 3162bb0bfe | |||
| ec95648c43 | |||
| 72ac11ac07 | |||
| f70ea2b74f | |||
| db834666ba | |||
| 6ed0e13178 | |||
| 446e519110 | |||
| fb1fc01963 | |||
| 4651ae1bbb | |||
| 18606e23c6 | |||
| ed6d070d1f | |||
| f00cecbcaf |
@ -7196,6 +7196,8 @@ namespace BinDocxRW
|
||||
}
|
||||
void WriteColorSchemeMapping(const PPTX::Logic::ClrMap& oColorSchemeMapping)
|
||||
{
|
||||
int re_index[] = {0, 1, 2, 3, 4, 5, 10, 11, 6, 7, 8, 9, 10, 6, 7};
|
||||
|
||||
int nCurPos = 0;
|
||||
std::map<std::wstring, PPTX::Limit::ColorSchemeIndex>::const_iterator pFind;
|
||||
|
||||
@ -7204,84 +7206,84 @@ namespace BinDocxRW
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Accent1);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"accent2");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Accent2);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"accent3");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Accent3);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"accent4");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Accent4);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"accent5");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Accent5);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"accent6");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Accent6);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"bg1");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Bg1);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"bg2");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Bg2);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"folHlink");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::FollowedHyperlink);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"hlink");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::Hyperlink);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"tx1");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::T1);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
pFind = oColorSchemeMapping.ColorMap.find(L"tx2");
|
||||
if(pFind != oColorSchemeMapping.ColorMap.end())
|
||||
{
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSer_ClrSchemeMappingType::T2);
|
||||
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
|
||||
m_oBcw.m_oStream.WriteBYTE(pFind->second.GetBYTECode());
|
||||
m_oBcw.m_oStream.WriteBYTE(re_index[pFind->second.GetBYTECode()]);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@ -128,7 +128,7 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
|
||||
_CP_OPT(std::wstring) strStrokeColor;
|
||||
_CP_OPT(int) iStroke;
|
||||
_CP_OPT(double) dStrokeWidth;
|
||||
_CP_OPT(double) dStrokeOpacity;
|
||||
_CP_OPT(double) dStrokeOpacity;
|
||||
_CP_OPT(bool) bWordArt;
|
||||
|
||||
odf_reader::GetProperty(prop, L"wordArt", bWordArt);
|
||||
@ -167,15 +167,23 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
|
||||
{
|
||||
if (fill != L"a:noFill")
|
||||
{
|
||||
if (color.length() < 1 && always_draw) color = L"000000";
|
||||
else if (color.length() <1 ) color = L"ffffff";
|
||||
if ( color.empty() )
|
||||
{
|
||||
if (always_draw) color = L"000000";
|
||||
else color = L"ffffff";
|
||||
}
|
||||
|
||||
CP_XML_NODE(L"a:srgbClr")
|
||||
{
|
||||
CP_XML_ATTR(L"val",color);
|
||||
|
||||
if (dStrokeOpacity) CP_XML_NODE(L"a:alpha"){CP_XML_ATTR(L"val", *dStrokeOpacity);}
|
||||
|
||||
if (dStrokeOpacity)
|
||||
{
|
||||
CP_XML_NODE(L"a:alpha")
|
||||
{
|
||||
CP_XML_ATTR(L"val", (int)(*dStrokeOpacity * 1000));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -203,69 +211,33 @@ void oox_serialize_ln(std::wostream & strm, const std::vector<odf_reader::_prope
|
||||
}
|
||||
void oox_serialize_aLst(std::wostream & strm, const std::vector<odf_reader::_property> & prop)
|
||||
{
|
||||
_CP_OPT(int) iShapeIndex;
|
||||
_CP_OPT(bool) bWordArt;
|
||||
|
||||
odf_reader::GetProperty(prop, L"wordArt" , bWordArt);
|
||||
odf_reader::GetProperty(prop, L"odf-custom-draw-index" , iShapeIndex);
|
||||
|
||||
int count_values = 0, min_value = 0, max_value = 0;
|
||||
|
||||
if (!bWordArt && iShapeIndex)
|
||||
{
|
||||
count_values = _OO_OOX_custom_shapes[*iShapeIndex].count_values;
|
||||
min_value = _OO_OOX_custom_shapes[*iShapeIndex].min;
|
||||
max_value = _OO_OOX_custom_shapes[*iShapeIndex].max;
|
||||
}
|
||||
else if (iShapeIndex)
|
||||
{
|
||||
count_values = _OO_OOX_wordart[*iShapeIndex].count_values;
|
||||
min_value = _OO_OOX_wordart[*iShapeIndex].min;
|
||||
max_value = _OO_OOX_wordart[*iShapeIndex].max;
|
||||
}
|
||||
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(L"a:avLst")
|
||||
{
|
||||
_CP_OPT(std::wstring) strVal;
|
||||
if (odf_reader::GetProperty(prop,L"draw-modifiers",strVal) && iShapeIndex)
|
||||
_CP_OPT(bool) bModifiers;
|
||||
_CP_OPT(std::wstring) strModifiers;
|
||||
odf_reader::GetProperty(prop, L"bModifiers", bModifiers);
|
||||
odf_reader::GetProperty(prop, L"oox-draw-modifiers", strModifiers);
|
||||
if (strModifiers)
|
||||
{
|
||||
std::vector< std::wstring > values;
|
||||
boost::algorithm::split(values, strVal.get(), boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
|
||||
boost::algorithm::split(values, strModifiers.get(), boost::algorithm::is_any_of(L" "), boost::algorithm::token_compress_on);
|
||||
|
||||
if( count_values >0 && values.size()>0 && count_values < 3)//временное ограниечение .. хз как там свойства путаются
|
||||
{//если не заданы доп свойства - нефиг мучится
|
||||
int i=1;
|
||||
if (!values.empty() && values.back().empty()) values.pop_back();
|
||||
|
||||
_CP_OPT(int) iMax,iMin;
|
||||
odf_reader::GetProperty(prop,L"draw-modifiers-min",iMin);
|
||||
odf_reader::GetProperty(prop,L"draw-modifiers-max",iMax);
|
||||
values.resize(count_values);
|
||||
|
||||
BOOST_FOREACH(std::wstring & v, values)
|
||||
for (size_t i = 0; i < values.size(); i++)
|
||||
{
|
||||
if (values[i].empty()) continue;
|
||||
CP_XML_NODE(L"a:gd")
|
||||
{
|
||||
CP_XML_NODE(L"a:gd")
|
||||
{
|
||||
if (values.size() >1)
|
||||
CP_XML_ATTR(L"name",(L"adj" + boost::lexical_cast<std::wstring>(i++)));
|
||||
else
|
||||
CP_XML_ATTR(L"name",L"adj");
|
||||
double val=0;
|
||||
if (v.length()>0)val= boost::lexical_cast<double>(v);
|
||||
|
||||
if (iMin && iMax && iShapeIndex)
|
||||
{
|
||||
if (min_value < max_value)
|
||||
{
|
||||
double W = *iMax - *iMin;
|
||||
val = (val- (*iMin))/W * (max_value - min_value) + min_value;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
CP_XML_ATTR(L"fmla",L"val " + boost::lexical_cast<std::wstring>(static_cast<int>(val)));
|
||||
}
|
||||
if (values.size() > 1 || bModifiers)
|
||||
//весьма странное .. для некоторых модификаторов (напр math...) нужно указывать множественность их
|
||||
CP_XML_ATTR(L"name", L"adj" + std::to_wstring(i+1));
|
||||
else
|
||||
CP_XML_ATTR(L"name", L"adj");
|
||||
|
||||
CP_XML_ATTR(L"fmla", L"val " + values[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -358,34 +330,34 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
|
||||
|
||||
void _oox_drawing::serialize_shape(std::wostream & strm)
|
||||
{
|
||||
_CP_OPT(std::wstring) strVal, strPath;
|
||||
_CP_OPT(double) dVal;
|
||||
_CP_OPT(int) iOoxShapeIndex;
|
||||
_CP_OPT(bool) bWordArt, bOoxShape;
|
||||
_CP_OPT(std::wstring) sCustomPath;
|
||||
|
||||
odf_reader::GetProperty(additional, L"wordArt", bWordArt);
|
||||
odf_reader::GetProperty(additional, L"oox-geom-index", iOoxShapeIndex);
|
||||
odf_reader::GetProperty(additional, L"oox-geom", bOoxShape);
|
||||
|
||||
std::wstring shapeType;
|
||||
_CP_OPT(bool) bWordArt;
|
||||
|
||||
odf_reader::GetProperty(additional,L"wordArt", bWordArt);
|
||||
odf_reader::GetProperty(additional, L"custom_path", strPath);
|
||||
odf_reader::GetProperty(additional, L"custom_path", sCustomPath);
|
||||
|
||||
std::wstring shapeGeomPreset;
|
||||
|
||||
if (sub_type == 7)//custom
|
||||
{
|
||||
_CP_OPT(int) iVal;
|
||||
odf_reader::GetProperty(additional, L"odf-custom-draw-index",iVal);
|
||||
|
||||
if (iVal)
|
||||
shapeType = _OO_OOX_custom_shapes[*iVal].oox;
|
||||
else
|
||||
if (iOoxShapeIndex)
|
||||
shapeGeomPreset = _OO_OOX_custom_shapes[*iOoxShapeIndex].oox;
|
||||
else if (sCustomPath)
|
||||
sub_type = 6; //path
|
||||
|
||||
if (shapeType == L"textBox")
|
||||
if (shapeGeomPreset == L"textBox")
|
||||
{
|
||||
sub_type = 1;
|
||||
shapeType = L"rect";
|
||||
shapeGeomPreset = L"rect";
|
||||
}
|
||||
}
|
||||
else if (sub_type < 9 && sub_type >= 0)
|
||||
{
|
||||
shapeType = _ooxShapeType[sub_type];
|
||||
shapeGeomPreset = _ooxShapeType[sub_type]; //odf -> oox
|
||||
}
|
||||
|
||||
if (bWordArt) sub_type = 1;
|
||||
@ -393,7 +365,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
|
||||
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
if ((sub_type == 6 || sub_type == 8) && strPath && !strPath->empty())
|
||||
if (sub_type == 6 || sub_type == 8)
|
||||
{
|
||||
CP_XML_NODE(L"a:custGeom")
|
||||
{
|
||||
@ -420,22 +392,29 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
|
||||
CP_XML_ATTR(L"w", w ? *w : cx);
|
||||
CP_XML_ATTR(L"h", h ? *h : cy);
|
||||
|
||||
CP_XML_STREAM() << *strPath;
|
||||
CP_XML_STREAM() << *sCustomPath;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (shapeType.empty())
|
||||
if (shapeGeomPreset.empty())
|
||||
{
|
||||
shapeType = L"rect";
|
||||
shapeGeomPreset = L"rect";
|
||||
sub_type = 2;
|
||||
}
|
||||
CP_XML_NODE(L"a:prstGeom")//автофигура
|
||||
{
|
||||
CP_XML_ATTR(L"prst", shapeType);
|
||||
if (!bWordArt) oox_serialize_aLst(CP_XML_STREAM(), additional);
|
||||
CP_XML_ATTR(L"prst", shapeGeomPreset);
|
||||
if (!bWordArt)
|
||||
{
|
||||
if (std::wstring::npos != shapeGeomPreset.find(L"mathPlus"))
|
||||
{
|
||||
additional.push_back(odf_reader::_property(L"bModifiers", true));
|
||||
}
|
||||
oox_serialize_aLst(CP_XML_STREAM(), additional);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (bWordArt)
|
||||
|
||||
@ -421,8 +421,8 @@ void xlsx_table_state::serialize_table_format (std::wostream & strm)
|
||||
int col = -1, row = -1;
|
||||
try
|
||||
{
|
||||
col = boost::lexical_cast<int>(s_col);
|
||||
row = boost::lexical_cast<int>(s_row);
|
||||
if (!s_col.empty()) col = boost::lexical_cast<int>(s_col);
|
||||
if (!s_row.empty()) row = boost::lexical_cast<int>(s_row);
|
||||
}
|
||||
catch(...){}
|
||||
|
||||
|
||||
@ -251,7 +251,11 @@ static const _shape_converter _OO_OOX_custom_shapes[]=
|
||||
{L"" ,L"accentBorderCallout3",0 ,0 ,0 },
|
||||
{L"" ,L"accentBorderCallout2",0 ,0 ,0 },
|
||||
{L"" ,L"accentBorderCallout1",0 ,0 ,0 },
|
||||
{L"" ,L"halfFrame" ,0 ,0 ,0 }
|
||||
{L"" ,L"halfFrame" ,0 ,0 ,0 },
|
||||
{L"" ,L"leftCircularArrow",0 ,0 ,0 },
|
||||
{L"" ,L"leftRightRibbon",0 ,0 ,0 },
|
||||
{L"" ,L"pieWedge",0 ,0 ,0 },
|
||||
{L"" ,L"swooshArrow",0 ,0 ,0 }
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -163,10 +163,10 @@ void draw_line::add_attributes( const xml::attributes_wc_ptr & Attributes )
|
||||
}
|
||||
void draw_line::reset_svg_attributes()
|
||||
{
|
||||
double x1=draw_line_attlist_.svg_x1_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
double y1=draw_line_attlist_.svg_y1_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
double x2=draw_line_attlist_.svg_x2_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
double y2=draw_line_attlist_.svg_y2_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
double x1 = draw_line_attlist_.svg_x1_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
double y1 = draw_line_attlist_.svg_y1_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
double x2 = draw_line_attlist_.svg_x2_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
double y2 = draw_line_attlist_.svg_y2_.get_value_or(length(0)).get_value_unit(length::pt);
|
||||
|
||||
if (x1 > x2)
|
||||
{
|
||||
@ -431,8 +431,8 @@ void draw_equation::add_attributes( const xml::attributes_wc_ptr & Attributes )
|
||||
}
|
||||
int draw_enhanced_geometry::parsing(_CP_OPT(std::wstring) val)
|
||||
{
|
||||
int pos=0, res=-1;
|
||||
if (!val)return res;
|
||||
int pos = 0, res = -1;
|
||||
if (!val) return res;
|
||||
|
||||
BOOST_FOREACH(wchar_t c, val.get())
|
||||
{
|
||||
@ -533,12 +533,12 @@ void draw_enhanced_geometry::find_draw_type_oox()
|
||||
}
|
||||
else
|
||||
{
|
||||
bOoxType_ = true;
|
||||
std::wstring oox_type = odf_type.substr(pos + 6);
|
||||
for (long i = 0; i< count; i++)
|
||||
{
|
||||
if (_OO_OOX_custom_shapes[i].oox == oox_type)
|
||||
{
|
||||
bOoxType_ = true;
|
||||
draw_type_oox_index_ = i;
|
||||
break;
|
||||
}
|
||||
@ -550,38 +550,36 @@ void draw_enhanced_geometry::find_draw_type_oox()
|
||||
}
|
||||
}
|
||||
}
|
||||
std::wstringstream str;
|
||||
// for (size_t i = 0; i < draw_handle_.size(); i++)
|
||||
// {
|
||||
//draw_handle * handle = dynamic_cast<draw_handle *>(draw_handle_[i].get());
|
||||
//if (!handle) continue;
|
||||
|
||||
for (size_t i = 0; i < draw_handle_.size(); i++)
|
||||
{
|
||||
draw_handle * handle = dynamic_cast<draw_handle *>(draw_handle_[i].get());
|
||||
if (!handle) continue;
|
||||
//int min = -1, max = -1;
|
||||
//
|
||||
//try
|
||||
//{
|
||||
// min = parsing(handle->draw_handle_attlist_.draw_handle_range_y_minimum_);//пока статик .. и выдается только цыфровое значение
|
||||
// if (min < 0) min = parsing(handle->draw_handle_attlist_.draw_handle_range_x_minimum_);
|
||||
// if (min < 0) min = parsing(handle->draw_handle_attlist_.draw_handle_radius_range_minimum_);
|
||||
//}
|
||||
//catch(...)
|
||||
//{
|
||||
//}
|
||||
//if (min < 0 ) min=0;
|
||||
|
||||
int min = -1, max = -1;
|
||||
|
||||
try
|
||||
{
|
||||
min = parsing(handle->draw_handle_attlist_.draw_handle_range_y_minimum_);//пока статик .. и выдается только цыфровое значение
|
||||
if (min < 0) min = parsing(handle->draw_handle_attlist_.draw_handle_range_x_minimum_);
|
||||
if (min < 0) min = parsing(handle->draw_handle_attlist_.draw_handle_radius_range_minimum_);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
}
|
||||
if (min < 0 ) min=0;
|
||||
|
||||
try
|
||||
{
|
||||
max = parsing(handle->draw_handle_attlist_.draw_handle_range_y_maximum_);
|
||||
if (max < 0) max = parsing(handle->draw_handle_attlist_.draw_handle_range_x_maximum_);
|
||||
if (max < 0) max = parsing(handle->draw_handle_attlist_.draw_handle_radius_range_maximum_);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
}
|
||||
draw_handle_geometry elm = {min, max};
|
||||
draw_handle_geometry_.push_back(elm);
|
||||
}
|
||||
//try
|
||||
//{
|
||||
// max = parsing(handle->draw_handle_attlist_.draw_handle_range_y_maximum_);
|
||||
// if (max < 0) max = parsing(handle->draw_handle_attlist_.draw_handle_range_x_maximum_);
|
||||
// if (max < 0) max = parsing(handle->draw_handle_attlist_.draw_handle_radius_range_maximum_);
|
||||
//}
|
||||
//catch(...)
|
||||
//{
|
||||
//}
|
||||
//draw_handle_geometry elm = {min, max};
|
||||
//draw_handle_geometry_.push_back(elm);
|
||||
// }
|
||||
}
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
/// draw-caption-attlist
|
||||
|
||||
@ -246,7 +246,8 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
|
||||
|
||||
if (draw_type_oox_index_)
|
||||
{
|
||||
shape->additional_.push_back(_property(L"odf-custom-draw-index", draw_type_oox_index_.get()));
|
||||
shape->additional_.push_back(_property(L"oox-geom-index", draw_type_oox_index_.get()));
|
||||
shape->additional_.push_back(_property(L"oox-geom", bOoxType_));
|
||||
|
||||
if (shape->word_art_ == true)
|
||||
shape->additional_.push_back(_property(L"wordArt", true));
|
||||
@ -317,14 +318,10 @@ void draw_enhanced_geometry::docx_convert(oox::docx_conversion_context & Context
|
||||
|
||||
if (draw_enhanced_geometry_attlist_.draw_modifiers_)
|
||||
{
|
||||
shape->additional_.push_back(_property(L"draw-modifiers",draw_enhanced_geometry_attlist_.draw_modifiers_.get()));
|
||||
if (draw_handle_geometry_.size()>0)
|
||||
if (bOoxType_)
|
||||
shape->additional_.push_back(_property(L"oox-draw-modifiers", draw_enhanced_geometry_attlist_.draw_modifiers_.get()));
|
||||
else
|
||||
{
|
||||
if (draw_handle_geometry_[0].min < draw_handle_geometry_[0].max)
|
||||
{
|
||||
shape->additional_.push_back(_property(L"draw-modifiers-min", draw_handle_geometry_[0].min));
|
||||
shape->additional_.push_back(_property(L"draw-modifiers-max", draw_handle_geometry_[0].max));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -312,8 +312,9 @@ void draw_enhanced_geometry::pptx_convert(oox::pptx_conversion_context & Context
|
||||
|
||||
if (draw_type_oox_index_)
|
||||
{
|
||||
Context.get_slide_context().set_property(_property(L"odf-custom-draw-index", draw_type_oox_index_.get()));
|
||||
|
||||
Context.get_slide_context().set_property(_property(L"oox-geom-index", draw_type_oox_index_.get()));
|
||||
Context.get_slide_context().set_property(_property(L"oox-geom", bOoxType_));
|
||||
|
||||
if (word_art_ == true)
|
||||
Context.get_slide_context().set_property(_property(L"wordArt", true));
|
||||
|
||||
@ -381,16 +382,20 @@ void draw_enhanced_geometry::pptx_convert(oox::pptx_conversion_context & Context
|
||||
}
|
||||
if (draw_enhanced_geometry_attlist_.draw_modifiers_)
|
||||
{
|
||||
Context.get_slide_context().set_property(_property(L"draw-modifiers",draw_enhanced_geometry_attlist_.draw_modifiers_.get()));
|
||||
|
||||
if (draw_handle_geometry_.size()>0)
|
||||
if (bOoxType_)
|
||||
Context.get_slide_context().set_property(_property(L"oox-draw-modifiers", draw_enhanced_geometry_attlist_.draw_modifiers_.get()));
|
||||
else
|
||||
{
|
||||
if (draw_handle_geometry_[0].min < draw_handle_geometry_[0].max)
|
||||
{
|
||||
Context.get_slide_context().set_property(_property(L"draw-modifiers-min",draw_handle_geometry_[0].min));
|
||||
Context.get_slide_context().set_property(_property(L"draw-modifiers-max",draw_handle_geometry_[0].max));
|
||||
}
|
||||
}
|
||||
|
||||
//if (draw_handle_geometry_.size()>0)
|
||||
//{
|
||||
// if (draw_handle_geometry_[0].min < draw_handle_geometry_[0].max)
|
||||
// {
|
||||
// Context.get_slide_context().set_property(_property(L"draw-modifiers-min",draw_handle_geometry_[0].min));
|
||||
// Context.get_slide_context().set_property(_property(L"draw-modifiers-max",draw_handle_geometry_[0].max));
|
||||
// }
|
||||
//}
|
||||
}
|
||||
if (!set_shape)
|
||||
{
|
||||
|
||||
@ -258,7 +258,8 @@ void draw_enhanced_geometry::xlsx_convert(oox::xlsx_conversion_context & Context
|
||||
|
||||
if (draw_type_oox_index_)
|
||||
{
|
||||
Context.get_drawing_context().set_property(_property(L"odf-custom-draw-index", draw_type_oox_index_.get()));
|
||||
Context.get_drawing_context().set_property(_property(L"oox-geom-index", draw_type_oox_index_.get()));
|
||||
Context.get_drawing_context().set_property(_property(L"oox-geom", bOoxType_));
|
||||
|
||||
if (word_art_ == true)
|
||||
Context.get_drawing_context().set_property(_property(L"wordArt", true));
|
||||
@ -327,15 +328,10 @@ void draw_enhanced_geometry::xlsx_convert(oox::xlsx_conversion_context & Context
|
||||
}
|
||||
if (draw_enhanced_geometry_attlist_.draw_modifiers_)
|
||||
{
|
||||
Context.get_drawing_context().set_property(_property(L"draw-modifiers",draw_enhanced_geometry_attlist_.draw_modifiers_.get()));
|
||||
|
||||
if (draw_handle_geometry_.size()>0)
|
||||
if (bOoxType_)
|
||||
Context.get_drawing_context().set_property(_property(L"oox-draw-modifiers", draw_enhanced_geometry_attlist_.draw_modifiers_.get()));
|
||||
else
|
||||
{
|
||||
if (draw_handle_geometry_[0].min < draw_handle_geometry_[0].max)
|
||||
{
|
||||
Context.get_drawing_context().set_property(_property(L"draw-modifiers-min",draw_handle_geometry_[0].min));
|
||||
Context.get_drawing_context().set_property(_property(L"draw-modifiers-max",draw_handle_geometry_[0].max));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -225,7 +225,7 @@ void paragraph_format_properties::xlsx_convert(std::wostream & strm, bool in_dra
|
||||
{
|
||||
CP_XML_NODE(L"a:spcBef")
|
||||
{
|
||||
if (fo_margin_bottom_->get_type() == length_or_percent::Length)
|
||||
if (fo_margin_top_->get_type() == length_or_percent::Length)
|
||||
{
|
||||
std::wstring w_before = pptx_process_margin(fo_margin_top_, length::pt, 100.0);
|
||||
CP_XML_NODE(L"a:spcPts")
|
||||
@ -235,11 +235,10 @@ void paragraph_format_properties::xlsx_convert(std::wostream & strm, bool in_dra
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstringstream s;
|
||||
s << fo_margin_top_;
|
||||
double pct = fo_margin_top_->get_percent().get_value();
|
||||
CP_XML_NODE(L"a:spcPct")
|
||||
{
|
||||
CP_XML_ATTR(L"val", s.str());
|
||||
CP_XML_ATTR(L"val", (int)(pct * 1000));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -258,11 +257,11 @@ void paragraph_format_properties::xlsx_convert(std::wostream & strm, bool in_dra
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstringstream s;
|
||||
s << fo_margin_bottom_;
|
||||
double pct = fo_margin_bottom_->get_percent().get_value();
|
||||
|
||||
CP_XML_NODE(L"a:spcPct")
|
||||
{
|
||||
CP_XML_ATTR(L"val", s.str());
|
||||
CP_XML_ATTR(L"val", (int)(pct * 1000));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -468,11 +467,11 @@ void paragraph_format_properties::pptx_convert(oox::pptx_conversion_context & Co
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstringstream s;
|
||||
s << fo_margin_top_;
|
||||
double pct = fo_margin_top_->get_percent().get_value();
|
||||
|
||||
CP_XML_NODE(L"a:spcPct")
|
||||
{
|
||||
CP_XML_ATTR(L"val", s.str());
|
||||
CP_XML_ATTR(L"val", (int)(pct * 1000));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -491,11 +490,11 @@ void paragraph_format_properties::pptx_convert(oox::pptx_conversion_context & Co
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstringstream s;
|
||||
s << fo_margin_bottom_;
|
||||
double pct = fo_margin_bottom_->get_percent().get_value();
|
||||
|
||||
CP_XML_NODE(L"a:spcPct")
|
||||
{
|
||||
CP_XML_ATTR(L"val", s.str());
|
||||
CP_XML_ATTR(L"val", (int)(pct * 1000));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -463,9 +463,13 @@ void text_format_properties_content::drawing_serialize(std::wostream & strm, std
|
||||
//nodes
|
||||
if (fo_color_)
|
||||
{
|
||||
CP_XML_NODE(L"a:solidFill")
|
||||
std::wstring strRGB = fo_color_->get_hex_value(); //auto ... не нужно
|
||||
if (!strRGB.empty())
|
||||
{
|
||||
CP_XML_NODE(L"a:srgbClr") {CP_XML_ATTR(L"val",fo_color_->get_hex_value());}
|
||||
CP_XML_NODE(L"a:solidFill")
|
||||
{
|
||||
CP_XML_NODE(L"a:srgbClr") {CP_XML_ATTR(L"val", strRGB);}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (style_font_name_ || style_font_name_asian_ || style_font_name_complex_ || fo_font_family_)
|
||||
|
||||
@ -57,13 +57,13 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"mso-spt200" , 7}, // shapetypeActionButtonMovie,
|
||||
{ L"mso-spt197" , 7}, // shapetypeActionButtonReturn,
|
||||
{ L"mso-spt199" , 7}, // shapetypeActionButtonSound,
|
||||
{ L"ooxml-arc" , 7}, // shapetypeArc,
|
||||
{ L"" , 7}, // shapetypeArc,
|
||||
{ L"mso-spt91" , 7}, // shapetypeBentArrow,
|
||||
{ L"mso-spt33" , 7}, // shapetypeBentConnector2,
|
||||
{ L"mso-spt34" , 7}, // shapetypeBentConnector3,
|
||||
{ L"mso-spt35" , 7}, // shapetypeBentConnector4,
|
||||
{ L"mso-spt36" , 7}, // shapetypeBentConnector5,
|
||||
{ L"mso-spt90" , 7}, // shapetypeBentUpArrow,
|
||||
{ L"" , 7}, // shapetypeBentUpArrow,
|
||||
{ L"quad-bevel" , 7}, // shapetypeBevel,
|
||||
{ L"" , 7}, // shapetypeBlockArc,
|
||||
{ L"mso-spt49" , 7}, // shapetypeBorderCallout1,
|
||||
@ -78,7 +78,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"" , 7}, // shapetypeChartPlus,
|
||||
{ L"" , 7}, // shapetypeChartStar,
|
||||
{ L"" , 7}, // shapetypeChartX,
|
||||
{ L"chevron" , 7}, // shapetypeChevron,
|
||||
{ L"" , 7}, // shapetypeChevron,
|
||||
{ L"" , 7}, // shapetypeChord,
|
||||
{ L"" , 7}, // shapetypeCircularArrow,
|
||||
{ L"cloud" , 7}, // shapetypeCloud,
|
||||
@ -92,16 +92,16 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"mso-spt40" , 7}, // shapetypeCurvedConnector5,
|
||||
{ L"" , 7}, // shapetypeCurvedDownArrow,
|
||||
{ L"" , 7}, // shapetypeCurvedLeftArrow,
|
||||
{ L"mso-spt102" , 7}, // shapetypeCurvedRightArrow,
|
||||
{ L"" , 7}, // shapetypeCurvedRightArrow,
|
||||
{ L"mso-spt104" , 7}, // shapetypeCurvedUpArrow,
|
||||
{ L"" , 7}, // shapetypeDecagon,
|
||||
{ L"" , 7}, // shapetypeDiagStripe,
|
||||
{ L"diamond" , 7}, // shapetypeDiamond,
|
||||
{ L"" , 7}, // shapetypeDiamond,
|
||||
{ L"" , 7}, // shapetypeDodecagon,
|
||||
{ L"" , 7}, // shapetypeDonut,
|
||||
{ L"" , 7}, // shapetypeDoubleWave,
|
||||
{ L"down-arrow" , 7}, // shapetypeDownArrow,
|
||||
{ L"down-arrow-callout" , 7}, // shapetypeDownArrowCallout,
|
||||
{ L"" , 7}, // shapetypeDownArrow,
|
||||
{ L"" , 7}, // shapetypeDownArrowCallout,
|
||||
{ L"ellipse" , 3}, // shapetypeEllipse,
|
||||
{ L"mso-spt107" , 7}, // shapetypeEllipseRibbon,
|
||||
{ L"mso-spt108" , 7}, // shapetypeEllipseRibbon2,
|
||||
@ -112,7 +112,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"flowchart-delay" , 7}, // shapetypeFlowChartDelay,
|
||||
{ L"flowchart-display" , 7}, // shapetypeFlowChartDisplay,
|
||||
{ L"flowchart-document" , 7}, // shapetypeFlowChartDocument,
|
||||
{ L"flowchart-extract" , 7}, // shapetypeFlowChartExtract,
|
||||
{ L"" , 7}, // shapetypeFlowChartExtract,
|
||||
{ L"flowchart-data" , 7}, // shapetypeFlowChartInputOutput,
|
||||
{ L"flowchart-internal-storage" , 7}, // shapetypeFlowChartInternalStorage,
|
||||
{ L"flowchart-magnetic-disk" , 7}, // shapetypeFlowChartMagneticDisk,
|
||||
@ -135,7 +135,7 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"flowchart-summing-junction" , 7}, // shapetypeFlowChartSummingJunction,
|
||||
{ L"flowchart-terminator" , 7}, // shapetypeFlowChartTerminator,
|
||||
{ L"paper" , 7}, // shapetypeFoldedCorner,
|
||||
{ L"frame" , 7}, // shapetypeFrame,
|
||||
{ L"" , 7}, // shapetypeFrame,
|
||||
{ L"" , 7}, // shapetypeFunnel,
|
||||
{ L"" , 7}, // shapetypeGear6,
|
||||
{ L"" , 7}, // shapetypeGear9,
|
||||
@ -143,21 +143,21 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"heart" , 7}, // shapetypeHeart,
|
||||
{ L"" , 7}, // shapetypeHeptagon,
|
||||
{ L"hexagon" , 7}, // shapetypeHexagon,
|
||||
{ L"pentagon-right" , 7}, // shapetypeHomePlate,
|
||||
{ L"" , 7}, // shapetypeHomePlate,
|
||||
{ L"horizontal-scroll" , 7}, // shapetypeHorizontalScroll,
|
||||
{ L"" , 7}, // shapetypeIrregularSeal1,
|
||||
{ L"" , 7}, // shapetypeIrregularSeal2,
|
||||
{ L"left-arrow" , 7}, // shapetypeLeftArrow,
|
||||
{ L"left-arrow-callout" , 7}, // shapetypeLeftArrowCallout,
|
||||
{ L"" , 7}, // shapetypeLeftArrow,
|
||||
{ L"" , 7}, // shapetypeLeftArrowCallout,
|
||||
{ L"left-brace" , 7}, // shapetypeLeftBrace,
|
||||
{ L"left-bracket" , 7}, // shapetypeLeftBracket,
|
||||
{ L"" , 7}, // shapetypeLeftCircularArrow,
|
||||
{ L"left-right-arrow" , 7}, // shapetypeLeftRightArrow,
|
||||
{ L"" , 7}, // shapetypeLeftRightArrow,
|
||||
{ L"left-right-arrow-callout" , 7}, // shapetypeLeftRightArrowCallout,
|
||||
{ L"" , 7}, // shapetypeLeftRightCircularArrow,
|
||||
{ L"" , 7}, // shapetypeLeftRightRibbon,
|
||||
{ L"mso-spt182" , 7}, // shapetypeLeftRightUpArrow,
|
||||
{ L"mso-spt89" , 7}, // shapetypeLeftUpArrow,
|
||||
{ L"" , 7}, // shapetypeLeftUpArrow,
|
||||
{ L"lightning" , 7}, // shapetypeLightningBolt,
|
||||
{ L"" , 5}, // shapetypeLine,
|
||||
{ L"" , 7}, // shapetypeLineInv,
|
||||
@ -166,33 +166,33 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"" , 7}, // shapetypeMathMinus,
|
||||
{ L"" , 7}, // shapetypeMathMultiply,
|
||||
{ L"" , 7}, // shapetypeMathNotEqual,
|
||||
{ L"cross" , 7}, // shapetypeMathPlus,
|
||||
{ L"" , 7}, // shapetypeMathPlus,
|
||||
{ L"moon" , 7}, // shapetypeMoon,
|
||||
{ L"" , 7}, // shapetypeNonIsoscelesTrapezoid,
|
||||
{ L"forbidden" , 7}, // shapetypeNoSmoking,
|
||||
{ L"notched-right-arrow" , 7}, // shapetypeNotchedRightArrow,
|
||||
{ L"" , 7}, // shapetypeNotchedRightArrow,
|
||||
{ L"octagon" , 7}, // shapetypeOctagon,
|
||||
{ L"parallelogram" , 7}, // shapetypeParallelogram,
|
||||
{ L"" , 7}, // shapetypeParallelogram,
|
||||
{ L"pentagon" , 7}, // shapetypePentagon,
|
||||
{ L"" , 7}, // shapetypePie,
|
||||
{ L"" , 7}, // shapetypePieWedge,
|
||||
{ L"" , 7}, // shapetypePlaque,
|
||||
{ L"" , 7}, // shapetypePlaqueTabs,
|
||||
{ L"cross" , 7}, // shapetypePlus,
|
||||
{ L"" , 7}, // shapetypePlus,
|
||||
{ L"quad-arrow" , 7}, // shapetypeQuadArrow,
|
||||
{ L"quad-arrow-callout" , 7}, // shapetypeQuadArrowCallout,
|
||||
{ L"rectangle" , 2}, // shapetypeRect,
|
||||
{ L"mso-spt53" , 7}, // shapetypeRibbon,
|
||||
{ L"mso-spt54" , 7}, // shapetypeRibbon2,
|
||||
{ L"right-arrow" , 7}, // shapetypeRightArrow,
|
||||
{ L"right-arrow-callout" , 7}, // shapetypeRightArrowCallout,
|
||||
{ L"" , 7}, // shapetypeRightArrow,
|
||||
{ L"" , 7}, // shapetypeRightArrowCallout,
|
||||
{ L"right-brace" , 7}, // shapetypeRightBrace,
|
||||
{ L"right-bracket" , 7}, // shapetypeRightBracket,
|
||||
{ L"" , 7}, // shapetypeRound1Rect,
|
||||
{ L"" , 7}, // shapetypeRound2DiagRect,
|
||||
{ L"" , 7}, // shapetypeRound2SameRect,
|
||||
{ L"round-rectangle" , 7}, // shapetypeRoundRect,
|
||||
{ L"right-triangle" , 7}, // shapetypeRtTriangle,
|
||||
{ L"" , 7}, // shapetypeRoundRect,
|
||||
{ L"" , 7}, // shapetypeRtTriangle,
|
||||
{ L"smiley" , 7}, // shapetypeSmileyFace,
|
||||
{ L"" , 7}, // shapetypeSnip1Rect,
|
||||
{ L"" , 7}, // shapetypeSnip2DiagRect,
|
||||
@ -214,11 +214,11 @@ static const _sh_typ Shape_Types_Mapping[] = // index === OOX::Drawing::EShapeTy
|
||||
{ L"" , 7}, // shapetypeSun,
|
||||
{ L"" , 7}, // shapetypeSwooshArrow,
|
||||
{ L"" , 7}, // shapetypeTeardrop,
|
||||
{ L"trapezoid" , 7}, // shapetypeTrapezoid,
|
||||
{ L"isosceles-triangle" , 7}, // shapetypeTriangle,
|
||||
{ L"up-arrow" , 7}, // shapetypeUpArrow,
|
||||
{ L"up-arrow-callout" , 7}, // shapetypeUpArrowCallout,
|
||||
{ L"up-down-arrow" , 7}, // shapetypeUpDownArrow,
|
||||
{ L"" , 7}, // shapetypeTrapezoid,
|
||||
{ L"" , 7}, // shapetypeTriangle,
|
||||
{ L"" , 7}, // shapetypeUpArrow,
|
||||
{ L"" , 7}, // shapetypeUpArrowCallout,
|
||||
{ L"" , 7}, // shapetypeUpDownArrow,
|
||||
{ L"up-down-arrow-callout" , 7}, // shapetypeUpDownArrowCallout,
|
||||
{ L"mso-spt101" , 7}, // shapetypeUturnArrow,
|
||||
{ L"vertical-scroll" , 7}, // shapetypeVerticalScroll,
|
||||
|
||||
@ -30,6 +30,12 @@
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
|
||||
// shapetypeAccentBorderCallout1,
|
||||
// shapetypeAccentBorderCallout2,
|
||||
// shapetypeAccentBorderCallout3,
|
||||
|
||||
namespace cpdoccore
|
||||
{
|
||||
|
||||
}
|
||||
@ -29,3 +29,9 @@
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
|
||||
namespace cpdoccore
|
||||
{
|
||||
|
||||
}
|
||||
@ -30,12 +30,331 @@
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
// +shapetypeLeftCircularArrow,
|
||||
// shapetypeLeftRightCircularArrow,
|
||||
// +shapetypeSwooshArrow,
|
||||
// +shapetypeCircularArrow
|
||||
|
||||
//+ shapetypeLeftArrow,
|
||||
//+ shapetypeRightArrow,
|
||||
//+ shapetypeDownArrow,
|
||||
//+ shapetypeUpArrow,
|
||||
//+ shapetypeLeftRightArrow
|
||||
//+ shapetypeUpDownArrow
|
||||
//+ shapetypeLeftCircularArrow,
|
||||
// shapetypeLeftRightCircularArrow,
|
||||
//+ shapetypeSwooshArrow,
|
||||
//+ shapetypeCircularArrow
|
||||
//+ shapetypeNotchedRightArrow
|
||||
|
||||
//...
|
||||
namespace cpdoccore
|
||||
{
|
||||
class oox_shape_LeftArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_LeftArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-leftArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f7 L ?f5 0 ?f5 ?f8 ?f13 ?f8 ?f13 ?f9 ?f5 ?f9 ?f5 ?f14 Z N";
|
||||
text_areas = L"?f12 ?f8 ?f13 ?f9";
|
||||
modifiers = L"50000 50000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f3", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"0+?f4 -0");
|
||||
add(L"f6", L"logheight*?f2 /200000");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f7 +?f6 -0");
|
||||
add(L"f10", L"logheight/2");
|
||||
add(L"f11", L"?f8 *?f4 /?f10 ");
|
||||
add(L"f12", L"?f5 +0-?f11 ");
|
||||
add(L"f13", L"logwidth");
|
||||
add(L"f14", L"logheight");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f13 ?f8";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"100000";
|
||||
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f5 0";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"?f1";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_RightArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_RightArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-rightArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f8 L ?f5 ?f8 ?f5 0 ?f14 ?f7 ?f5 ?f13 ?f5 ?f9 0 ?f9 Z N";
|
||||
text_areas = L"?f12 ?f8 ?f13 ?f9";
|
||||
modifiers = L"50000 50000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f3", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"logwidth+0-?f4 ");
|
||||
add(L"f6", L"logheight*?f2 /200000");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f7 +?f6 -0");
|
||||
add(L"f10", L"logheight/2");
|
||||
add(L"f11", L"?f8 *?f4 /?f10 ");
|
||||
add(L"f12", L"?f5 +?f11 -0");
|
||||
add(L"f13", L"logheight");
|
||||
add(L"f14", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"0 ?f8";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"100000";
|
||||
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f5 0";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"?f1";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_DownArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_DownArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-downArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f5 L ?f8 ?f5 ?f8 0 ?f9 0 ?f9 ?f5 ?f14 ?f5 ?f7 ?f13 Z N";
|
||||
text_areas = L"?f8 0 ?f9 ?f12";
|
||||
modifiers = L"50000 50000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logheight/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f3", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"logheight+0-?f4 ");
|
||||
add(L"f6", L"logwidth*?f2 /200000");
|
||||
add(L"f7", L"logwidth/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f7 +?f6 -0");
|
||||
add(L"f10", L"logwidth/2");
|
||||
add(L"f11", L"?f8 *?f4 /?f10 ");
|
||||
add(L"f12", L"?f5 +?f11 -0");
|
||||
add(L"f13", L"logheight");
|
||||
add(L"f14", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f8 0";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"100000";
|
||||
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"0 ?f5";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"?f1";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_UpArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_UpArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-upArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f5 L ?f7 0 ?f14 ?f5 ?f9 ?f5 ?f9 ?f13 ?f8 ?f13 ?f8 ?f5 Z N";
|
||||
text_areas = L"?f8 ?f12 ?f9 ?f13";
|
||||
modifiers = L"50000 50000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logheight/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f3", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"0+?f4 -0");
|
||||
add(L"f6", L"logwidth*?f2 /200000");
|
||||
add(L"f7", L"logwidth/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f7 +?f6 -0");
|
||||
add(L"f10", L"logwidth/2");
|
||||
add(L"f11", L"?f8 *?f4 /?f10 ");
|
||||
add(L"f12", L"?f5 +0-?f11 ");
|
||||
add(L"f13", L"logheight");
|
||||
add(L"f14", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f8 ?f13";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"100000";
|
||||
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"0 ?f5";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"?f1";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_LeftRightArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_LeftRightArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-leftRightArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f7 L ?f4 0 ?f4 ?f8 ?f5 ?f8 ?f5 0 ?f14 ?f7 ?f5 ?f15 ?f5 ?f9 ?f4 ?f9 ?f4 ?f15 Z N";
|
||||
text_areas = L"?f12 ?f8 ?f13 ?f9";
|
||||
modifiers = L"50000 50000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f3", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"logwidth+0-?f4 ");
|
||||
add(L"f6", L"logheight*?f2 /200000");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f7 +?f6 -0");
|
||||
add(L"f10", L"logheight/2");
|
||||
add(L"f11", L"?f8 *?f4 /?f10 ");
|
||||
add(L"f12", L"?f4 +0-?f11 ");
|
||||
add(L"f13", L"?f5 +?f11 -0");
|
||||
add(L"f14", L"logwidth");
|
||||
add(L"f15", L"logheight");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f5 ?f8";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"100000";
|
||||
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f4 0";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"?f1";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_LeftUpArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_LeftUpArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-leftUpArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f12 L ?f6 ?f9 ?f6 ?f16 ?f14 ?f16 ?f14 ?f6 ?f8 ?f6 ?f11 0 ?f22 ?f6 ?f15 ?f6 ?f15 ?f17 ?f6 ?f17 ?f6 ?f21 Z N";
|
||||
text_areas = L"?f18 ?f16 ?f11 ?f17";
|
||||
modifiers = L"25000 25000 25000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"if(0-$1 ,0,if(50000-$1 ,$1 ,50000))");
|
||||
add(L"f1", L"?f0 *2/1");
|
||||
add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
|
||||
add(L"f3", L"100000+0-?f1 ");
|
||||
add(L"f4", L"if(0-$2 ,0,if(?f3 -$2 ,$2 ,?f3 ))");
|
||||
add(L"f5", L"min(logwidth,logheight)");
|
||||
add(L"f6", L"?f5 *?f4 /100000");
|
||||
add(L"f7", L"?f5 *?f0 /50000");
|
||||
add(L"f8", L"logwidth+0-?f7 ");
|
||||
add(L"f9", L"logheight+0-?f7 ");
|
||||
add(L"f10", L"?f5 *?f0 /100000");
|
||||
add(L"f11", L"logwidth+0-?f10 ");
|
||||
add(L"f12", L"logheight+0-?f10 ");
|
||||
add(L"f13", L"?f5 *?f2 /200000");
|
||||
add(L"f14", L"?f11 +0-?f13 ");
|
||||
add(L"f15", L"?f11 +?f13 -0");
|
||||
add(L"f16", L"?f12 +0-?f13 ");
|
||||
add(L"f17", L"?f12 +?f13 -0");
|
||||
add(L"f18", L"?f13 *?f6 /?f10 ");
|
||||
add(L"f19", L"(?f6 +?f15 )/2");
|
||||
add(L"f20", L"(?f6 +?f17 )/2");
|
||||
add(L"f21", L"logheight");
|
||||
add(L"f22", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f14 ?f16";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"?f1";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f8 0";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"50000";
|
||||
handles.push_back(h2);
|
||||
|
||||
h1.position = L"?f14 ?f6";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"?f3";
|
||||
handles.push_back(h1);
|
||||
}
|
||||
};
|
||||
class oox_shape_UpDownArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_UpDownArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-upDownArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f4 L ?f7 0 ?f16 ?f4 ?f9 ?f4 ?f9 ?f5 ?f16 ?f5 ?f7 ?f15 0 ?f5 ?f8 ?f5 ?f8 ?f4 Z N";
|
||||
text_areas = L"?f8 ?f12 ?f9 ?f13";
|
||||
modifiers = L"50000 50000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logheight/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f3", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"logheight+0-?f4 ");
|
||||
add(L"f6", L"logwidth*?f2 /200000");
|
||||
add(L"f7", L"logwidth/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f7 +?f6 -0");
|
||||
add(L"f10", L"logwidth/2");
|
||||
add(L"f11", L"?f8 *?f4 /?f10 ");
|
||||
add(L"f12", L"?f4 +0-?f11 ");
|
||||
add(L"f13", L"?f5 +?f11 -0");
|
||||
add(L"f14", L"logheight/2");
|
||||
add(L"f15", L"logheight");
|
||||
add(L"f16", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h2.position = L"?f8 ?f5";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"100000";
|
||||
handles.push_back(h2);
|
||||
|
||||
h1.position = L"0 ?f4";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"?f1";
|
||||
|
||||
handles.push_back(h1);
|
||||
}
|
||||
};
|
||||
class oox_shape_LeftCircularArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
@ -574,4 +893,46 @@ public:
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_NotchedRightArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_NotchedRightArrow()
|
||||
{
|
||||
odf_type_name = L"ooxml-notchedRightArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f8 L ?f5 ?f8 ?f5 0 ?f13 ?f7 ?f5 ?f14 ?f5 ?f9 0 ?f9 ?f11 ?f7 Z N";
|
||||
text_areas = L"?f11 ?f8 ?f12 ?f9";
|
||||
modifiers = L"50000 50000";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f3", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"logwidth+0-?f4 ");
|
||||
add(L"f6", L"logheight*?f2 /200000");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f7 +?f6 -0");
|
||||
add(L"f10", L"logheight/2");
|
||||
add(L"f11", L"?f6 *?f4 /?f10 ");
|
||||
add(L"f12", L"logwidth+0-?f11 ");
|
||||
add(L"f13", L"logwidth");
|
||||
add(L"f14", L"logheight");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f13 ?f8";
|
||||
h1.y_minimum = L"0";
|
||||
h1.y_maximum = L"100000";
|
||||
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f5 0";
|
||||
h2.x_minimum = L"0";
|
||||
h2.x_maximum = L"?f1";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
}
|
||||
@ -29,3 +29,67 @@
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
|
||||
//+ shapetypeBentUpArrow
|
||||
// shapetypeBentArrow,
|
||||
// shapetypeBentConnector2,
|
||||
// shapetypeBentConnector3,
|
||||
// shapetypeBentConnector4,
|
||||
// shapetypeBentConnector5,
|
||||
|
||||
namespace cpdoccore
|
||||
{
|
||||
class oox_shape_BentUpArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_BentUpArrow()
|
||||
{
|
||||
odf_type_name =L"ooxml-bentUpArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f13 L ?f10 ?f13 ?f10 ?f4 ?f6 ?f4 ?f8 0 ?f18 ?f4 ?f11 ?f4 ?f11 ?f17 0 ?f17 Z N";
|
||||
text_areas = L"0 ?f13 ?f11 ?f17";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 25000 25000";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))");
|
||||
add(L"f1", L"if(0-$1 ,0,if(50000-$1 ,$1 ,50000))");
|
||||
add(L"f2", L"if(0-$2 ,0,if(50000-$2 ,$2 ,50000))");
|
||||
add(L"f3", L"min(logwidth,logheight)");
|
||||
add(L"f4", L"?f3 *?f2 /100000");
|
||||
add(L"f5", L"?f3 *?f1 /50000");
|
||||
add(L"f6", L"logwidth+0-?f5 ");
|
||||
add(L"f7", L"?f3 *?f1 /100000");
|
||||
add(L"f8", L"logwidth+0-?f7 ");
|
||||
add(L"f9", L"?f3 *?f0 /200000");
|
||||
add(L"f10", L"?f8 +0-?f9 ");
|
||||
add(L"f11", L"?f8 +?f9 -0");
|
||||
add(L"f12", L"?f3 *?f0 /100000");
|
||||
add(L"f13", L"logheight+0-?f12 ");
|
||||
add(L"f14", L"?f11 *1/2");
|
||||
add(L"f15", L"(?f13 +logheight)/2");
|
||||
add(L"f16", L"(?f4 +logheight)/2");
|
||||
add(L"f17", L"logheight");
|
||||
add(L"f18", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"0 ?f13";
|
||||
h1.y_maximum= L"50000";
|
||||
h1.y_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f6 0";
|
||||
h2.x_maximum= L"50000";
|
||||
h2.x_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
h1.position = L"?f10 ?f4";
|
||||
h1.y_maximum= L"50000";
|
||||
h1.y_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
@ -29,3 +29,253 @@
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
|
||||
//+ shapetypeLeftArrowCallout
|
||||
//+ shapetypeRightArrowCallout
|
||||
//+ shapetypeUpArrowCallout
|
||||
//+ shapetypeDownArrowCallout
|
||||
|
||||
namespace cpdoccore
|
||||
{
|
||||
class oox_shape_LeftArrowCallout : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_LeftArrowCallout()
|
||||
{
|
||||
odf_type_name =L"ooxml-leftArrowCallout";
|
||||
|
||||
enhanced_path = L"M 0 ?f12 L ?f17 ?f13 ?f17 ?f14 ?f19 ?f14 ?f19 0 ?f22 0 ?f22 ?f21 ?f19 ?f21 ?f19 ?f15 ?f17 ?f15 ?f17 ?f16 Z N";
|
||||
text_areas = L"?f19 0 ?f22 ?f21";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 25000 25000 64977";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logheight/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"?f2 *2/1");
|
||||
add(L"f4", L"if(0-$0 ,0,if(?f3 -$0 ,$0 ,?f3 ))");
|
||||
add(L"f5", L"100000*logwidth/?f0 ");
|
||||
add(L"f6", L"if(0-$2 ,0,if(?f5 -$2 ,$2 ,?f5 ))");
|
||||
add(L"f7", L"?f6 *?f0 /logwidth");
|
||||
add(L"f8", L"100000+0-?f7 ");
|
||||
add(L"f9", L"if(0-$3 ,0,if(?f8 -$3 ,$3 ,?f8 ))");
|
||||
add(L"f10", L"?f0 *?f2 /100000");
|
||||
add(L"f11", L"?f0 *?f4 /200000");
|
||||
add(L"f12", L"logheight/2");
|
||||
add(L"f13", L"?f12 +0-?f10 ");
|
||||
add(L"f14", L"?f12 +0-?f11 ");
|
||||
add(L"f15", L"?f12 +?f11 -0");
|
||||
add(L"f16", L"?f12 +?f10 -0");
|
||||
add(L"f17", L"?f0 *?f6 /100000");
|
||||
add(L"f18", L"logwidth*?f9 /100000");
|
||||
add(L"f19", L"logwidth+0-?f18 ");
|
||||
add(L"f20", L"(?f19 +logwidth)/2");
|
||||
add(L"f21", L"logheight");
|
||||
add(L"f22", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h2.position = L"?f17 ?f14";
|
||||
h2.y_maximum= L"?f3";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
h2.position = L"0 ?f13";
|
||||
h2.y_maximum= L"?f1";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
h1.position = L"?f17 0";
|
||||
h1.x_maximum= L"?f5";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h1.position = L"?f19 ?f21";
|
||||
h1.x_maximum= L"?f8";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_RightArrowCallout : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_RightArrowCallout()
|
||||
{
|
||||
odf_type_name = L"ooxml-rightArrowCallout";
|
||||
|
||||
enhanced_path = L"M 0 0 L ?f19 0 ?f19 ?f14 ?f18 ?f14 ?f18 ?f13 ?f21 ?f12 ?f18 ?f16 ?f18 ?f15 ?f19 ?f15 ?f19 ?f22 0 ?f22 Z N";
|
||||
text_areas = L"0 0 ?f19 ?f22";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 25000 25000 64977";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logheight/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"?f2 *2/1");
|
||||
add(L"f4", L"if(0-$0 ,0,if(?f3 -$0 ,$0 ,?f3 ))");
|
||||
add(L"f5", L"100000*logwidth/?f0 ");
|
||||
add(L"f6", L"if(0-$2 ,0,if(?f5 -$2 ,$2 ,?f5 ))");
|
||||
add(L"f7", L"?f6 *?f0 /logwidth");
|
||||
add(L"f8", L"100000+0-?f7 ");
|
||||
add(L"f9", L"if(0-$3 ,0,if(?f8 -$3 ,$3 ,?f8 ))");
|
||||
add(L"f10", L"?f0 *?f2 /100000");
|
||||
add(L"f11", L"?f0 *?f4 /200000");
|
||||
add(L"f12", L"logheight/2");
|
||||
add(L"f13", L"?f12 +0-?f10 ");
|
||||
add(L"f14", L"?f12 +0-?f11 ");
|
||||
add(L"f15", L"?f12 +?f11 -0");
|
||||
add(L"f16", L"?f12 +?f10 -0");
|
||||
add(L"f17", L"?f0 *?f6 /100000");
|
||||
add(L"f18", L"logwidth+0-?f17 ");
|
||||
add(L"f19", L"logwidth*?f9 /100000");
|
||||
add(L"f20", L"?f19 *1/2");
|
||||
add(L"f21", L"logwidth");
|
||||
add(L"f22", L"logheight");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h2.position = L"?f18 ?f14";
|
||||
h2.y_maximum= L"?f3";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
h2.position = L"?f21 ?f13";
|
||||
h2.y_maximum= L"?f1";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
h1.position = L"?f18 0";
|
||||
h1.x_maximum= L"?f5";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h1.position = L"?f19 ?f22";
|
||||
h1.x_maximum= L"?f8";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_UpArrowCallout : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_UpArrowCallout()
|
||||
{
|
||||
odf_type_name =L"ooxml-upArrowCallout";
|
||||
|
||||
enhanced_path = L"M 0 ?f19 L ?f14 ?f19 ?f14 ?f17 ?f13 ?f17 ?f12 0 ?f16 ?f17 ?f15 ?f17 ?f15 ?f19 ?f21 ?f19 ?f21 ?f22 0 ?f22 Z N";
|
||||
text_areas = L"0 ?f19 ?f21 ?f22";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 25000 25000 64977";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"?f2 *2/1");
|
||||
add(L"f4", L"if(0-$0 ,0,if(?f3 -$0 ,$0 ,?f3 ))");
|
||||
add(L"f5", L"100000*logheight/?f0 ");
|
||||
add(L"f6", L"if(0-$2 ,0,if(?f5 -$2 ,$2 ,?f5 ))");
|
||||
add(L"f7", L"?f6 *?f0 /logheight");
|
||||
add(L"f8", L"100000+0-?f7 ");
|
||||
add(L"f9", L"if(0-$3 ,0,if(?f8 -$3 ,$3 ,?f8 ))");
|
||||
add(L"f10", L"?f0 *?f2 /100000");
|
||||
add(L"f11", L"?f0 *?f4 /200000");
|
||||
add(L"f12", L"logwidth/2");
|
||||
add(L"f13", L"?f12 +0-?f10 ");
|
||||
add(L"f14", L"?f12 +0-?f11 ");
|
||||
add(L"f15", L"?f12 +?f11 -0");
|
||||
add(L"f16", L"?f12 +?f10 -0");
|
||||
add(L"f17", L"?f0 *?f6 /100000");
|
||||
add(L"f18", L"logheight*?f9 /100000");
|
||||
add(L"f19", L"logheight+0-?f18 ");
|
||||
add(L"f20", L"(?f19 +logheight)/2");
|
||||
add(L"f21", L"logwidth");
|
||||
add(L"f22", L"logheight");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f14 ?f17";
|
||||
h1.x_maximum= L"?f3";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h1.position = L"?f13 0";
|
||||
h1.x_maximum= L"?f1";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f21 ?f17";
|
||||
h2.y_maximum= L"?f5";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
h2.position = L"0 ?f19";
|
||||
h2.y_maximum= L"?f8";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_DownArrowCallout : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_DownArrowCallout()
|
||||
{
|
||||
odf_type_name =L"ooxml-downArrowCallout";
|
||||
|
||||
enhanced_path = L"M 0 0 L ?f22 0 ?f22 ?f19 ?f15 ?f19 ?f15 ?f18 ?f16 ?f18 ?f12 ?f21 ?f13 ?f18 ?f14 ?f18 ?f14 ?f19 0 ?f19 Z N";
|
||||
text_areas = L"0 0 ?f22 ?f19";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 25000 25000 64977";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"?f2 *2/1");
|
||||
add(L"f4", L"if(0-$0 ,0,if(?f3 -$0 ,$0 ,?f3 ))");
|
||||
add(L"f5", L"100000*logheight/?f0 ");
|
||||
add(L"f6", L"if(0-$2 ,0,if(?f5 -$2 ,$2 ,?f5 ))");
|
||||
add(L"f7", L"?f6 *?f0 /logheight");
|
||||
add(L"f8", L"100000+0-?f7 ");
|
||||
add(L"f9", L"if(0-$3 ,0,if(?f8 -$3 ,$3 ,?f8 ))");
|
||||
add(L"f10", L"?f0 *?f2 /100000");
|
||||
add(L"f11", L"?f0 *?f4 /200000");
|
||||
add(L"f12", L"logwidth/2");
|
||||
add(L"f13", L"?f12 +0-?f10 ");
|
||||
add(L"f14", L"?f12 +0-?f11 ");
|
||||
add(L"f15", L"?f12 +?f11 -0");
|
||||
add(L"f16", L"?f12 +?f10 -0");
|
||||
add(L"f17", L"?f0 *?f6 /100000");
|
||||
add(L"f18", L"logheight+0-?f17 ");
|
||||
add(L"f19", L"logheight*?f9 /100000");
|
||||
add(L"f20", L"?f19 *1/2");
|
||||
add(L"f21", L"logheight");
|
||||
add(L"f22", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f14 ?f18";
|
||||
h1.x_maximum= L"?f3";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h1.position = L"?f13 ?f21";
|
||||
h1.x_maximum= L"?f1";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f22 ?f18";
|
||||
h2.y_maximum= L"?f5";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
h2.position = L"0 ?f19";
|
||||
h2.y_maximum= L"?f8";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
@ -29,6 +29,32 @@
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
|
||||
// shapetypeChartPlus,
|
||||
// shapetypeChartStar,
|
||||
// shapetypeChartX,
|
||||
// shapetypeChartX
|
||||
//+ shapetypeFlowChartExtract
|
||||
namespace cpdoccore
|
||||
{
|
||||
class oox_shape_FlowChartExtract : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_FlowChartExtract()
|
||||
{
|
||||
odf_type_name =L"ooxml-flowChartExtract";
|
||||
|
||||
enhanced_path = L"M 0 2 L 1 0 2 2 Z N";
|
||||
text_areas = L"?f2 ?f3 ?f0 ?f4";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"logwidth*3/4");
|
||||
add(L"f1", L"logwidth/2");
|
||||
add(L"f2", L"logwidth/4");
|
||||
add(L"f3", L"logheight/2");
|
||||
add(L"f4", L"logheight");
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
@ -29,3 +29,9 @@
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
|
||||
namespace cpdoccore
|
||||
{
|
||||
|
||||
}
|
||||
@ -35,202 +35,386 @@
|
||||
// shapetypeCurvedConnector5,
|
||||
//+ shapetypeCurvedDownArrow,
|
||||
//+ shapetypeCurvedLeftArrow,
|
||||
// shapetypeCurvedRightArrow,
|
||||
// shapetypeCurvedUpArrow,
|
||||
//+ shapetypeCurvedRightArrow,
|
||||
//+ shapetypeCurvedUpArrow,
|
||||
|
||||
#include "../oox_shape_defines.h"
|
||||
|
||||
namespace cpdoccore
|
||||
{
|
||||
class oox_shape_curvedLeftArrow : public oox_shape
|
||||
class oox_shape_CurvedLeftArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_curvedLeftArrow()
|
||||
oox_shape_CurvedLeftArrow()
|
||||
{
|
||||
odf_type_name =L"ooxml-curvedLeftArrow";
|
||||
|
||||
//modifiers = L"23520";
|
||||
enhanced_path = L"M ?f2 ?f8 A ?f65 ?f66 ?f67 ?f68 ?f2 ?f8 ?f62 ?f64 W ?f69 ?f70 ?f71 ?f72 ?f2 ?f8 ?f62 ?f64 Z N";
|
||||
text_areas = L"?f22 ?f24 ?f23 ?f25";
|
||||
glue_points = L"?f22 ?f24 ?f22 ?f25 ?f23 ?f25 ?f23 ?f24";
|
||||
view_box = L"0 0 21600 21600";
|
||||
enhanced_path = L"M 0 ?f31 L ?f32 ?f28 ?f32 ?f24 G ?f44 ?f8 ?f45 ?f46 ?f44 ?f8 ?f47 ?f48 L ?f32 ?f29 Z S N M ?f42 ?f18 G ?f44 ?f8 ?f49 ?f50 L 0 0 G ?f44 ?f8 ?f51 ?f52 Z I S N M ?f42 ?f18 G ?f44 ?f8 ?f53 ?f54 L 0 0 G ?f44 ?f8 ?f55 ?f56 L ?f42 ?f18 G ?f44 ?f8 ?f57 ?f58 L ?f32 ?f29 0 ?f31 ?f32 ?f28 ?f32 ?f24 G ?f44 ?f8 ?f59 ?f60 F N";
|
||||
text_areas = L"0 0 ?f42 ?f43";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 50000 25000";
|
||||
|
||||
add(L"f0", L"10800000");
|
||||
add(L"f0", L"10800000");
|
||||
add(L"f1", L"5400000");
|
||||
add(L"f2", L"left");
|
||||
add(L"f3", L"right");
|
||||
add(L"f4", L"top");
|
||||
add(L"f5", L"bottom");
|
||||
add(L"f6", L"?f5 - ?f4");
|
||||
add(L"f7", L"?f6 / 2");
|
||||
add(L"f8", L"?f4 + ?f7");
|
||||
add(L"f9", L"?f3 - ?f2");
|
||||
add(L"f10", L"?f9 / 2");
|
||||
add(L"f11", L"?f2 + ?f10");
|
||||
add(L"f12", L"5419351 / 1725033");
|
||||
add(L"f13", L"2700000 + ?f1");
|
||||
add(L"f14", L"?f13 * ?f12 / ?f0");
|
||||
add(L"f15", L"0 - ?f14");
|
||||
add(L"f16", L"sin(?f15)");
|
||||
add(L"f17", L"0 - ?f16");
|
||||
add(L"f18", L"?f17 * ?f10");
|
||||
add(L"f19", L"cos(?f15)");
|
||||
add(L"f20", L"0 - ?f19");
|
||||
add(L"f21", L"?f20 * ?f7");
|
||||
add(L"f22", L"?f11 - ?f18");
|
||||
add(L"f23", L"?f11 + ?f18");
|
||||
add(L"f24", L"?f8 - ?f21");
|
||||
add(L"f25", L"?f8 + ?f21");
|
||||
add(L"f26", L"21550000 - 21600000");
|
||||
add(L"f27", L"if(?f26, 21600000, 21550000)");
|
||||
add(L"f28", L"-21550000 - ?f27");
|
||||
add(L"f29", L"if(?f28, -21550000, ?f27)");
|
||||
add(L"f30", L"?f0 + ?f29");
|
||||
add(L"f31", L"?f0 + ?f1");
|
||||
add(L"f32", L"?f31 * ?f12 / ?f0");
|
||||
add(L"f33", L"0 - ?f32");
|
||||
add(L"f34", L"cos(?f33)");
|
||||
add(L"f35", L"0 - ?f34");
|
||||
add(L"f36", L"?f35 * ?f10");
|
||||
add(L"f37", L"sin(?f33)");
|
||||
add(L"f38", L"0 - ?f37");
|
||||
add(L"f39", L"?f38 * ?f7");
|
||||
add(L"f40", L"sqrt(?f36 * ?f36 + ?f39 * ?f39 + 0 * 0)");
|
||||
add(L"f41", L"?f10 * ?f7 / ?f40");
|
||||
add(L"f42", L"?f38 * ?f41");
|
||||
add(L"f43", L"?f2 - ?f42");
|
||||
add(L"f44", L"?f35 * ?f41");
|
||||
add(L"f45", L"?f8 - ?f44");
|
||||
add(L"f46", L"?f43 - ?f10");
|
||||
add(L"f47", L"?f45 - ?f7");
|
||||
add(L"f48", L"?f43 + ?f10");
|
||||
add(L"f49", L"?f45 + ?f7");
|
||||
add(L"f50", L"?f30 + ?f1");
|
||||
add(L"f51", L"?f50 * ?f12 / ?f0");
|
||||
add(L"f52", L"0 - ?f51");
|
||||
add(L"f53", L"cos(?f52)");
|
||||
add(L"f54", L"0 - ?f53");
|
||||
add(L"f55", L"?f54 * ?f10");
|
||||
add(L"f56", L"sin(?f52)");
|
||||
add(L"f57", L"0 - ?f56");
|
||||
add(L"f58", L"?f57 * ?f7");
|
||||
add(L"f59", L"sqrt(?f55 * ?f55 + ?f58 * ?f58 + 0 * 0)");
|
||||
add(L"f60", L"?f10 * ?f7 / ?f59");
|
||||
add(L"f61", L"?f57 * ?f60");
|
||||
add(L"f62", L"?f43 + ?f61");
|
||||
add(L"f63", L"?f54 * ?f60");
|
||||
add(L"f64", L"?f45 + ?f63");
|
||||
add(L"f65", L"if(?f29, ?f2, ?f46)");
|
||||
add(L"f66", L"if(?f29, ?f8, ?f47)");
|
||||
add(L"f67", L"if(?f29, ?f2, ?f48)");
|
||||
add(L"f68", L"if(?f29, ?f8, ?f49)");
|
||||
add(L"f69", L"if(?f29, ?f46, ?f62)");
|
||||
add(L"f70", L"if(?f29, ?f47, ?f64)");
|
||||
add(L"f71", L"if(?f29, ?f48, ?f62)");
|
||||
add(L"f72", L"if(?f29, ?f49, ?f64)");
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logheight/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"if(0-$0 ,0,if(?f2 -$0 ,$0 ,?f2 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"?f0 *?f2 /100000");
|
||||
add(L"f6", L"(?f4 +?f5 )/4");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f8 *2/1");
|
||||
add(L"f10", L"?f9 *?f9 /1");
|
||||
add(L"f11", L"?f4 *?f4 /1");
|
||||
add(L"f12", L"?f10 +0-?f11 ");
|
||||
add(L"f13", L"sqrt(?f12 )");
|
||||
add(L"f14", L"?f13 *logwidth/?f9 ");
|
||||
add(L"f15", L"100000*?f14 /?f0 ");
|
||||
add(L"f16", L"if(0-$2 ,0,if(?f15 -$2 ,$2 ,?f15 ))");
|
||||
add(L"f17", L"?f0 *?f16 /100000");
|
||||
add(L"f18", L"?f8 +?f4 -0");
|
||||
add(L"f19", L"logwidth*logwidth/1");
|
||||
add(L"f20", L"?f17 *?f17 /1");
|
||||
add(L"f21", L"?f19 +0-?f20 ");
|
||||
add(L"f22", L"sqrt(?f21 )");
|
||||
add(L"f23", L"?f22 *?f8 /logwidth");
|
||||
add(L"f24", L"?f8 +?f23 -0");
|
||||
add(L"f25", L"?f18 +?f23 -0");
|
||||
add(L"f26", L"?f5 +0-?f4 ");
|
||||
add(L"f27", L"?f26 *1/2");
|
||||
add(L"f28", L"?f24 +0-?f27 ");
|
||||
add(L"f29", L"?f25 +?f27 -0");
|
||||
add(L"f30", L"?f5 *1/2");
|
||||
add(L"f31", L"logheight+0-?f30 ");
|
||||
add(L"f32", L"0+?f17 -0");
|
||||
add(L"f33", L"(10800000*atan2(?f23 ,?f17 ))/pi");
|
||||
add(L"f34", L"0+0-?f33 ");
|
||||
add(L"f35", L"0+?f14 -0");
|
||||
add(L"f36", L"(?f8 +?f18 )/2");
|
||||
add(L"f37", L"?f4 *1/2");
|
||||
add(L"f38", L"(10800000*atan2(?f37 ,?f14 ))/pi");
|
||||
add(L"f39", L"?f38 +0-?f33 ");
|
||||
add(L"f40", L"?f33 +?f38 -0");
|
||||
add(L"f41", L"0+0-?f38 ");
|
||||
add(L"f42", L"logwidth");
|
||||
add(L"f43", L"logheight");
|
||||
add(L"f44", L"logwidth");
|
||||
add(L"f45", L"(?f33 )/60000.0");
|
||||
add(L"f46", L"(?f39 )/60000.0");
|
||||
add(L"f47", L"(?f41 )/60000.0");
|
||||
add(L"f48", L"(?f40 )/60000.0");
|
||||
add(L"f49", L"(0)/60000.0");
|
||||
add(L"f50", L"(-5400000)/60000.0");
|
||||
add(L"f51", L"(16200000)/60000.0");
|
||||
add(L"f52", L"(5400000)/60000.0");
|
||||
add(L"f53", L"(0)/60000.0");
|
||||
add(L"f54", L"(-5400000)/60000.0");
|
||||
add(L"f55", L"(16200000)/60000.0");
|
||||
add(L"f56", L"(5400000)/60000.0");
|
||||
add(L"f57", L"(0)/60000.0");
|
||||
add(L"f58", L"(?f33 )/60000.0");
|
||||
add(L"f59", L"(?f33 )/60000.0");
|
||||
add(L"f60", L"(?f39 )/60000.0");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
h.position = L"0 ?f2";
|
||||
h.y_maximum= L"51965";
|
||||
h.y_minimum= L"0";
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f32 ?f24";
|
||||
h1.y_maximum= L"?f2";
|
||||
h1.y_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
handles.push_back(h);
|
||||
h1.position = L"?f42 ?f28";
|
||||
h1.y_maximum= L"?f1";
|
||||
h1.y_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f32 ?f43";
|
||||
h2.x_maximum= L"?f15";
|
||||
h2.x_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_curvedDownArrow : public oox_shape
|
||||
class oox_shape_CurvedRightArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_curvedDownArrow()
|
||||
oox_shape_CurvedRightArrow()
|
||||
{
|
||||
odf_type_name =L"ooxml-curvedRightArrow";
|
||||
|
||||
enhanced_path = L"M 0 ?f8 G ?f45 ?f8 ?f46 ?f47 L ?f32 ?f28 ?f43 ?f31 ?f32 ?f29 ?f32 ?f25 G ?f45 ?f8 ?f48 ?f49 Z S N M ?f43 ?f4 G ?f45 ?f8 ?f50 ?f51 ?f45 ?f8 ?f52 ?f53 Z I S N M 0 ?f8 G ?f45 ?f8 ?f54 ?f55 L ?f32 ?f28 ?f43 ?f31 ?f32 ?f29 ?f32 ?f25 G ?f45 ?f8 ?f56 ?f57 L 0 ?f8 G ?f45 ?f8 ?f58 ?f59 L ?f43 ?f4 G ?f45 ?f8 ?f60 ?f61 F N";
|
||||
text_areas = L"0 0 ?f43 ?f44";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 50000 25000";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logheight/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"if(0-$0 ,0,if(?f2 -$0 ,$0 ,?f2 ))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"?f0 *?f2 /100000");
|
||||
add(L"f6", L"(?f4 +?f5 )/4");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f8 *2/1");
|
||||
add(L"f10", L"?f9 *?f9 /1");
|
||||
add(L"f11", L"?f4 *?f4 /1");
|
||||
add(L"f12", L"?f10 +0-?f11 ");
|
||||
add(L"f13", L"sqrt(?f12 )");
|
||||
add(L"f14", L"?f13 *logwidth/?f9 ");
|
||||
add(L"f15", L"100000*?f14 /?f0 ");
|
||||
add(L"f16", L"if(0-$2 ,0,if(?f15 -$2 ,$2 ,?f15 ))");
|
||||
add(L"f17", L"?f0 *?f16 /100000");
|
||||
add(L"f18", L"?f8 +?f4 -0");
|
||||
add(L"f19", L"logwidth*logwidth/1");
|
||||
add(L"f20", L"?f17 *?f17 /1");
|
||||
add(L"f21", L"?f19 +0-?f20 ");
|
||||
add(L"f22", L"sqrt(?f21 )");
|
||||
add(L"f23", L"?f22 *?f8 /logwidth");
|
||||
add(L"f24", L"?f8 +?f23 -0");
|
||||
add(L"f25", L"?f18 +?f23 -0");
|
||||
add(L"f26", L"?f5 +0-?f4 ");
|
||||
add(L"f27", L"?f26 *1/2");
|
||||
add(L"f28", L"?f24 +0-?f27 ");
|
||||
add(L"f29", L"?f25 +?f27 -0");
|
||||
add(L"f30", L"?f5 *1/2");
|
||||
add(L"f31", L"logheight+0-?f30 ");
|
||||
add(L"f32", L"logwidth+0-?f17 ");
|
||||
add(L"f33", L"(10800000*atan2(?f23 ,?f17 ))/pi");
|
||||
add(L"f34", L"10800000+0-?f33 ");
|
||||
add(L"f35", L"0+0-?f33 ");
|
||||
add(L"f36", L"logwidth+0-?f14 ");
|
||||
add(L"f37", L"(?f8 +?f18 )/2");
|
||||
add(L"f38", L"?f4 *1/2");
|
||||
add(L"f39", L"(10800000*atan2(?f38 ,?f14 ))/pi");
|
||||
add(L"f40", L"?f39 +0-5400000");
|
||||
add(L"f41", L"5400000+?f39 -0");
|
||||
add(L"f42", L"10800000+0-?f39 ");
|
||||
add(L"f43", L"logwidth");
|
||||
add(L"f44", L"logheight");
|
||||
add(L"f45", L"logwidth");
|
||||
add(L"f46", L"(10800000)/60000.0");
|
||||
add(L"f47", L"(?f35 )/60000.0");
|
||||
add(L"f48", L"(?f34 )/60000.0");
|
||||
add(L"f49", L"(?f33 )/60000.0");
|
||||
add(L"f50", L"(16200000)/60000.0");
|
||||
add(L"f51", L"(?f40 )/60000.0");
|
||||
add(L"f52", L"(?f42 )/60000.0");
|
||||
add(L"f53", L"(?f41 )/60000.0");
|
||||
add(L"f54", L"(10800000)/60000.0");
|
||||
add(L"f55", L"(?f35 )/60000.0");
|
||||
add(L"f56", L"(?f34 )/60000.0");
|
||||
add(L"f57", L"(?f33 )/60000.0");
|
||||
add(L"f58", L"(10800000)/60000.0");
|
||||
add(L"f59", L"(5400000)/60000.0");
|
||||
add(L"f60", L"(16200000)/60000.0");
|
||||
add(L"f61", L"(?f40 )/60000.0");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f32 ?f24";
|
||||
h1.y_maximum= L"?f2";
|
||||
h1.y_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h1.position = L"?f43 ?f28";
|
||||
h1.y_maximum= L"?f1";
|
||||
h1.y_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f32 ?f43";
|
||||
h2.x_maximum= L"?f15";
|
||||
h2.x_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
}
|
||||
};
|
||||
class oox_shape_CurvedDownArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_CurvedDownArrow()
|
||||
{
|
||||
odf_type_name =L"ooxml-curvedDownArrow";
|
||||
|
||||
//modifiers = L"23520";
|
||||
enhanced_path = L"M ?f2 ?f8 A ?f65 ?f66 ?f67 ?f68 ?f2 ?f8 ?f62 ?f64 W ?f69 ?f70 ?f71 ?f72 ?f2 ?f8 ?f62 ?f64 Z N";
|
||||
text_areas = L"?f22 ?f24 ?f23 ?f25";
|
||||
glue_points = L"?f22 ?f24 ?f22 ?f25 ?f23 ?f25 ?f23 ?f24";
|
||||
view_box = L"0 0 21600 21600";
|
||||
enhanced_path = L"M ?f31 ?f43 L ?f28 ?f32 ?f24 ?f32 G ?f8 ?f45 ?f46 ?f47 L ?f18 0 G ?f8 ?f45 ?f48 ?f49 L ?f29 ?f32 Z S N M ?f36 ?f35 G ?f8 ?f45 ?f50 ?f51 L 0 ?f43 G ?f8 ?f45 ?f52 ?f53 Z I S N M ?f36 ?f35 G ?f8 ?f45 ?f54 ?f55 L 0 ?f43 G ?f8 ?f45 ?f56 ?f57 L ?f18 0 G ?f8 ?f45 ?f58 ?f59 L ?f29 ?f32 ?f31 ?f43 ?f28 ?f32 ?f24 ?f32 G ?f8 ?f45 ?f60 ?f61 F N";
|
||||
text_areas = L"0 0 ?f44 ?f43";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 50000 25000";
|
||||
|
||||
add(L"f0", L"10800000");
|
||||
add(L"f1", L"5400000");
|
||||
add(L"f2", L"left");
|
||||
add(L"f3", L"right");
|
||||
add(L"f4", L"top");
|
||||
add(L"f5", L"bottom");
|
||||
add(L"f6", L"?f5 - ?f4");
|
||||
add(L"f7", L"?f6 / 2");
|
||||
add(L"f8", L"?f4 + ?f7");
|
||||
add(L"f9", L"?f3 - ?f2");
|
||||
add(L"f10", L"?f9 / 2");
|
||||
add(L"f11", L"?f2 + ?f10");
|
||||
add(L"f12", L"5419351 / 1725033");
|
||||
add(L"f13", L"2700000 + ?f1");
|
||||
add(L"f14", L"?f13 * ?f12 / ?f0");
|
||||
add(L"f15", L"0 - ?f14");
|
||||
add(L"f16", L"sin(?f15)");
|
||||
add(L"f17", L"0 - ?f16");
|
||||
add(L"f18", L"?f17 * ?f10");
|
||||
add(L"f19", L"cos(?f15)");
|
||||
add(L"f20", L"0 - ?f19");
|
||||
add(L"f21", L"?f20 * ?f7");
|
||||
add(L"f22", L"?f11 - ?f18");
|
||||
add(L"f23", L"?f11 + ?f18");
|
||||
add(L"f24", L"?f8 - ?f21");
|
||||
add(L"f25", L"?f8 + ?f21");
|
||||
add(L"f26", L"21550000 - 21600000");
|
||||
add(L"f27", L"if(?f26, 21600000, 21550000)");
|
||||
add(L"f28", L"-21550000 - ?f27");
|
||||
add(L"f29", L"if(?f28, -21550000, ?f27)");
|
||||
add(L"f30", L"?f0 + ?f29");
|
||||
add(L"f31", L"?f0 + ?f1");
|
||||
add(L"f32", L"?f31 * ?f12 / ?f0");
|
||||
add(L"f33", L"0 - ?f32");
|
||||
add(L"f34", L"cos(?f33)");
|
||||
add(L"f35", L"0 - ?f34");
|
||||
add(L"f36", L"?f35 * ?f10");
|
||||
add(L"f37", L"sin(?f33)");
|
||||
add(L"f38", L"0 - ?f37");
|
||||
add(L"f39", L"?f38 * ?f7");
|
||||
add(L"f40", L"sqrt(?f36 * ?f36 + ?f39 * ?f39 + 0 * 0)");
|
||||
add(L"f41", L"?f10 * ?f7 / ?f40");
|
||||
add(L"f42", L"?f38 * ?f41");
|
||||
add(L"f43", L"?f2 - ?f42");
|
||||
add(L"f44", L"?f35 * ?f41");
|
||||
add(L"f45", L"?f8 - ?f44");
|
||||
add(L"f46", L"?f43 - ?f10");
|
||||
add(L"f47", L"?f45 - ?f7");
|
||||
add(L"f48", L"?f43 + ?f10");
|
||||
add(L"f49", L"?f45 + ?f7");
|
||||
add(L"f50", L"?f30 + ?f1");
|
||||
add(L"f51", L"?f50 * ?f12 / ?f0");
|
||||
add(L"f52", L"0 - ?f51");
|
||||
add(L"f53", L"cos(?f52)");
|
||||
add(L"f54", L"0 - ?f53");
|
||||
add(L"f55", L"?f54 * ?f10");
|
||||
add(L"f56", L"sin(?f52)");
|
||||
add(L"f57", L"0 - ?f56");
|
||||
add(L"f58", L"?f57 * ?f7");
|
||||
add(L"f59", L"sqrt(?f55 * ?f55 + ?f58 * ?f58 + 0 * 0)");
|
||||
add(L"f60", L"?f10 * ?f7 / ?f59");
|
||||
add(L"f61", L"?f57 * ?f60");
|
||||
add(L"f62", L"?f43 + ?f61");
|
||||
add(L"f63", L"?f54 * ?f60");
|
||||
add(L"f64", L"?f45 + ?f63");
|
||||
add(L"f65", L"if(?f29, ?f2, ?f46)");
|
||||
add(L"f66", L"if(?f29, ?f8, ?f47)");
|
||||
add(L"f67", L"if(?f29, ?f2, ?f48)");
|
||||
add(L"f68", L"if(?f29, ?f8, ?f49)");
|
||||
add(L"f69", L"if(?f29, ?f46, ?f62)");
|
||||
add(L"f70", L"if(?f29, ?f47, ?f64)");
|
||||
add(L"f71", L"if(?f29, ?f48, ?f62)");
|
||||
add(L"f72", L"if(?f29, ?f49, ?f64)");
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"?f0 *?f2 /100000");
|
||||
add(L"f6", L"(?f4 +?f5 )/4");
|
||||
add(L"f7", L"logwidth/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f8 *2/1");
|
||||
add(L"f10", L"?f9 *?f9 /1");
|
||||
add(L"f11", L"?f4 *?f4 /1");
|
||||
add(L"f12", L"?f10 +0-?f11 ");
|
||||
add(L"f13", L"sqrt(?f12 )");
|
||||
add(L"f14", L"?f13 *logheight/?f9 ");
|
||||
add(L"f15", L"100000*?f14 /?f0 ");
|
||||
add(L"f16", L"if(0-$2 ,0,if(?f15 -$2 ,$2 ,?f15 ))");
|
||||
add(L"f17", L"?f0 *$2 /100000");
|
||||
add(L"f18", L"?f8 +?f4 -0");
|
||||
add(L"f19", L"logheight*logheight/1");
|
||||
add(L"f20", L"?f17 *?f17 /1");
|
||||
add(L"f21", L"?f19 +0-?f20 ");
|
||||
add(L"f22", L"sqrt(?f21 )");
|
||||
add(L"f23", L"?f22 *?f8 /logheight");
|
||||
add(L"f24", L"?f8 +?f23 -0");
|
||||
add(L"f25", L"?f18 +?f23 -0");
|
||||
add(L"f26", L"?f5 +0-?f4 ");
|
||||
add(L"f27", L"?f26 *1/2");
|
||||
add(L"f28", L"?f24 +0-?f27 ");
|
||||
add(L"f29", L"?f25 +?f27 -0");
|
||||
add(L"f30", L"?f5 *1/2");
|
||||
add(L"f31", L"logwidth+0-?f30 ");
|
||||
add(L"f32", L"logheight+0-?f17 ");
|
||||
add(L"f33", L"(10800000*atan2(?f23 ,?f17 ))/pi");
|
||||
add(L"f34", L"0+0-?f33 ");
|
||||
add(L"f35", L"logheight+0-?f14 ");
|
||||
add(L"f36", L"(?f8 +?f18 )/2");
|
||||
add(L"f37", L"?f4 *1/2");
|
||||
add(L"f38", L"(10800000*atan2(?f37 ,?f14 ))/pi");
|
||||
add(L"f39", L"16200000+?f33 -0");
|
||||
add(L"f40", L"16200000+0-?f38 ");
|
||||
add(L"f41", L"?f38 +0-5400000");
|
||||
add(L"f42", L"5400000+?f38 -0");
|
||||
add(L"f43", L"logheight");
|
||||
add(L"f44", L"logwidth");
|
||||
add(L"f45", L"logheight");
|
||||
add(L"f46", L"(?f39 )/60000.0");
|
||||
add(L"f47", L"(?f34 )/60000.0");
|
||||
add(L"f48", L"(16200000)/60000.0");
|
||||
add(L"f49", L"(?f33 )/60000.0");
|
||||
add(L"f50", L"(?f40 )/60000.0");
|
||||
add(L"f51", L"(?f41 )/60000.0");
|
||||
add(L"f52", L"(10800000)/60000.0");
|
||||
add(L"f53", L"(?f42 )/60000.0");
|
||||
add(L"f54", L"(?f40 )/60000.0");
|
||||
add(L"f55", L"(?f41 )/60000.0");
|
||||
add(L"f56", L"(10800000)/60000.0");
|
||||
add(L"f57", L"(5400000)/60000.0");
|
||||
add(L"f58", L"(16200000)/60000.0");
|
||||
add(L"f59", L"(?f33 )/60000.0");
|
||||
add(L"f60", L"(?f39 )/60000.0");
|
||||
add(L"f61", L"(?f34 )/60000.0");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
h.position = L"0 ?f2";
|
||||
h.y_maximum= L"51965";
|
||||
h.y_minimum= L"0";
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f25 ?f32";
|
||||
h1.x_maximum= L"$1";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h1.position = L"?f28 ?f43";
|
||||
h1.x_maximum= L"?f1";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f44 ?f32";
|
||||
h2.y_maximum= L"?f15";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
class oox_shape_CurvedUpArrow : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_CurvedUpArrow()
|
||||
{
|
||||
odf_type_name =L"ooxml-curvedUpArrow";
|
||||
|
||||
enhanced_path = L"M ?f31 0 L ?f29 ?f32 ?f25 ?f32 G ?f8 ?f46 ?f47 ?f48 ?f8 ?f46 ?f49 ?f50 L ?f28 ?f32 Z S N M ?f8 ?f45 G ?f8 ?f46 ?f51 ?f52 L ?f4 0 G ?f8 ?f46 ?f53 ?f54 Z I S N M ?f36 ?f35 G ?f8 ?f46 ?f55 ?f56 L ?f28 ?f32 ?f31 0 ?f29 ?f32 ?f25 ?f32 G ?f8 ?f46 ?f57 ?f58 L ?f8 ?f45 G ?f8 ?f46 ?f59 ?f60 L ?f4 0 G ?f8 ?f46 ?f61 ?f62 F N";
|
||||
text_areas = L"0 0 ?f44 ?f45";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000 50000 25000";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$1 ,0,if(?f1 -$1 ,$1 ,?f1 ))");
|
||||
add(L"f3", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f4", L"?f0 *?f3 /100000");
|
||||
add(L"f5", L"?f0 *?f2 /100000");
|
||||
add(L"f6", L"(?f4 +?f5 )/4");
|
||||
add(L"f7", L"logwidth/2");
|
||||
add(L"f8", L"?f7 +0-?f6 ");
|
||||
add(L"f9", L"?f8 *2/1");
|
||||
add(L"f10", L"?f9 *?f9 /1");
|
||||
add(L"f11", L"?f4 *?f4 /1");
|
||||
add(L"f12", L"?f10 +0-?f11 ");
|
||||
add(L"f13", L"sqrt(?f12 )");
|
||||
add(L"f14", L"?f13 *logheight/?f9 ");
|
||||
add(L"f15", L"100000*?f14 /?f0 ");
|
||||
add(L"f16", L"if(0-$2 ,0,if(?f15 -$2 ,$2 ,?f15 ))");
|
||||
add(L"f17", L"?f0 *$2 /100000");
|
||||
add(L"f18", L"?f8 +?f4 -0");
|
||||
add(L"f19", L"logheight*logheight/1");
|
||||
add(L"f20", L"?f17 *?f17 /1");
|
||||
add(L"f21", L"?f19 +0-?f20 ");
|
||||
add(L"f22", L"sqrt(?f21 )");
|
||||
add(L"f23", L"?f22 *?f8 /logheight");
|
||||
add(L"f24", L"?f8 +?f23 -0");
|
||||
add(L"f25", L"?f18 +?f23 -0");
|
||||
add(L"f26", L"?f5 +0-?f4 ");
|
||||
add(L"f27", L"?f26 *1/2");
|
||||
add(L"f28", L"?f24 +0-?f27 ");
|
||||
add(L"f29", L"?f25 +?f27 -0");
|
||||
add(L"f30", L"?f5 *1/2");
|
||||
add(L"f31", L"logwidth+0-?f30 ");
|
||||
add(L"f32", L"0+?f17 -0");
|
||||
add(L"f33", L"(10800000*atan2(?f23 ,?f17 ))/pi");
|
||||
add(L"f34", L"0+0-?f33 ");
|
||||
add(L"f35", L"0+?f14 -0");
|
||||
add(L"f36", L"(?f8 +?f18 )/2");
|
||||
add(L"f37", L"?f4 *1/2");
|
||||
add(L"f38", L"(10800000*atan2(?f37 ,?f14 ))/pi");
|
||||
add(L"f39", L"?f38 +0-?f33 ");
|
||||
add(L"f40", L"0+0-?f39 ");
|
||||
add(L"f41", L"5400000+0-?f33 ");
|
||||
add(L"f42", L"?f33 +?f38 -0");
|
||||
add(L"f43", L"5400000+0-?f38 ");
|
||||
add(L"f44", L"logwidth");
|
||||
add(L"f45", L"logheight");
|
||||
add(L"f46", L"logheight");
|
||||
add(L"f47", L"(?f41 )/60000.0");
|
||||
add(L"f48", L"(?f42 )/60000.0");
|
||||
add(L"f49", L"(?f43 )/60000.0");
|
||||
add(L"f50", L"(?f39 )/60000.0");
|
||||
add(L"f51", L"(5400000)/60000.0");
|
||||
add(L"f52", L"(5400000)/60000.0");
|
||||
add(L"f53", L"(10800000)/60000.0");
|
||||
add(L"f54", L"(-5400000)/60000.0");
|
||||
add(L"f55", L"(?f43 )/60000.0");
|
||||
add(L"f56", L"(?f39 )/60000.0");
|
||||
add(L"f57", L"(?f41 )/60000.0");
|
||||
add(L"f58", L"(?f33 )/60000.0");
|
||||
add(L"f59", L"(5400000)/60000.0");
|
||||
add(L"f60", L"(5400000)/60000.0");
|
||||
add(L"f61", L"(10800000)/60000.0");
|
||||
add(L"f62", L"(-5400000)/60000.0");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h1, h2;
|
||||
|
||||
h1.position = L"?f25 ?f32";
|
||||
h1.x_maximum= L"?f2";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h1.position = L"?f28 0";
|
||||
h1.x_maximum= L"?f1";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h2.position = L"?f44 ?f32";
|
||||
h2.y_maximum= L"?f15";
|
||||
h2.y_minimum= L"0";
|
||||
handles.push_back(h2);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -30,11 +30,12 @@
|
||||
*
|
||||
*/
|
||||
#include "../oox_shape_defines.h"
|
||||
// shapetypeMathDivide,
|
||||
//+ shapetypeMathDivide,
|
||||
//+ shapetypeMathEqual,
|
||||
// shapetypeMathMinus,
|
||||
//+ shapetypeMathMinus,
|
||||
//+ shapetypeMathMultiply,
|
||||
// shapetypeMathNotEqual,
|
||||
//+ shapetypeMathPlus,
|
||||
//+ shapetypeMathNotEqual,
|
||||
namespace cpdoccore
|
||||
{
|
||||
class oox_shape_mathMultiply : public oox_shape
|
||||
@ -160,4 +161,216 @@ public:
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
class oox_shape_mathDivide : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_mathDivide()
|
||||
{
|
||||
odf_type_name =L"ooxml-mathDivide";
|
||||
|
||||
enhanced_path = L"M ?f20 ?f18 G ?f11 ?f11 ?f25 ?f26 Z M ?f20 ?f19 G ?f11 ?f11 ?f27 ?f28 Z M ?f21 ?f14 L ?f22 ?f14 ?f22 ?f15 ?f21 ?f15 Z N";
|
||||
text_areas = L"?f21 ?f14 ?f22 ?f15";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"23520 5880 11760";
|
||||
|
||||
add(L"f0", L"if(1000-$0 ,1000,if(36745-$0 ,$0 ,36745))");
|
||||
add(L"f1", L"0+0-?f0 ");
|
||||
add(L"f2", L"(73490+?f1 )/4");
|
||||
add(L"f3", L"36745*logwidth/logheight");
|
||||
add(L"f4", L"min(?f2 ,?f3 )");
|
||||
add(L"f5", L"if(1000-$2 ,1000,if(?f4 -$2 ,$2 ,?f4 ))");
|
||||
add(L"f6", L"-4*?f5 /1");
|
||||
add(L"f7", L"73490+?f6 -?f0 ");
|
||||
add(L"f8", L"if(0-$1 ,0,if(?f7 -$1 ,$1 ,?f7 ))");
|
||||
add(L"f9", L"logheight*?f0 /200000");
|
||||
add(L"f10", L"logheight*?f8 /100000");
|
||||
add(L"f11", L"logheight*?f5 /100000");
|
||||
add(L"f12", L"logwidth*73490/200000");
|
||||
add(L"f13", L"logheight/2");
|
||||
add(L"f14", L"?f13 +0-?f9 ");
|
||||
add(L"f15", L"?f13 +?f9 -0");
|
||||
add(L"f16", L"?f10 +?f11 -0");
|
||||
add(L"f17", L"?f14 +0-?f16 ");
|
||||
add(L"f18", L"?f17 +0-?f11 ");
|
||||
add(L"f19", L"logheight+0-?f18 ");
|
||||
add(L"f20", L"logwidth/2");
|
||||
add(L"f21", L"?f20 +0-?f12 ");
|
||||
add(L"f22", L"?f20 +?f12 -0");
|
||||
add(L"f23", L"?f20 +0-?f11 ");
|
||||
add(L"f24", L"logwidth");
|
||||
add(L"f25", L"(16200000)/60000.0");
|
||||
add(L"f26", L"(21600000)/60000.0");
|
||||
add(L"f27", L"(5400000)/60000.0");
|
||||
add(L"f28", L"(21600000)/60000.0");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h, h1;
|
||||
h.position = L"0 ?f14";
|
||||
h.y_maximum= L"36745";
|
||||
h.y_minimum= L"1000";
|
||||
handles.push_back(h);
|
||||
|
||||
h.position = L"?f24 ?f17";
|
||||
h.y_maximum= L"?f7";
|
||||
h.y_minimum= L"0";
|
||||
handles.push_back(h);
|
||||
|
||||
h1.position = L"?f23 0";
|
||||
h1.x_maximum= L"?f4";
|
||||
h1.x_minimum= L"1000";
|
||||
handles.push_back(h1);
|
||||
}
|
||||
};
|
||||
class oox_shape_mathNotEqual : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_mathNotEqual()
|
||||
{
|
||||
odf_type_name =L"ooxml-mathNotEqual";
|
||||
|
||||
enhanced_path = L"M ?f9 ?f14 L ?f24 ?f14 ?f43 ?f47 ?f42 ?f46 ?f34 ?f14 ?f10 ?f14 ?f10 ?f12 ?f35 ?f12 ?f36 ?f13 ?f10 ?f13 ?f10 ?f15 ?f37 ?f15 ?f49 ?f51 ?f48 ?f50 ?f30 ?f15 ?f9 ?f15 ?f9 ?f13 ?f28 ?f13 ?f26 ?f12 ?f9 ?f12 Z N";
|
||||
text_areas = L"?f9 ?f14 ?f10 ?f15";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"23520 6600000 11760";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))");
|
||||
add(L"f1", L"if(4200000-$1 ,4200000,if(6600000-$1 ,$1 ,6600000))");
|
||||
add(L"f2", L"?f0 *2/1");
|
||||
add(L"f3", L"100000+0-2");
|
||||
add(L"f4", L"if(0-$2 ,0,if(?f3 -$2 ,$2 ,?f3 ))");
|
||||
add(L"f5", L"logheight*?f0 /100000");
|
||||
add(L"f6", L"logheight*?f4 /200000");
|
||||
add(L"f7", L"logwidth*73490/200000");
|
||||
add(L"f8", L"logwidth/2");
|
||||
add(L"f9", L"?f8 +0-?f7 ");
|
||||
add(L"f10", L"?f8 +?f7 -0");
|
||||
add(L"f11", L"logheight/2");
|
||||
add(L"f12", L"?f11 +0-?f6 ");
|
||||
add(L"f13", L"?f11 +?f6 -0");
|
||||
add(L"f14", L"?f12 +0-?f5 ");
|
||||
add(L"f15", L"?f13 +?f5 -0");
|
||||
add(L"f16", L"?f1 +0-5400000");
|
||||
add(L"f17", L"logheight/2");
|
||||
add(L"f18", L"?f17 *tan(pi*(?f16 )/10800000)");
|
||||
add(L"f19", L"sqrt(?f18 *?f18 +?f17 *?f17 +0*0)");
|
||||
add(L"f20", L"?f19 *?f5 /?f17 ");
|
||||
add(L"f21", L"?f20 *1/2");
|
||||
add(L"f22", L"?f8 +?f18 -?f21 ");
|
||||
add(L"f23", L"?f18 *?f14 /?f17 ");
|
||||
add(L"f24", L"?f22 +0-?f23 ");
|
||||
add(L"f25", L"?f18 *?f12 /?f17 ");
|
||||
add(L"f26", L"?f22 +0-?f25 ");
|
||||
add(L"f27", L"?f18 *?f13 /?f17 ");
|
||||
add(L"f28", L"?f22 +0-?f27 ");
|
||||
add(L"f29", L"?f18 *?f15 /?f17 ");
|
||||
add(L"f30", L"?f22 +0-?f29 ");
|
||||
add(L"f31", L"?f18 *2/1");
|
||||
add(L"f32", L"?f22 +0-?f31 ");
|
||||
add(L"f33", L"?f22 +?f20 -0");
|
||||
add(L"f34", L"?f24 +?f20 -0");
|
||||
add(L"f35", L"?f26 +?f20 -0");
|
||||
add(L"f36", L"?f28 +?f20 -0");
|
||||
add(L"f37", L"?f30 +?f20 -0");
|
||||
add(L"f38", L"?f32 +?f20 -0");
|
||||
add(L"f39", L"?f5 *?f17 /?f19 ");
|
||||
add(L"f40", L"?f22 +?f39 -0");
|
||||
add(L"f41", L"?f33 +0-?f39 ");
|
||||
add(L"f42", L"if(?f16 ,?f40 ,?f33 )");
|
||||
add(L"f43", L"if(?f16 ,?f22 ,?f41 )");
|
||||
add(L"f44", L"?f5 *?f18 /?f19 ");
|
||||
add(L"f45", L"0+0-?f44 ");
|
||||
add(L"f46", L"if(?f16 ,?f44 ,0)");
|
||||
add(L"f47", L"if(?f16 ,0,?f45 )");
|
||||
add(L"f48", L"logwidth+0-?f42 ");
|
||||
add(L"f49", L"logwidth+0-?f43 ");
|
||||
add(L"f50", L"logheight+0-?f46 ");
|
||||
add(L"f51", L"logheight+0-?f47 ");
|
||||
add(L"f52", L"(?f42 +?f43 )/2");
|
||||
add(L"f53", L"(?f49 +?f48 )/2");
|
||||
add(L"f54", L"(?f46 +?f47 )/2");
|
||||
add(L"f55", L"(?f14 +?f12 )/2");
|
||||
add(L"f56", L"(?f13 +?f15 )/2");
|
||||
add(L"f57", L"(?f51 +?f50 )/2");
|
||||
add(L"f58", L"logwidth");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h, h1;
|
||||
h.position = L"0 ?f14";
|
||||
h.y_maximum= L"50000";
|
||||
h.y_minimum= L"0";
|
||||
handles.push_back(h);
|
||||
|
||||
h1.position = L"?f43 0";
|
||||
handles.push_back(h1);
|
||||
|
||||
h.position = L"?f58 ?f12";
|
||||
h.y_maximum= L"?f3";
|
||||
h.y_minimum= L"0";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
class oox_shape_mathPlus : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_mathPlus()
|
||||
{
|
||||
odf_type_name =L"ooxml-mathPlus";
|
||||
|
||||
enhanced_path = L"?f6 ?f12 L ?f7 ?f12 ?f7 ?f11 ?f8 ?f11 ?f8 ?f12 ?f9 ?f12 ?f9 ?f13 ?f8 ?f13 ?f8 ?f14 ?f7 ?f14 ?f7 ?f13 ?f6 ?f13 Z N";
|
||||
text_areas = L"?f6 ?f12 ?f9 ?f13";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"23520";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(73490-$0 ,$0 ,73490))");
|
||||
add(L"f1", L"logwidth*73490/200000");
|
||||
add(L"f2", L"logheight*73490/200000");
|
||||
add(L"f3", L"min(logwidth,logheight)");
|
||||
add(L"f4", L"?f3 *?f0 /200000");
|
||||
add(L"f5", L"logwidth/2");
|
||||
add(L"f6", L"?f5 +0-?f1 ");
|
||||
add(L"f7", L"?f5 +0-?f4 ");
|
||||
add(L"f8", L"?f5 +?f4 -0");
|
||||
add(L"f9", L"?f5 +?f1 -0");
|
||||
add(L"f10", L"logheight/2");
|
||||
add(L"f11", L"?f10 +0-?f2 ");
|
||||
add(L"f12", L"?f10 +0-?f4 ");
|
||||
add(L"f13", L"?f10 +?f4 -0");
|
||||
add(L"f14", L"?f10 +?f2 -0");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
h.position = L"0 ?f12";
|
||||
h.y_maximum= L"73490";
|
||||
h.y_minimum= L"0";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_mathMinus : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_mathMinus()
|
||||
{
|
||||
odf_type_name =L"ooxml-mathMinus";
|
||||
|
||||
enhanced_path = L"M ?f7 ?f4 L ?f8 ?f4 ?f8 ?f5 ?f7 ?f5 Z N";
|
||||
text_areas = L"?f7 ?f4 ?f8 ?f5";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"23520";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f1", L"logheight*?f0 /200000");
|
||||
add(L"f2", L"logwidth*73490/200000");
|
||||
add(L"f3", L"logheight/2");
|
||||
add(L"f4", L"?f3 +0-?f1 ");
|
||||
add(L"f5", L"?f3 +?f1 -0");
|
||||
add(L"f6", L"logwidth/2");
|
||||
add(L"f7", L"?f6 +0-?f2 ");
|
||||
add(L"f8", L"?f6 +?f2 -0");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
h.position = L"0 ?f4";
|
||||
h.y_maximum= L"100000";
|
||||
h.y_minimum= L"0";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@ -29,12 +29,15 @@
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
// shapetypeArc,
|
||||
//+ shapetypeArc,
|
||||
//+ shapetypeBevel,
|
||||
//+ shapetypeChevron,
|
||||
//+ shapetypeChord,
|
||||
//+ shapetypeCorner,
|
||||
// shapetypeCornerTabs,
|
||||
// shapetypeDecagon,
|
||||
// shapetypeDiagStripe,
|
||||
//+ shapetypeDiamond
|
||||
// shapetypeDodecagon,
|
||||
//+ shapetypeDoubleWave,
|
||||
//+ shapetypeFunnel,
|
||||
@ -42,13 +45,17 @@
|
||||
//+ shapetypeGear9,
|
||||
// shapetypeHalfFrame,
|
||||
// shapetypeHeptagon,
|
||||
//+ shapetypeHomePlate,
|
||||
// shapetypeNonIsoscelesTrapezoid,
|
||||
//+ shapetypeParallelogram
|
||||
//+ shapetypePie,
|
||||
//+ shapetypePieWedge,
|
||||
//+ shapetypePlaque,
|
||||
// shapetypePlaqueTabs,
|
||||
// shapetypeSquareTabs,
|
||||
// shapetypeTeardrop,
|
||||
// shapetypeTeardrop
|
||||
//+ shapetypeTriangle
|
||||
//+ shapetypeTrapezoid
|
||||
//+ shapetypeBlockArc
|
||||
//+ shapetypeDonut
|
||||
|
||||
@ -766,7 +773,7 @@ class oox_shape_PieWedge : public oox_shape
|
||||
public:
|
||||
oox_shape_PieWedge()
|
||||
{
|
||||
odf_type_name =L"ooxml-PieWedge";
|
||||
odf_type_name =L"ooxml-pieWedge";
|
||||
|
||||
enhanced_path = L"M 0 ?f7 G ?f8 ?f9 ?f10 ?f11 L ?f4 ?f7 Z N";
|
||||
text_areas = L"?f2 ?f3 ?f4 ?f7";
|
||||
@ -1103,4 +1110,376 @@ public:
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
class oox_shape_Chevron : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Chevron()
|
||||
{
|
||||
odf_type_name =L"ooxml-chevron";
|
||||
|
||||
enhanced_path = L"M 0 0 L ?f4 0 ?f11 ?f9 ?f4 ?f10 0 ?f10 ?f3 ?f9 Z N";
|
||||
text_areas = L"?f7 0 ?f8 ?f10";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"50000";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
|
||||
add(L"f3", L"?f0 *?f2 /100000");
|
||||
add(L"f4", L"logwidth+0-?f3 ");
|
||||
add(L"f5", L"?f4 *1/2");
|
||||
add(L"f6", L"?f4 +0-?f3 ");
|
||||
add(L"f7", L"if(?f6 ,?f3 ,0)");
|
||||
add(L"f8", L"if(?f6 ,?f4 ,logwidth)");
|
||||
add(L"f9", L"logheight/2");
|
||||
add(L"f10", L"logheight");
|
||||
add(L"f11", L"logwidth");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f4 0";
|
||||
h.x_minimum = L"0";
|
||||
h.x_maximum = L"?f1";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
class oox_shape_Arc : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Arc()
|
||||
{
|
||||
odf_type_name =L"ooxml-arc";
|
||||
|
||||
enhanced_path = L"M ?f16 ?f18 G ?f5 ?f7 ?f46 ?f47 L ?f15 ?f17 Z S N M ?f16 ?f18 G ?f5 ?f7 ?f48 ?f49 F N";
|
||||
text_areas = L"?f36 ?f42 ?f24 ?f30";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"16200000 0";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))");
|
||||
add(L"f1", L"if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))");
|
||||
add(L"f2", L"?f1 +0-?f0 ");
|
||||
add(L"f3", L"?f2 +21600000-0");
|
||||
add(L"f4", L"if(?f2 ,?f2 ,?f3 )");
|
||||
add(L"f5", L"logwidth/2");
|
||||
add(L"f6", L"?f5 *sin(pi*(?f0 )/10800000)");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"?f7 *cos(pi*(?f0 )/10800000)");
|
||||
add(L"f9", L"?f5 *(cos(atan2(?f6 ,?f8 )))");
|
||||
add(L"f10", L"?f7 *(sin(atan2(?f6 ,?f8 )))");
|
||||
add(L"f11", L"?f5 *sin(pi*(?f1 )/10800000)");
|
||||
add(L"f12", L"?f7 *cos(pi*(?f1 )/10800000)");
|
||||
add(L"f13", L"?f5 *(cos(atan2(?f11 ,?f12 )))");
|
||||
add(L"f14", L"?f7 *(sin(atan2(?f11 ,?f12 )))");
|
||||
add(L"f15", L"logwidth/2");
|
||||
add(L"f16", L"?f15 +?f9 -0");
|
||||
add(L"f17", L"logheight/2");
|
||||
add(L"f18", L"?f17 +?f10 -0");
|
||||
add(L"f19", L"?f15 +?f13 -0");
|
||||
add(L"f20", L"?f17 +?f14 -0");
|
||||
add(L"f21", L"21600000+0-?f0 ");
|
||||
add(L"f22", L"?f4 +0-?f21 ");
|
||||
add(L"f23", L"max(?f16 ,?f19 )");
|
||||
add(L"f24", L"if(?f22 ,logwidth,?f23 )");
|
||||
add(L"f25", L"5400000+0-?f0 ");
|
||||
add(L"f26", L"27000000+0-?f0 ");
|
||||
add(L"f27", L"if(?f25 ,?f25 ,?f26 )");
|
||||
add(L"f28", L"?f4 +0-?f27 ");
|
||||
add(L"f29", L"max(?f18 ,?f20 )");
|
||||
add(L"f30", L"if(?f28 ,logheight,?f29 )");
|
||||
add(L"f31", L"10800000+0-?f0 ");
|
||||
add(L"f32", L"32400000+0-?f0 ");
|
||||
add(L"f33", L"if(?f31 ,?f31 ,?f32 )");
|
||||
add(L"f34", L"?f4 +0-?f33 ");
|
||||
add(L"f35", L"min(?f16 ,?f19 )");
|
||||
add(L"f36", L"if(?f34 ,0,?f35 )");
|
||||
add(L"f37", L"16200000+0-?f0 ");
|
||||
add(L"f38", L"37800000+0-?f0 ");
|
||||
add(L"f39", L"if(?f37 ,?f37 ,?f38 )");
|
||||
add(L"f40", L"?f4 +0-?f39 ");
|
||||
add(L"f41", L"min(?f18 ,?f20 )");
|
||||
add(L"f42", L"if(?f40 ,0,?f41 )");
|
||||
add(L"f43", L"?f0 +0-5400000");
|
||||
add(L"f44", L"?f1 +5400000-0");
|
||||
add(L"f45", L"(?f43 +?f44 )/2");
|
||||
add(L"f46", L"(?f0 )/60000.0");
|
||||
add(L"f47", L"(?f4 )/60000.0");
|
||||
add(L"f48", L"(?f0 )/60000.0");
|
||||
add(L"f49", L"(?f4 )/60000.0");
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f16 ?f18";
|
||||
handles.push_back(h);
|
||||
|
||||
h.position = L"?f19 ?f20";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
class oox_shape_HomePlate : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_HomePlate()
|
||||
{
|
||||
odf_type_name =L"ooxml-homePlate";
|
||||
|
||||
enhanced_path = L"M 0 0 L ?f4 0 ?f9 ?f7 ?f4 ?f8 0 ?f8 Z N";
|
||||
text_areas = L"0 0 ?f5 ?f8";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"50000";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logwidth/?f0 ");
|
||||
add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
|
||||
add(L"f3", L"?f0 *?f2 /100000");
|
||||
add(L"f4", L"logwidth+0-?f3 ");
|
||||
add(L"f5", L"(?f4 +logwidth)/2");
|
||||
add(L"f6", L"?f4 *1/2");
|
||||
add(L"f7", L"logheight/2");
|
||||
add(L"f8", L"logheight");
|
||||
add(L"f9", L"logwidth");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f4 0";
|
||||
h.x_minimum = L"0";
|
||||
h.x_maximum = L"?f1";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_Bevel : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Bevel()
|
||||
{
|
||||
odf_type_name =L"ooxml-bevel";
|
||||
|
||||
enhanced_path = L"M ?f2 ?f2 L ?f3 ?f2 ?f3 ?f4 ?f2 ?f4 Z S N M 0 0 L ?f5 0 ?f3 ?f2 ?f2 ?f2 Z K S N M 0 ?f8 L ?f2 ?f4 ?f3 ?f4 ?f5 ?f8 Z I S N M 0 0 L ?f2 ?f2 ?f2 ?f4 0 ?f8 Z J S N M ?f5 0 L ?f5 ?f8 ?f3 ?f4 ?f3 ?f2 Z H S N M 0 0 L ?f5 0 ?f5 ?f8 0 ?f8 Z M ?f2 ?f2 L ?f3 ?f2 ?f3 ?f4 ?f2 ?f4 Z M 0 0 L ?f2 ?f2 M 0 ?f8 L ?f2 ?f4 M ?f5 0 L ?f3 ?f2 M ?f5 ?f8 L ?f3 ?f4 F N";
|
||||
text_areas = L"?f2 ?f2 ?f3 ?f4";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"12500";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))");
|
||||
add(L"f1", L"min(logwidth,logheight)");
|
||||
add(L"f2", L"?f1 *?f0 /100000");
|
||||
add(L"f3", L"logwidth+0-?f2 ");
|
||||
add(L"f4", L"logheight+0-?f2 ");
|
||||
add(L"f5", L"logwidth");
|
||||
add(L"f6", L"logheight/2");
|
||||
add(L"f7", L"logwidth/2");
|
||||
add(L"f8", L"logheight");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f2 0";
|
||||
h.x_minimum = L"0";
|
||||
h.x_maximum = L"50000";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
class oox_shape_Trapezoid : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Trapezoid()
|
||||
{
|
||||
odf_type_name =L"ooxml-trapezoid";
|
||||
|
||||
enhanced_path = L"M 0 ?f14 L ?f4 0 ?f5 0 ?f15 ?f14 Z N";
|
||||
text_areas = L"?f8 ?f10 ?f11 ?f14";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"50000*logwidth/?f0");
|
||||
add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
|
||||
add(L"f3", L"?f0 *?f2 /200000");
|
||||
add(L"f4", L"?f0 *?f2 /100000");
|
||||
add(L"f5", L"logwidth+0-?f4");
|
||||
add(L"f6", L"logwidth+0-?f3");
|
||||
add(L"f7", L"logwidth/3");
|
||||
add(L"f8", L"?f7 *?f2 /?f1");
|
||||
add(L"f9", L"logheight/3");
|
||||
add(L"f10", L"?f9 *?f2 /?f1");
|
||||
add(L"f11", L"logwidth+0-?f8");
|
||||
add(L"f12", L"logwidth/2");
|
||||
add(L"f13", L"logheight/2");
|
||||
add(L"f14", L"logheight");
|
||||
add(L"f15", L"logwidth");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f4 0";
|
||||
h.x_minimum = L"0";
|
||||
h.x_maximum = L"?f1";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
class oox_shape_Triangle : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Triangle()
|
||||
{
|
||||
odf_type_name =L"ooxml-triangle";
|
||||
|
||||
enhanced_path = L"M 0 ?f6 L ?f2 0 ?f7 ?f6 Z N";
|
||||
text_areas = L"?f1 ?f5 ?f4 ?f6";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"50000";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(100000-$0 ,$0 ,100000))");
|
||||
add(L"f1", L"logwidth*?f0 /200000");
|
||||
add(L"f2", L"logwidth*?f0 /100000");
|
||||
add(L"f3", L"logwidth/2");
|
||||
add(L"f4", L"?f1 +?f3 -0");
|
||||
add(L"f5", L"logheight/2");
|
||||
add(L"f6", L"logheight");
|
||||
add(L"f7", L"logwidth");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f2 0";
|
||||
h.x_minimum = L"0";
|
||||
h.x_maximum = L"100000";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_Diamond : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Diamond()
|
||||
{
|
||||
odf_type_name =L"ooxml-diamond";
|
||||
|
||||
enhanced_path = L"M 0 ?f3 L ?f2 0 ?f5 ?f3 ?f2 ?f4 Z N";
|
||||
text_areas = L"?f6 ?f7 ?f0 ?f1";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"logwidth*3/4");
|
||||
add(L"f1", L"logheight*3/4");
|
||||
add(L"f2", L"logwidth/2");
|
||||
add(L"f3", L"logheight/2");
|
||||
add(L"f4", L"logheight");
|
||||
add(L"f5", L"logwidth");
|
||||
add(L"f6", L"logwidth/4");
|
||||
add(L"f7", L"logheight/4");
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_Parallelogram : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Parallelogram()
|
||||
{
|
||||
odf_type_name =L"ooxml-parallelogram";
|
||||
|
||||
enhanced_path = L"M 0 ?f22 L ?f4 0 ?f23 0 ?f6 ?f22 Z N";
|
||||
text_areas = L"?f13 ?f14 ?f15 ?f16";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000";
|
||||
|
||||
add(L"f0", L"min(logwidth,logheight)");
|
||||
add(L"f1", L"100000*logwidth/?f0");
|
||||
add(L"f2", L"if(0-$0 ,0,if(?f1 -$0 ,$0 ,?f1 ))");
|
||||
add(L"f3", L"?f0 *?f2 /200000");
|
||||
add(L"f4", L"?f0 *?f2 /100000");
|
||||
add(L"f5", L"logwidth+0-?f3");
|
||||
add(L"f6", L"logwidth+0-?f4");
|
||||
add(L"f7", L"?f6 *1/2");
|
||||
add(L"f8", L"logwidth+0-?f7");
|
||||
add(L"f9", L"logwidth/2");
|
||||
add(L"f10", L"?f9 *?f2 /?f1");
|
||||
add(L"f11", L"5*?f2 /?f1 ");
|
||||
add(L"f12", L"(1+?f11 )/12");
|
||||
add(L"f13", L"?f12 *logwidth/1");
|
||||
add(L"f14", L"?f12 *logheight/1");
|
||||
add(L"f15", L"logwidth+0-?f13");
|
||||
add(L"f16", L"logheight+0-?f14");
|
||||
add(L"f17", L"logwidth/2");
|
||||
add(L"f18", L"logheight*?f17 /?f4");
|
||||
add(L"f19", L"if(0-?f18 ,0,if(logheight-?f18 ,?f18 ,logheight))");
|
||||
add(L"f20", L"logheight+0-?f19");
|
||||
add(L"f21", L"logheight/2");
|
||||
add(L"f22", L"logheight");
|
||||
add(L"f23", L"logwidth");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f4 0";
|
||||
h.x_minimum = L"0";
|
||||
h.x_maximum = L"?f1";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};
|
||||
|
||||
class oox_shape_RtTriangle : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_RtTriangle()
|
||||
{
|
||||
odf_type_name =L"ooxml-rtTriangle";
|
||||
|
||||
enhanced_path = L"M 0 ?f4 L 0 0 ?f6 ?f4 Z N";
|
||||
text_areas = L"?f7 ?f0 ?f1 ?f2";
|
||||
view_box = L"0 0 0 0";
|
||||
|
||||
add(L"f0", L"logheight*7/12");
|
||||
add(L"f1", L"logwidth*7/12");
|
||||
add(L"f2", L"logheight*11/12");
|
||||
add(L"f3", L"logheight/2");
|
||||
add(L"f4", L"logheight");
|
||||
add(L"f5", L"logwidth/2");
|
||||
add(L"f6", L"logwidth");
|
||||
add(L"f7", L"logwidth/12");
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
class oox_shape_Plus : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_Plus()
|
||||
{
|
||||
odf_type_name =L"ooxml-plus";
|
||||
|
||||
enhanced_path = L"M 0 ?f2 L ?f2 ?f2 ?f2 0 ?f3 0 ?f3 ?f2 ?f13 ?f2 ?f13 ?f4 ?f3 ?f4 ?f3 ?f12 ?f2 ?f12 ?f2 ?f4 0 ?f4 Z N";
|
||||
text_areas = L"?f6 ?f8 ?f7 ?f9";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"25000";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))");
|
||||
add(L"f1", L"min(logwidth,logheight)");
|
||||
add(L"f2", L"?f1 *?f0 /100000");
|
||||
add(L"f3", L"logwidth+0-?f2 ");
|
||||
add(L"f4", L"logheight+0-?f2 ");
|
||||
add(L"f5", L"logwidth+0-logheight");
|
||||
add(L"f6", L"if(?f5 ,0,?f2 )");
|
||||
add(L"f7", L"if(?f5 ,logwidth,?f3 )");
|
||||
add(L"f8", L"if(?f5 ,?f2 ,0)");
|
||||
add(L"f9", L"if(?f5 ,?f4 ,logheight)");
|
||||
add(L"f10", L"logwidth/2");
|
||||
add(L"f11", L"logheight/2");
|
||||
add(L"f12", L"logheight");
|
||||
add(L"f13", L"logwidth");
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
_handle h;
|
||||
|
||||
h.position = L"?f2 0";
|
||||
h.x_minimum = L"0";
|
||||
h.x_maximum = L"50000";
|
||||
handles.push_back(h);
|
||||
}
|
||||
};}
|
||||
|
||||
@ -719,4 +719,45 @@ public:
|
||||
add(L"f198", L"if(?f26, ?f175, ?f190)");
|
||||
}
|
||||
};
|
||||
class oox_shape_roundRect : public oox_shape
|
||||
{
|
||||
public:
|
||||
oox_shape_roundRect()
|
||||
{
|
||||
odf_type_name =L"ooxml-roundRect";
|
||||
|
||||
enhanced_path = L"M 0 ?f2 G ?f2 ?f2 ?f12 ?f13 L ?f3 0 G ?f2 ?f2 ?f14 ?f15 L ?f11 ?f4 G ?f2 ?f2 ?f16 ?f17 L ?f2 ?f10 G ?f2 ?f2 ?f18 ?f19 Z N";
|
||||
text_areas = L"?f5 ?f5 ?f6 ?f7";
|
||||
view_box = L"0 0 0 0";
|
||||
modifiers = L"16667";
|
||||
|
||||
add(L"f0", L"if(0-$0 ,0,if(50000-$0 ,$0 ,50000))");
|
||||
add(L"f1", L"min(logwidth,logheight)");
|
||||
add(L"f2", L"?f1 *?f0 /100000");
|
||||
add(L"f3", L"logwidth+0-?f2 ");
|
||||
add(L"f4", L"logheight+0-?f2 ");
|
||||
add(L"f5", L"?f2 *29289/100000");
|
||||
add(L"f6", L"logwidth+0-?f5 ");
|
||||
add(L"f7", L"logheight+0-?f5 ");
|
||||
add(L"f8", L"logwidth/2");
|
||||
add(L"f9", L"logheight/2");
|
||||
add(L"f10", L"logheight");
|
||||
add(L"f11", L"logwidth");
|
||||
add(L"f12", L"(10800000)/60000.0");
|
||||
add(L"f13", L"(5400000)/60000.0");
|
||||
add(L"f14", L"(16200000)/60000.0");
|
||||
add(L"f15", L"(5400000)/60000.0");
|
||||
add(L"f16", L"(0)/60000.0");
|
||||
add(L"f17", L"(5400000)/60000.0");
|
||||
add(L"f18", L"(5400000)/60000.0");
|
||||
add(L"f19", L"(5400000)/60000.0");
|
||||
//-----------------------------------------------------------------
|
||||
_handle h1;
|
||||
|
||||
h1.position = L"?f2 0";
|
||||
h1.x_maximum= L"50000";
|
||||
h1.x_minimum= L"0";
|
||||
handles.push_back(h1);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ void draw_page::serialize(std::wostream & _Wostream)
|
||||
{
|
||||
CP_XML_NODE_SIMPLE()
|
||||
{
|
||||
draw_page_attr_.serialize(CP_GET_XML_NODE());
|
||||
attlist_.serialize(CP_GET_XML_NODE());
|
||||
for (int i = 0; i < content_.size(); i++)
|
||||
{
|
||||
content_[i]->serialize(CP_XML_STREAM());
|
||||
@ -107,7 +107,7 @@ const wchar_t * presentation_footer_decl::name = L"footer-decl";
|
||||
// CP_XML_ATTR_OPT(L"presentation:name", presentation_name_);
|
||||
//}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//------------------------------------------------------
|
||||
const wchar_t * presentation_date_time_decl::ns = L"presentation";
|
||||
const wchar_t * presentation_date_time_decl::name = L"date-time-decl";
|
||||
//
|
||||
@ -119,5 +119,33 @@ const wchar_t * presentation_date_time_decl::name = L"date-time-decl";
|
||||
//}
|
||||
//
|
||||
|
||||
//------------------------------------------------------
|
||||
const wchar_t * presentation_notes::ns = L"presentation";
|
||||
const wchar_t * presentation_notes::name = L"notes";
|
||||
|
||||
void presentation_notes::create_child_element( const std::wstring & Ns, const std::wstring & Name)
|
||||
{
|
||||
CP_CREATE_ELEMENT(content_);
|
||||
}
|
||||
void presentation_notes::add_child_element( const office_element_ptr & child_element)
|
||||
{
|
||||
content_.push_back(child_element);
|
||||
}
|
||||
|
||||
void presentation_notes::serialize(std::wostream & _Wostream)
|
||||
{
|
||||
CP_XML_WRITER(_Wostream)
|
||||
{
|
||||
CP_XML_NODE_SIMPLE()
|
||||
{
|
||||
attlist_.serialize(CP_GET_XML_NODE());
|
||||
for (int i = 0; i < content_.size(); i++)
|
||||
{
|
||||
content_[i]->serialize(CP_XML_STREAM());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ public:
|
||||
office_element_ptr_array content_;
|
||||
office_element_ptr animation_;
|
||||
|
||||
draw_page_attr draw_page_attr_;
|
||||
draw_page_attr attlist_;
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_page);
|
||||
@ -127,6 +127,26 @@ public:
|
||||
|
||||
};
|
||||
CP_REGISTER_OFFICE_ELEMENT2(presentation_date_time_decl);
|
||||
//---------------------------------------------------------------------
|
||||
class presentation_notes : public office_element_impl<presentation_notes>
|
||||
{
|
||||
public:
|
||||
static const wchar_t * ns;
|
||||
static const wchar_t * name;
|
||||
static const xml::NodeType xml_type = xml::typeElement;
|
||||
static const ElementType type = typePresentationNotes;
|
||||
CPDOCCORE_DEFINE_VISITABLE();
|
||||
|
||||
virtual void create_child_element(const std::wstring & Ns, const std::wstring & Name);
|
||||
virtual void add_child_element( const office_element_ptr & child_element);
|
||||
|
||||
virtual void serialize(std::wostream & _Wostream);
|
||||
|
||||
office_element_ptr_array content_;
|
||||
draw_page_attr attlist_;
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(presentation_notes);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -958,7 +958,8 @@ void odf_drawing_context::end_shape()
|
||||
{
|
||||
oox_shape_ptr shape_define = oox_shape::create(impl_->current_drawing_state_.oox_shape_preset_);
|
||||
|
||||
if (!shape_define) shape_define = impl_->current_drawing_state_.oox_shape_;
|
||||
if (!shape_define)
|
||||
shape_define = impl_->current_drawing_state_.oox_shape_;
|
||||
|
||||
if (shape_define)
|
||||
{
|
||||
|
||||
@ -84,7 +84,7 @@ void odf_master_state::set_name(std::wstring & name)
|
||||
|
||||
if (!style_)return;
|
||||
|
||||
style_->style_master_page_attlist_.style_name_ = name;
|
||||
style_->attlist_.style_name_ = name;
|
||||
}
|
||||
void odf_master_state::set_display_name(std::wstring & name)
|
||||
{
|
||||
@ -92,7 +92,7 @@ void odf_master_state::set_display_name(std::wstring & name)
|
||||
|
||||
if (!style_)return;
|
||||
|
||||
style_->style_master_page_attlist_.style_display_name_ = name;
|
||||
style_->attlist_.style_display_name_ = name;
|
||||
}
|
||||
|
||||
void odf_master_state::set_layout_style_name(std::wstring name)
|
||||
@ -101,14 +101,14 @@ void odf_master_state::set_layout_style_name(std::wstring name)
|
||||
|
||||
if (!style_)return;
|
||||
|
||||
style_->style_master_page_attlist_.style_page_layout_name_ = name;
|
||||
style_->attlist_.style_page_layout_name_ = name;
|
||||
}
|
||||
std::wstring odf_master_state::get_name()
|
||||
{
|
||||
style_master_page* style_ = dynamic_cast<style_master_page*>(elements_[0].elm.get());
|
||||
if (!style_)return L"";
|
||||
|
||||
return style_->style_master_page_attlist_.style_name_.get_value_or(L"");
|
||||
return style_->attlist_.style_name_.get_value_or(L"");
|
||||
}
|
||||
void odf_master_state::add_footer(office_element_ptr & elm)
|
||||
{
|
||||
|
||||
@ -147,7 +147,16 @@ void odp_conversion_context::end_drawings()
|
||||
{
|
||||
current_slide().drawing_context()->clear();
|
||||
}
|
||||
|
||||
void odp_conversion_context::start_note()
|
||||
{
|
||||
office_element_ptr note_elm;
|
||||
create_element(L"presentation", L"notes", note_elm, this);
|
||||
|
||||
current_slide().drawing_context()->start_drawing();
|
||||
current_slide().drawing_context()->start_element(note_elm);
|
||||
|
||||
slide_context_.start_page(note_elm);
|
||||
}
|
||||
void odp_conversion_context::start_comment(int oox_comm_id)
|
||||
{
|
||||
office_element_ptr comm_elm;
|
||||
@ -182,6 +191,15 @@ void odp_conversion_context::end_comment()
|
||||
current_slide().drawing_context()->end_element();
|
||||
current_slide().drawing_context()->end_drawing();
|
||||
}
|
||||
void odp_conversion_context::end_note()
|
||||
{
|
||||
slide_context_.end_page();
|
||||
|
||||
slide_context_.remove_page();
|
||||
|
||||
current_slide().drawing_context()->end_element();
|
||||
current_slide().drawing_context()->end_drawing();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -77,6 +77,9 @@ public:
|
||||
void start_comment_content ();
|
||||
void end_comment_content ();
|
||||
|
||||
void start_note();
|
||||
void end_note();
|
||||
|
||||
private:
|
||||
odp_slide_context slide_context_;
|
||||
|
||||
|
||||
@ -72,12 +72,12 @@ void odp_page_state::set_page_name(std::wstring name)
|
||||
|
||||
draw_page* page = dynamic_cast<draw_page*>(page_elm_.get());
|
||||
if (page)
|
||||
page->draw_page_attr_.draw_name_ = name;
|
||||
page->attlist_.draw_name_ = name;
|
||||
else
|
||||
{
|
||||
//style_master_page *master_page = dynamic_cast<style_master_page*>(page_elm_.get());
|
||||
//if (master_page)
|
||||
// master_page->style_master_page_attlist_.style_display_name_ = name;
|
||||
// master_page->attlist_.style_display_name_ = name;
|
||||
}
|
||||
}
|
||||
|
||||
@ -88,7 +88,7 @@ void odp_page_state::set_layout_page(std::wstring name)
|
||||
draw_page* page = dynamic_cast<draw_page*>(page_elm_.get());
|
||||
if (page == NULL)return;
|
||||
|
||||
page->draw_page_attr_.page_layout_name_ = name;
|
||||
page->attlist_.page_layout_name_ = name;
|
||||
}
|
||||
|
||||
void odp_page_state::set_master_page(std::wstring name)
|
||||
@ -98,7 +98,7 @@ void odp_page_state::set_master_page(std::wstring name)
|
||||
draw_page* page = dynamic_cast<draw_page*>(page_elm_.get());
|
||||
if (page == NULL)return;
|
||||
|
||||
page->draw_page_attr_.master_page_name_ = name;
|
||||
page->attlist_.master_page_name_ = name;
|
||||
}
|
||||
|
||||
void odp_page_state::set_page_style(office_element_ptr & elm)
|
||||
@ -111,12 +111,18 @@ void odp_page_state::set_page_style(office_element_ptr & elm)
|
||||
|
||||
draw_page* page = dynamic_cast<draw_page*>(page_elm_.get());
|
||||
if (page)
|
||||
page->draw_page_attr_.draw_style_name_ = office_page_style_->style_name_;
|
||||
page->attlist_.draw_style_name_ = office_page_style_->style_name_;
|
||||
else
|
||||
{
|
||||
style_master_page *master_page = dynamic_cast<style_master_page*>(page_elm_.get());
|
||||
if (master_page)
|
||||
master_page->style_master_page_attlist_.draw_style_name_ = office_page_style_->style_name_;
|
||||
master_page->attlist_.draw_style_name_ = office_page_style_->style_name_;
|
||||
else
|
||||
{
|
||||
presentation_notes* notes = dynamic_cast<presentation_notes*>(page_elm_.get());
|
||||
if (notes)
|
||||
notes->attlist_.draw_style_name_ = office_page_style_->style_name_;
|
||||
}
|
||||
}
|
||||
}
|
||||
void odp_page_state::add_child_element( const office_element_ptr & child_element)
|
||||
|
||||
@ -44,8 +44,9 @@ namespace cpdoccore {
|
||||
|
||||
namespace odf_writer {
|
||||
|
||||
odp_slide_context::odp_slide_context(odp_conversion_context & Context): context_(Context), table_context_(&Context), comment_context_(&Context)
|
||||
odp_slide_context::odp_slide_context(odp_conversion_context & Context) : context_(Context), table_context_(&Context), comment_context_(&Context)
|
||||
{
|
||||
count_slides_ = 0;
|
||||
styles_context_ = Context.styles_context();
|
||||
}
|
||||
void odp_slide_context::set_styles_context(odf_style_context* styles_context)
|
||||
@ -67,17 +68,13 @@ void odp_slide_context::start_page(office_element_ptr & elm)
|
||||
{
|
||||
page_state_list_.push_back( odp_page_state(&context_, elm) );
|
||||
|
||||
std::wstring style_name_new = L"dp" + boost::lexical_cast<std::wstring>(page_state_list_.size());
|
||||
std::wstring style_name_new = L"dp" + std::to_wstring(++count_slides_);
|
||||
|
||||
office_element_ptr & style = styles_context_->add_or_find(style_name_new, style_family::DrawingPage, true);
|
||||
style->create_child_element(L"style", L"drawing-page-properties");
|
||||
|
||||
state().set_page_style(style);
|
||||
state().drawing_context()->set_styles_context(styles_context_);
|
||||
|
||||
//для свойств страницы, а не таблицы - нужно создать master-page c page layout и связать по имени со стилем таблицы
|
||||
//причем здесь, т.к. с другой стороны это ВСЕ еще свойства листа. то есть совйства листа разделить на свйства страницы и таблицы ..
|
||||
//todooo
|
||||
//????
|
||||
}
|
||||
|
||||
void odp_slide_context::end_page()
|
||||
@ -85,6 +82,11 @@ void odp_slide_context::end_page()
|
||||
state().drawing_context()->finalize(state().page_elm_);
|
||||
}
|
||||
|
||||
void odp_slide_context::remove_page()
|
||||
{
|
||||
page_state_list_.pop_back();
|
||||
}
|
||||
|
||||
odf_table_context* odp_slide_context::table_context()
|
||||
{
|
||||
return &table_context_;
|
||||
|
||||
@ -53,6 +53,8 @@ public:
|
||||
void start_page (office_element_ptr & elm);
|
||||
void end_page ();
|
||||
|
||||
void remove_page();
|
||||
|
||||
void set_styles_context(odf_style_context* styles_context);
|
||||
odf_style_context* get_styles_context();
|
||||
|
||||
@ -81,6 +83,7 @@ private:
|
||||
odf_comment_context comment_context_;
|
||||
|
||||
std::list<odp_page_state> page_state_list_;
|
||||
int count_slides_;
|
||||
|
||||
friend class odp_conversion_context;
|
||||
|
||||
|
||||
@ -157,8 +157,6 @@ enum ElementType
|
||||
typeStylePresentationPlaceholder,
|
||||
typeStyleDrawingPageProperties,
|
||||
|
||||
typePresentationNotes,
|
||||
|
||||
typeStyleColumns,
|
||||
typeStyleColumn,
|
||||
typeStyleColumnSep,
|
||||
@ -264,6 +262,7 @@ enum ElementType
|
||||
typeDrawPage,
|
||||
typePresentationFooterDecl,
|
||||
typePresentationDateTimeDecl,
|
||||
typePresentationNotes,
|
||||
|
||||
typeAnimPar,
|
||||
typeAnimSeq,
|
||||
|
||||
@ -44,6 +44,8 @@
|
||||
#include "Shapes/oox_shapeConnectors.h"
|
||||
#include "Shapes/oox_shapeWordArt.h"
|
||||
#include "Shapes/oox_shapeCurvedArrows.h"
|
||||
#include "Shapes/oox_shapeCallouts.h"
|
||||
#include "Shapes/oox_shapeBents.h"
|
||||
|
||||
#include "../../../Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h"
|
||||
|
||||
@ -61,7 +63,12 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
|
||||
{
|
||||
case SimpleTypes::shapetypeMathMultiply: return boost::make_shared<oox_shape_mathMultiply>();
|
||||
case SimpleTypes::shapetypeMathEqual: return boost::make_shared<oox_shape_mathEqual>();
|
||||
case SimpleTypes::shapetypeSun: return boost::make_shared<oox_shape_sun>();
|
||||
case SimpleTypes::shapetypeMathPlus: return boost::make_shared<oox_shape_mathPlus>();
|
||||
case SimpleTypes::shapetypeMathNotEqual: return boost::make_shared<oox_shape_mathNotEqual>();
|
||||
case SimpleTypes::shapetypeMathDivide: return boost::make_shared<oox_shape_mathDivide>();
|
||||
case SimpleTypes::shapetypeMathMinus: return boost::make_shared<oox_shape_mathMinus>();
|
||||
|
||||
case SimpleTypes::shapetypeRoundRect: return boost::make_shared<oox_shape_roundRect>();
|
||||
case SimpleTypes::shapetypeRound1Rect: return boost::make_shared<oox_shape_round1Rect>();
|
||||
case SimpleTypes::shapetypeRound2DiagRect: return boost::make_shared<oox_shape_round2DiagRect>();
|
||||
case SimpleTypes::shapetypeRound2SameRect: return boost::make_shared<oox_shape_round2SameRect>();
|
||||
@ -69,23 +76,46 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
|
||||
case SimpleTypes::shapetypeSnip2DiagRect: return boost::make_shared<oox_shape_snip2DiagRect>();
|
||||
case SimpleTypes::shapetypeSnip2SameRect: return boost::make_shared<oox_shape_snip2SameRect>();
|
||||
case SimpleTypes::shapetypeSnipRoundRect: return boost::make_shared<oox_shape_snipRoundRect>();
|
||||
|
||||
case SimpleTypes::shapetypeStar6: return boost::make_shared<oox_shape_star6>();
|
||||
case SimpleTypes::shapetypeStar7: return boost::make_shared<oox_shape_star7>();
|
||||
case SimpleTypes::shapetypeStar10: return boost::make_shared<oox_shape_star10>();
|
||||
case SimpleTypes::shapetypeStar12: return boost::make_shared<oox_shape_star12>();
|
||||
case SimpleTypes::shapetypeStar16: return boost::make_shared<oox_shape_star16>();
|
||||
case SimpleTypes::shapetypeStar32: return boost::make_shared<oox_shape_star32>();
|
||||
case SimpleTypes::shapetypeSun: return boost::make_shared<oox_shape_sun>();
|
||||
|
||||
case SimpleTypes::shapetypeCircularArrow: return boost::make_shared<oox_shape_CircularArrow>();
|
||||
case SimpleTypes::shapetypeCurvedLeftArrow: return boost::make_shared<oox_shape_CurvedLeftArrow>();
|
||||
case SimpleTypes::shapetypeCurvedRightArrow: return boost::make_shared<oox_shape_CurvedRightArrow>();
|
||||
case SimpleTypes::shapetypeCurvedDownArrow: return boost::make_shared<oox_shape_CurvedDownArrow>();
|
||||
case SimpleTypes::shapetypeLeftCircularArrow: return boost::make_shared<oox_shape_LeftCircularArrow>();
|
||||
case SimpleTypes::shapetypeSwooshArrow: return boost::make_shared<oox_shape_SwooshArrow>();
|
||||
case SimpleTypes::shapetypeLeftArrow: return boost::make_shared<oox_shape_LeftArrow>();
|
||||
case SimpleTypes::shapetypeLeftRightArrow: return boost::make_shared<oox_shape_LeftRightArrow>();
|
||||
case SimpleTypes::shapetypeLeftUpArrow: return boost::make_shared<oox_shape_LeftUpArrow>();
|
||||
case SimpleTypes::shapetypeUpDownArrow: return boost::make_shared<oox_shape_UpDownArrow>();
|
||||
case SimpleTypes::shapetypeRightArrow: return boost::make_shared<oox_shape_RightArrow>();
|
||||
case SimpleTypes::shapetypeDownArrow: return boost::make_shared<oox_shape_DownArrow>();
|
||||
case SimpleTypes::shapetypeUpArrow: return boost::make_shared<oox_shape_UpArrow>();
|
||||
case SimpleTypes::shapetypeNotchedRightArrow: return boost::make_shared<oox_shape_NotchedRightArrow>();
|
||||
|
||||
case SimpleTypes::shapetypeFunnel: return boost::make_shared<oox_shape_Funnel>();
|
||||
case SimpleTypes::shapetypeGear6: return boost::make_shared<oox_shape_Gear6>();
|
||||
case SimpleTypes::shapetypeGear9: return boost::make_shared<oox_shape_Gear9>();
|
||||
case SimpleTypes::shapetypeCircularArrow: return boost::make_shared<oox_shape_CircularArrow>();
|
||||
case SimpleTypes::shapetypeCurvedLeftArrow: return boost::make_shared<oox_shape_curvedLeftArrow>();
|
||||
case SimpleTypes::shapetypeCurvedDownArrow: return boost::make_shared<oox_shape_curvedDownArrow>();
|
||||
case SimpleTypes::shapetypeLeftCircularArrow: return boost::make_shared<oox_shape_LeftCircularArrow>();
|
||||
case SimpleTypes::shapetypeSwooshArrow: return boost::make_shared<oox_shape_SwooshArrow>();
|
||||
case SimpleTypes::shapetypeBlockArc: return boost::make_shared<oox_shape_BlockArc>();
|
||||
case SimpleTypes::shapetypeCorner: return boost::make_shared<oox_shape_Corner>();
|
||||
case SimpleTypes::shapetypeChord: return boost::make_shared<oox_shape_Chord>();
|
||||
case SimpleTypes::shapetypeChevron: return boost::make_shared<oox_shape_Chevron>();
|
||||
case SimpleTypes::shapetypeHomePlate: return boost::make_shared<oox_shape_HomePlate>();
|
||||
case SimpleTypes::shapetypeBevel: return boost::make_shared<oox_shape_Bevel>();
|
||||
case SimpleTypes::shapetypeArc: return boost::make_shared<oox_shape_Arc>();
|
||||
case SimpleTypes::shapetypeTrapezoid: return boost::make_shared<oox_shape_Trapezoid>();
|
||||
case SimpleTypes::shapetypeTriangle: return boost::make_shared<oox_shape_Triangle>();
|
||||
case SimpleTypes::shapetypeRtTriangle: return boost::make_shared<oox_shape_RtTriangle>();
|
||||
case SimpleTypes::shapetypeParallelogram: return boost::make_shared<oox_shape_Parallelogram>();
|
||||
case SimpleTypes::shapetypeDiamond: return boost::make_shared<oox_shape_Diamond>();
|
||||
case SimpleTypes::shapetypePlus: return boost::make_shared<oox_shape_Plus>();
|
||||
|
||||
case SimpleTypes::shapetypePlaque: return boost::make_shared<oox_shape_Plaque>();
|
||||
case SimpleTypes::shapetypeDoubleWave: return boost::make_shared<oox_shape_DoubleWave>();
|
||||
@ -93,7 +123,15 @@ oox_shape_ptr oox_shape::create(int ooxPrstGeomType)
|
||||
case SimpleTypes::shapetypePie: return boost::make_shared<oox_shape_Pie>();
|
||||
case SimpleTypes::shapetypeDonut: return boost::make_shared<oox_shape_Donut>();
|
||||
case SimpleTypes::shapetypeLeftRightRibbon: return boost::make_shared<oox_shape_LeftRightRibbon>();
|
||||
|
||||
|
||||
case SimpleTypes::shapetypeFlowChartExtract: return boost::make_shared<oox_shape_FlowChartExtract>();
|
||||
|
||||
case SimpleTypes::shapetypeLeftArrowCallout: return boost::make_shared<oox_shape_LeftArrowCallout>();
|
||||
case SimpleTypes::shapetypeRightArrowCallout: return boost::make_shared<oox_shape_RightArrowCallout>();
|
||||
case SimpleTypes::shapetypeUpArrowCallout: return boost::make_shared<oox_shape_UpArrowCallout>();
|
||||
case SimpleTypes::shapetypeDownArrowCallout: return boost::make_shared<oox_shape_DownArrowCallout>();
|
||||
|
||||
case SimpleTypes::shapetypeBentUpArrow: return boost::make_shared<oox_shape_BentUpArrow>();
|
||||
|
||||
//case (2001 + SimpleTypes::textshapetypeTextArchDown):
|
||||
//case (2001 + SimpleTypes::textshapetypeTextArchDownPour):
|
||||
|
||||
@ -1270,7 +1270,7 @@ void style_master_page::serialize(std::wostream & strm)
|
||||
{
|
||||
CP_XML_NODE_SIMPLE()
|
||||
{
|
||||
style_master_page_attlist_.serialize( CP_GET_XML_NODE());
|
||||
attlist_.serialize( CP_GET_XML_NODE());
|
||||
|
||||
if (style_footer_) style_footer_->serialize(CP_XML_STREAM());
|
||||
if (style_header_) style_header_->serialize(CP_XML_STREAM());
|
||||
|
||||
@ -505,7 +505,7 @@ public:
|
||||
|
||||
int find_placeHolderIndex(odf_types::presentation_class::type placeHolder,int & last_idx);
|
||||
|
||||
style_master_page_attlist style_master_page_attlist_;
|
||||
style_master_page_attlist attlist_;
|
||||
|
||||
office_element_ptr style_header_;
|
||||
office_element_ptr style_header_left_;
|
||||
|
||||
@ -1825,9 +1825,27 @@ void OoxConverter::convert(PPTX::Logic::Run *oox_run)
|
||||
|
||||
if ((oox_run->rPr.IsInit()) && (oox_run->rPr->hlinkClick.IsInit()) && (oox_run->rPr->hlinkClick->id.IsInit()))
|
||||
{
|
||||
odf_writer::style_text_properties * text_properties = odf_context()->text_context()->get_text_properties();
|
||||
|
||||
if (!text_properties->content_.fo_color_)
|
||||
{
|
||||
PPTX::Logic::UniColor colorLink;
|
||||
colorLink.Color.reset(new PPTX::Logic::SchemeClr());
|
||||
|
||||
PPTX::Logic::SchemeClr & clr = colorLink.as<PPTX::Logic::SchemeClr>();
|
||||
clr.val.set(L"hlink");
|
||||
|
||||
std::wstring strHexColor;
|
||||
_CP_OPT(double) opacity;
|
||||
convert(&colorLink, strHexColor, opacity);
|
||||
if (!strHexColor.empty())
|
||||
text_properties->content_.fo_color_ = strHexColor;
|
||||
}
|
||||
text_properties->content_.style_text_underline_type_ = odf_types::line_type::Single;
|
||||
text_properties->content_.style_text_underline_style_ = odf_types::line_style::Solid;
|
||||
|
||||
std::wstring hlink = find_link_by_id(oox_run->rPr->hlinkClick->id.get(), 2);
|
||||
odf_context()->text_context()->add_hyperlink(hlink, oox_run->GetText());
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1929,17 +1947,17 @@ void OoxConverter::convert(PPTX::Logic::TxBody *oox_txBody, PPTX::Logic::ShapeSt
|
||||
for (size_t i = 0; i < oox_txBody->Paragrs.size(); i++)
|
||||
{
|
||||
convert(&oox_txBody->Paragrs[i], oox_txBody->lstStyle.GetPointer());
|
||||
|
||||
//внешние настройки для текста
|
||||
convert(oox_txBody->bodyPr.GetPointer());
|
||||
|
||||
if (oox_style)
|
||||
{
|
||||
convert(&oox_style->fontRef);
|
||||
}
|
||||
}
|
||||
odf_context()->drawing_context()->set_text( odf_context()->text_context());
|
||||
|
||||
//внешние настройки для текста
|
||||
|
||||
convert(oox_txBody->bodyPr.GetPointer());
|
||||
|
||||
if (oox_style)
|
||||
{
|
||||
convert(&oox_style->fontRef);
|
||||
}
|
||||
odf_context()->end_text_context();
|
||||
}
|
||||
void OoxConverter::convert(PPTX::Logic::ArcTo *oox_geom_path)
|
||||
|
||||
@ -412,6 +412,18 @@ void PptxConverter::convert_slides()
|
||||
void PptxConverter::convert(PPTX::NotesSlide *oox_note)
|
||||
{
|
||||
if (!oox_note) return;
|
||||
|
||||
odp_context->start_note();
|
||||
|
||||
current_slide = dynamic_cast<OOX::IFileContainer*>(oox_note);
|
||||
|
||||
if (oox_note->clrMapOvr.IsInit() && oox_note->clrMapOvr->overrideClrMapping.IsInit())
|
||||
current_clrMap = oox_note->clrMapOvr->overrideClrMapping.GetPointer();
|
||||
//current_txStyles = oox_note->Master->txStyles.GetPointer();
|
||||
|
||||
convert_slide(&oox_note->cSld, NULL, true, true);
|
||||
|
||||
odp_context->end_note();
|
||||
}
|
||||
|
||||
void PptxConverter::convert(OOX::WritingElement *oox_unknown)
|
||||
|
||||
@ -145,19 +145,21 @@ namespace PPTX
|
||||
lColorIndex._set(node.GetAttribute(_T("w:followedHyperlink"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("folHlink"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("w:hyperlink"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("hlink"), lColorIndex));
|
||||
}
|
||||
|
||||
lColorIndex._set(node.GetAttribute(_T("accent1"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent1"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent2"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent2"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent3"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent3"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent4"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent4"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent5"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent5"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent6"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent6"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("bg1"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("bg1"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("bg2"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("bg2"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("tx1"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("tx1"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("tx2"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("tx2"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("folHlink")));ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("folHlink"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("hlink"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("hlink"), lColorIndex));
|
||||
else
|
||||
{
|
||||
lColorIndex._set(node.GetAttribute(_T("accent1"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent1"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent2"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent2"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent3"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent3"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent4"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent4"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent5"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent5"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("accent6"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("accent6"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("bg1"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("bg1"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("bg2"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("bg2"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("tx1"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("tx1"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("tx2"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("tx2"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("folHlink")));ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("folHlink"), lColorIndex));
|
||||
lColorIndex._set(node.GetAttribute(_T("hlink"))); ColorMap.insert(std::pair<std::wstring,Limit::ColorSchemeIndex>(_T("hlink"), lColorIndex));
|
||||
}
|
||||
}
|
||||
|
||||
virtual std::wstring toXML() const
|
||||
|
||||
@ -182,12 +182,14 @@ namespace PPTX
|
||||
NSBinPptxRW::CDrawingConverter oDrawingConverter;
|
||||
NSBinPptxRW::CBinaryFileWriter* pOldWriter = oDrawingConverter.m_pBinaryWriter;
|
||||
|
||||
oDrawingConverter.m_pBinaryWriter = pWriter;
|
||||
oDrawingConverter.m_pBinaryWriter = pWriter;
|
||||
smart_ptr<OOX::IFileContainer> oldRels = oDrawingConverter.GetRels();
|
||||
oDrawingConverter.SetRels(pChart.smart_dynamic_cast<OOX::IFileContainer>());
|
||||
|
||||
BinXlsxRW::BinaryChartWriter oBinaryChartWriter(*pWriter, &oDrawingConverter);
|
||||
oBinaryChartWriter.WriteCT_ChartSpace(*pChart);
|
||||
|
||||
oDrawingConverter.SetRels(oldRels);
|
||||
oDrawingConverter.m_pBinaryWriter = pOldWriter;
|
||||
}
|
||||
std::wstring ChartRec::toXML() const
|
||||
|
||||
@ -694,6 +694,25 @@ namespace NSStringUtils
|
||||
return 1;
|
||||
}
|
||||
};
|
||||
|
||||
static void string_replace(std::wstring& text, const std::wstring& replaceFrom, const std::wstring& replaceTo)
|
||||
{
|
||||
size_t posn = 0;
|
||||
while (std::wstring::npos != (posn = text.find(replaceFrom, posn)))
|
||||
{
|
||||
text.replace(posn, replaceFrom.length(), replaceTo);
|
||||
posn += replaceTo.length();
|
||||
}
|
||||
}
|
||||
static void string_replaceA(std::string& text, const std::string& replaceFrom, const std::string& replaceTo)
|
||||
{
|
||||
size_t posn = 0;
|
||||
while (std::string::npos != (posn = text.find(replaceFrom, posn)))
|
||||
{
|
||||
text.replace(posn, replaceFrom.length(), replaceTo);
|
||||
posn += replaceTo.length();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif // _BUILD_STRING_BUILDER_CROSSPLATFORM_H_
|
||||
|
||||
@ -336,7 +336,7 @@ void MyHandleError(char *s);
|
||||
|
||||
bool Sign(PCCERT_CONTEXT pCertContext, std::wstring sFileXml, std::wstring sSignatureFile);
|
||||
bool Verify(PCCERT_CONTEXT pCertContext, std::wstring sFileXml, std::wstring sSignatureFile);
|
||||
bool SignDocument(std::wstring sFolderOOXML, PCCERT_CONTEXT pCertContext);
|
||||
bool SignDocument(std::wstring sFolderOOXML, PCCERT_CONTEXT pCertContext, std::wstring sign_id);
|
||||
|
||||
void main(void)
|
||||
{
|
||||
@ -655,7 +655,8 @@ void main(void)
|
||||
std::string sCertHash = oSigner.GetCertificateHash();
|
||||
}
|
||||
|
||||
SignDocument(NSFile::GetProcessDirectory() + L"/ImageStamp", pCertContext);
|
||||
//SignDocument(NSFile::GetProcessDirectory() + L"/ImageStamp", pCertContext, L"{39B6B9C7-60AD-45A2-9F61-40C74A24042E}");
|
||||
SignDocument(L"D:\\555", pCertContext, L"{9792D33F-AB37-4E5B-A465-481B9465818B}");
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -708,10 +709,184 @@ bool Verify(PCCERT_CONTEXT pCertContext, std::wstring sFileXml, std::wstring sSi
|
||||
class COOXMLSigner
|
||||
{
|
||||
public:
|
||||
PCCERT_CONTEXT m_context;
|
||||
std::wstring m_sFolder;
|
||||
PCCERT_CONTEXT m_context;
|
||||
std::wstring m_sFolder;
|
||||
|
||||
CXmlSigner* m_signer;
|
||||
CXmlSigner* m_signer;
|
||||
|
||||
std::wstring m_date;
|
||||
std::map<std::wstring, std::wstring> m_content_types;
|
||||
std::vector<std::wstring> m_rels;
|
||||
std::vector<std::wstring> m_files;
|
||||
|
||||
NSStringUtils::CStringBuilderA m_signed_info;
|
||||
|
||||
std::wstring m_image_valid;
|
||||
std::wstring m_image_invalid;
|
||||
|
||||
std::wstring m_guid;
|
||||
|
||||
public:
|
||||
class COOXMLRelationship
|
||||
{
|
||||
public:
|
||||
std::wstring rid;
|
||||
std::wstring type;
|
||||
std::wstring target;
|
||||
std::wstring target_mode;
|
||||
|
||||
public:
|
||||
|
||||
COOXMLRelationship()
|
||||
{
|
||||
}
|
||||
|
||||
COOXMLRelationship(XmlUtils::CXmlNode& node)
|
||||
{
|
||||
rid = node.GetAttribute("Id");
|
||||
type = node.GetAttribute("Type");
|
||||
target = node.GetAttribute("Target");
|
||||
|
||||
CheckTargetMode();
|
||||
}
|
||||
|
||||
std::wstring GetXml()
|
||||
{
|
||||
NSStringUtils::CStringBuilder builder;
|
||||
builder.WriteString(L"<Relationship Id=\"");
|
||||
builder.WriteEncodeXmlString(rid);
|
||||
builder.WriteString(L"\" Type=\"");
|
||||
builder.WriteEncodeXmlString(type);
|
||||
builder.WriteString(L"\" Target=\"");
|
||||
builder.WriteEncodeXmlString(target);
|
||||
builder.WriteString(L"\" TargetMode=\"");
|
||||
builder.WriteEncodeXmlString(target_mode);
|
||||
builder.WriteString(L"\" />");
|
||||
return builder.GetData();
|
||||
}
|
||||
|
||||
static bool Compare(const COOXMLRelationship& i, const COOXMLRelationship& j)
|
||||
{
|
||||
return i.rid < j.rid;
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
void CheckTargetMode()
|
||||
{
|
||||
if (0 == target.find(L"http") || 0 == target.find(L"www") || 0 == target.find(L"ftp"))
|
||||
target_mode = L"External";
|
||||
else
|
||||
target_mode = L"Internal";
|
||||
}
|
||||
};
|
||||
|
||||
class COOXMLRelationships
|
||||
{
|
||||
public:
|
||||
std::vector<COOXMLRelationship> rels;
|
||||
|
||||
public:
|
||||
|
||||
COOXMLRelationships()
|
||||
{
|
||||
}
|
||||
|
||||
COOXMLRelationships(std::wstring& file)
|
||||
{
|
||||
XmlUtils::CXmlNode oNode;
|
||||
if (!oNode.FromXmlFile(file))
|
||||
return;
|
||||
|
||||
XmlUtils::CXmlNodes oNodes;
|
||||
if (!oNode.GetNodes(L"Relationship", oNodes))
|
||||
return;
|
||||
|
||||
int nCount = oNodes.GetCount();
|
||||
for (int i = 0; i < nCount; ++i)
|
||||
{
|
||||
XmlUtils::CXmlNode oRel;
|
||||
oNodes.GetAt(i, oRel);
|
||||
rels.push_back(COOXMLRelationship(oRel));
|
||||
}
|
||||
}
|
||||
|
||||
std::wstring GetXml()
|
||||
{
|
||||
NSStringUtils::CStringBuilder builder;
|
||||
|
||||
builder.WriteString(L"<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">");
|
||||
|
||||
// sort by rId
|
||||
std::sort(rels.begin(), rels.end(), COOXMLRelationship::Compare);
|
||||
|
||||
for (std::vector<COOXMLRelationship>::iterator i = rels.begin(); i != rels.end(); i++)
|
||||
builder.WriteString(i->GetXml());
|
||||
|
||||
builder.WriteString(L"</Relationships>");
|
||||
|
||||
return builder.GetData();
|
||||
}
|
||||
|
||||
std::wstring GetTransforms()
|
||||
{
|
||||
NSStringUtils::CStringBuilder builder;
|
||||
|
||||
builder.WriteString(L"<Transforms><Transform Algorithm=\"http://schemas.openxmlformats.org/package/2006/RelationshipTransform\">");
|
||||
|
||||
for (std::vector<COOXMLRelationship>::iterator i = rels.begin(); i != rels.end(); i++)
|
||||
{
|
||||
builder.WriteString(L"<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"");
|
||||
builder.WriteEncodeXmlString(i->rid);
|
||||
builder.WriteString(L"\" />");
|
||||
}
|
||||
|
||||
builder.WriteString(L"</Transform><Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/></Transforms>");
|
||||
|
||||
return builder.GetData();
|
||||
}
|
||||
|
||||
void CheckOriginSigs(std::wstring& file)
|
||||
{
|
||||
int rId = 0;
|
||||
std::vector<COOXMLRelationship>::iterator i = rels.begin();
|
||||
while (i != rels.end())
|
||||
{
|
||||
if (0 == i->target.find(L"_xmlsignatures/"))
|
||||
return;
|
||||
|
||||
std::wstring rid = i->rid;
|
||||
rid = rid.substr(3);
|
||||
|
||||
int nTemp = std::stoi(rid);
|
||||
|
||||
if (nTemp > rId)
|
||||
rId = nTemp;
|
||||
|
||||
i++;
|
||||
}
|
||||
|
||||
std::string sXmlA;
|
||||
NSFile::CFileBinary::ReadAllTextUtf8A(file, sXmlA);
|
||||
|
||||
std::string::size_type pos = sXmlA.rfind("</Relationships>");
|
||||
if (pos == std::string::npos)
|
||||
return;
|
||||
|
||||
rId++;
|
||||
std::string sRet = sXmlA.substr(0, pos);
|
||||
sRet += ("<Relationship Id=\"rId" + std::to_string(rId) + "\" \
|
||||
Type=\"http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin\" Target=\"_xmlsignatures/origin.sigs\"/>\
|
||||
</Relationships>");
|
||||
|
||||
NSFile::CFileBinary::Remove(file);
|
||||
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(file);
|
||||
oFile.WriteFile((BYTE*)sRet.c_str(), (DWORD)sRet.length());
|
||||
oFile.CloseFile();
|
||||
}
|
||||
};
|
||||
|
||||
public:
|
||||
COOXMLSigner(const std::wstring& sFolder, PCCERT_CONTEXT pContext)
|
||||
@ -719,6 +894,11 @@ public:
|
||||
m_sFolder = sFolder;
|
||||
m_context = pContext;
|
||||
m_signer = new CXmlSigner(pContext);
|
||||
|
||||
m_date = L"2017-04-21T08:30:21Z";
|
||||
|
||||
m_signed_info.WriteString("<CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>");
|
||||
m_signed_info.WriteString("<SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/>");
|
||||
}
|
||||
~COOXMLSigner()
|
||||
{
|
||||
@ -782,89 +962,328 @@ public:
|
||||
|
||||
return sReturn;
|
||||
}
|
||||
};
|
||||
|
||||
bool SignDocument(std::wstring sFolderOOXML, PCCERT_CONTEXT pCertContext)
|
||||
{
|
||||
std::wstring sFolder = NSFile::GetProcessDirectory();
|
||||
|
||||
COOXMLSigner oOOXMLSigner(sFolderOOXML, pCertContext);
|
||||
|
||||
std::string sSignedData;
|
||||
std::wstring sXmlData;
|
||||
|
||||
std::wstring sDataSign = L"2017-04-21T08:30:21Z";
|
||||
|
||||
sSignedData += "<CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/>\
|
||||
<SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/>";
|
||||
|
||||
if (true)
|
||||
std::wstring GetRelsReference(const std::wstring& file)
|
||||
{
|
||||
// idPackageObject
|
||||
std::wstring sXml = L"<Manifest>";
|
||||
COOXMLRelationships oRels(m_sFolder + file);
|
||||
|
||||
// TODO: rels
|
||||
if (true)
|
||||
if (L"/_rels/.rels" == file)
|
||||
{
|
||||
sXml += L"<Reference URI=\"/_rels/.rels?ContentType=application/vnd.openxmlformats-package.relationships+xml\">\
|
||||
<Transforms><Transform Algorithm=\"http://schemas.openxmlformats.org/package/2006/RelationshipTransform\">\
|
||||
<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"rId1\"/>\
|
||||
</Transform><Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/></Transforms>\
|
||||
<DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/>\
|
||||
<DigestValue>1vWU/YTF/7t6ZjnE44gAFTbZvvA=</DigestValue>\
|
||||
</Reference>";
|
||||
oRels.CheckOriginSigs(m_sFolder + file);
|
||||
|
||||
sXml += L"<Reference URI=\"/word/_rels/document.xml.rels?ContentType=application/vnd.openxmlformats-package.relationships+xml\">\
|
||||
<Transforms><Transform Algorithm=\"http://schemas.openxmlformats.org/package/2006/RelationshipTransform\">\
|
||||
<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"rId3\"/>\
|
||||
<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"rId2\"/>\
|
||||
<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"rId1\"/>\
|
||||
<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"rId6\"/>\
|
||||
<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"rId5\"/>\
|
||||
<mdssi:RelationshipReference xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\" SourceId=\"rId4\"/>\
|
||||
</Transform><Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/></Transforms>\
|
||||
<DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/>\
|
||||
<DigestValue>kVYCpjZZG3SU5+sOsB1PRnQSCzk=</DigestValue>\
|
||||
</Reference>";
|
||||
// удалим все лишнее
|
||||
std::vector<COOXMLRelationship>::iterator i = oRels.rels.begin();
|
||||
while (i != oRels.rels.end())
|
||||
{
|
||||
if (0 == i->target.find(L"docProps/"))
|
||||
i = oRels.rels.erase(i);
|
||||
else if (0 == i->target.find(L"_xmlsignatures/"))
|
||||
i = oRels.rels.erase(i);
|
||||
else
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
NSStringUtils::CStringBuilder builder;
|
||||
builder.WriteString(L"<Reference URI=\"");
|
||||
builder.WriteString(file);
|
||||
builder.WriteString(L"?ContentType=application/vnd.openxmlformats-package.relationships+xml\">");
|
||||
builder.WriteString(oRels.GetTransforms());
|
||||
builder.WriteString(L"<DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>");
|
||||
|
||||
sXml += oOOXMLSigner.GetReference(L"/word/document.xml", L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
|
||||
sXml += oOOXMLSigner.GetReference(L"/word/fontTable.xml", L"application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml");
|
||||
sXml += oOOXMLSigner.GetReference(L"/word/media/image1.emf", L"image/x-emf");
|
||||
sXml += oOOXMLSigner.GetReference(L"/word/settings.xml", L"application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml");
|
||||
sXml += oOOXMLSigner.GetReference(L"/word/styles.xml", L"application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml");
|
||||
sXml += oOOXMLSigner.GetReference(L"/word/theme/theme1.xml", L"application/vnd.openxmlformats-officedocument.theme+xml");
|
||||
sXml += oOOXMLSigner.GetReference(L"/word/webSettings.xml", L"application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml");
|
||||
std::wstring sXml = oRels.GetXml();
|
||||
std::string sHash = GetHashXml(sXml);
|
||||
|
||||
sXml += L"</Manifest>";
|
||||
std::wstring sHashW = UTF8_TO_U(sHash);
|
||||
builder.WriteString(sHashW);
|
||||
|
||||
sXml += L"<SignatureProperties><SignatureProperty Id=\"idSignatureTime\" Target=\"#idPackageSignature\">";
|
||||
sXml += (L"<mdssi:SignatureTime xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\">\
|
||||
<mdssi:Format>YYYY-MM-DDThh:mm:ssTZD</mdssi:Format>\
|
||||
<mdssi:Value>" + sDataSign + L"</mdssi:Value>\
|
||||
</mdssi:SignatureTime></SignatureProperty></SignatureProperties>");
|
||||
builder.WriteString(L"</DigestValue></Reference>");
|
||||
|
||||
sXmlData += (L"<Object Id=\"idPackageObject\">" + sXml + L"</Object>");
|
||||
|
||||
sSignedData += ("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idPackageObject\">" +
|
||||
oOOXMLSigner.GetReferenceMain(sXml, L"idPackageObject", false) + "</Reference>");
|
||||
return builder.GetData();
|
||||
}
|
||||
|
||||
|
||||
std::wstring sImageValid = oOOXMLSigner.GetImageBase64(sFolder + L"/../../../resources/valid.png");
|
||||
std::wstring sImageInValid = oOOXMLSigner.GetImageBase64(sFolder + L"/../../../resources/invalid.png");
|
||||
|
||||
if (true)
|
||||
int GetCountSigns(const std::wstring& file)
|
||||
{
|
||||
// idOfficeObject
|
||||
std::wstring sXml = L"<SignatureProperties>\
|
||||
<SignatureProperty Id=\"idOfficeV1Details\" Target=\"#idPackageSignature\">\
|
||||
<SignatureInfoV1 xmlns=\"http://schemas.microsoft.com/office/2006/digsig\">\
|
||||
<SetupID>{39B6B9C7-60AD-45A2-9F61-40C74A24042E}</SetupID>\
|
||||
<SignatureText></SignatureText>\
|
||||
<SignatureImage>" + sImageValid + L"</SignatureImage>\
|
||||
<SignatureComments/>\
|
||||
if (!NSFile::CFileBinary::Exists(file))
|
||||
{
|
||||
std::wstring sRels = L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
|
||||
<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">\
|
||||
<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/signature\" Target=\"sig1.xml\"/>\
|
||||
</Relationships>";
|
||||
|
||||
NSFile::CFileBinary::SaveToFile(file, sRels, false);
|
||||
return 1;
|
||||
}
|
||||
|
||||
XmlUtils::CXmlNode oNode;
|
||||
oNode.FromXmlFile(file);
|
||||
|
||||
XmlUtils::CXmlNodes oNodes;
|
||||
oNode.GetNodes(L"Relationship", oNodes);
|
||||
|
||||
int rId = oNodes.GetCount() + 1;
|
||||
|
||||
std::string sXmlA;
|
||||
NSFile::CFileBinary::ReadAllTextUtf8A(file, sXmlA);
|
||||
|
||||
std::string::size_type pos = sXmlA.rfind("</Relationships>");
|
||||
if (pos == std::string::npos)
|
||||
return 1;
|
||||
|
||||
std::string sRet = sXmlA.substr(0, pos);
|
||||
sRet += ("<Relationship Id=\"rId" + std::to_string(rId) + "\" \
|
||||
Type=\"http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/signature\" Target=\"sig" + std::to_string(rId) + ".xml\"/>\
|
||||
</Relationships>");
|
||||
|
||||
NSFile::CFileBinary::Remove(file);
|
||||
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(file);
|
||||
oFile.WriteFile((BYTE*)sRet.c_str(), (DWORD)sRet.length());
|
||||
oFile.CloseFile();
|
||||
|
||||
return rId;
|
||||
}
|
||||
|
||||
void ParseContentTypes()
|
||||
{
|
||||
std::wstring file = m_sFolder + L"/[Content_Types].xml";
|
||||
XmlUtils::CXmlNode oNode;
|
||||
oNode.FromXmlFile(file);
|
||||
|
||||
XmlUtils::CXmlNodes nodesDefaults;
|
||||
oNode.GetNodes(L"Default", nodesDefaults);
|
||||
|
||||
XmlUtils::CXmlNodes nodesOverrides;
|
||||
oNode.GetNodes(L"Override", nodesOverrides);
|
||||
|
||||
int nCount = nodesDefaults.GetCount();
|
||||
for (int i = 0; i < nCount; ++i)
|
||||
{
|
||||
XmlUtils::CXmlNode node;
|
||||
nodesDefaults.GetAt(i, node);
|
||||
|
||||
m_content_types.insert(std::pair<std::wstring, std::wstring>(node.GetAttribute("Extension"), node.GetAttribute("ContentType")));
|
||||
}
|
||||
|
||||
nCount = nodesOverrides.GetCount();
|
||||
for (int i = 0; i < nCount; ++i)
|
||||
{
|
||||
XmlUtils::CXmlNode node;
|
||||
nodesOverrides.GetAt(i, node);
|
||||
|
||||
m_content_types.insert(std::pair<std::wstring, std::wstring>(node.GetAttribute("PartName"), node.GetAttribute("ContentType")));
|
||||
}
|
||||
}
|
||||
|
||||
void Parse()
|
||||
{
|
||||
// 1) Parse Content_Types.xml
|
||||
ParseContentTypes();
|
||||
|
||||
// 2) Parse files in directory
|
||||
std::vector<std::wstring> files = NSDirectory::GetFiles(m_sFolder, true);
|
||||
|
||||
// 3) Check each file
|
||||
std::wstring sFolder = m_sFolder;
|
||||
NSStringUtils::string_replace(sFolder, L"\\", L"/");
|
||||
for (std::vector<std::wstring>::iterator i = files.begin(); i != files.end(); i++)
|
||||
{
|
||||
std::wstring sCheckFile = *i;
|
||||
NSStringUtils::string_replace(sCheckFile, L"\\", L"/");
|
||||
|
||||
if (0 != sCheckFile.find(sFolder))
|
||||
continue;
|
||||
|
||||
// make cool filename
|
||||
sCheckFile = sCheckFile.substr(sFolder.length());
|
||||
|
||||
// check needed file
|
||||
if (0 == sCheckFile.find(L"/_xmlsignatures") ||
|
||||
0 == sCheckFile.find(L"/docProps") ||
|
||||
0 == sCheckFile.find(L"/[Content_Types].xml"))
|
||||
continue;
|
||||
|
||||
// check rels and add to needed array
|
||||
std::wstring::size_type posExt = sCheckFile.rfind(L".");
|
||||
if (std::wstring::npos == posExt)
|
||||
continue;
|
||||
|
||||
std::wstring sExt = sCheckFile.substr(posExt + 1);
|
||||
if (sExt == L"rels")
|
||||
m_rels.push_back(sCheckFile);
|
||||
else
|
||||
m_files.push_back(sCheckFile);
|
||||
}
|
||||
|
||||
std::sort(m_rels.begin(), m_rels.end());
|
||||
std::sort(m_files.begin(), m_files.end());
|
||||
}
|
||||
|
||||
void WriteRelsReferences(NSStringUtils::CStringBuilder& builder)
|
||||
{
|
||||
for (std::vector<std::wstring>::iterator i = m_rels.begin(); i != m_rels.end(); i++)
|
||||
{
|
||||
builder.WriteString(GetRelsReference(*i));
|
||||
}
|
||||
}
|
||||
|
||||
void WriteFilesReferences(NSStringUtils::CStringBuilder& builder)
|
||||
{
|
||||
for (std::vector<std::wstring>::iterator i = m_files.begin(); i != m_files.end(); i++)
|
||||
{
|
||||
std::wstring sFile = *i;
|
||||
std::wstring sContentType = L"application/xml";
|
||||
|
||||
std::map<std::wstring, std::wstring>::iterator _find = m_content_types.find(sFile);
|
||||
if (_find != m_content_types.end())
|
||||
{
|
||||
sContentType = _find->second;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstring::size_type posExt = sFile.rfind(L".");
|
||||
if (std::wstring::npos != posExt)
|
||||
{
|
||||
std::wstring sExt = sFile.substr(posExt + 1);
|
||||
|
||||
_find = m_content_types.find(sExt);
|
||||
if (_find != m_content_types.end())
|
||||
sContentType = _find->second;
|
||||
}
|
||||
}
|
||||
|
||||
builder.WriteString(GetReference(sFile, sContentType));
|
||||
}
|
||||
}
|
||||
|
||||
void WriteManifest(NSStringUtils::CStringBuilder& builder)
|
||||
{
|
||||
builder.WriteString(L"<Manifest>");
|
||||
WriteRelsReferences(builder);
|
||||
WriteFilesReferences(builder);
|
||||
builder.WriteString(L"</Manifest>");
|
||||
}
|
||||
|
||||
void CorrectContentTypes(int nCountSigsNeeds)
|
||||
{
|
||||
std::wstring file = m_sFolder + L"/[Content_Types].xml";
|
||||
XmlUtils::CXmlNode oNode;
|
||||
oNode.FromXmlFile(file);
|
||||
|
||||
XmlUtils::CXmlNodes nodesDefaults;
|
||||
oNode.GetNodes(L"Default", nodesDefaults);
|
||||
|
||||
XmlUtils::CXmlNodes nodesOverrides;
|
||||
oNode.GetNodes(L"Override", nodesOverrides);
|
||||
|
||||
std::string sAddition = "";
|
||||
|
||||
bool bIsSigsExist = false;
|
||||
int nCount = nodesDefaults.GetCount();
|
||||
for (int i = 0; i < nCount; ++i)
|
||||
{
|
||||
XmlUtils::CXmlNode node;
|
||||
nodesDefaults.GetAt(i, node);
|
||||
|
||||
if ("sigs" == node.GetAttributeA("Extension") &&
|
||||
"application/vnd.openxmlformats-package.digital-signature-origin" == node.GetAttributeA("ContentType"))
|
||||
{
|
||||
bIsSigsExist = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!bIsSigsExist)
|
||||
sAddition += "<Default Extension=\"sigs\" ContentType=\"application/vnd.openxmlformats-package.digital-signature-origin\"/>";
|
||||
|
||||
int nCountSigs = 0;
|
||||
nCount = nodesOverrides.GetCount();
|
||||
for (int i = 0; i < nCount; ++i)
|
||||
{
|
||||
XmlUtils::CXmlNode node;
|
||||
nodesOverrides.GetAt(i, node);
|
||||
|
||||
if ("application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml" == node.GetAttributeA("ContentType"))
|
||||
{
|
||||
++nCountSigs;
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = nCountSigs; i < nCountSigsNeeds; ++i)
|
||||
{
|
||||
sAddition += "<Override PartName=\"/_xmlsignatures/sig";
|
||||
sAddition += std::to_string(i + 1);
|
||||
sAddition += ".xml\" ContentType=\"application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml\"/>";
|
||||
}
|
||||
|
||||
std::string sXmlA;
|
||||
NSFile::CFileBinary::ReadAllTextUtf8A(file, sXmlA);
|
||||
|
||||
std::string::size_type pos = sXmlA.rfind("</Types>");
|
||||
if (pos == std::string::npos)
|
||||
return;
|
||||
|
||||
std::string sRet = sXmlA.substr(0, pos);
|
||||
sRet += sAddition;
|
||||
sRet += "</Types>";
|
||||
|
||||
NSFile::CFileBinary::Remove(file);
|
||||
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(file);
|
||||
oFile.WriteFile((BYTE*)sRet.c_str(), (DWORD)sRet.length());
|
||||
oFile.CloseFile();
|
||||
}
|
||||
|
||||
void SetGuid(const std::wstring& guid)
|
||||
{
|
||||
m_guid = guid;
|
||||
}
|
||||
void SetImageValid(const std::wstring& file)
|
||||
{
|
||||
m_image_valid = GetImageBase64(file);
|
||||
}
|
||||
void SetImageInvalid(const std::wstring& file)
|
||||
{
|
||||
m_image_invalid = GetImageBase64(file);
|
||||
}
|
||||
|
||||
std::wstring GeneratePackageObject()
|
||||
{
|
||||
NSStringUtils::CStringBuilder builder;
|
||||
WriteManifest(builder);
|
||||
|
||||
builder.WriteString(L"<SignatureProperties><SignatureProperty Id=\"idSignatureTime\" Target=\"#idPackageSignature\">");
|
||||
builder.WriteString(L"<mdssi:SignatureTime xmlns:mdssi=\"http://schemas.openxmlformats.org/package/2006/digital-signature\">");
|
||||
builder.WriteString(L"<mdssi:Format>YYYY-MM-DDThh:mm:ssTZD</mdssi:Format>");
|
||||
builder.WriteString(L"<mdssi:Value>");
|
||||
builder.WriteString(m_date);
|
||||
builder.WriteString(L"</mdssi:Value>");
|
||||
builder.WriteString(L"</mdssi:SignatureTime></SignatureProperty></SignatureProperties>");
|
||||
|
||||
std::wstring sXml = builder.GetData();
|
||||
|
||||
m_signed_info.WriteString("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idPackageObject\">");
|
||||
m_signed_info.WriteString(GetReferenceMain(sXml, L"idPackageObject", false));
|
||||
m_signed_info.WriteString("</Reference>");
|
||||
|
||||
return (L"<Object Id=\"idPackageObject\">" + sXml + L"</Object>");
|
||||
}
|
||||
std::wstring GenerateOfficeObject()
|
||||
{
|
||||
NSStringUtils::CStringBuilder builder;
|
||||
|
||||
builder.WriteString(L"<SignatureProperties><SignatureProperty Id=\"idOfficeV1Details\" Target=\"#idPackageSignature\">");
|
||||
builder.WriteString(L"<SignatureInfoV1 xmlns=\"http://schemas.microsoft.com/office/2006/digsig\">");
|
||||
builder.WriteString(L"<SetupID>");
|
||||
builder.WriteString(m_guid);
|
||||
builder.WriteString(L"</SetupID>");
|
||||
builder.WriteString(L"<SignatureText></SignatureText>");
|
||||
builder.WriteString(L"<SignatureImage>");
|
||||
builder.WriteString(m_image_valid);
|
||||
builder.WriteString(L"</SignatureImage>");
|
||||
builder.WriteString(L"<SignatureComments/>\
|
||||
<WindowsVersion>10.0</WindowsVersion>\
|
||||
<OfficeVersion>16.0</OfficeVersion>\
|
||||
<ApplicationVersion>16.0</ApplicationVersion>\
|
||||
@ -878,33 +1297,50 @@ bool SignDocument(std::wstring sFolderOOXML, PCCERT_CONTEXT pCertContext)
|
||||
<SignatureType>2</SignatureType>\
|
||||
</SignatureInfoV1>\
|
||||
</SignatureProperty>\
|
||||
</SignatureProperties>";
|
||||
</SignatureProperties>");
|
||||
|
||||
sXmlData += (L"<Object Id=\"idOfficeObject\">" + sXml + L"</Object>");
|
||||
m_signed_info.WriteString("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idOfficeObject\">");
|
||||
m_signed_info.WriteString(GetReferenceMain(builder.GetData(), L"idOfficeObject", false));
|
||||
m_signed_info.WriteString("</Reference>");
|
||||
|
||||
sSignedData += ("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idOfficeObject\">" +
|
||||
oOOXMLSigner.GetReferenceMain(sXml, L"idOfficeObject", false) + "</Reference>");
|
||||
return (L"<Object Id=\"idOfficeObject\">" + builder.GetData() + L"</Object>");
|
||||
}
|
||||
|
||||
if (true)
|
||||
std::wstring GenerateImageObject()
|
||||
{
|
||||
DWORD dwNameLen = CertGetNameStringW(pCertContext, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, NULL, 0);
|
||||
if (m_image_valid.empty())
|
||||
return L"";
|
||||
|
||||
m_signed_info.WriteString("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idValidSigLnImg\">");
|
||||
m_signed_info.WriteString(GetReferenceMain(m_image_valid, L"idValidSigLnImg", false));
|
||||
m_signed_info.WriteString("</Reference>");
|
||||
|
||||
m_signed_info.WriteString("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idInvalidSigLnImg\">");
|
||||
m_signed_info.WriteString(GetReferenceMain(m_image_invalid, L"idInvalidSigLnImg", false));
|
||||
m_signed_info.WriteString("</Reference>");
|
||||
|
||||
return (L"<Object Id=\"idValidSigLnImg\">" + m_image_valid + L"</Object><Object Id=\"idInvalidSigLnImg\">" + m_image_invalid + L"</Object>");
|
||||
}
|
||||
|
||||
std::wstring GenerateSignPropertiesObject()
|
||||
{
|
||||
DWORD dwNameLen = CertGetNameStringW(m_context, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, NULL, 0);
|
||||
wchar_t* pNameData = new wchar_t[dwNameLen];
|
||||
CertGetNameStringW(pCertContext, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, pNameData, dwNameLen);
|
||||
CertGetNameStringW(m_context, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, pNameData, dwNameLen);
|
||||
std::wstring sName(pNameData);
|
||||
RELEASEARRAYOBJECTS(pNameData);
|
||||
|
||||
int nNumberLen = (int)pCertContext->pCertInfo->SerialNumber.cbData;
|
||||
int nNumberLen = (int)m_context->pCertInfo->SerialNumber.cbData;
|
||||
BYTE* pNumberData = new BYTE[nNumberLen];
|
||||
CXmlSigner::ConvertEndian(pCertContext->pCertInfo->SerialNumber.pbData, pNumberData, (DWORD)nNumberLen);
|
||||
CXmlSigner::ConvertEndian(m_context->pCertInfo->SerialNumber.pbData, pNumberData, (DWORD)nNumberLen);
|
||||
CBigInteger oInteger(pNumberData, nNumberLen);
|
||||
delete[] pNumberData;
|
||||
|
||||
std::string sKeyA = oInteger.ToString();
|
||||
std::wstring sKey = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sKeyA.c_str(), (LONG)sKeyA.length());
|
||||
std::wstring sKey = UTF8_TO_U(sKeyA);
|
||||
|
||||
std::wstring sXml = (L"<xd:SignedSignatureProperties>\
|
||||
<xd:SigningTime>" + sDataSign + L"</xd:SigningTime>\
|
||||
<xd:SigningTime>" + m_date + L"</xd:SigningTime>\
|
||||
<xd:SigningCertificate>\
|
||||
<xd:Cert>\
|
||||
<xd:CertDigest>\
|
||||
@ -926,72 +1362,88 @@ bool SignDocument(std::wstring sFolderOOXML, PCCERT_CONTEXT pCertContext)
|
||||
sSignedXml += sXml;
|
||||
sSignedXml += L"</xd:SignedProperties>";
|
||||
|
||||
sXmlData += L"<Object><xd:QualifyingProperties xmlns:xd=\"http://uri.etsi.org/01903/v1.3.2#\" Target=\"#idPackageSignature\">\
|
||||
<xd:SignedProperties Id=\"idSignedProperties\">";
|
||||
sXmlData += sXml;
|
||||
sXmlData += L"</xd:SignedProperties></xd:QualifyingProperties></Object>";
|
||||
|
||||
sSignedData += "<Reference Type=\"http://uri.etsi.org/01903#SignedProperties\" URI=\"#idSignedProperties\">\
|
||||
<Transforms><Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/></Transforms>\
|
||||
<DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>";
|
||||
|
||||
std::string sXmlTmp = CXmlCanonicalizator::Execute(U_TO_UTF8(sSignedXml), XML_C14N_1_0);
|
||||
sSignedData += oOOXMLSigner.m_signer->GetHash(sXmlTmp);
|
||||
|
||||
sSignedData += "</DigestValue></Reference>";
|
||||
m_signed_info.WriteString("<Reference Type=\"http://uri.etsi.org/01903#SignedProperties\" URI=\"#idSignedProperties\">");
|
||||
m_signed_info.WriteString("<Transforms><Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/></Transforms>");
|
||||
m_signed_info.WriteString("<DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>");
|
||||
m_signed_info.WriteString(m_signer->GetHash(sXmlTmp));
|
||||
m_signed_info.WriteString("</DigestValue></Reference>");
|
||||
|
||||
return (L"<Object><xd:QualifyingProperties xmlns:xd=\"http://uri.etsi.org/01903/v1.3.2#\" Target=\"#idPackageSignature\">\
|
||||
<xd:SignedProperties Id=\"idSignedProperties\">" + sXml + L"</xd:SignedProperties></xd:QualifyingProperties></Object>");
|
||||
}
|
||||
|
||||
if (true)
|
||||
int AddSignatureReference()
|
||||
{
|
||||
std::wstring sXml = sImageValid;
|
||||
std::wstring sDirectory = m_sFolder + L"/_xmlsignatures";
|
||||
|
||||
sXmlData += (L"<Object Id=\"idValidSigLnImg\">" + sXml + L"</Object>");
|
||||
if (!NSDirectory::Exists(sDirectory))
|
||||
NSDirectory::CreateDirectory(sDirectory);
|
||||
|
||||
sSignedData += ("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idValidSigLnImg\">" +
|
||||
oOOXMLSigner.GetReferenceMain(sXml, L"idValidSigLnImg", false) + "</Reference>");
|
||||
if (!NSFile::CFileBinary::Exists(sDirectory + L"/origin.sigs"))
|
||||
{
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(sDirectory + L"/origin.sigs");
|
||||
oFile.CloseFile();
|
||||
}
|
||||
|
||||
if (!NSDirectory::Exists(sDirectory + L"/_rels"))
|
||||
NSDirectory::CreateDirectory(sDirectory + L"/_rels");
|
||||
|
||||
int nSignNum = GetCountSigns(sDirectory + L"/_rels/origin.sigs.rels");
|
||||
|
||||
CorrectContentTypes(nSignNum);
|
||||
|
||||
return nSignNum;
|
||||
}
|
||||
|
||||
if (true)
|
||||
void Sign()
|
||||
{
|
||||
std::wstring sXml = sImageInValid;
|
||||
Parse();
|
||||
|
||||
sXmlData += (L"<Object Id=\"idInvalidSigLnImg\">" + sXml + L"</Object>");
|
||||
std::string sSignedData;
|
||||
|
||||
sSignedData += ("<Reference Type=\"http://www.w3.org/2000/09/xmldsig#Object\" URI=\"#idInvalidSigLnImg\">" +
|
||||
oOOXMLSigner.GetReferenceMain(sXml, L"idInvalidSigLnImg", false) + "</Reference>");
|
||||
NSStringUtils::CStringBuilder builderMain;
|
||||
|
||||
builderMain.WriteString(GeneratePackageObject());
|
||||
builderMain.WriteString(GenerateOfficeObject());
|
||||
builderMain.WriteString(GenerateSignPropertiesObject());
|
||||
builderMain.WriteString(GenerateImageObject());
|
||||
|
||||
std::string sSignedInfoData = m_signed_info.GetData();
|
||||
std::string sSignedXml = "<SignedInfo xmlns=\"http://www.w3.org/2000/09/xmldsig#\">" + sSignedInfoData + "</SignedInfo>";
|
||||
sSignedXml = CXmlCanonicalizator::Execute(sSignedXml, XML_C14N_1_0);
|
||||
sSignedXml = m_signer->Sign(sSignedXml);
|
||||
|
||||
NSStringUtils::CStringBuilder builderResult;
|
||||
builderResult.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\"?><Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\" Id=\"idPackageSignature\"><SignedInfo>");
|
||||
builderResult.WriteString(UTF8_TO_U(sSignedInfoData));
|
||||
builderResult.WriteString(L"</SignedInfo>");
|
||||
builderResult.WriteString(L"<SignatureValue>");
|
||||
builderResult.WriteString(UTF8_TO_U(sSignedXml));
|
||||
builderResult.WriteString(L"</SignatureValue>");
|
||||
builderResult.WriteString(L"<KeyInfo><X509Data><X509Certificate>");
|
||||
builderResult.WriteString(UTF8_TO_U(m_signer->GetCertificateBase64()));
|
||||
builderResult.WriteString(L"</X509Certificate></X509Data></KeyInfo>");
|
||||
|
||||
builderResult.Write(builderMain);
|
||||
builderResult.WriteString(L"</Signature>");
|
||||
|
||||
int nSignNum = AddSignatureReference();
|
||||
|
||||
NSFile::CFileBinary::SaveToFile(m_sFolder + L"/_xmlsignatures/sig" + std::to_wstring(nSignNum) + L".xml", builderResult.GetData(), false);
|
||||
}
|
||||
};
|
||||
|
||||
std::string sXmlPrepend = ("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\" Id=\"idPackageSignature\"><SignedInfo>");
|
||||
sXmlPrepend += sSignedData;
|
||||
sXmlPrepend += "</SignedInfo>";
|
||||
bool SignDocument(std::wstring sFolderOOXML, PCCERT_CONTEXT pCertContext, std::wstring sign_id)
|
||||
{
|
||||
COOXMLSigner oOOXMLSigner(sFolderOOXML, pCertContext);
|
||||
|
||||
sXmlPrepend += "<SignatureValue>";
|
||||
std::string sSignedInfo = "<SignedInfo xmlns=\"http://www.w3.org/2000/09/xmldsig#\">" + sSignedData + "</SignedInfo>";
|
||||
sSignedInfo = CXmlCanonicalizator::Execute(sSignedInfo, XML_C14N_1_0);
|
||||
sXmlPrepend += oOOXMLSigner.m_signer->Sign(sSignedInfo);
|
||||
sXmlPrepend += "</SignatureValue>";
|
||||
sXmlPrepend += ("<KeyInfo><X509Data><X509Certificate>" + oOOXMLSigner.m_signer->GetCertificateBase64() + "</X509Certificate></X509Data></KeyInfo>");
|
||||
|
||||
sXmlData = (UTF8_TO_U(sXmlPrepend) + sXmlData);
|
||||
sXmlData += L"</Signature>";
|
||||
|
||||
std::wstring sDirectory = sFolderOOXML + L"/_xmlsignatures";
|
||||
NSDirectory::CreateDirectory(sDirectory);
|
||||
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(sDirectory + L"/origin.sigs");
|
||||
oFile.CloseFile();
|
||||
|
||||
NSFile::CFileBinary::SaveToFile(sDirectory + L"/sig1.xml", sXmlData, false);
|
||||
|
||||
NSDirectory::CreateDirectory(sDirectory + L"/_rels");
|
||||
|
||||
std::wstring sRels = L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
|
||||
<Relationships xmlns=\"http://schemas.openxmlformats.org/package/2006/relationships\">\
|
||||
<Relationship Id=\"rId1\" Type=\"http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/signature\" Target=\"sig1.xml\"/>\
|
||||
</Relationships>";
|
||||
|
||||
NSFile::CFileBinary::SaveToFile(sDirectory + L"/_rels/origin.sigs.rels", sRels, false);
|
||||
oOOXMLSigner.SetGuid(sign_id);
|
||||
oOOXMLSigner.SetImageValid(NSFile::GetProcessDirectory() + L"/../../../resources/valid.png");
|
||||
oOOXMLSigner.SetImageInvalid(NSFile::GetProcessDirectory() + L"/../../../resources/invalid.png");
|
||||
|
||||
oOOXMLSigner.Sign();
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
QT -= core
|
||||
QT -= gui
|
||||
|
||||
VERSION = 2.4.454.0
|
||||
VERSION = 2.4.455.0
|
||||
DEFINES += INTVER=$$VERSION
|
||||
|
||||
TARGET = x2t
|
||||
|
||||
@ -333,6 +333,7 @@ namespace NExtractTools
|
||||
int* m_nFormatTo;
|
||||
int* m_nCsvTxtEncoding;
|
||||
int* m_nCsvDelimiter;
|
||||
std::wstring* m_sCsvDelimiterChar;
|
||||
bool* m_bPaid;
|
||||
bool* m_bFromChanges;
|
||||
bool* m_bDontSaveAdditional;
|
||||
@ -356,6 +357,7 @@ namespace NExtractTools
|
||||
m_nFormatTo = NULL;
|
||||
m_nCsvTxtEncoding = NULL;
|
||||
m_nCsvDelimiter = NULL;
|
||||
m_sCsvDelimiterChar = NULL;
|
||||
m_bPaid = NULL;
|
||||
m_bFromChanges = NULL;
|
||||
m_bDontSaveAdditional = NULL;
|
||||
@ -379,6 +381,7 @@ namespace NExtractTools
|
||||
RELEASEOBJECT(m_nFormatTo);
|
||||
RELEASEOBJECT(m_nCsvTxtEncoding);
|
||||
RELEASEOBJECT(m_nCsvDelimiter);
|
||||
RELEASEOBJECT(m_sCsvDelimiterChar);
|
||||
RELEASEOBJECT(m_bPaid);
|
||||
RELEASEOBJECT(m_bFromChanges);
|
||||
RELEASEOBJECT(m_bDontSaveAdditional);
|
||||
@ -456,6 +459,8 @@ namespace NExtractTools
|
||||
m_nCsvTxtEncoding = new int(XmlUtils::GetInteger(sValue));
|
||||
else if(_T("m_nCsvDelimiter") == sName)
|
||||
m_nCsvDelimiter = new int(XmlUtils::GetInteger(sValue));
|
||||
else if(_T("m_nCsvDelimiterChar") == sName)
|
||||
m_sCsvDelimiterChar = new std::wstring(sValue);
|
||||
else if(_T("m_bPaid") == sName)
|
||||
m_bPaid = new bool(XmlUtils::GetBoolean2(sValue));
|
||||
else if(_T("m_bFromChanges") == sName)
|
||||
@ -475,6 +480,10 @@ namespace NExtractTools
|
||||
else if(_T("m_sPassword") == sName)
|
||||
m_sPassword = new std::wstring(sValue);
|
||||
}
|
||||
else if(_T("m_nCsvDelimiterChar") == sName)
|
||||
{
|
||||
m_sCsvDelimiterChar = new std::wstring(L"");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -492,8 +501,8 @@ namespace NExtractTools
|
||||
std::wstring getXmlOptions()
|
||||
{
|
||||
std::wstring sRes;
|
||||
int nCsvEncoding = 65001; //utf8
|
||||
std::string cDelimiter = ",";
|
||||
int nCsvEncoding = 46;//65001 utf8
|
||||
std::wstring cDelimiter = L"";
|
||||
|
||||
if(NULL != m_nCsvTxtEncoding)
|
||||
nCsvEncoding = *m_nCsvTxtEncoding;
|
||||
@ -501,13 +510,17 @@ namespace NExtractTools
|
||||
{
|
||||
switch (*m_nCsvDelimiter)
|
||||
{
|
||||
case TCSVD_TAB: cDelimiter = "\t"; break;
|
||||
case TCSVD_SEMICOLON: cDelimiter = ";"; break;
|
||||
case TCSVD_COLON: cDelimiter = ":"; break;
|
||||
case TCSVD_COMMA: cDelimiter = ","; break;
|
||||
case TCSVD_SPACE: cDelimiter = " "; break;
|
||||
case TCSVD_TAB: cDelimiter = L"\t"; break;
|
||||
case TCSVD_SEMICOLON: cDelimiter = L";"; break;
|
||||
case TCSVD_COLON: cDelimiter = L":"; break;
|
||||
case TCSVD_COMMA: cDelimiter = L","; break;
|
||||
case TCSVD_SPACE: cDelimiter = L" "; break;
|
||||
}
|
||||
}
|
||||
if(NULL != m_sCsvDelimiterChar)
|
||||
{
|
||||
cDelimiter = *m_sCsvDelimiterChar;
|
||||
}
|
||||
int nFileType = 1;
|
||||
if(NULL != m_nFormatFrom && AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == *m_nFormatFrom)
|
||||
nFileType = 2;
|
||||
@ -522,7 +535,7 @@ namespace NExtractTools
|
||||
}
|
||||
sRes = L"<xmlOptions><fileOptions fileType='" + std::to_wstring(nFileType);
|
||||
sRes += L"' codePage='" + std::to_wstring(nCsvEncoding);
|
||||
sRes += L"' delimiter='" + std::wstring(cDelimiter.begin(), cDelimiter.end()) + L"' " + sSaveType;
|
||||
sRes += L"' delimiter='" + XmlUtils::EncodeXmlString(cDelimiter) + L"' " + sSaveType;
|
||||
sRes += L"/><TXTOptions><Encoding>" + std::to_wstring(nCsvEncoding) + L"</Encoding></TXTOptions></xmlOptions>";
|
||||
|
||||
return sRes;
|
||||
@ -602,7 +615,7 @@ namespace NExtractTools
|
||||
eRes = TCD_ERROR;
|
||||
}
|
||||
}
|
||||
else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatFrom && (NULL == m_nCsvTxtEncoding || NULL == m_nCsvDelimiter))
|
||||
else if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatFrom && (NULL == m_nCsvTxtEncoding || (NULL == m_nCsvDelimiter && NULL == m_sCsvDelimiterChar)))
|
||||
{
|
||||
if(!getDontSaveAdditional())
|
||||
{
|
||||
|
||||
@ -40,10 +40,6 @@
|
||||
#endif
|
||||
#include "../../DesktopEditor/common/File.h"
|
||||
|
||||
#ifndef CP_UTF8
|
||||
#define CP_UTF8 65001
|
||||
#endif
|
||||
|
||||
namespace SerializeCommon
|
||||
{
|
||||
std::wstring DownloadImage(const std::wstring& strFile)
|
||||
@ -99,11 +95,11 @@ namespace SerializeCommon
|
||||
return sSourcePath.substr(0, nIndex + 1) + sTargetExt;
|
||||
return sSourcePath;
|
||||
}
|
||||
void ReadFileType(const std::wstring& sXMLOptions, BYTE& result, UINT& nCodePage, WCHAR& wcDelimiter, BYTE& cSaveFileType)
|
||||
void ReadFileType(const std::wstring& sXMLOptions, BYTE& result, UINT& nCodePage, std::wstring& sDelimiter, BYTE& cSaveFileType)
|
||||
{
|
||||
result = BinXlsxRW::c_oFileTypes::XLSX;
|
||||
nCodePage = CP_UTF8;
|
||||
wcDelimiter = _T(',');
|
||||
nCodePage = 46;//todo 46 временно CP_UTF8
|
||||
sDelimiter = _T("");
|
||||
cSaveFileType = BinXlsxRW::c_oFileTypes::XLSX;
|
||||
|
||||
nullable<SimpleTypes::CUnsignedDecimalNumber<>> fileType;
|
||||
@ -142,9 +138,7 @@ namespace SerializeCommon
|
||||
cSaveFileType = (BYTE)saveFileType->GetValue();
|
||||
if (delimiter.IsInit())
|
||||
{
|
||||
const std::wstring& sDelimiter = delimiter.get();
|
||||
if (0 < sDelimiter.length())
|
||||
wcDelimiter = sDelimiter[0];
|
||||
sDelimiter = delimiter.get();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@ -72,7 +72,7 @@ namespace SerializeCommon
|
||||
aReplies.clear();
|
||||
}
|
||||
};
|
||||
void ReadFileType(const std::wstring& sXMLOptions, BYTE& result, UINT& nCodePage, WCHAR& wcDelimiter, BYTE& saveFileType);
|
||||
void ReadFileType(const std::wstring& sXMLOptions, BYTE& result, UINT& nCodePage, std::wstring& wcDelimiter, BYTE& saveFileType);
|
||||
}
|
||||
|
||||
#endif //SERIALIZER_COMMON
|
||||
|
||||
@ -3926,16 +3926,16 @@ namespace BinXlsxRW
|
||||
// File Type
|
||||
BYTE fileType;
|
||||
UINT nCodePage;
|
||||
WCHAR wcDelimiter;
|
||||
std::wstring sDelimiter;
|
||||
BYTE saveFileType;
|
||||
SerializeCommon::ReadFileType(sXMLOptions, fileType, nCodePage, wcDelimiter, saveFileType);
|
||||
SerializeCommon::ReadFileType(sXMLOptions, fileType, nCodePage, sDelimiter, saveFileType);
|
||||
|
||||
OOX::Spreadsheet::CXlsx *pXlsx = NULL;
|
||||
switch(fileType)
|
||||
{
|
||||
case BinXlsxRW::c_oFileTypes::CSV:
|
||||
pXlsx = new OOX::Spreadsheet::CXlsx();
|
||||
CSVReader::ReadFromCsvToXlsx(sInputDir, *pXlsx, nCodePage, wcDelimiter);
|
||||
CSVReader::ReadFromCsvToXlsx(sInputDir, *pXlsx, nCodePage, sDelimiter);
|
||||
break;
|
||||
case BinXlsxRW::c_oFileTypes::XLSX:
|
||||
default:
|
||||
@ -3946,8 +3946,8 @@ namespace BinXlsxRW
|
||||
|
||||
if (BinXlsxRW::c_oFileTypes::JSON == saveFileType)
|
||||
{
|
||||
//todo 46 временно CP_UTF8
|
||||
CSVWriter::WriteFromXlsxToCsv(sFileDst, *pXlsx, 46, _T(','), true);
|
||||
//todo 46 временно CP_UTF8
|
||||
CSVWriter::WriteFromXlsxToCsv(sFileDst, *pXlsx, 46, std::wstring(L","), true);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -81,7 +81,7 @@ namespace CSVReader
|
||||
pCell->setRowCol(nRow, nCol);
|
||||
oRow.m_arrItems.push_back(pCell);
|
||||
}
|
||||
void ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const WCHAR wcDelimiter)
|
||||
void ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& sDelimiter)
|
||||
{
|
||||
// Создадим Workbook
|
||||
oXlsx.CreateWorkbook();
|
||||
@ -169,6 +169,20 @@ namespace CSVReader
|
||||
INT nSize = sFileDataW.length();
|
||||
const WCHAR *pTemp =sFileDataW.c_str();
|
||||
|
||||
WCHAR wcDelimiterLeading = L'\0';
|
||||
WCHAR wcDelimiterTrailing = L'\0';
|
||||
int nDelimiterSize = 0;
|
||||
if (sDelimiter.length() > 0)
|
||||
{
|
||||
wcDelimiterLeading = sDelimiter[0];
|
||||
nDelimiterSize = 1;
|
||||
if (2 == sizeof(wchar_t) && 0xD800 <= wcDelimiterLeading && wcDelimiterLeading <= 0xDBFF && sDelimiter.length() > 1)
|
||||
{
|
||||
wcDelimiterTrailing = sDelimiter[1];
|
||||
nDelimiterSize = 2;
|
||||
}
|
||||
}
|
||||
|
||||
const WCHAR wcNewLineN = _T('\n');
|
||||
const WCHAR wcNewLineR = _T('\r');
|
||||
const WCHAR wcQuote = _T('"');
|
||||
@ -188,7 +202,7 @@ namespace CSVReader
|
||||
for (INT nIndex = 0; nIndex < nSize; ++nIndex)
|
||||
{
|
||||
wcCurrent = pTemp[nIndex];
|
||||
if (wcDelimiter == wcCurrent)
|
||||
if (wcDelimiterLeading == wcCurrent && (L'\0' == wcDelimiterTrailing || (nIndex + 1 < nSize && wcDelimiterTrailing == pTemp[nIndex + 1])))
|
||||
{
|
||||
if (bInQuote)
|
||||
continue;
|
||||
@ -197,7 +211,7 @@ namespace CSVReader
|
||||
AddCell(sCellText, nStartCell, oDeleteChars, *pRow, nIndexRow, nIndexCol++, bIsWrap);
|
||||
bIsWrap = false;
|
||||
|
||||
nStartCell = nIndex + 1;
|
||||
nStartCell = nIndex + nDelimiterSize;
|
||||
if (nStartCell == nSize)
|
||||
{
|
||||
pWorksheet->m_oSheetData->m_arrItems.push_back(pRow);
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
namespace CSVReader
|
||||
{
|
||||
void AddCell(std::wstring &sText, INT nStartCell, std::stack<INT> &oDeleteChars, OOX::Spreadsheet::CRow &oRow, INT nRow, INT nCol, bool bIsWrap);
|
||||
void ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const WCHAR wcDelimiter);
|
||||
void ReadFromCsvToXlsx(const std::wstring &sFileName, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& wcDelimiter);
|
||||
}
|
||||
|
||||
#endif //CSV_READER
|
||||
|
||||
@ -3916,10 +3916,10 @@ namespace BinXlsxRW {
|
||||
std::wstring sDstPathCSV = sDstPath;
|
||||
BYTE fileType;
|
||||
UINT nCodePage;
|
||||
WCHAR wcDelimiter;
|
||||
std::wstring sDelimiter;
|
||||
BYTE saveFileType;
|
||||
|
||||
SerializeCommon::ReadFileType(sXMLOptions, fileType, nCodePage, wcDelimiter, saveFileType);
|
||||
SerializeCommon::ReadFileType(sXMLOptions, fileType, nCodePage, sDelimiter, saveFileType);
|
||||
// Делаем для CSV перебивку пути, иначе создается папка с одинаковым имеем (для rels) и файл не создается.
|
||||
|
||||
if (BinXlsxRW::c_oFileTypes::CSV == fileType)
|
||||
@ -3943,7 +3943,7 @@ namespace BinXlsxRW {
|
||||
switch(fileType)
|
||||
{
|
||||
case BinXlsxRW::c_oFileTypes::CSV:
|
||||
CSVWriter::WriteFromXlsxToCsv(sDstPathCSV, oXlsx, nCodePage, wcDelimiter, false);
|
||||
CSVWriter::WriteFromXlsxToCsv(sDstPathCSV, oXlsx, nCodePage, sDelimiter, false);
|
||||
break;
|
||||
case BinXlsxRW::c_oFileTypes::XLSX:
|
||||
default:
|
||||
|
||||
@ -64,7 +64,7 @@ namespace CSVWriter
|
||||
}
|
||||
}
|
||||
}
|
||||
void WriteFile(NSFile::CFileBinary *pFile, WCHAR **pWriteBuffer, INT &nCurrentIndex, std::wstring &sWriteString, UINT &nCodePage, bool bIsEnd)
|
||||
void WriteFile(NSFile::CFileBinary *pFile, WCHAR **pWriteBuffer, INT &nCurrentIndex, const std::wstring &sWriteString, UINT &nCodePage, bool bIsEnd)
|
||||
{
|
||||
if (NULL == pFile || NULL == pWriteBuffer)
|
||||
return;
|
||||
@ -84,7 +84,7 @@ namespace CSVWriter
|
||||
if (nCountChars + nCurrentIndex > c_nSize || bIsEnd)
|
||||
{
|
||||
// Буффер заполнился, пишем
|
||||
if (nCodePage == CP_UTF16)
|
||||
if (nCodePage == 48 && 2 == sizeof(wchar_t))//todo 48 временно CP_UTF16
|
||||
{
|
||||
pFile->WriteFile((BYTE*)*pWriteBuffer, sizeof (WCHAR) * nCurrentIndex);
|
||||
}
|
||||
@ -106,23 +106,23 @@ namespace CSVWriter
|
||||
nCurrentIndex += nCountChars;
|
||||
}
|
||||
}
|
||||
void WriteFromXlsxToCsv(const std::wstring &sFileDst, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const WCHAR wcDelimiter, bool bJSON)
|
||||
void WriteFromXlsxToCsv(const std::wstring &sFileDst, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& sDelimiter, bool bJSON)
|
||||
{
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(sFileDst);
|
||||
|
||||
// Нужно записать шапку
|
||||
if (CP_UTF8 == nCodePage)
|
||||
if (46 == nCodePage)//todo 46 временно CP_UTF8
|
||||
{
|
||||
BYTE arUTF8[3] = {0xEF, 0xBB, 0xBF};
|
||||
oFile.WriteFile(arUTF8, 3);
|
||||
}
|
||||
else if (CP_UTF16 == nCodePage)
|
||||
else if (48 == nCodePage)//todo 48 временно CP_UTF16
|
||||
{
|
||||
BYTE arUTF16[2] = {0xFF, 0xFE};
|
||||
oFile.WriteFile(arUTF16, 2);
|
||||
}
|
||||
else if (CP_unicodeFFFE == nCodePage)
|
||||
else if (49 == nCodePage)//todo 49 временно CP_unicodeFFFE
|
||||
{
|
||||
BYTE arBigEndian[2] = {0xFE, 0xFF};
|
||||
oFile.WriteFile(arBigEndian, 2);
|
||||
@ -169,9 +169,8 @@ namespace CSVWriter
|
||||
if (NULL != pWorksheet && pWorksheet->m_oSheetData.IsInit())
|
||||
{
|
||||
OOX::Spreadsheet::CSharedStrings *pSharedStrings = oXlsx.GetSharedStrings();
|
||||
std::wstring sDelimiter = _T(""); sDelimiter += wcDelimiter;
|
||||
std::wstring sEscape = _T("\"\n");
|
||||
sEscape += wcDelimiter;
|
||||
sEscape += sDelimiter;
|
||||
std::wstring sEndJson = std::wstring(_T("]"));
|
||||
std::wstring sQuote = _T("\"");
|
||||
std::wstring sDoubleQuote = _T("\"\"");
|
||||
|
||||
@ -32,20 +32,13 @@
|
||||
#ifndef CSV_WRITER
|
||||
#define CSV_WRITER
|
||||
|
||||
#define CP_UTF16 1200
|
||||
#define CP_unicodeFFFE 1201
|
||||
|
||||
#ifndef CP_UTF8
|
||||
#define CP_UTF8 65001
|
||||
#endif
|
||||
|
||||
#include "../../DesktopEditor/common/File.h"
|
||||
#include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
|
||||
|
||||
namespace CSVWriter
|
||||
{
|
||||
void WriteFile(NSFile::CFileBinary *pFile, WCHAR **pWriteBuffer, INT &nCurrentIndex, std::wstring &sWriteString, UINT &nCodePage, bool bIsEnd = false);
|
||||
void WriteFromXlsxToCsv(const std::wstring &sFileDst, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const WCHAR wcDelimiter, bool bJSON);
|
||||
void WriteFile(NSFile::CFileBinary *pFile, WCHAR **pWriteBuffer, INT &nCurrentIndex, const std::wstring &sWriteString, UINT &nCodePage, bool bIsEnd = false);
|
||||
void WriteFromXlsxToCsv(const std::wstring &sFileDst, OOX::Spreadsheet::CXlsx &oXlsx, UINT nCodePage, const std::wstring& wcDelimiter, bool bJSON);
|
||||
}
|
||||
|
||||
#endif //CSV_WRITER
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user