Skip to content

ADDS compatibility with Animate v20 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gepatto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ADDS compatibility with Animate v20 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OpenFLPlugin/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
{
for(var i=0;i<styleSheets.length;i++)
{
styleSheets.item(i).addRule("*",'font-family: "' + skinInfo.baseFontFamily + '";font-size:11px',0);
styleSheets.item(i).addRule("*",'font-family: "' + skinInfo.baseFontFamily + '",Sans-Serif;font-size:11px',0);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions project/Build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<file name="src/DocType.cpp" />
<file name="src/Main.cpp" />
<file name="src/MyXmlParser.cpp" />
<!-- <file name="src/MyXmlParser.cpp" /> -->
<file name="src/OutputWriter.cpp" />
<!-- <file name="src/ScriptOutputWriter.cpp" /> -->
<file name="src/Publisher.cpp" />
Expand All @@ -58,7 +58,7 @@

<ext value=".fcm" />

<lib name="${NATIVE_TOOLKIT_PATH}/xerces-c/Build/Win64/VC10/Release/xerces-c_3.lib" />
<!-- <lib name="${NATIVE_TOOLKIT_PATH}/xerces-c/Build/Win64/VC10/Release/xerces-c_3.lib" /> -->
<lib name="Shell32.lib" />

</section>
Expand Down
34 changes: 17 additions & 17 deletions project/src/DocType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "DocType.h"
#include "Utils.h"
#include "MyXmlParser.h"
#include "xercesc/framework/MemBufInputSource.hpp"
// #include "MyXmlParser.h"
// #include "xercesc/framework/MemBufInputSource.hpp"
#include <fstream>
#include <sstream>
#include <memory>
Expand Down Expand Up @@ -118,22 +118,22 @@ namespace OpenFL
}
xmlFile.close();

try {
XMLPlatformUtils::Initialize();
FeatureDocumentHandler featureXmlDocHandler(this);
SAXParser *parser = new SAXParser();
parser->setDocumentHandler(&featureXmlDocHandler);
// try {
// XMLPlatformUtils::Initialize();
// FeatureDocumentHandler featureXmlDocHandler(this);
// SAXParser *parser = new SAXParser();
// parser->setDocumentHandler(&featureXmlDocHandler);

XERCES_CPP_NAMESPACE::MemBufInputSource *memInput = new XERCES_CPP_NAMESPACE::MemBufInputSource((const XMLByte*) buffer, length, "dummy", false);
m_bInited = true;
parser->parse(*memInput);
delete parser;
delete memInput;
XMLPlatformUtils::Terminate();
}
catch (...) {
ASSERT(0);
}
// XERCES_CPP_NAMESPACE::MemBufInputSource *memInput = new XERCES_CPP_NAMESPACE::MemBufInputSource((const XMLByte*) buffer, length, "dummy", false);
// m_bInited = true;
// parser->parse(*memInput);
// delete parser;
// delete memInput;
// XMLPlatformUtils::Terminate();
// }
// catch (...) {
// ASSERT(0);
// }
delete[] buffer;
}

Expand Down