Commit 34e4097d authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

(1.0.1.170): ASCOfficeOdfFile

проверены/пофиксены баги 8022, 8033, 8041, 8042, 8175, 9924, 9968, 21047

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53647 954022d7-b5bf-4e40-9824-e11837661b57
parent 8fbfd798
......@@ -2,6 +2,6 @@
//1
//0
//1
//168
#define INTVER 1,0,1,168
#define STRVER "1,0,1,168\0"
//170
#define INTVER 1,0,1,170
#define STRVER "1,0,1,170\0"
......@@ -67,7 +67,7 @@ bool parse_clipping(std::wstring strClipping,std::wstring fileName, double_4 & c
int fileWidth=0,fileHeight=0;
if (! _image_file_::GetResolution(fileName.data(),fileWidth,fileHeight) && fileWidth>0 && fileHeight>0)return false;
if (!_image_file_::GetResolution(fileName.data(),fileWidth,fileHeight) || fileWidth<1 || fileHeight<1)return false;
std::vector<std::wstring> Points;
......@@ -75,7 +75,7 @@ bool parse_clipping(std::wstring strClipping,std::wstring fileName, double_4 & c
boost::algorithm::split(Points,strClipping, boost::algorithm::is_any_of(L" ,"), boost::algorithm::token_compress_on);
//<top>, <right>, <bottom>, <left> - !!! .. - http://www.w3.org/TR/2001/REC-xsl-20011015/xslspec.html#clip
//<top>, <right>, <bottom>, <left> - http://www.w3.org/TR/2001/REC-xsl-20011015/xslspec.html#clip
BOOST_FOREACH(std::wstring const & p, Points)
{
Points_pt.push_back(length::parse(p) );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment