crengine changes

Author: plotn

crengine/src/lvopc.cpp

@@ -136,9 +136,24 @@ void OpcPackage::readContentTypes()
                 for(int i = 0; i < root->getChildCount(); i++) {
                     ldomNode * typeNode = root->getChildNode(i);
 
-                    if(typeNode->getNodeName() == cs16("Override")) //Don't care about Extensions
-                        m_contentTypes.set( typeNode->getAttributeValue(L"ContentType"),
-                                            typeNode->getAttributeValue(L"PartName") );
+                    //plotn - add TextMaker file format
+                    //if(typeNode->getNodeName() == cs16("Override")) //Don't care about Extensions
+                    //    m_contentTypes.set( typeNode->getAttributeValue(L"ContentType"),
+                    //                        typeNode->getAttributeValue(L"PartName") );
+
+                    if(typeNode->getNodeName() == cs16("Override")) { //Don't care about Extensions
+                        lString16 contentType = typeNode->getAttributeValue(L"ContentType");
+                        lString16 partName = typeNode->getAttributeValue(L"PartName");
+                        if (
+                                (partName == L"/word/document.xml")&&
+                                (contentType == L"application/textmaker.wordprocessingml.document.main+xml")
+                           ) {
+                            m_contentTypes.set(L"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",
+                                               typeNode->getAttributeValue(L"PartName"));
+                        } else
+                            m_contentTypes.set(typeNode->getAttributeValue(L"ContentType"),
+                                           typeNode->getAttributeValue(L"PartName"));
+                    }
                 }
             }
             delete doc;

crengine/src/private/lvfontcache.h

@@ -103,6 +103,22 @@ class LVFontCache {
         list.sort();
     }
 
+    //plotn
+    virtual void getFontFaceAndFileNameList(lString16Collection &list)
+    {
+        list.clear();
+        for ( int i=0; i<_registered_list.length(); i++ ) {
+            if (_registered_list[i]->getDef()->getDocumentId() == -1) {
+                lString16 name = Utf8ToUnicode( _registered_list[i]->getDef()->getTypeFace() );
+                lString16 fileName = Utf8ToUnicode(_registered_list[i]->getDef()->getName());
+                if (!list.contains(name + "~" + fileName))
+                    list.add(name + "~" + fileName);
+            }
+        }
+        list.sort();
+    }
+    //\plotn
+
     virtual void clearFallbackFonts() {
         for (int i = 0; i < _registered_list.length(); i++) {
             _registered_list[i]->getFont()->setFallbackFont(LVFontRef());

crengine/src/private/lvfreetypefontman.cpp

@@ -446,6 +446,11 @@ void LVFreeTypeFontManager::getFontFileNameList(lString16Collection &list) {
     _cache.getFontFileNameList(list);
 }
 
+void LVFreeTypeFontManager::getFontFaceAndFileNameList(lString16Collection &list) {
+    FONT_MAN_GUARD
+    _cache.getFontFaceAndFileNameList(list);
+}
+
 bool LVFreeTypeFontManager::setalias(lString8 alias, lString8 facename, int id, bool italic, bool bold) {
     FONT_MAN_GUARD
     lString8 fontname = lString8("\0");