Commit 4b727edd authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent 9d10c4dd
...@@ -166,8 +166,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName) ...@@ -166,8 +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) std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref)
{ {
bool isMediaInternal = is_internal(href, odf_packet_); bool isMediaInternal = true;
std::wstring sub_path = L"media/"; std::wstring sub_path = L"media/";
std::wstring inputFileName; std::wstring inputFileName;
...@@ -175,10 +174,13 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b ...@@ -175,10 +174,13 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
{ {
sub_path = L"charts/"; sub_path = L"charts/";
} }
if ( type == typeMsObject || type == typeOleObject) else if ( type == typeMsObject || type == typeOleObject)
{ {
sub_path = L"embeddings/"; sub_path = L"embeddings/";
} }
else
isMediaInternal = is_internal(href, odf_packet_);
int number=0; int number=0;
if ( type == typeChart) number = count_charts + 1; if ( type == typeChart) number = count_charts + 1;
......
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