Compare commits

..

6 Commits

Author SHA1 Message Date
00328e88b2 [ios] spellcheck 2019-03-05 17:27:02 +03:00
ed2878a8cc . 2019-03-05 12:14:31 +03:00
bc18304827 OdfFormatReader .. 2019-03-04 12:25:20 +03:00
8d59eeabd5 . 2019-03-04 11:52:21 +03:00
df894c0193 Fix build 2019-03-01 13:11:27 +03:00
655c393a1b Add videoplayerlib 2019-03-01 12:23:08 +03:00
6 changed files with 17 additions and 10 deletions

View File

@ -523,11 +523,7 @@ const std::wstring & font_instance::style_name() const
const std::wstring & font_instance::name() const
{
static const std::wstring Symbol = L"Symbol";
if (name_ == L"StarSymbol")
return Symbol;
else
return name_;
return name_;
}
const std::wstring & font_instance::charset() const

View File

@ -537,7 +537,7 @@ wchar_t convert_bullet_char(wchar_t c)
case L'\x25CF': res = L'\xF0B7'; break;
case L'\x27A2': res = L'\xF0D8'; break;
case L'\x2714': res = L'\xF0FC'; break;
case L'\x25A0': res = L'\xF0A7'; break;
/*case L'\x25A0': res = L'\xF0A7'; break; */
case L'\x25CB': res = L'\x006F'; break;
case L'\x2794': res = L'\xF0DA'; break;
case L'\x2717': res = L'\xF04F'; break;

View File

@ -24,10 +24,7 @@ include($$PWD/../../3dParty/boost/boost.pri)
core_release {
SOURCES += \
docxformatlib_logic.cpp \
common_formatlib.cpp \
xlsxformatlib_logic.cpp
docxformatlib_logic.cpp
}
core_debug {

View File

@ -29,6 +29,8 @@
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#include "common_formatlib.cpp"
#include "xlsxformatlib_logic.cpp"
#include "../Source/DocxFormat/Logic/AlternateContent.cpp"
#include "../Source/DocxFormat/Logic/Annotations.cpp"

View File

@ -788,4 +788,6 @@
#define ASC_MENU_EVENT_TYPE_ON_EDIT_TEXT 22003
#define ASC_SPELLCHECK_EVENT_TYPE_MESSAGE 22004
#endif //_BUILD_EDITOR_DEFINES_CROSSPLATFORM_H_

View File

@ -78,6 +78,7 @@ OOXMLSIGNATURE := $(LIBDIR)/$(LIB_PREFIX)ooxmlsignature$(LIB_EXT)
HUNSPELL := $(LIBDIR)/$(LIB_PREFIX)hunspell$(SHARED_EXT)
KERNEL := $(LIBDIR)/$(LIB_PREFIX)kernel$(SHARED_EXT)
CRYPTOPP := $(LIBDIR)/$(LIB_PREFIX)CryptoPPLib$(LIB_EXT)
VIDEOPLAYERLIB := $(LIBDIR)/$(LIB_PREFIX)videoplayer$(SHARED_EXT)
TARGETS += $(ALLFONTSGEN)
TARGETS += $(X2T)
@ -98,6 +99,7 @@ TARGETS += $(OOXMLSIGNATURE)
TARGETS += $(HUNSPELL)
TARGETS += $(KERNEL)
TARGETS += $(CRYPTOPP)
TARGETS += $(VIDEOPLAYERLIB)
X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro)
HTMLFILEINTERNAL_PRO := $(abspath ../desktop-sdk/HtmlFile/Internal/Internal.pro)
@ -118,6 +120,7 @@ OOXMLSIGNATURE_PRO := $(abspath DesktopEditor/xmlsec/src/ooxmlsignature.pro)
HUNSPELL_PRO := $(abspath DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro)
KERNEL_PRO := $(abspath Common/kernel.pro)
CRYPTOPP_PRO := $(abspath Common/3dParty/cryptopp/project/cryptopp.pro)
VIDEOPLAYERLIB_PRO := $(abspath ../core-ext/multimedia/videoplayer/lib/VideoPlayerLib.pro)
# PROS += $(basename $(X2T_PRO)).build
# PROS += ALLFONTSGEN_PRO
@ -150,6 +153,7 @@ QT_PROJ += OOXMLSIGNATURE
QT_PROJ += HUNSPELL
QT_PROJ += KERNEL
QT_PROJ += CRYPTOPP
QT_PROJ += VIDEOPLAYERLIB
X2T_DEP += $(PDFWRITER)
X2T_DEP += $(GRAPHICS)
@ -215,6 +219,8 @@ PDFWRITER_DEP += $(KERNEL)
PDFWRITER_DEP += $(GRAPHICS)
PDFWRITER_DEP += $(CRYPTOPP)
VIDEOPLAYERLIB_DEP += $(KERNEL)
ARCHIVE := ./$(PACKAGE_NAME)$(ARCH_EXT)
ARTIFACTS += build/*
@ -266,6 +272,8 @@ ext: $(EXT_TARGET)
desktop: $(ASCDOCUMENTSCORE)
video: $(VIDEOPLAYERLIB)
$(foreach proj, $(QT_PROJ), $(eval $(call build_proj_tmpl, $(proj))))
$(X2T): $(X2T_DEP)
@ -294,6 +302,8 @@ $(PDFREADER): $(PDFREADER_DEP)
$(PDFWRITER): $(PDFWRITER_DEP)
$(VIDEOPLAYERLIB): $(VIDEOPLAYERLIB_DEP)
%.build/Makefile: %.pro
mkdir -p $(dir $@) && \
cd $(dir $@) && \