Skip to content

O
onlyoffice_core
Commit 56ecea3f authored by Alexey.Musinov's avatar Alexey.Musinov
Browse files
Options

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop 

* 'develop' of https://github.com/ONLYOFFICE/core:
  OdfFormatReader - spreadsheets - support convert ole objects (and other embedded)
  CONVERT_CORRUPTED
parents 59599289 d95c93ab
Show whitespace changes
Inline Side-by-side
Showing with 1060 additions and 839 deletions
ASCOfficeOdfFile/Test/ASCOfficeOdfFileTest/ASCOfficeOdfFileTest.vcproj
View file @ 56ecea3f
......@@ -345,6 +345,18 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\Common\3dParty\pole\pole.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
</Filter>
</Files>
<Globals>
......
ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
View file @ 56ecea3f
......@@ -213,7 +213,6 @@ SOURCES += \
../src/docx/hyperlinks.cpp \
../src/docx/measuredigits.cpp \
../src/docx/mediaitems.cpp \
../src/docx/mediaitems_utils.cpp \
../src/docx/namespaces.cpp \
../src/docx/oox_chart_axis.cpp \
../src/docx/oox_chart_context.cpp \
......@@ -462,7 +461,6 @@ HEADERS += \
../src/docx/hyperlinks.h \
../src/docx/measuredigits.h \
../src/docx/mediaitems.h \
../src/docx/mediaitems_utils.h \
../src/docx/namespaces.h \
../src/docx/oox_chart_axis.h \
../src/docx/oox_chart_context.h \
......
ASCOfficeOdfFile/src/docx/docx_drawing.cpp
View file @ 56ecea3f
......@@ -622,7 +622,8 @@ void _docx_drawing::serialize(std::wostream & strm/*, bool insideOtherDrawing*/)
if (inGroup)
return docx_serialize_child(strm, *this);
if (type == typeObject)
if (type == typeMsObject ||
type == typeOleObject)
{
docx_serialize_object(strm, *this);
}
......
ASCOfficeOdfFile/src/docx/docx_package.cpp
View file @ 56ecea3f
......@@ -141,7 +141,7 @@ void word_files::update_rels(docx_conversion_context & Context)
void word_files::set_media(mediaitems & _Mediaitems, CApplicationFonts *pAppFonts)
{
if (_Mediaitems.count_image > 0)
if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
{
media_ = element_ptr( new media(_Mediaitems, pAppFonts) );
}
......
ASCOfficeOdfFile/src/docx/drawing_object_description.h
View file @ 56ecea3f
......@@ -52,6 +52,8 @@ struct drawing_object_description
oox::RelsType type_;
std::wstring name_;
std::wstring descriptor_;
_CP_OPT(_rect) svg_rect_;
std::wstring anchor_;
......@@ -66,7 +68,6 @@ struct drawing_object_description
_oox_fill fill_;
bool use_image_replace_;
bool in_group_;
int shape_type_; //default - frame
......
ASCOfficeOdfFile/src/docx/mediaitems.cpp
View file @ 56ecea3f
......@@ -39,15 +39,27 @@
#include <cpdoccore/xml/utils.h>
#include "mediaitems_utils.h"
#include "../../Common/DocxFormat/Source/Base/Base.h"
#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
#include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
namespace cpdoccore {
namespace oox {
bool is_internal(const std::wstring & uri, const std::wstring & packetRoot)
{
if (uri.empty())return false;
std::wstring mediaPath = boost::regex_search(uri.begin(), uri.end(), boost::wregex(L"^/[A-Za-z]:"))
? std::wstring(uri.begin() + 1, uri.end())
: uri;
std::wstring resultPath = packetRoot + FILE_SEPARATOR_STR + mediaPath;
return FileSystem::Directory::IsExist(resultPath) || FileSystem::Directory::IsExist(mediaPath);
}
mediaitems::item::item( std::wstring const & _href,
RelsType _type,
......@@ -82,7 +94,9 @@ std::wstring static get_default_file_name(RelsType type)
return L"chart";
case typeMedia:
return L"media";
case typeObject:
case typeMsObject:
return L"msObject";
case typeOleObject:
return L"oleObject";
default:
return L"";
......@@ -123,7 +137,7 @@ std::wstring mediaitems::create_file_name(const std::wstring & uri, RelsType typ
}
}
if (type == typeObject && sExt.empty())
if (type == typeOleObject && sExt.empty())
sExt = L".bin";
return get_default_file_name(type) + std::to_wstring(Num) + sExt;
......@@ -152,7 +166,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref)
{
bool isMediaInternal = utils::media::is_internal(href, odf_packet_);
bool isMediaInternal = is_internal(href, odf_packet_);
std::wstring sub_path = L"media/";
......@@ -161,7 +175,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
{
sub_path = L"charts/";
}
if ( type == typeObject)
if ( type == typeMsObject || type == typeOleObject)
{
sub_path = L"embeddings/";
}
......@@ -171,7 +185,8 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
else if ( type == typeImage) number = count_image + 1;
else if ( type == typeShape) number = count_shape + 1;
else if ( type == typeMedia) number = count_media + 1;
else if ( type == typeObject) number = count_object + 1;
else if ( type == typeMsObject ||
type == typeOleObject) number = count_object + 1;
else
number = items_.size() + 1;
......@@ -218,7 +233,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
id = std::wstring(L"picId") + std::to_wstring(count_image + 1);
count_image++;
}
else if ( type == typeObject)
else if ( type == typeMsObject || type == typeOleObject)
{
id = std::wstring(L"objId") + std::to_wstring(count_object + 1);
count_object++;
......@@ -240,16 +255,17 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
void mediaitems::dump_rels(rels & Rels)
{
size_t i = 0;
BOOST_FOREACH(item & elm, items_)
for (int i = 0; i < items_.size(); i++)
{
if (elm.count_used > elm.count_add)continue; // уже использовали этот релс выше(колонтитул ....)
if (items_[i].count_used > items_[i].count_add) continue; // уже использовали этот релс выше(колонтитул ....)
Rels.add( relationship(
elm.Id,
utils::media::get_rel_type(elm.type),
elm.valid ? elm.outputName : L"NULL",
elm.mediaInternal ? L"" : L"External" )
items_[i].Id,
get_rel_type (items_[i].type),
items_[i].valid ? items_[i].outputName : L"NULL",
items_[i].mediaInternal ? L"" : L"External" )
);
elm.count_used++;
items_[i].count_used++;
}
}
......
ASCOfficeOdfFile/src/docx/mediaitems.h
View file @ 56ecea3f
......@@ -39,7 +39,6 @@
namespace cpdoccore {
namespace oox {
class mediaitems
{
public:
......@@ -85,6 +84,20 @@ public:
void dump_rels(rels & Rels);
items_array & items() { return items_; }
static std::wstring get_rel_type(RelsType type)
{
switch (type)
{
case typeImage: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
case typeChart: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
case typeMsObject: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
case typeOleObject: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
case typeHyperlink: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
default:
return L"";
}
}
private:
std::wstring create_file_name (const std::wstring & uri, RelsType type, bool & isInternal, size_t Num);
std::wstring detectImageFileExtension (std::wstring &fileName);
......
ASCOfficeOdfFile/src/docx/mediaitems_utils.cpp deleted 100644 → 0
View file @ 59599289
/*
* (c) Copyright Ascensio System SIA 2010-2016
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#include "mediaitems_utils.h"
#include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/regex.hpp>
#include "../../Common/DocxFormat/Source/Base/Base.h"
#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
namespace cpdoccore {
namespace oox {
namespace utils {
namespace media {
bool is_internal(const std::wstring & uri, const std::wstring & packetRoot)
{
if (uri.empty())return false;
std::wstring mediaPath = boost::regex_search(uri.begin(), uri.end(), boost::wregex(L"^/[A-Za-z]:"))
? std::wstring(uri.begin() + 1, uri.end())
: uri;
std::wstring resultPath = packetRoot + FILE_SEPARATOR_STR + mediaPath;
return FileSystem::Directory::IsExist(resultPath) || FileSystem::Directory::IsExist(mediaPath);
}
std::wstring get_rel_type(RelsType type)
{
switch (type)
{
case typeImage:
{
return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
}
case typeChart:
{
return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
}
case typeObject:
{
return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
}break;
default:
return L"";
}
}
std::wstring replace_extension(const std::wstring & ext)
{
// TODO
if (ext == L"jpg")
return L"jpeg";
else
return ext;
}
}
}
}
}
ASCOfficeOdfFile/src/docx/mediaitems_utils.h deleted 100644 → 0
View file @ 59599289
/*
* (c) Copyright Ascensio System SIA 2010-2016
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#ifndef CPDOCCORE_MEDIAITEMS_UTILS_H_
#define CPDOCCORE_MEDIAITEMS_UTILS_H_
#include <string>
#include "mediaitems.h"
namespace cpdoccore {
namespace oox {
namespace utils {
namespace media {
bool is_internal(const std::wstring & uri, const std::wstring & packetRoot);
std::wstring get_rel_type(RelsType type);
}
}
}
}
#endif
ASCOfficeOdfFile/src/docx/oox_chart_context.cpp
View file @ 56ecea3f
......@@ -31,13 +31,12 @@
*/
#include <boost/foreach.hpp>
#include <vector>
#include <cpdoccore/xml/simple_xml_writer.h>
#include "mediaitems_utils.h"
#include "oox_rels.h"
#include "oox_rels.h"
#include "oox_chart_context.h"
#include "mediaitems.h"
namespace cpdoccore {
namespace oox {
......@@ -87,7 +86,7 @@ void oox_chart_context::dump_rels(rels & Rels)
{
Rels.add(relationship(
r.rid,
utils::media::get_rel_type(r.type),
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
r.is_internal ? std::wstring(L"../") + r.ref : r.ref,
(r.is_internal ? L"" : L"External")
)
......
ASCOfficeOdfFile/src/docx/oox_package.cpp
View file @ 56ecea3f
......@@ -140,10 +140,18 @@ bool content_types_file::add_or_find_override(const std::wstring & fileName)
std::wstring extension = pos >= 0 ? fileName.substr(pos + 1) : L"";
if (extension == L"xlsx")
{
content_type = L"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
content_type_content_.add_override(fileName, content_type);
//add_or_find_default(extension);
}
if (extension == L"bin")
{
//content_type = L"application/vnd.openxmlformats-officedocument.oleObject";
add_or_find_default(extension);
}
return true;
}
void content_types_file::set_media(mediaitems & _Mediaitems)
......@@ -309,12 +317,13 @@ void media::write(const std::wstring & RootPath)
std::wstring path = RootPath + FILE_SEPARATOR_STR + L"media";
FileSystem::Directory::CreateDirectory(path.c_str());
BOOST_FOREACH( mediaitems::item & item, mediaitems_.items() )
mediaitems::items_array & items = mediaitems_.items();
for (int i = 0; i < items.size(); i++ )
{
if (item.mediaInternal && item.valid && (item.type == typeImage || item.type == typeMedia))
if (items[i].mediaInternal && items[i].valid && (items[i].type == typeImage || items[i].type == typeMedia))
{
std::wstring & file_name = item.href;
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.outputName;
std::wstring & file_name = items[i].href;
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].outputName;
CImageFileFormatChecker svmFileChecker;
if (svmFileChecker.isSvmFile(file_name))
......@@ -322,7 +331,7 @@ void media::write(const std::wstring & RootPath)
ConvertSvmToImage(file_name, file_name_out, appFonts_);
}
else
NSFile::CFileBinary::Copy(item.href, file_name_out);
NSFile::CFileBinary::Copy(items[i].href, file_name_out);
}
}
......@@ -347,15 +356,17 @@ void embeddings::write(const std::wstring & RootPath)
content_types_file & content_types = get_main_document()->get_content_types_file();
BOOST_FOREACH( mediaitems::item & item, embeddingsitems_.items() )
mediaitems::items_array & items = embeddingsitems_.items();
for (int i = 0; i < items.size(); i++ )
{
if (item.mediaInternal && item.valid && item.type == typeObject )
if ( items[i].mediaInternal && items[i].valid &&
(items[i].type == typeMsObject || items[i].type == typeOleObject))
{
content_types.add_or_find_override(std::wstring(L"/word/") + item.outputName);
content_types.add_or_find_override(std::wstring(L"/word/") + items[i].outputName);
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.outputName;
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].outputName;
NSFile::CFileBinary::Copy(item.href, file_name_out);
NSFile::CFileBinary::Copy(items[i].href, file_name_out);
}
}
}
......
ASCOfficeOdfFile/src/docx/oox_rels.h
View file @ 56ecea3f
......@@ -40,7 +40,20 @@
namespace cpdoccore {
namespace oox {
enum RelsType { typeUnknown = 0, typeImage, typeChart, typeShape, typeTable, typeHyperlink, typeComment, typeMedia, typeGroupShape, typeObject};
enum RelsType
{
typeUnknown = 0,
typeImage,
typeChart,
typeShape,
typeTable,
typeHyperlink,
typeComment,
typeMedia,
typeGroupShape,
typeMsObject,
typeOleObject
};
struct _rel
{
......
ASCOfficeOdfFile/src/docx/pptx_drawings.cpp
View file @ 56ecea3f
......@@ -34,7 +34,6 @@
#include <vector>
#include <cpdoccore/xml/simple_xml_writer.h>
#include "mediaitems_utils.h"
#include "oox_rels.h"
#include "pptx_drawings.h"
......@@ -57,18 +56,18 @@ public:
pptx_drawings_.push_back(d);
bool present = false;
BOOST_FOREACH(_rel const & r, pptx_drawing_rels_)
for (int i = 0; i < pptx_drawing_rels_.size(); i++)
{
if (r.rid == rid && r.ref == ref)
if (pptx_drawing_rels_[i].rid == rid && pptx_drawing_rels_[i].ref == ref)
present = true;
}
if (!present)
{
pptx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
}
BOOST_FOREACH(_hlink_desc h, d.hlinks)
for (int i = 0; i < d.hlinks.size(); i++)
{
pptx_drawing_rels_.push_back(_rel(false, h.hId, h.hRef, typeHyperlink));
pptx_drawing_rels_.push_back(_rel(false, d.hlinks[i].hId, d.hlinks[i].hRef, typeHyperlink));
}
}
......@@ -80,13 +79,14 @@ public:
{
bool present = false;
BOOST_FOREACH(_rel const & r, pptx_drawing_rels_)
for (int i = 0; i < pptx_drawing_rels_.size(); i++)
{
if (r.rid == rid && r.ref == ref)
if (pptx_drawing_rels_[i].rid == rid && pptx_drawing_rels_[i].ref == ref)
present = true;
}
if (!present)
{
if (type == typeHyperlink) isInternal = false;
pptx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
}
}
......@@ -105,44 +105,25 @@ public:
void dump_rels(rels & Rels)
{
BOOST_FOREACH(_rel const & r, pptx_drawing_rels_)
for (int i = 0; i < pptx_drawing_rels_.size(); i++)
{
if (r.type == typeChart)//временно - нужно потом все загнать в релс
{
Rels.add(relationship(
r.rid,
utils::media::get_rel_type(r.type),
(r.is_internal ? std::wstring(L"../") + r.ref : r.ref),
(r.is_internal ? L"" : L"External")
)
);
}
else if (r.type == typeImage)
{
Rels.add(relationship(
r.rid,
utils::media::get_rel_type(r.type),
r.is_internal ? std::wstring(L"../") + r.ref : r.ref,
(r.is_internal ? L"" : L"External")
)
);
}
else if (r.type == typeHyperlink)
if (pptx_drawing_rels_[i].type == typeUnknown ||
pptx_drawing_rels_[i].type == typeTable ||
pptx_drawing_rels_[i].type == typeShape ||
pptx_drawing_rels_[i].type == typeGroupShape) continue;
if (pptx_drawing_rels_[i].type == typeComment)
{
Rels.add(relationship(
r.rid,
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
r.ref,
L"External")
);
Rels.add(relationship( pptx_drawing_rels_[i].rid,
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
pptx_drawing_rels_[i].ref) );
}
else if (r.type == typeComment)
else
{
Rels.add(relationship(
r.rid,
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
r.ref)
);
Rels.add(relationship( pptx_drawing_rels_[i].rid,
mediaitems::get_rel_type(pptx_drawing_rels_[i].type),
(pptx_drawing_rels_[i].is_internal ? std::wstring(L"../") + pptx_drawing_rels_[i].ref : pptx_drawing_rels_[i].ref),
(pptx_drawing_rels_[i].is_internal ? L"" : L"External")) );
}
}
}
......
ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp
View file @ 56ecea3f
......@@ -36,8 +36,6 @@
#include <cpdoccore/xml/utils.h>
#include <cpdoccore/odf/odf_document.h>
#include "mediaitems_utils.h"
#include "pptx_drawing.h"
#include "pptx_drawings.h"
#include "pptx_slide_context.h"
......@@ -74,15 +72,11 @@ public:
}
drawing_object_description object_description_;
std::vector<drawing_object_description> images_;
std::vector<drawing_object_description> charts_;
std::vector<drawing_object_description> shapes_;
std::vector<drawing_object_description> tables_;
std::vector<drawing_object_description> objects_;
_CP_OPT(_oox_fill) background_fill_;
_transition transition_;
bool use_image_replacement_;
bool header, footer, date_time, slideNum;
......@@ -111,10 +105,7 @@ public:
void clear()
{
images_.clear();
charts_.clear();
shapes_.clear();
tables_.clear();
objects_.clear();
background_fill_ = boost::none;
......@@ -215,7 +206,12 @@ void pptx_slide_context::default_set()
impl_->object_description_.fill_.clear();
impl_->object_description_.use_image_replace_ = false;
impl_->use_image_replacement_ = false;
}
void pptx_slide_context::set_use_image_replacement()
{
impl_->use_image_replacement_ = true;
}
void pptx_slide_context::set_placeHolder_type(std::wstring typeHolder)
......@@ -341,54 +337,66 @@ void pptx_slide_context::start_shape(int type)
impl_->object_description_.shape_type_ = type; //2,3...
}
void pptx_slide_context::start_image(std::wstring const & path)
{
impl_->object_description_.type_ = typeImage;
impl_->object_description_.xlink_href_ = path;
}
void pptx_slide_context::start_table()
{
impl_->object_description_.type_ = typeTable;
}
void pptx_slide_context::set_use_image_replacement()
void pptx_slide_context::set_text_box()
{
impl_->object_description_.use_image_replace_ = true;
impl_->object_description_.type_ = typeShape;
impl_->object_description_.shape_type_ = 2; //2,3...
}
void pptx_slide_context::start_object_ole()
void pptx_slide_context::set_ole_object(const std::wstring & path, const std::wstring & progId)
{
impl_->object_description_.type_ = typeOleObject;
impl_->object_description_.xlink_href_ = path;
impl_->object_description_.descriptor_ = progId;
}
void pptx_slide_context::start_chart(std::wstring const & path)
void pptx_slide_context::set_image(std::wstring const & path)
{
impl_->object_description_.type_ = typeChart;
if (impl_->object_description_.type_ == typeUnknown)
{
impl_->object_description_.type_ = typeImage;
impl_->object_description_.xlink_href_ = path;
}
else if (impl_->use_image_replacement_)
{
impl_->object_description_.fill_.type = 2;
impl_->object_description_.fill_.bitmap = oox::oox_bitmap_fill::create();
impl_->object_description_.fill_.bitmap->xlink_href_ = path;
}
}
void pptx_slide_context::end_object_ole()
void pptx_slide_context::start_frame()
{
impl_->object_description_.type_ = typeUnknown;
}
void pptx_slide_context::end_shape()
void pptx_slide_context::set_chart(std::wstring const & path)
{
impl_->shapes_.push_back(impl_->object_description_);
default_set();
impl_->object_description_.type_ = typeChart;
impl_->object_description_.xlink_href_ = path;
}
void pptx_slide_context::end_image()
void pptx_slide_context::end_frame()
{
impl_->images_.push_back(impl_->object_description_);
impl_->objects_.push_back(impl_->object_description_);
default_set();
}
void pptx_slide_context::end_chart()
void pptx_slide_context::end_shape()
{
impl_->charts_.push_back(impl_->object_description_);
impl_->objects_.push_back(impl_->object_description_);
default_set();
}
void pptx_slide_context::end_table()
{
impl_->tables_.push_back(impl_->object_description_);
impl_->objects_.push_back(impl_->object_description_);
default_set();
}
......@@ -399,23 +407,24 @@ bool pptx_slide_context::empty() const
void pptx_slide_context::process_drawings()
{
process_shapes();
process_images();
process_tables();
process_charts();
for (int i = 0; i < impl_->objects_.size(); i++)
{
switch(impl_->objects_[i].type_)
{
case typeImage: process_image(impl_->objects_[i]); break;
case typeChart: process_chart(impl_->objects_[i]); break;
case typeShape: process_shape(impl_->objects_[i]); break;
case typeTable: process_table(impl_->objects_[i]); break;
case typeMsObject:
case typeOleObject: process_object(impl_->objects_[i]); break;
}
}
}
void pptx_slide_context::process_images()
void pptx_slide_context::process_image(drawing_object_description& pic)
{
int pos_replaicement=0, pos_preview=0;
BOOST_FOREACH(drawing_object_description & pic, impl_->images_)
{
pos_replaicement = pic.xlink_href_.find(L"ObjectReplacements");
pos_preview = pic.xlink_href_.find(L"TablePreview");
int pos_replaicement = 0, pos_preview = 0;
if ((pos_replaicement <0 && pos_preview <0) || pic.use_image_replace_)//оригинал, а не заменяемый объект (при наличии объекта)
{
_pptx_drawing drawing =_pptx_drawing();
drawing.type = pic.type_;
......@@ -428,14 +437,13 @@ void pptx_slide_context::process_images()
drawing.fill.type = 2;
_CP_OPT(std::wstring) sTextContent;
GetProperty(pic.additional_,L"text-content",sTextContent);
GetProperty(pic.additional_, L"text-content", sTextContent);
if (sTextContent)//в ms office на картинке нельзя сделать надпись - меняем тип на рект с заливкой картинкой
{
drawing.type = typeShape;
drawing.sub_type = 2;//rect
}
std::wstring fileName = impl_->odfPacket_ + FILE_SEPARATOR_STR + pic.xlink_href_;
drawing.fill.bitmap->bCrop = odf_reader::parse_clipping(pic.clipping_string_,fileName,drawing.fill.bitmap->cropRect, NULL);
drawing.fill.bitmap->bStretch = true;
......@@ -458,89 +466,53 @@ void pptx_slide_context::process_images()
{
impl_->add_drawing(drawing, isMediaInternal, drawing.fill.bitmap->rId , ref, drawing.type);//объект
}
}
}
}
void pptx_slide_context::process_charts()
void pptx_slide_context::process_chart(drawing_object_description & obj)
{
BOOST_FOREACH(drawing_object_description & pic, impl_->charts_)
{
_pptx_drawing drawing=_pptx_drawing();
_pptx_drawing drawing =_pptx_drawing();
drawing.type = pic.type_;
drawing.name = pic.name_;
drawing.type = obj.type_;
drawing.name = obj.name_;
drawing.id = impl_->next_rId();
process_common_properties(pic,drawing);
process_common_properties(obj, drawing);
////////////////////////////////////////////////////////////////
std::wstring ref;
bool isMediaInternal = true;
drawing.objectId = impl_->get_mediaitems().add_or_find(pic.xlink_href_, typeChart, isMediaInternal, ref);
impl_->add_drawing(drawing, isMediaInternal, drawing.objectId, ref, typeChart);
}
drawing.objectId = impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
impl_->add_drawing(drawing, isMediaInternal, drawing.objectId, ref, drawing.type);
}
void pptx_slide_context::process_tables()
void pptx_slide_context::process_table(drawing_object_description & obj)
{
BOOST_FOREACH(drawing_object_description & pic, impl_->tables_)
{
_pptx_drawing drawing=_pptx_drawing();
_pptx_drawing drawing =_pptx_drawing();
drawing.type = pic.type_;
drawing.name = pic.name_;
drawing.type = obj.type_;
drawing.name = obj.name_;
drawing.id = impl_->next_rId();
process_common_properties(pic,drawing);
process_common_properties(obj, drawing);
////////////////////////////////////////////////////////////////
std::wstring ref;
bool isMediaInternal = true;
std::wstring rId = impl_->get_mediaitems().add_or_find(L"", typeTable, isMediaInternal, ref);
impl_->add_drawing(drawing, isMediaInternal, rId, ref, typeTable);
}
}
void pptx_slide_context::process_common_properties(drawing_object_description & pic,_pptx_drawing & drawing)
{
if (pic.svg_rect_)
{
//todooo непонятки с отрицательными значениями
int val = (int)(0.5 + odf_types::length(pic.svg_rect_->x, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >= 0) drawing.x = val;
val = (int)(0.5 + odf_types::length(pic.svg_rect_->y, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >= 0) drawing.y = val;
std::wstring rId = impl_->get_mediaitems().add_or_find(L"", obj.type_, isMediaInternal, ref);
val = (int)(0.5 + odf_types::length(pic.svg_rect_->cx, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >=0) drawing.cx = val;
val = (int)(0.5 + odf_types::length(pic.svg_rect_->cy, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >=0) drawing.cy = val;
}
drawing.additional = pic.additional_;
drawing.hlinks = pic.hlinks_;
drawing.fill = pic.fill_;
impl_->add_drawing(drawing, isMediaInternal, rId, ref, drawing.type);
}
void pptx_slide_context::process_shapes()
void pptx_slide_context::process_shape(drawing_object_description & obj)
{
int PlaceHolderIndex = 1;
BOOST_FOREACH(drawing_object_description & pic, impl_->shapes_)
{
_pptx_drawing drawing=_pptx_drawing();
drawing.type = pic.type_;
drawing.name = pic.name_;
drawing.type = obj.type_;
drawing.name = obj.name_;
drawing.id = impl_->next_rId();
process_common_properties(pic,drawing);
process_common_properties(obj, drawing);
std::wstring ref;
bool isMediaInternal = true;
......@@ -555,22 +527,66 @@ void pptx_slide_context::process_shapes()
////////////////////////////////////////////////////////////////
_CP_OPT(std::wstring) sPlaceHolderType;
GetProperty(pic.additional_,L"PlaceHolderType",sPlaceHolderType);
GetProperty(obj.additional_, L"PlaceHolderType", sPlaceHolderType);
if (sPlaceHolderType)
{
drawing.place_holder_type_ = *sPlaceHolderType;
_CP_OPT(int) iPlaceHolderIdx;
GetProperty(pic.additional_,L"PlaceHolderIdx",iPlaceHolderIdx);
GetProperty(obj.additional_, L"PlaceHolderIdx", iPlaceHolderIdx);
if (iPlaceHolderIdx) drawing.place_holder_idx_ = *iPlaceHolderIdx;
}
drawing.sub_type = pic.shape_type_;
drawing.sub_type = obj.shape_type_;
impl_->add_drawing(drawing, isMediaInternal, rId, ref, typeShape);
}
void pptx_slide_context::process_object(drawing_object_description& obj)
{
_pptx_drawing drawing =_pptx_drawing();
drawing.type = obj.type_;
drawing.name = obj.name_;
drawing.id = impl_->next_rId();
process_common_properties(obj, drawing);
////////////////////////////////////////////////////////////////
std::wstring ref;
bool isMediaInternal = true;
drawing.objectId = impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
drawing.objectProgId = obj.descriptor_;
impl_->add_drawing(drawing, isMediaInternal, drawing.objectId, ref, drawing.type);
}
void pptx_slide_context::process_common_properties(drawing_object_description & pic,_pptx_drawing & drawing)
{
if (pic.svg_rect_)
{
//todooo непонятки с отрицательными значениями
int val = (int)(0.5 + odf_types::length(pic.svg_rect_->x, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >= 0) drawing.x = val;
val = (int)(0.5 + odf_types::length(pic.svg_rect_->y, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >= 0) drawing.y = val;
val = (int)(0.5 + odf_types::length(pic.svg_rect_->cx, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >=0) drawing.cx = val;
val = (int)(0.5 + odf_types::length(pic.svg_rect_->cy, odf_types::length::pt).get_value_unit(odf_types::length::emu));
if (val >=0) drawing.cy = val;
}
drawing.additional = pic.additional_;
drawing.hlinks = pic.hlinks_;
drawing.fill = pic.fill_;
}
void pptx_slide_context::dump_rels(rels & Rels)
{
impl_->get_drawings()->dump_rels(Rels);
......@@ -627,7 +643,6 @@ void pptx_slide_context::serialize_background(std::wostream & strm, bool always)
void pptx_slide_context::serialize_animations(std::wostream & strm)
{
CP_XML_WRITER(strm)
{
if (impl_->transition_.Enabled)
......
ASCOfficeOdfFile/src/docx/pptx_slide_context.h
View file @ 56ecea3f
......@@ -50,38 +50,39 @@ public:
pptx_slide_context(pptx_conversion_context & Context);
void start_slide();
void end_slide(){}
void end_slide (){}
////////////////////////////////////////////////////////////////////////////////////////
void start_slide_animation();
void end_slide_animation(){}
void start_slide_animation ();
void end_slide_animation (){}
void set_transitionFilter(std::wstring & type,_CP_OPT(std::wstring) & dir, _CP_OPT(std::wstring) & dop, _CP_OPT(int) & time);
void set_transitionAction(bool val);
void set_transitionSpeed(std::wstring val);
void set_transitionFilter (std::wstring & type,_CP_OPT(std::wstring) & dir, _CP_OPT(std::wstring) & dop, _CP_OPT(int) & time);
void set_transitionAction (bool val);
void set_transitionSpeed (std::wstring val);
///////////////////////////////////////////////////////////////////////////////////////////
void set_rect(double width_pt, double height_pt, double x_pt, double y_pt);
void set_rect (double width_pt, double height_pt, double x_pt, double y_pt);
void set_translate(double x_pt, double y_pt);
void set_scale(double cx_pt, double cy_pt);
void set_rotate(double angle);
void set_translate (double x_pt, double y_pt);
void set_scale (double cx_pt, double cy_pt);
void set_rotate (double angle);
void set_name(std::wstring const & name);
void set_anchor(std::wstring anchor, double x_pt, double y_pt);
void set_property(odf_reader::_property p);
void set_name (std::wstring const & name);
void set_anchor (std::wstring anchor, double x_pt, double y_pt);
void set_property (odf_reader::_property p);
std::vector<odf_reader::_property> & get_properties();
void set_clipping(const std::wstring & str );
void set_fill(_oox_fill & fill);
void set_clipping (const std::wstring & str );
void set_fill (_oox_fill & fill);
void set_placeHolder_type(std::wstring typeHolder);
void set_placeHolder_idx(int idx);
void set_placeHolder_type (std::wstring typeHolder);
void set_placeHolder_idx (int idx);
std::wstring add_hyperlink(std::wstring const & ref, bool object);
void start_image(std::wstring const & path);
void end_image();
void start_chart(std::wstring const & path);
void end_chart();
void start_frame();
void set_image (std::wstring const & path);
void set_chart (std::wstring const & path);
void set_ole_object (const std::wstring & path, const std::wstring & progId);
void set_text_box ();
void end_frame();
void start_table();
void end_table();
......@@ -89,9 +90,6 @@ public:
void start_shape(int type);
void end_shape();
void start_object_ole();
void end_object_ole();
void set_use_image_replacement();
bool empty() const;
......@@ -109,7 +107,6 @@ public:
void add_background(_oox_fill & fill);
void add_rels( bool isInternal,
std::wstring const & rid,
std::wstring const & ref,
......@@ -121,13 +118,14 @@ public:
void set_page_number();
void set_date_time();
private:
void process_common_properties(drawing_object_description& pic,_pptx_drawing & drawing);
void process_common_properties(drawing_object_description& obj,_pptx_drawing & drawing);
void default_set();
void process_shapes();
void process_images();
void process_charts();
void process_tables();
void process_shape (drawing_object_description& obj);
void process_image (drawing_object_description& obj);
void process_chart (drawing_object_description& obj);
void process_table (drawing_object_description& obj);
void process_object (drawing_object_description& obj);
int hlinks_size_;
......
ASCOfficeOdfFile/src/docx/xlsx_drawing.cpp
View file @ 56ecea3f
......@@ -71,11 +71,11 @@ void xlsx_serialize_text(std::wostream & strm, _xlsx_drawing & val)
}
}
void xlsx_drawing_position::serialize(std::wostream & strm)
void xlsx_drawing_position::serialize(std::wostream & strm, std::wstring ns)
{
CP_XML_WRITER(strm)
{
CP_XML_NODE(std::wstring(L"xdr:") + (type == xlsx_drawing_position::from ? L"from" : L"to") )
CP_XML_NODE( ns + (type == xlsx_drawing_position::from ? L"from" : L"to") )
{
CP_XML_NODE(L"xdr:col")
{
......@@ -182,6 +182,34 @@ void xlsx_serialize_shape(std::wostream & strm, _xlsx_drawing & val)
}
} // CP_XML_WRITER
}
void xlsx_serialize_object(std::wostream & strm, _xlsx_drawing & val)
{//отображательная часть
CP_XML_WRITER(strm)
{
CP_XML_NODE(L"xdr:sp")
{
CP_XML_NODE(L"xdr:nvSpPr")
{
CP_XML_NODE(L"xdr:cNvPr")
{
CP_XML_ATTR(L"id", val.id); //числовое значение val.rId
CP_XML_ATTR(L"name", val.name);
}
CP_XML_NODE(L"xdr:cNvSpPr");
}
CP_XML_NODE(L"xdr:spPr")
{
val.serialize_xfrm(CP_XML_STREAM());
CP_XML_NODE(L"a:prstGeom")
{
CP_XML_ATTR(L"prst", L"rect");
}
}
}
}
}
void xlsx_serialize_group(std::wostream & strm, _xlsx_drawing & val)
{
CP_XML_WRITER(strm)
......@@ -208,7 +236,7 @@ void xlsx_serialize_group(std::wostream & strm, _xlsx_drawing & val)
}
void xlsx_serialize_chart(std::wostream & strm, _xlsx_drawing & val)
{
{//отображательная часть
CP_XML_WRITER(strm)
{
CP_XML_NODE(L"xdr:graphicFrame")
......@@ -224,7 +252,6 @@ void xlsx_serialize_chart(std::wostream & strm, _xlsx_drawing & val)
CP_XML_NODE(L"xdr:cNvGraphicFramePr");
}
val.serialize_xfrm(CP_XML_STREAM(), L"xdr");
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
CP_XML_NODE(L"a:graphic")
......@@ -240,10 +267,10 @@ void xlsx_serialize_chart(std::wostream & strm, _xlsx_drawing & val)
}
}
}
} // xdr:graphicFrame
} // CP_XML_WRITER
}
}
}
void xlsx_serialize_object(std::wostream & strm, _xlsx_drawing & val)
void xlsx_serialize(std::wostream & strm, _xlsx_drawing & val)
{
if (val.type == typeShape)
{
......@@ -261,12 +288,17 @@ void xlsx_serialize_object(std::wostream & strm, _xlsx_drawing & val)
{
xlsx_serialize_group(strm, val);
}
else if (val.type == typeOleObject ||
val.type == typeMsObject )
{
xlsx_serialize_object(strm, val);
}
}
void _xlsx_drawing::serialize(std::wostream & strm)
{
if (inGroup)
return xlsx_serialize_object(strm, *this);
return xlsx_serialize(strm, *this);
CP_XML_WRITER(strm)
{
......@@ -279,8 +311,7 @@ void _xlsx_drawing::serialize(std::wostream & strm)
from_.serialize (CP_XML_STREAM());
to_.serialize (CP_XML_STREAM());
xlsx_serialize_object (CP_XML_STREAM(), *this);
xlsx_serialize (CP_XML_STREAM(), *this);
CP_XML_NODE(L"xdr:clientData");
}
}
......@@ -293,15 +324,12 @@ void _xlsx_drawing::serialize(std::wostream & strm)
CP_XML_ATTR(L"x", x);
CP_XML_ATTR(L"y", y);
}
CP_XML_NODE(L"xdr:ext")
{
CP_XML_ATTR(L"cx", cx);
CP_XML_ATTR(L"cy", cy);
}
xlsx_serialize_object (CP_XML_STREAM(), *this);
xlsx_serialize(CP_XML_STREAM(), *this);
CP_XML_NODE(L"xdr:clientData");
}
}
......@@ -310,5 +338,38 @@ void _xlsx_drawing::serialize(std::wostream & strm)
}
void _xlsx_drawing::serialize_object (std::wostream & strm)
{
if (type != typeOleObject) return;
CP_XML_WRITER(strm)
{
CP_XML_NODE(L"oleObject")
{
CP_XML_ATTR(L"r:id", objectId);
CP_XML_ATTR(L"shapeId", id);
CP_XML_ATTR(L"progId", objectProgId);
CP_XML_NODE(L"objectPr")
{
CP_XML_ATTR(L"defaultSize", 0);
if (fill.bitmap)
{
CP_XML_ATTR(L"r:id", fill.bitmap->rId);
}
CP_XML_NODE(L"anchor")
{
CP_XML_ATTR(L"moveWithCells", 1);
from_.serialize (CP_XML_STREAM(), L"");
to_.serialize (CP_XML_STREAM(), L"");
}
}
}
}
}
}
}
ASCOfficeOdfFile/src/docx/xlsx_drawing.h
View file @ 56ecea3f
......@@ -49,7 +49,7 @@ struct xlsx_drawing_position
enum type_t {from, to} type;
xlsx_table_position position;
void serialize(std::wostream & _Wostream);
void serialize(std::wostream & _Wostream, std::wstring ns = L"xdr:");
};
......@@ -65,7 +65,8 @@ public:
std::wstring content_group_;
void serialize (std::wostream & _Wostream);
void serialize (std::wostream & strm);
void serialize_object (std::wostream & strm);
};
}
}
ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp
View file @ 56ecea3f
......@@ -34,8 +34,6 @@
#include <iostream>
#include <cpdoccore/xml/utils.h>
#include "mediaitems_utils.h"
#include "xlsx_drawing.h"
#include "xlsx_drawings.h"
#include "xlsx_utils.h"
......@@ -112,6 +110,7 @@ public:
Impl(xlsx_drawing_context_handle & handle) : xlsx_drawings_(xlsx_drawings::create(false)), handle_(handle)
{
current_level_ = &objects_;
use_image_replacement_ = false;
}
xlsx_drawing_context_handle& handle_;
......@@ -121,13 +120,14 @@ public:
std::vector<drawing_object_description*> groups_;
std::vector<drawing_object_description> * current_level_;
bool use_image_replacement_;
//-----------------------------------------------------------------------------------
mediaitems & get_mediaitems() { return handle_.impl_->get_mediaitems(); }
void serialize(std::wostream & strm)
{
xlsx_serialize(strm, *xlsx_drawings_);
xlsx_drawings_->serialize(strm);
}
bool empty() const
......@@ -167,12 +167,12 @@ void xlsx_drawing_context::clear()
impl_->object_description_.anchor_y_ = 0;
impl_->object_description_.clipping_string_ = L"";
impl_->object_description_.svg_rect_ = boost::none;
impl_->object_description_.use_image_replace_ = false;
impl_->object_description_.additional_.clear();
impl_->object_description_.hlinks_.clear();
impl_->object_description_.additional_.clear();
impl_->use_image_replacement_ = false;
}
xlsx_drawing_context::~xlsx_drawing_context()
......@@ -272,37 +272,57 @@ void xlsx_drawing_context::end_shape()
impl_->current_level_->push_back(impl_->object_description_);
}
void xlsx_drawing_context::start_object_ole()
void xlsx_drawing_context::set_use_image_replacement()
{
impl_->use_image_replacement_ = true;
}
void xlsx_drawing_context::set_text_box()
{
impl_->object_description_.type_ = typeShape;
impl_->object_description_.shape_type_ = 2; //2,3...
}
void xlsx_drawing_context::end_object_ole()
void xlsx_drawing_context::set_ole_object(const std::wstring & path, const std::wstring & progId)
{
impl_->object_description_.type_ = typeOleObject;
impl_->object_description_.xlink_href_ = path;
impl_->object_description_.descriptor_ = progId;
}
void xlsx_drawing_context::start_image(std::wstring const & path)
void xlsx_drawing_context::set_image(std::wstring const & path)
{
if (impl_->object_description_.type_ == typeUnknown)
{
impl_->object_description_.type_ = typeImage;
impl_->object_description_.xlink_href_ = path;
}
else if (impl_->use_image_replacement_)
{
impl_->object_description_.fill_.type = 2;
impl_->object_description_.fill_.bitmap = oox::oox_bitmap_fill::create();
impl_->object_description_.fill_.bitmap->xlink_href_ = path;
}
}
void xlsx_drawing_context::end_image()
void xlsx_drawing_context::start_frame()
{
impl_->object_description_.type_ = typeUnknown;
}
void xlsx_drawing_context::end_frame()
{
impl_->current_level_->push_back(impl_->object_description_);
}
void xlsx_drawing_context::start_chart(std::wstring const & path)
void xlsx_drawing_context::set_chart(std::wstring const & path)
{
impl_->object_description_.type_ = typeChart;
impl_->object_description_.xlink_href_ = path;
}
void xlsx_drawing_context::end_chart()
{
impl_->current_level_->push_back(impl_->object_description_);
}
void xlsx_drawing_context::set_rect(double width_pt, double height_pt, double x_pt, double y_pt)
{
impl_->object_description_.svg_rect_ = _rect(width_pt, height_pt, x_pt, y_pt);
}
void xlsx_drawing_context::set_translate(double x_pt, double y_pt)
{
if (impl_->object_description_.svg_rect_)
......@@ -313,6 +333,7 @@ void xlsx_drawing_context::set_translate(double x_pt, double y_pt)
r.y += y_pt;
}
}
void xlsx_drawing_context::set_rotate(double angle)
{
set_property(odf_reader::_property(L"svg:rotate", angle));
......@@ -369,6 +390,7 @@ void xlsx_drawing_context::set_fill(_oox_fill & fill)
{
impl_->object_description_.fill_= fill;
}
std::wstring xlsx_drawing_context::add_hyperlink(std::wstring const & href,bool object)
{
++hlinks_size_;
......@@ -384,11 +406,6 @@ std::wstring xlsx_drawing_context::add_hyperlink(std::wstring const & href,bool
return hId;
}
void xlsx_drawing_context::set_use_image_replacement()
{
impl_->object_description_.use_image_replace_ = true;
}
bool xlsx_drawing_context::empty() const
{
return impl_->empty();
......@@ -542,6 +559,19 @@ void xlsx_drawing_context::process_chart(drawing_object_description & obj,_xlsx_
impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
}
void xlsx_drawing_context::process_object(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
{
std::wstring ref;
bool isMediaInternal = true;
drawing.objectId = impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
drawing.objectProgId = obj.descriptor_;
xlsx_drawings_->add(drawing, isMediaInternal, drawing.objectId, ref, obj.type_, true);
if (drawing.inGroup)
impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
}
void xlsx_drawing_context::process_shape(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
{
std::wstring ref;
......@@ -559,7 +589,7 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
std::wstringstream strm;
xlsx_serialize(strm, *xlsx_drawings_child);
xlsx_drawings_child->serialize(strm);
drawing.content_group_ = strm.str();
......@@ -581,9 +611,6 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
{
drawing_object_description & obj = objects[i];
int pos_replaicement = obj.xlink_href_.find(L"ObjectReplacements");
if (pos_replaicement >= 0 && !obj.use_image_replace_)continue; //объект
_xlsx_drawing drawing =_xlsx_drawing();
drawing.type = obj.type_;
......@@ -600,7 +627,11 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
bool isMediaInternal = true;
drawing.fill.bitmap->rId = impl_->get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
impl_->get_drawings()->add(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);//собственно это не объект, а доп рел и ref объекта
bool in_sheet = (obj.type_== typeOleObject || obj.type_== typeMsObject) ? true : false;
impl_->get_drawings()->add(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage, in_sheet);//собственно это не объект, а доп рел и ref объекта
//object dumps in sheet rels !!
}
process_common_properties(obj, drawing, table_metrics);
......@@ -611,6 +642,9 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
case typeImage: process_image ( obj, drawing, xlsx_drawings_); break;
case typeShape: process_shape ( obj, drawing, xlsx_drawings_); break;
case typeGroupShape: process_group ( obj, table_metrics, drawing, xlsx_drawings_); break;
case typeMsObject:
case typeOleObject:
process_object ( obj, drawing, xlsx_drawings_); break;
}
}
}
......
ASCOfficeOdfFile/src/docx/xlsx_drawing_context.h
View file @ 56ecea3f
......@@ -80,35 +80,33 @@ public:
void set_odf_packet_path(std::wstring path){odf_packet_path_ = path;}//для анализа картинок
void start_drawing(std::wstring const & name);
void end_drawing();
void start_drawing (std::wstring const & name);
void end_drawing ();
void start_group(std::wstring const & name);
void end_group();
void start_image(std::wstring const & path);
void end_image();
void start_chart(std::wstring const & path);
void end_chart();
void end_group ();
void start_shape(int type);
//...пока тока общие свойства ... частные для каждого объекта пооозже
void end_shape();
void start_object_ole();
void end_object_ole();
void start_frame();
void set_image (std::wstring const & path);
void set_chart (std::wstring const & path);
void set_ole_object (const std::wstring & path, const std::wstring & progId);
void set_text_box ();
void end_frame();
void set_rect(double width_pt, double height_pt, double x_pt, double y_pt);
void set_translate(double x_pt, double y_pt);
void set_scale(double cx_pt, double cy_pt);
void set_rotate(double angle);
void set_translate (double x_pt, double y_pt);
void set_scale (double cx_pt, double cy_pt);
void set_rotate (double angle);
void set_anchor(std::wstring anchor, double x_pt, double y_pt, bool group = false);
void set_property(odf_reader::_property p);
void set_clipping(const std::wstring & str );
void set_fill(_oox_fill & fill);
void set_anchor (std::wstring anchor, double x_pt, double y_pt, bool group = false);
void set_property (odf_reader::_property p);
void set_clipping (const std::wstring & str );
void set_fill (_oox_fill & fill);
std::vector<odf_reader::_property> & get_properties();
......@@ -136,6 +134,7 @@ private:
void process_image (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
void process_chart (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
void process_shape (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
void process_object (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
void process_common_properties (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_table_metrics & table_metrics);
......
ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp
View file @ 56ecea3f
......@@ -36,7 +36,6 @@
#include <vector>
#include <cpdoccore/xml/simple_xml_writer.h>
#include "mediaitems_utils.h"
#include "oox_rels.h"
namespace cpdoccore {
......@@ -45,41 +44,45 @@ namespace oox {
class xlsx_drawings::Impl
{
public:
void add(_xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type)
void add(_xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel )//объект
{
xlsx_drawings_.push_back(d);
bool present = false;
for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
{
if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
present = true;
}
if (!present)
{
xlsx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
}
add (isInternal, rid, ref, type, sheet_rel);
for (int i = 0 ; i < d.hlinks.size(); i++)
{
xlsx_drawing_rels_.push_back(_rel(false, d.hlinks[i].hId, d.hlinks[i].hRef, typeHyperlink));
}
}
void add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type)
void add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel) //не объект
{
bool present = false;
if (type == typeHyperlink) isInternal = false;
if (sheet_rel)
{
for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
{
if (xlsx_sheet_rels_[i].rid == rid && xlsx_sheet_rels_[i].ref == ref)
present = true;
}
if (!present)
xlsx_sheet_rels_.push_back (_rel(isInternal, rid, ref, type));
}
else
{
for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
{
if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
present = true;
}
if (!present)
{
xlsx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
}
}
void serialize(std::wostream & strm)
{
if (inGroup)
......@@ -107,54 +110,56 @@ public:
}
}
}
void serialize_objects(std::wostream & strm)
{
for (int i = 0 ; i < xlsx_drawings_.size(); i++)
{
if (xlsx_drawings_[i].type != typeOleObject) continue;
xlsx_drawings_[i].serialize_object(strm);
}
}
bool empty() const
{
return (xlsx_drawings_.empty());
}
void dump_rels(rels & Rels)
void dump_rels_drawing(rels & Rels)
{
for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
{
if (xlsx_drawing_rels_[i].type == typeChart)
if (xlsx_drawing_rels_[i].type == typeImage ||
xlsx_drawing_rels_[i].type == typeMedia ||
xlsx_drawing_rels_[i].type == typeChart ||
xlsx_drawing_rels_[i].type == typeHyperlink )
{
Rels.add(relationship(
xlsx_drawing_rels_[i].rid,
utils::media::get_rel_type(xlsx_drawing_rels_[i].type),
Rels.add(relationship( xlsx_drawing_rels_[i].rid,
mediaitems::get_rel_type(xlsx_drawing_rels_[i].type),
(xlsx_drawing_rels_[i].is_internal ? std::wstring(L"../") + xlsx_drawing_rels_[i].ref : xlsx_drawing_rels_[i].ref),
(xlsx_drawing_rels_[i].is_internal ? L"" : L"External")
)
);
(xlsx_drawing_rels_[i].is_internal ? L"" : L"External")) );
}
else if (xlsx_drawing_rels_[i].type == typeImage)
{
Rels.add(relationship(
xlsx_drawing_rels_[i].rid,
utils::media::get_rel_type(xlsx_drawing_rels_[i].type),
xlsx_drawing_rels_[i].is_internal ? std::wstring(L"../") + xlsx_drawing_rels_[i].ref : xlsx_drawing_rels_[i].ref,
(xlsx_drawing_rels_[i].is_internal ? L"" : L"External")
)
);
}
else if (xlsx_drawing_rels_[i].type == typeHyperlink)
{
Rels.add(relationship(
xlsx_drawing_rels_[i].rid,
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
xlsx_drawing_rels_[i].ref,
L"External")
);
}
void dump_rels_sheet(rels & Rels)
{
for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
{
Rels.add(relationship( xlsx_sheet_rels_[i].rid,
mediaitems::get_rel_type(xlsx_sheet_rels_[i].type),
(xlsx_sheet_rels_[i].is_internal ? std::wstring(L"../") + xlsx_sheet_rels_[i].ref : xlsx_sheet_rels_[i].ref),
(xlsx_sheet_rels_[i].is_internal ? L"" : L"External")) );
}
}
bool inGroup;
private:
std::vector<_xlsx_drawing> xlsx_drawings_;
std::vector<_rel> xlsx_drawing_rels_;
std::vector<_rel> xlsx_sheet_rels_;
};
xlsx_drawings::xlsx_drawings(bool inGroup_) : impl_( new xlsx_drawings::Impl() )
......@@ -167,19 +172,24 @@ xlsx_drawings::~xlsx_drawings()
}
void xlsx_drawings::add(_xlsx_drawing const & d, bool isInternal, std::wstring const & rid,
std::wstring const & ref, RelsType type)
std::wstring const & ref, RelsType type, bool sheet_rel)
{
impl_->add(d, isInternal, rid, ref, type, sheet_rel);
}
void xlsx_drawings::add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel)
{
impl_->add(d, isInternal, rid, ref, type);
impl_->add(isInternal, rid, ref, type, sheet_rel);
}
void xlsx_drawings::add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type)
void xlsx_drawings::serialize(std::wostream & strm)
{
impl_->add(isInternal, rid, ref, type);
impl_->serialize(strm);
}
void xlsx_serialize(std::wostream & _Wostream, xlsx_drawings const & val)
void xlsx_drawings::serialize_objects(std::wostream & strm)
{
val.impl_->serialize(_Wostream);
impl_->serialize_objects(strm);
}
bool xlsx_drawings::empty() const
......@@ -187,9 +197,14 @@ bool xlsx_drawings::empty() const
return impl_->empty();
}
void xlsx_drawings::dump_rels(rels & Rels)
void xlsx_drawings::dump_rels_drawing(rels & Rels)
{
return impl_->dump_rels_drawing(Rels);
}
void xlsx_drawings::dump_rels_sheet(rels & Rels)
{
return impl_->dump_rels(Rels);
return impl_->dump_rels_sheet(Rels);
}
xlsx_drawings_ptr xlsx_drawings::create(bool inGroup)
......
ASCOfficeOdfFile/src/docx/xlsx_drawings.h
View file @ 56ecea3f
......@@ -55,7 +55,7 @@ struct drawing_elm
xlsx_drawings_ptr drawings;
};
struct _xlsx_drawing;
class _xlsx_drawing;
class xlsx_drawings
{
......@@ -64,14 +64,15 @@ public:
~xlsx_drawings ();
static xlsx_drawings_ptr create(bool inGroup);
public:
void add (_xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type);
void add (bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type );
void add ( _xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel = false );
void add ( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel = false );
bool empty () const;
void dump_rels (rels & Rels);
void dump_rels_sheet (rels & Rels);
void dump_rels_drawing (rels & Rels);
friend void xlsx_serialize(std::wostream & _Wostream, xlsx_drawings const & val);
void serialize (std::wostream & _Wostream);
void serialize_objects (std::wostream & _Wostream);
private:
class Impl;
_CP_SCOPED_PTR(Impl) impl_;
......
ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp
View file @ 56ecea3f
......@@ -54,8 +54,10 @@ public:
std::wstringstream sort_;
std::wstringstream autofilter_;
std::wstringstream conditionalFormatting_;
std::wstringstream ole_objects_;
rels hyperlinks_rels_;
rels ole_objects_rels_;
std::wstring drawingName_;
std::wstring drawingId_;
......@@ -128,10 +130,19 @@ std::wostream & xlsx_xml_worksheet::hyperlinks()
{
return impl_->hyperlinks_;
}
std::wostream & xlsx_xml_worksheet::ole_objects()
{
return impl_->ole_objects_;
}
//---------------------------------------------------------------------------------------
rels & xlsx_xml_worksheet::hyperlinks_rels()
{
return impl_->hyperlinks_rels_;
}
rels & xlsx_xml_worksheet::ole_objects_rels()
{
return impl_->ole_objects_rels_;
}
void xlsx_xml_worksheet::write_to(std::wostream & strm)
{
CP_XML_WRITER(strm)
......@@ -140,8 +151,10 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
{
CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
CP_XML_ATTR(L"xmlns:xdr", L"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
CP_XML_ATTR(L"xmlns:x14", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
CP_XML_ATTR(L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006");
CP_XML_ATTR(L"mc:Ignorable", L"x14ac");
CP_XML_ATTR(L"mc:Ignorable",L"x14ac");
CP_XML_ATTR(L"xmlns:x14ac", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac");
CP_XML_STREAM() << impl_->sheetFormat_.str();
......@@ -179,7 +192,13 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
CP_XML_ATTR(L"r:id",impl_->vml_drawingId_);
}
}
if (!impl_->ole_objects_.str().empty())
{
CP_XML_NODE(L"oleObjects")
{
CP_XML_STREAM() << impl_->ole_objects_.str();
}
}
//CP_XML_NODE(L"headerFooter){}
//CP_XML_NODE(L"rowBreaks){}
......@@ -217,43 +236,5 @@ std::pair<std::wstring, std::wstring> xlsx_xml_worksheet::get_vml_drawing_link()
return std::pair<std::wstring, std::wstring>(impl_->vml_drawingName_, impl_->vml_drawingId_);
}
//class xlsx_xml_workbook::Impl: noncopyable
//{
//public:
// std::wstringstream sheets_;
//};
//
//xlsx_xml_workbook::xlsx_xml_workbook() : impl_(new xlsx_xml_workbook::Impl)
//{
//}
//
//xlsx_xml_workbook::~xlsx_xml_workbook()
//{
//}
//
//std::wostream & xlsx_xml_workbook::sheets()
//{
// return impl_->sheets_;
//}
//
//void xlsx_xml_workbook::write_to(std::wostream & strm)
//{
// CP_XML_WRITER(strm)
// {
// CP_XML_NODE(L"workbook")
// {
// CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
// CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
//
// CP_XML_NODE(L"sheets")
// {
// CP_XML_STREAM() << impl_->sheets_.str();
// }
// }
// }
//}
//
}
}
ASCOfficeOdfFile/src/docx/xlsx_output_xml.h
View file @ 56ecea3f
......@@ -62,8 +62,10 @@ public:
std::wostream & autofilter();
std::wostream & conditionalFormatting();
std::wostream & sort();
std::wostream & ole_objects();
rels & hyperlinks_rels();
rels & ole_objects_rels();
void write_to(std::wostream & strm);
......
ASCOfficeOdfFile/src/docx/xlsx_package.cpp
View file @ 56ecea3f
......@@ -181,29 +181,29 @@ void xl_files::write(const std::wstring & RootPath)
sharedStrings_->write(path);
rels_files_.add( relationship( L"shId1", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings", L"sharedStrings.xml" ) );
}
if (styles_)
{
styles_->write(path);
rels_files_.add( relationship( L"stId1", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles", L"styles.xml" ) );
}
if (workbook_)
{
workbook_->write(path);
}
if (theme_)
{
theme_->write(path);
}
if (media_)
{
media_->set_main_document(get_main_document());
media_->write(path);
}
if (embeddings_)
{
embeddings_->set_main_document(get_main_document());
embeddings_->write(path);
}
{
charts_files_.set_main_document(get_main_document());
charts_files_.write(path);
......@@ -243,7 +243,15 @@ void xl_files::add_sheet(sheet_content_ptr sheet)
void xl_files::set_media(mediaitems & _Mediaitems, CApplicationFonts *pAppFonts)
{
if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
{
media_ = element_ptr( new media(_Mediaitems, pAppFonts) );
}
if (_Mediaitems.count_object > 0)
{
embeddings_ = element_ptr( new embeddings(_Mediaitems) );
}
}
void xl_files::set_comments(element_ptr Element)
{
......@@ -313,7 +321,7 @@ void xl_drawings::write(const std::wstring & RootPath)
rels_files relFiles;
rels_file_ptr r = rels_file::create(e.filename + L".rels");
e.drawings->dump_rels(r->get_rels());
e.drawings->dump_rels_drawing(r->get_rels());
relFiles.add_rel_file(r);
relFiles.write(path);
......
ASCOfficeOdfFile/src/docx/xlsx_package.h
View file @ 56ecea3f
......@@ -172,12 +172,14 @@ private:
rels_files rels_files_;
sheets_files sheets_files_;
xl_charts_files charts_files_;
element_ptr theme_;
element_ptr workbook_;
element_ptr styles_;
element_ptr sharedStrings_;
element_ptr media_;
element_ptr embeddings_;
element_ptr drawings_;
element_ptr vml_drawings_;
element_ptr comments_;
......
ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp
View file @ 56ecea3f
......@@ -403,7 +403,10 @@ void xlsx_table_state::serialize_merge_cells(std::wostream & _Wostream)
{
return xlsx_merge_cells_.xlsx_serialize(_Wostream);
}
void xlsx_table_state::serialize_ole_objects(std::wostream & _Wostream)
{
return xlsx_drawing_context_.get_drawings()->serialize_objects(_Wostream);
}
void xlsx_table_state::serialize_hyperlinks(std::wostream & _Wostream)
{
return xlsx_hyperlinks_.xlsx_serialize(_Wostream);
......@@ -416,6 +419,10 @@ void xlsx_table_state::dump_rels_hyperlinks(rels & Rels)
{
return xlsx_hyperlinks_.dump_rels(Rels);
}
void xlsx_table_state::dump_rels_ole_objects(rels & Rels)
{
return get_drawing_context().get_drawings()->dump_rels_sheet(Rels);
}
void xlsx_table_state::start_hyperlink()
{
......
ASCOfficeOdfFile/src/docx/xlsx_table_state.h
View file @ 56ecea3f
......@@ -127,7 +127,10 @@ public:
void serialize_table_format (std::wostream & _Wostream);
void serialize_merge_cells (std::wostream & _Wostream);
void serialize_hyperlinks (std::wostream & _Wostream);
void serialize_ole_objects (std::wostream & _Wostream);
void dump_rels_hyperlinks (rels & Rels);
void dump_rels_ole_objects (rels & Rels);
std::wstring get_table_name() const { return tableName_; }
int get_table_id() const { return tableId_; }
......
ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp
View file @ 56ecea3f
......@@ -320,10 +320,18 @@ void xlsx_table_context::serialize_hyperlinks(std::wostream & _Wostream)
{
return state()->serialize_hyperlinks(_Wostream);
}
void xlsx_table_context::serialize_ole_objects(std::wostream & _Wostream)
{
return state()->serialize_ole_objects(_Wostream);
}
void xlsx_table_context::dump_rels_hyperlinks(rels & Rels)
{
return state()->dump_rels_hyperlinks(Rels);
}
void xlsx_table_context::dump_rels_ole_objects(rels & Rels)
{
return state()->dump_rels_ole_objects(Rels);
}
xlsx_table_metrics & xlsx_table_context::get_table_metrics()
{
......
ASCOfficeOdfFile/src/docx/xlsx_tablecontext.h
View file @ 56ecea3f
......@@ -88,6 +88,8 @@ public:
void serialize_merge_cells (std::wostream & _Wostream);
void serialize_table_format (std::wostream & _Wostream);
void serialize_conditionalFormatting(std::wostream & _Wostream);
void serialize_hyperlinks (std::wostream & _Wostream);
void serialize_ole_objects (std::wostream & _Wostream);
xlsx_table_metrics & get_table_metrics();
......@@ -103,9 +105,8 @@ public:
void start_hyperlink();
std::wstring end_hyperlink(std::wstring const & ref, std::wstring const & href, std::wstring const & display);
void dump_rels_hyperlinks(rels & Rels);
void serialize_hyperlinks(std::wostream & _Wostream);
void dump_rels_hyperlinks (rels & Rels);
void dump_rels_ole_objects (rels & Rels);
void start_database_range(std::wstring table_name, std::wstring ref);
void set_database_orientation (bool val);
......
ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp
View file @ 56ecea3f
......@@ -132,12 +132,11 @@ void xlsx_conversion_context::end_document()
{
std::wstringstream workbook_content;
unsigned int count = 0;
// добавляем таблицы
BOOST_FOREACH(const xlsx_xml_worksheet_ptr& sheet, sheets_)
for (int i = 0; i < sheets_.size(); i++)
{
count++;
const std::wstring id = std::wstring(L"sId") + boost::lexical_cast<std::wstring>(count);
xlsx_xml_worksheet_ptr& sheet = sheets_[i];
const std::wstring id = std::wstring(L"sId") + std::to_wstring(i+1);
package::sheet_content_ptr content = package::sheet_content::create();
////////////////////////////////////////////////////////////////////////////////////////////
......@@ -152,6 +151,7 @@ void xlsx_conversion_context::end_document()
}
//////////////////////////////////////////////////////////////////////////////////////////////////
content->add_rels(sheet->hyperlinks_rels());
content->add_rels(sheet->ole_objects_rels());
/////////////////////////////////////////////////////////////////////////////////////////////////
const std::pair<std::wstring, std::wstring> p2 = sheet->get_comments_link();
if (!p2.first.empty())
......@@ -180,7 +180,7 @@ void xlsx_conversion_context::end_document()
CP_XML_NODE(L"sheet")
{
CP_XML_ATTR(L"name", sheet->name()); // office 2010 ! ограничение на длину имени !!!
CP_XML_ATTR(L"sheetId", count);
CP_XML_ATTR(L"sheetId", i + 1);
CP_XML_ATTR(L"state", L"visible");
CP_XML_ATTR(L"r:id", id);
}
......@@ -189,14 +189,12 @@ void xlsx_conversion_context::end_document()
}
//добавляем диаграммы
count = 0;
BOOST_FOREACH(const oox_chart_context_ptr& chart, charts_)
for (int i = 0; i < charts_.size(); i++)
{
count++;
package::chart_content_ptr content = package::chart_content::create();
chart->serialize(content->content());
chart->dump_rels(content->get_rel_file()->get_rels());
charts_[i]->serialize(content->content());
charts_[i]->dump_rels(content->get_rel_file()->get_rels());
output_document_->get_xl_files().add_charts(content);
}
......@@ -322,12 +320,16 @@ void xlsx_conversion_context::end_table()
get_table_context().serialize_autofilter (current_sheet().autofilter());
get_table_context().serialize_sort (current_sheet().sort());
get_table_context().serialize_merge_cells (current_sheet().mergeCells());
get_drawing_context().set_odf_packet_path (root()->get_folder());
get_drawing_context().process_objects (get_table_metrics());
get_table_context().serialize_hyperlinks (current_sheet().hyperlinks());
get_table_context().dump_rels_hyperlinks (current_sheet().hyperlinks_rels());
get_table_context().serialize_ole_objects (current_sheet().ole_objects());
get_drawing_context().set_odf_packet_path(root()->get_folder());
get_table_context().dump_rels_hyperlinks (current_sheet().hyperlinks_rels());
get_table_context().dump_rels_ole_objects (current_sheet().ole_objects_rels());
get_drawing_context().process_objects(get_table_metrics());
if (!get_drawing_context().empty())
{
......
ASCOfficeOdfFile/src/odf/datatypes/common_attlists.h
View file @ 56ecea3f
......@@ -116,7 +116,6 @@ public:
void apply_from(const common_horizontal_margin_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(length_or_percent) fo_margin_left_;
_CP_OPT(length_or_percent) fo_margin_right_;
};
......@@ -129,7 +128,6 @@ public:
void apply_from(const common_vertical_margin_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(length_or_percent) fo_margin_top_;
_CP_OPT(length_or_percent) fo_margin_bottom_;
};
......@@ -143,10 +141,7 @@ public:
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(length_or_percent) fo_margin_;
friend class style_page_layout_properties_attlist;
};
// common-math_style_attlist
......@@ -158,9 +153,7 @@ public:
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(math_variant) mathvariant_;
};
// common-break-attlist
......@@ -171,7 +164,6 @@ public:
void apply_from(const common_break_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(fo_break) fo_break_before_;
_CP_OPT(fo_break) fo_break_after_;
......@@ -185,7 +177,6 @@ public:
void apply_from(const common_page_number_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(unsigned int) style_page_number_;
};
......@@ -198,7 +189,6 @@ public:
void apply_from(const common_background_color_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(background_color) fo_background_color_;
};
......@@ -211,7 +201,6 @@ public:
void apply_from(const common_shadow_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(shadow_type) style_shadow_;
};
......@@ -224,7 +213,6 @@ public:
void apply_from(const common_keep_with_next_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(keep_together) keep_together_;
};
......@@ -238,7 +226,6 @@ public:
void serialize(CP_ATTR_NODE);
_CP_OPT(writing_mode) style_writing_mode_;
};
/// common-draw-data-attlist
......@@ -249,7 +236,6 @@ public:
void apply_from(const common_xlink_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) href_;
_CP_OPT(xlink_type) type_;
_CP_OPT(xlink_show) show_;
......@@ -265,7 +251,6 @@ public:
void apply_from(const common_value_and_type_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(office_value_type) office_value_type_;
_CP_OPT(std::wstring) office_value_;
_CP_OPT(std::wstring) office_currency_;
......@@ -273,7 +258,6 @@ public:
_CP_OPT(std::wstring) office_time_value_;
_CP_OPT(std::wstring) office_boolean_value_;
_CP_OPT(std::wstring) office_string_value_;
};
// common-border-attlist
......@@ -284,7 +268,6 @@ public:
void apply_from(const common_border_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(border_style) fo_border_;
_CP_OPT(border_style) fo_border_top_;
_CP_OPT(border_style) fo_border_bottom_;
......@@ -301,16 +284,10 @@ public:
void apply_from(const common_border_line_width_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
// style:border-line-width
_CP_OPT(border_widths) style_border_line_width_;
// style:border-line-width-top
_CP_OPT(border_widths) style_border_line_width_top_;
// style:border-line-width-bottom
_CP_OPT(border_widths) style_border_line_width_bottom_;
// style:border-line-width-left
_CP_OPT(border_widths) style_border_line_width_left_;
// style:border-line-width-right
_CP_OPT(border_widths) style_border_line_width_right_;
};
......@@ -323,7 +300,6 @@ public:
void apply_from(const common_padding_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(length) fo_padding_;
_CP_OPT(length) fo_padding_top_;
......@@ -340,12 +316,11 @@ public:
void apply_from(const common_rotation_angle_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(unsigned int) style_rotation_angle_;
};
/// common-num-format-attlist
// common-num-format-attlist
class common_num_format_attlist
{
public:
......@@ -353,13 +328,12 @@ public:
void apply_from(const common_num_format_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) style_num_format_;
_CP_OPT(Bool) style_num_letter_sync_;
};
/// common-num-format-prefix-suffix-attlist
// common-num-format-prefix-suffix-attlist
class common_num_format_prefix_suffix_attlist
{
public:
......@@ -367,13 +341,12 @@ public:
void apply_from(const common_num_format_prefix_suffix_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) style_num_prefix_;
_CP_OPT(std::wstring) style_num_suffix_;
};
/// common-text-align
// common-text-align
class common_text_align
{
public:
......@@ -381,11 +354,10 @@ public:
void apply_from(const common_text_align & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(text_align) fo_text_align_;
};
/// common-draw-size-attlist
// common-draw-size-attlist
class common_draw_size_attlist
{
public:
......@@ -393,7 +365,6 @@ public:
void apply_from(const common_draw_size_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(length) svg_width_;
_CP_OPT(length) svg_height_;
......@@ -407,7 +378,6 @@ public:
void apply_from(const common_text_anchor_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(anchor_type) type_;
_CP_OPT(unsigned int) page_number_;
};
......@@ -424,7 +394,6 @@ public:
}
void serialize(CP_ATTR_NODE){}
public:
// _CP_OPT(animation_type) type_;
//_CP_OPT(animation_direction) direction_;
//text:animation
......@@ -435,7 +404,7 @@ public:
};
/// common-draw-rel-size-attlist
// common-draw-rel-size-attlist
class common_draw_rel_size_attlist
{
public:
......@@ -449,7 +418,7 @@ public:
_CP_OPT(percent_or_scale) style_rel_height_;
};
/// common-vertical-rel-attlist
// common-vertical-rel-attlist
class common_vertical_rel_attlist
{
public:
......@@ -457,12 +426,11 @@ public:
void apply_from(const common_vertical_rel_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(vertical_rel) style_vertical_rel_;
};
/// common-horizontal-rel-attlist
// common-horizontal-rel-attlist
class common_horizontal_rel_attlist
{
public:
......@@ -470,12 +438,11 @@ public:
void apply_from(const common_horizontal_rel_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(horizontal_rel) style_horizontal_rel_;
};
/// common-vertical-pos-attlist
// common-vertical-pos-attlist
class common_vertical_pos_attlist
{
public:
......@@ -483,13 +450,12 @@ public:
void apply_from(const common_vertical_pos_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(vertical_pos) style_vertical_pos_;
_CP_OPT(length) svg_y_;
};
/// common-horizontal-pos-attlist
// common-horizontal-pos-attlist
class common_horizontal_pos_attlist
{
public:
......@@ -498,13 +464,12 @@ public:
void apply_from(const common_horizontal_pos_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(horizontal_pos) style_horizontal_pos_;
_CP_OPT(length) svg_x_;
};
/// common-draw-style-name-attlist
// common-draw-style-name-attlist
class common_draw_style_name_attlist
{
public:
......@@ -512,7 +477,6 @@ public:
void apply_from(const common_draw_style_name_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(style_ref) draw_style_name_;
_CP_OPT(std::wstring) draw_class_names_;
_CP_OPT(style_ref) presentation_style_name_;
......@@ -528,7 +492,6 @@ public:
void apply_from(const common_draw_z_index_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(int) draw_z_index_;
};
......@@ -540,7 +503,6 @@ public:
void apply_from(const common_draw_id_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) draw_id_;
};
......@@ -552,7 +514,6 @@ public:
void apply_from(const common_draw_layer_name_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) draw_layer_;
};
......@@ -564,7 +525,6 @@ public:
void apply_from(const common_draw_transform_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) draw_transform_;
};
......@@ -576,7 +536,6 @@ public:
void apply_from(const common_draw_name_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) draw_name_;
};
......@@ -588,7 +547,6 @@ public:
void apply_from(const common_text_spreadsheet_shape_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) table_end_cell_address_;
_CP_OPT(length) table_end_x_;
_CP_OPT(length) table_end_y_;
......@@ -606,7 +564,6 @@ public:
void apply_from(const common_draw_shape_with_styles_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
common_draw_z_index_attlist common_draw_z_index_attlist_;
common_draw_id_attlist common_draw_id_attlist_;
common_draw_layer_name_attlist common_draw_layer_name_attlist_;
......@@ -625,7 +582,6 @@ public:
void apply_from(const common_draw_text_style_name_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(style_ref) draw_text_style_name_;
};
......@@ -637,7 +593,6 @@ public:
void apply_from(const common_draw_position_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(length) svg_x_;
_CP_OPT(length) svg_y_;
......@@ -651,7 +606,6 @@ public:
void apply_from(const common_draw_shape_with_text_and_styles_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
common_draw_shape_with_styles_attlist common_draw_shape_with_styles_attlist_;
common_draw_text_style_name_attlist common_draw_text_style_name_attlist_;
};
......@@ -664,7 +618,6 @@ public:
void apply_from(const presentation_shape_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(std::wstring) presentation_class_;
_CP_OPT(Bool) presentation_placeholder_;
_CP_OPT(Bool) presentation_user_transformed_;
......@@ -678,7 +631,6 @@ public:
void add_attributes( const xml::attributes_wc_ptr & Attributes );
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(style_ref) style_name_;
_CP_OPT(std::wstring) number_language_;
_CP_OPT(std::wstring) number_country_;
......@@ -710,7 +662,6 @@ public:
void apply_from(const common_presentation_attlist & Other);
void serialize(CP_ATTR_NODE);
public:
_CP_OPT(presentation_class) presentation_class_;
_CP_OPT(std::wstring) style_name_;
_CP_OPT(Bool) presentation_placeholder_;
......@@ -726,7 +677,6 @@ public:
void apply_from(const common_anim_smil_attlist & Other);
void serialize(CP_ATTR_NODE){}
public:
//_CP_OPT(std::wstring) smil_direction_;
//_CP_OPT(std::wstring) smil_subtype_;
//_CP_OPT(std::wstring) smil_type_;
......
ASCOfficeOdfFile/src/odf/draw_frame.cpp
View file @ 56ecea3f
......@@ -85,11 +85,6 @@ void draw_chart_attlist::add_attributes( const xml::attributes_wc_ptr & Attribut
const wchar_t * draw_image::ns = L"draw";
const wchar_t * draw_image::name = L"image";
std::wostream & draw_image::text_to_stream(std::wostream & _Wostream) const
{
return _Wostream;
}
void draw_image::add_attributes( const xml::attributes_wc_ptr & Attributes )
{
draw_image_attlist_.add_attributes(Attributes);
......
ASCOfficeOdfFile/src/odf/draw_frame.h
View file @ 56ecea3f
......@@ -40,8 +40,6 @@
#include "office_elements_create.h"
#include "datatypes/common_attlists.h"
//#include "../docx/xlsxconversioncontext.h"
namespace cpdoccore {
namespace oox
{
......@@ -75,22 +73,18 @@ public:
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
virtual void pptx_convert(oox::pptx_conversion_context & Context);
public:
virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
private:
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
private:
draw_image_attlist draw_image_attlist_;
odf_types::common_xlink_attlist common_xlink_attlist_;
office_element_ptr office_binary_data_;
office_element_ptr_array content_;
friend class odf_document;
};
CP_REGISTER_OFFICE_ELEMENT2(draw_image);
//////////////////////////////////////////////////////////////////////////////////////////////////////////
//draw-chart-attlist
class draw_chart_attlist
......@@ -98,12 +92,10 @@ class draw_chart_attlist
public:
void add_attributes( const xml::attributes_wc_ptr & Attributes );
public:
//_CP_OPT(std::wstring) draw_filter_name_;
};
//объект рисования не нужен .. нужно только место для фрэйма - сам чарт в другом месте
class draw_chart : public office_element_impl<draw_chart>
{
public:
......@@ -113,7 +105,7 @@ public:
static const ElementType type = typeDrawChart;
CPDOCCORE_DEFINE_VISITABLE();
//virtual void docx_convert(oox::docx_conversion_context & Context);
virtual void docx_convert(oox::docx_conversion_context & Context){}
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
virtual void pptx_convert(oox::pptx_conversion_context & Context);
......@@ -126,16 +118,17 @@ private:
private:
draw_chart_attlist draw_chart_attlist_;
odf_types::common_xlink_attlist common_xlink_attlist_;
office_element_ptr_array content_;
//office_element_ptr title_;
office_element_ptr_array content_;
friend class odf_document;
};
CP_REGISTER_OFFICE_ELEMENT2(draw_chart);
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
//draw-frame-attlist
//draw-frame-attlist
class draw_frame_attlist
{
public:
......@@ -198,9 +191,9 @@ private:
};
CP_REGISTER_OFFICE_ELEMENT2(draw_frame);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
//draw-frame-attlist
//-------------------------------------------------------------------------------------------------------------
//draw-frame-attlist
class draw_g_attlist
{
public:
......@@ -222,19 +215,19 @@ public:
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
virtual void pptx_convert(oox::pptx_conversion_context & Context);
public:
private:
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
public:
odf_types::union_common_draw_attlists common_draw_attlists_;
draw_g_attlist draw_g_attlist_;
office_element_ptr_array content_;
private:
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
};
CP_REGISTER_OFFICE_ELEMENT2(draw_g);
//-------------------------------------------------------------------------------------------------------------
// draw-text-box-attlist
class draw_text_box_attlist
{
......@@ -250,7 +243,6 @@ public:
};
class draw_text_box : public office_element_impl<draw_text_box>
{
public:
......@@ -264,20 +256,20 @@ public:
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
virtual void pptx_convert(oox::pptx_conversion_context & Context);
public:
virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
draw_text_box_attlist draw_text_box_attlist_;
office_element_ptr_array content_;
private:
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
virtual void add_text(const std::wstring & Text);
public:
draw_text_box_attlist draw_text_box_attlist_;
office_element_ptr_array content_;
};
CP_REGISTER_OFFICE_ELEMENT2(draw_text_box);
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//-------------------------------------------------------------------------------------------------------------
/// draw-object-attlist
class draw_object_attlist
{
......@@ -304,13 +296,12 @@ public:
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
virtual void pptx_convert(oox::pptx_conversion_context & Context);
draw_object_attlist draw_object_attlist_;
odf_types::common_xlink_attlist common_xlink_attlist_;
private:
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
public:
draw_object_attlist draw_object_attlist_;
odf_types::common_xlink_attlist common_xlink_attlist_;
};
CP_REGISTER_OFFICE_ELEMENT2(draw_object);
......@@ -329,13 +320,14 @@ public:
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
virtual void pptx_convert(oox::pptx_conversion_context & Context);
odf_types::common_xlink_attlist common_xlink_attlist_;
_CP_OPT(std::wstring) draw_class_id_;
private:
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
public:
odf_types::common_xlink_attlist common_xlink_attlist_;
_CP_OPT(std::wstring) draw_class_id_;
std::wstring detectObject(const std::wstring &fileName);
};
CP_REGISTER_OFFICE_ELEMENT2(draw_object_ole);
......
ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp
View file @ 56ecea3f
......@@ -58,6 +58,7 @@
#include "datatypes/borderstyle.h"
#include "../../../OfficeUtils/src/OfficeUtils.h"
#include "../../../Common/3dParty/pole/pole.h"
namespace cpdoccore {
......@@ -1429,10 +1430,7 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
{
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
odf_reader::odf_document * odf_reader = Context.root();
std::wstring folderPath = odf_reader->get_folder();
std::wstring folderPath = Context.root()->get_folder();
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
//normalize path ??? todooo
......@@ -1440,13 +1438,9 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
cpdoccore::odf_reader::odf_document objectSubDoc(objectPath ,NULL);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//функциональная часть
office_element* contentSubDoc = objectSubDoc.get_impl()->get_content();
draw_frame* frame = NULL;
oox::_docx_drawing * drawing = NULL;
//if (!contentSubDoc)//Diagramma.odt - кривые ссылки на объекты
// return;
office_element* contentSubDoc = objectSubDoc.get_impl()->get_content();
object_odf_context objectBuild (href);
if (contentSubDoc)
......@@ -1456,8 +1450,8 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
objectBuild.docx_convert(Context);
frame = Context.get_drawing_context().get_current_frame();//owner
frame = Context.get_drawing_context().get_current_frame(); //owner
if (frame)
drawing = dynamic_cast<oox::_docx_drawing *>(frame->oox_drawing_.get());
}
......@@ -1474,10 +1468,12 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
bool isMediaInternal = true;
drawing->objectId = Context.add_mediaitem(href, drawing->type, isMediaInternal, href);
}
else if (objectBuild.object_type_ == 2 ) //embedded text
{
//text in text not support
}
else if (objectBuild.object_type_ == 3) //мат формулы
{
//skip replacement image !!!
const std::wstring & content = Context.get_drawing_context().get_text_stream_frame();
bool in_frame = !drawing->isInline;
......@@ -1497,7 +1493,7 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
}
else
{//in text
drawing->type = oox::typeUnknown;
drawing->type = oox::typeUnknown; //not drawing
if (runState) Context.finish_run();
//if (pState == false)
......@@ -1528,7 +1524,7 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
if (objectSubDoc.xlsx_convert(conversionXlsxContext))
{
drawing->type = oox::typeObject;
drawing->type = oox::typeMsObject;
std::wstring objectXlsxPath = FileSystem::Directory::CreateDirectoryWithUniqueName(folderPath);
outputXlsx.write(objectXlsxPath);
......@@ -1568,12 +1564,14 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
void draw_object_ole::docx_convert(oox::docx_conversion_context & Context)
{
//временно - замещающая картинка(если она конечно присутствует)
bool & use_image_replace = Context.get_drawing_context().get_use_image_replace();
use_image_replace = true;
//------------------------------------------------
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
std::wstring folderPath = Context.root()->get_folder();
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
if (href.empty()) return;
draw_frame* frame = Context.get_drawing_context().get_current_frame(); //owner
......@@ -1582,11 +1580,58 @@ void draw_object_ole::docx_convert(oox::docx_conversion_context & Context)
oox::_docx_drawing * drawing = dynamic_cast<oox::_docx_drawing *>(frame->oox_drawing_.get());
if (!drawing) return;
drawing->type = oox::typeObject;
drawing->type = oox::typeOleObject;
bool isMediaInternal = true;
drawing->objectId = Context.add_mediaitem(href, drawing->type, isMediaInternal, href);
drawing->objectProgId = L""; //detect ???
drawing->objectProgId = detectObject(objectPath);
}
std::wstring draw_object_ole::detectObject(const std::wstring &fileName)
{
POLE::Storage *storage = new POLE::Storage(fileName.c_str());
if (storage == NULL) return L"";
if (storage->open(false, false) == false)
{
delete storage;
return L"";
}
std::wstring prog;
POLE::Stream* pStream = new POLE::Stream(storage, "CompObj");
if ((pStream) && (pStream->size() > 28))
{
//skip the CompObjHeader
pStream->seek(28);
int sz_obj = pStream->size() - 28;
std::vector<std::string> str;
while (sz_obj > 0)
{
_UINT32 sz = 0;
pStream->read((unsigned char*)&sz, 4); sz_obj-= 4;
if (sz > sz_obj)
break;
unsigned char *data = new unsigned char[sz];
pStream->read(data, sz);
str.push_back(std::string((char*)data, sz));
delete []data;
sz_obj-= sz;
}
if (!str.empty())
{
prog = std::wstring (str.back().begin(), str.back().end());
}
delete pStream;
}
delete storage;
return prog;
}
}
......
ASCOfficeOdfFile/src/odf/draw_frame_pptx.cpp
View file @ 56ecea3f
......@@ -86,6 +86,8 @@ void draw_frame::pptx_convert_placeHolder(oox::pptx_conversion_context & Context
}
void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
{
Context.get_slide_context().start_frame();
common_draw_shape_with_styles_attlist common_draw_attlist_ = common_draw_attlists_.shape_with_text_and_styles_.common_draw_shape_with_styles_attlist_;
const int z_index = common_draw_attlist_.common_draw_z_index_attlist_.draw_z_index_.get_value_or(0);
......@@ -206,13 +208,15 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
}
Context.get_text_context().end_base_style();
Context.get_slide_context().end_frame();
}
void draw_image::pptx_convert(oox::pptx_conversion_context & Context)
{
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
Context.get_slide_context().start_image(href);
Context.get_slide_context().set_image(href);
////////////////////////////////////в принципе достаточно общая часть ...
Context.get_text_context().start_object();
......@@ -224,25 +228,23 @@ void draw_image::pptx_convert(oox::pptx_conversion_context & Context)
if (text_content_.length()>0)
{
Context.get_slide_context().set_property(_property(L"text-content",text_content_));
Context.get_slide_context().set_property(_property(L"text-content", text_content_));
}
////////////////////////////////////////////////////////////////////////////3 раза уже повторилась Content -> Context
Context.get_slide_context().end_image();
}
void draw_chart::pptx_convert(oox::pptx_conversion_context & Context)
{
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
Context.get_slide_context().start_chart(href);
Context.get_slide_context().set_chart(href);
for (int i = 0; i < content_.size(); i++)
{
content_[i]->pptx_convert(Context);
}
Context.get_slide_context().end_chart();
}
void draw_text_box::pptx_convert(oox::pptx_conversion_context & Context)
{
Context.get_slide_context().start_shape(2);//rect с наваротами
Context.get_slide_context().set_text_box(); //rect с наваротами
Context.get_text_context().start_object();
for (int i = 0; i < content_.size(); i++)
......@@ -256,7 +258,6 @@ void draw_text_box::pptx_convert(oox::pptx_conversion_context & Context)
{
Context.get_slide_context().set_property(_property(L"text-content",text_content_));
}
Context.get_slide_context().end_shape();
}
void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
{
......@@ -282,11 +283,8 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
{
//здесь другой формат xml (не Open Office)
//временно - замещающая картинка(если она конечно присутствует)
Context.get_slide_context().start_object_ole();
return;
}
object_odf_context objectBuild(href);
process_build_object process_build_object_(objectBuild, objectSubDoc.odf_context());
......@@ -300,12 +298,11 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"");
objectBuild.pptx_convert(Context);
Context.get_slide_context().start_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
Context.get_slide_context().end_chart();
Context.get_slide_context().set_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
}
else if (objectBuild.object_type_ == 2)//odt текст
{
Context.get_slide_context().start_shape(2);
Context.get_slide_context().set_text_box();
Context.get_text_context().start_object();
//сменить контекст с главного на другой ... проблема со стилями!!
......@@ -320,11 +317,10 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
{
Context.get_slide_context().set_property(_property(L"text-content",text_content_));
}
Context.get_slide_context().end_shape();
}
else if (objectBuild.object_type_ == 3) //мат формулы
{
Context.get_slide_context().start_shape(2);
Context.get_slide_context().set_text_box();
objectBuild.pptx_convert(Context);
......@@ -342,11 +338,10 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
Context.get_slide_context().set_property(_property(L"fit-to-size", true));
Context.get_slide_context().set_property(_property(L"text-content", text_content));
}
Context.get_slide_context().end_shape();
}
else
{
//временно - замещающая картинка(если она конечно присутствует)
//замещающая картинка(если она конечно присутствует)
Context.get_slide_context().set_use_image_replacement();
}
......@@ -359,14 +354,14 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
void draw_object_ole::pptx_convert(oox::pptx_conversion_context & Context)
{
//объект бин в embeddings
//Context.get_slide_context().start_object_ole();
//распознать тип по guid???
//временно - замещающая картинка(если она конечно присутствует)
Context.get_slide_context().set_use_image_replacement();
//Context.get_slide_context().end_object_ole();
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
std::wstring folderPath = Context.root()->get_folder();
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
if (!href.empty())
Context.get_slide_context().set_ole_object(href, detectObject(objectPath));
}
}
......
ASCOfficeOdfFile/src/odf/draw_frame_xlsx.cpp
View file @ 56ecea3f
......@@ -128,6 +128,7 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
//////////////////////////////////////////////////////////////////////////
Context.get_drawing_context().start_drawing( name);
Context.get_drawing_context().start_frame();
const _CP_OPT(length) svg_widthVal = common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_width_;
const _CP_OPT(length) svg_heightVal = common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_height_;
......@@ -199,6 +200,7 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
office_element_ptr const & elm = content_[i];
elm->xlsx_convert(Context);
}
Context.get_drawing_context().end_frame();
Context.get_drawing_context().end_drawing();
Context.get_drawing_context().clear();
......@@ -207,7 +209,8 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
void draw_image::xlsx_convert(oox::xlsx_conversion_context & Context)
{
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
Context.get_drawing_context().start_image(href);
Context.get_drawing_context().set_image(href);
////////////////////////////////////в принципе достаточно общая часть ...
Context.get_text_context().start_drawing_content();//... если в объекте есть текст он привяжется к объекту - иначе к ячейке
......@@ -219,25 +222,24 @@ void draw_image::xlsx_convert(oox::xlsx_conversion_context & Context)
if (text_content_.length()>0)
{
Context.get_drawing_context().set_property(_property(L"text-content",text_content_));
Context.get_drawing_context().set_property(_property(L"text-content", text_content_));
}
////////////////////////////////////////////////////////////////////////////3 раза уже повторилась Content -> Context
Context.get_drawing_context().end_image();
}
void draw_chart::xlsx_convert(oox::xlsx_conversion_context & Context)
{
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
Context.get_drawing_context().start_chart(href);
Context.get_drawing_context().set_chart(href);
for (int i = 0 ; i < content_.size(); i++)
{
content_[i]->xlsx_convert(Context);
}
Context.get_drawing_context().end_chart();
}
void draw_text_box::xlsx_convert(oox::xlsx_conversion_context & Context)
{
Context.get_drawing_context().start_shape(2);//rect с наваротами
Context.get_drawing_context().set_text_box();
Context.get_text_context().start_drawing_content();
for (int i = 0 ; i < content_.size(); i++)
......@@ -251,7 +253,6 @@ void draw_text_box::xlsx_convert(oox::xlsx_conversion_context & Context)
{
Context.get_drawing_context().set_property(_property(L"text-content",text_content_));
}
Context.get_drawing_context().end_shape();
}
void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
{
......@@ -287,12 +288,11 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"");
objectBuild.xlsx_convert(Context);
Context.get_drawing_context().start_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
Context.get_drawing_context().end_chart();
Context.get_drawing_context().set_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
}
else if (objectBuild.object_type_ == 2) //текст (odt text)
{
Context.get_drawing_context().start_shape(2);
Context.get_drawing_context().set_text_box();
Context.get_text_context().start_drawing_content();
//сменить контекст с главного на другой ... проблема со стилями!!
......@@ -307,11 +307,10 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
{
Context.get_drawing_context().set_property(_property(L"text-content", text_content));
}
Context.get_drawing_context().end_shape();
}
else if (objectBuild.object_type_ == 3) //мат формулы
{
Context.get_drawing_context().start_shape(2);
Context.get_drawing_context().set_text_box();
objectBuild.xlsx_convert(Context);
......@@ -329,11 +328,15 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
Context.get_drawing_context().set_property(_property(L"fit-to-size", true));
Context.get_drawing_context().set_property(_property(L"text-content", text_content));
}
Context.get_drawing_context().end_shape();
}
else if (objectBuild.object_type_ == 4) // embedded sheet
{
Context.get_drawing_context().set_use_image_replacement();
//???
}
else
{
//временно - замещающая картинка(если она конечно присутствует)
//замещающая картинка(если она конечно присутствует)
Context.get_drawing_context().set_use_image_replacement();
}
......@@ -343,15 +346,20 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
_CP_LOG << "[error] : convert draw::object error" << std::endl;
}
}
void draw_object_ole::xlsx_convert(oox::xlsx_conversion_context & Context)
{
//временно - замещающая картинка(если она конечно присутствует)
//Context.get_drawing_context().start_object_ole();
Context.get_drawing_context().set_use_image_replacement();
//Context.get_drawing_context().end_object_ole();
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
std::wstring folderPath = Context.root()->get_folder();
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
if (!href.empty())
Context.get_drawing_context().set_ole_object(href, detectObject(objectPath));
}
}
}
ASCOfficeOdfFile/src/odf/office_elements_type.h
View file @ 56ecea3f
......@@ -103,6 +103,16 @@ enum ElementType
typeTextAlphabeticalIndex,
typeTextBibliography,
typeTextBibliographyMark,
typeTextTableOfContentSource,
typeTextIllustrationIndexSource,
typeTextTableIndexSource,
typeTextObjectIndexSource,
typeTextUserIndexSource,
typeTextAlphabeticalIndexSource,
typeTextBibliographySource,
typeTextTrackedChanges,
typeTextChangedRegion,
typeTextChangeStart,
......
ASCOfficeOdfFile/src/odf/text_elements.cpp
View file @ 56ecea3f
......@@ -1105,6 +1105,121 @@ void text_alphabetical_index::add_child_element( xml::sax * Reader, const std::w
}
// todooo text-alphabetical-index-source
}
// text:bibliography
//////////////////////////////////////////////////////////////////////////////////////////////////
const wchar_t * text_bibliography::ns = L"text";
const wchar_t * text_bibliography::name = L"bibliography";
void text_bibliography::afterCreate()
{
if (document_context * context = getContext())
{
if (paragraph * lastPar = context->get_last_paragraph())
{
lastPar->set_next_section(true);
}
}
}
void text_bibliography::afterReadContent()
{
if (document_context * context = getContext())
{
if (paragraph * lastPar = context->get_last_paragraph())
{
lastPar->set_next_end_section(true);
}
}
}
void text_bibliography::docx_convert(oox::docx_conversion_context & Context)
{
std::wstring current_page_properties = Context.get_page_properties();
Context.get_section_context().add_section(
text_section_attr_.text_name_,
text_section_attr_.text_style_name_.get_value_or(style_ref()).style_name(),
current_page_properties
);
Context.add_page_properties(current_page_properties);
if (text_index_body_)
text_index_body_->docx_convert(Context);
}
void text_bibliography::pptx_convert(oox::pptx_conversion_context & Context)
{
if (text_index_body_)
text_index_body_->pptx_convert(Context);
}
std::wostream & text_bibliography::text_to_stream(std::wostream & _Wostream) const
{
CP_SERIALIZE_TEXT(text_index_body_);
return _Wostream;
}
void text_bibliography::add_attributes( const xml::attributes_wc_ptr & Attributes )
{
text_section_attr_.add_attributes( Attributes );
}
void text_bibliography::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
{
if CP_CHECK_NAME(L"text", L"index-body")
{
CP_CREATE_ELEMENT(text_index_body_);
}
// todooo text-bibliography-source
}
// text:bibliography
//////////////////////////////////////////////////////////////////////////////////////////////////
const wchar_t * text_bibliography_mark::ns = L"text";
const wchar_t * text_bibliography_mark::name = L"bibliography-mark";
void text_bibliography_attr::add_attributes( const xml::attributes_wc_ptr & Attributes )
{
CP_APPLY_ATTR(L"text:identifier", text_identifier_, std::wstring(L""));
CP_APPLY_ATTR(L"text:bibliography-type", text_bibliography_type_, std::wstring(L""));
CP_APPLY_ATTR(L"text:author", text_author_);
CP_APPLY_ATTR(L"text:url", text_url_);
CP_APPLY_ATTR(L"text:title", text_title_);
CP_APPLY_ATTR(L"text:year", text_year_);
///
}
void text_bibliography_mark::add_attributes( const xml::attributes_wc_ptr & Attributes )
{
text_bibliography_attr_.add_attributes( Attributes );
}
void text_bibliography_mark::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
{
}
void text_bibliography_mark::add_text(const std::wstring & Text)
{
office_element_ptr elm = text::create(Text) ;
content_ = elm;
}
std::wostream & text_bibliography_mark::text_to_stream(std::wostream & _Wostream) const
{
CP_SERIALIZE_TEXT(content_);
return _Wostream;
}
void text_bibliography_mark::docx_convert(oox::docx_conversion_context & Context)
{
if (content_)
content_->docx_convert(Context);
}
void text_bibliography_mark::pptx_convert(oox::pptx_conversion_context & Context)
{
if (content_)
content_->pptx_convert(Context);
}
//--------------------------------------------------------------------------------------------------------
// text:tracked-changes
......
ASCOfficeOdfFile/src/odf/text_elements.h
View file @ 56ecea3f
......@@ -234,7 +234,6 @@ public:
};
//---------------------------------------------------------------------------------------------------
class text_section : public text_content_impl<text_section>
{
public:
......@@ -410,17 +409,20 @@ public:
};
CP_REGISTER_OFFICE_ELEMENT2(text_alphabetical_index);
//---------------------------------------------------------------------------------------------------
class text_index_body : public text_content_impl<text_index_body>
//------------------------------------------------------------------------------------------------------------
class text_bibliography : public text_content_impl<text_bibliography>
{
public:
static const wchar_t * ns;
static const wchar_t * name;
static const xml::NodeType xml_type = xml::typeElement;
static const ElementType type = typeTextIndexBody;
static const ElementType type = typeTextBibliography;
CPDOCCORE_DEFINE_VISITABLE();
virtual void afterCreate();
virtual void afterReadContent();
void docx_convert(oox::docx_conversion_context & Context);
void pptx_convert(oox::pptx_conversion_context & Context) ;
......@@ -431,8 +433,80 @@ private:
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
public:
text_section_attr text_section_attr_;
office_element_ptr text_bibliography_source_;
office_element_ptr text_index_body_;
};
CP_REGISTER_OFFICE_ELEMENT2(text_bibliography);
//---------------------------------------------------------------------------------------------------
//typeTextTableIndex,
//typeTextObjectIndex,
//typeTextUserIndex,
//---------------------------------------------------------------------------------------------------
//text:bibliography-mark
class text_bibliography_attr
{
public:
void add_attributes( const xml::attributes_wc_ptr & Attributes );
std::wstring text_identifier_;
std::wstring text_bibliography_type_; // todoooo in datatype
_CP_OPT(std::wstring) text_url_;
_CP_OPT(std::wstring) text_author_;
_CP_OPT(std::wstring) text_title_;
_CP_OPT(std::wstring) text_year_;
_CP_OPT(std::wstring) text_isbn_;
_CP_OPT(std::wstring) text_chapter_;
//todooo to map or list
};
class text_bibliography_mark : public text_content_impl<text_bibliography_mark>
{
public:
static const wchar_t * ns;
static const wchar_t * name;
static const xml::NodeType xml_type = xml::typeElement;
static const ElementType type = typeTextBibliographyMark;
CPDOCCORE_DEFINE_VISITABLE();
void docx_convert(oox::docx_conversion_context & Context);
void pptx_convert(oox::pptx_conversion_context & Context) ;
virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
text_bibliography_attr text_bibliography_attr_;
office_element_ptr content_;
private:
virtual void add_attributes ( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element ( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
virtual void add_text (const std::wstring & Text);
};
CP_REGISTER_OFFICE_ELEMENT2(text_bibliography_mark);
//---------------------------------------------------------------------------------------------------
class text_index_body : public text_content_impl<text_index_body>
{
public:
static const wchar_t * ns;
static const wchar_t * name;
static const xml::NodeType xml_type = xml::typeElement;
static const ElementType type = typeTextIndexBody;
CPDOCCORE_DEFINE_VISITABLE();
void docx_convert(oox::docx_conversion_context & Context);
void pptx_convert(oox::pptx_conversion_context & Context) ;
virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
office_element_ptr_array index_content_main_;
private:
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
};
CP_REGISTER_OFFICE_ELEMENT2(text_index_body);
......@@ -461,6 +535,9 @@ public:
};
CP_REGISTER_OFFICE_ELEMENT2(text_index_title);
//---------------------------------------------------------------------------------------------------
//---------------------------------------------------------------------------------------------------
//---------------------------------------------------------------------------------------------------
class text_unknown_base_change : public office_element_impl<text_unknown_base_change>
{
......
ASCOfficeOdfFile/win32/cpodf.vcproj
View file @ 56ecea3f
......@@ -922,14 +922,6 @@
RelativePath="..\src\docx\mediaitems.h"
>
</File>
<File
RelativePath="..\src\docx\mediaitems_utils.cpp"
>
</File>
<File
RelativePath="..\src\docx\mediaitems_utils.h"
>
</File>
<File
RelativePath="..\src\docx\oox_conversion_context.cpp"
>
......
X2tConverter/src/ASCConverters.cpp
View file @ 56ecea3f
......@@ -2738,8 +2738,15 @@ namespace NExtractTools
//clean up v8
NSDoctRenderer::CDocBuilder::Dispose();
if (SUCCEEDED_X2T(result) && oInputParams.m_bOutputConvertCorrupted)
{
return AVS_FILEUTILS_ERROR_CONVERT_CORRUPTED;
}
else
{
return result;
}
}
int FromFile(const std::wstring& file)
{
......
X2tConverter/src/cextracttools.cpp
View file @ 56ecea3f
......@@ -298,7 +298,6 @@ namespace NExtractTools
}
int apply_changes(const std::wstring &sBinFrom, const std::wstring &sToResult, NSDoctRenderer::DoctRendererFormat::FormatFile eType, const std::wstring &sThemeDir, std::wstring &sBinTo, const InputParams& params)
{
int nRes = 0;
std::wstring sBinDir = FileSystem::Directory::GetFolderPath(sBinFrom);
std::wstring sChangesDir = sBinDir + FILE_SEPARATOR_STR + _T("changes");
if (NSDirectory::Exists(sChangesDir))
......@@ -317,7 +316,7 @@ namespace NExtractTools
if (!sResult.empty() && -1 != sResult.find(_T("error")))
{
std::wcerr << _T("DoctRenderer:") << sResult << std::endl;
nRes = AVS_FILEUTILS_ERROR_CONVERT_CORRUPTED;
params.m_bOutputConvertCorrupted = true;
int nErrorIndex = -1;
int nErrorIndexStart = sResult.find(_T("index"));
if (-1 != nErrorIndexStart)
......@@ -364,6 +363,6 @@ namespace NExtractTools
}
else
sBinTo = sBinFrom;
return nRes;
return 0;
}
}
X2tConverter/src/cextracttools.h
View file @ 56ecea3f
......@@ -45,7 +45,7 @@
#include <iostream>
#include <fstream>
#define SUCCEEDED_X2T(nRes) (0 == (nRes) || AVS_FILEUTILS_ERROR_CONVERT_CORRUPTED == (nRes))
#define SUCCEEDED_X2T(nRes) (0 == (nRes))
namespace NExtractTools
{
......@@ -337,6 +337,8 @@ namespace NExtractTools
int* m_nDoctParams;
std::wstring* m_sHtmlFileInternalPath;
std::wstring* m_sPassword;
//output params
mutable bool m_bOutputConvertCorrupted;
public:
InputParams()
{
......@@ -358,6 +360,8 @@ namespace NExtractTools
m_nDoctParams = NULL;
m_sHtmlFileInternalPath = NULL;
m_sPassword = NULL;
m_bOutputConvertCorrupted = false;
}
~InputParams()
{
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7