Merge branch release/v9.0.0 into master

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/370

OdfFile/Reader/Converter/xlsx_fonts.cpp

@@ -112,13 +112,14 @@ size_t xlsx_fonts::Impl::fontId(const odf_reader::text_format_properties_ptr &te
 	fonts_array_t::const_iterator i = fonts_.find(fnt);
     if (i != fonts_.end())
         return i->index;
-    else
+    else if (fnt.bEnabled)
     {
         fnt.index = fonts_.size();
         fonts_.insert(fnt);
-        //fonts_.push_back(OdfFont2XlsxFont(textProp, parProp, cellProp));
         return fnt.index;
     }
+    else
+        return 0;
 }
 
 //const xlsx_font & xlsx_fonts::Impl::getFont(size_t id) const

OdfFile/Reader/Format/odf_document_impl.cpp

@@ -491,7 +491,7 @@ void odf_document::Impl::parse_fonts(office_element *element)
 
             std::vector<std::wstring> fontNames;
             boost::algorithm::split(fontNames, fontNameTmp, boost::algorithm::is_any_of(L","), boost::algorithm::token_compress_on);
-            if (fontNames.empty() || fontNames[0].empty())
+            if (fontNames.empty()) // nextcloud_sync_issue-1.ods
                 fontName = styleName;
             else
                 fontName = fontNames[0];

OdfFile/Reader/Format/odfcontext.h

@@ -35,7 +35,6 @@
 #include "templates.h"
 
 #include <vector>
-#include <boost/unordered_map.hpp>
 #include "../../DataTypes/stylefamily.h"
 #include "../../DataTypes/noteclass.h"
 
@@ -321,8 +320,8 @@ public:
     void add_font( font_instance_ptr FontInstance );
 
 private:
-    boost::unordered_map<std::wstring, int> font_names_;
-    boost::unordered_map<std::wstring, int> font_style_names_;
+    std::map<std::wstring, int> font_names_;
+    std::map<std::wstring, int> font_style_names_;
     instances_array instances_;
 
 };

OdfFile/Reader/Format/svg_parser.cpp

@@ -638,6 +638,15 @@ namespace svg_path
 						nLastControlY = nY;
                     }                    
 				}break;
+                case 'a':
+                {
+                    bRelative = true;
+                }
+                case 'A':
+                {
+                    skipSpaces(nPos, rSvgDStatement, nLen);
+                    return false;
+                }break;
                 default:
                 {
                      ++nPos;
@@ -1148,6 +1157,16 @@ namespace svg_path
                     nLastControlY = nY;
                 }
             }break;
+            case 'a':
+            {
+                bRelative = true;
+            }
+            case 'A':
+            {
+                skipSpaces(nPos, rSvgDStatement, nLen);
+
+                return false;
+            }break;
             default:
             {
                 ++nPos;

OdfFile/Reader/Format/svg_parser.h

@@ -42,6 +42,7 @@ namespace svg_path
 {
 	struct _point
 	{
+		_point() {}
 		_point(double _x, double _y) { x = _x; y = _y; }
 
 		_CP_OPT(double) x;

OdfFile/Reader/Format/table_xlsx.cpp

@@ -548,7 +548,7 @@ void table_table_column::xlsx_convert(oox::xlsx_conversion_context & Context)
 							bool set_default = false;
 							if (columnsRepeated > 100) set_default = true;
 
-							size_t style_ = Context.get_style_manager().xfId(NULL,NULL, &cellFormatProperties, NULL, L"", 0, set_default);	
+							size_t style_ = Context.get_style_manager().xfId(NULL, NULL, &cellFormatProperties, NULL, L"", 0, set_default);	
 
 							//if (set_default)
 							//	CP_XML_ATTR(L"style", style_ );

OdfFile/Writer/Converter/ConvertDrawing.cpp

@@ -3005,6 +3005,7 @@ void OoxConverter::convert(PPTX::Logic::StyleRef *style_ref, int type)
 	}
 	else if (type == 3) 
 	{
+		index -= 1;
 		if (index >= 0 && index < (int)theme->themeElements.fmtScheme.effectStyleLst.size())
 		{
 			convert(&theme->themeElements.fmtScheme.effectStyleLst[index], nARGB);