Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
8c43c781
Commit
8c43c781
authored
Feb 21, 2017
by
Alexey.Musinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix build
parent
7496de06
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
DesktopEditor/fontengine/ApplicationFonts.h
DesktopEditor/fontengine/ApplicationFonts.h
+1
-1
DesktopEditor/fontengine/ApplicationFontsWorker.cpp
DesktopEditor/fontengine/ApplicationFontsWorker.cpp
+6
-6
DesktopEditor/fontengine/ApplicationFonts_ios.mm
DesktopEditor/fontengine/ApplicationFonts_ios.mm
+3
-3
DesktopEditor/ios_projects/PdfWriter/AscEditorPDFPrinter.mm
DesktopEditor/ios_projects/PdfWriter/AscEditorPDFPrinter.mm
+1
-1
No files found.
DesktopEditor/fontengine/ApplicationFonts.h
View file @
8c43c781
...
...
@@ -276,7 +276,7 @@ public:
#endif
#ifdef _IOS
CArray
<
std
::
wstring
>
GetSetupFontFiles_ios
();
std
::
vector
<
std
::
wstring
>
GetSetupFontFiles_ios
();
#endif
CFontManager
*
GenerateFontManager
();
...
...
DesktopEditor/fontengine/ApplicationFontsWorker.cpp
View file @
8c43c781
...
...
@@ -653,7 +653,7 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed
{
std
::
vector
<
std
::
wstring
>
arrNames
;
CArray
<
std
::
wstring
>
fonts
;
std
::
vector
<
std
::
wstring
>
fonts
;
CApplicationFonts
oFonts
;
pDataDst
=
NULL
;
...
...
@@ -676,19 +676,19 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed
int
nLenAllFonts
=
oReader
.
GetInt32
();
oReader
.
Skip
(
nLenAllFonts
);
CArray
<
std
::
wstring
>
arrOld
;
std
::
vector
<
std
::
wstring
>
arrOld
;
int
nCountCache
=
oReader
.
GetInt32
();
for
(
int
i
=
0
;
i
<
nCountCache
;
++
i
)
{
int
nLen
=
oReader
.
GetInt32
();
arrOld
.
Add
(
NSFile
::
CUtf8Converter
::
GetUnicodeStringFromUTF8
(
oReader
.
GetCur
(),
(
LONG
)
nLen
));
arrOld
.
push_back
(
NSFile
::
CUtf8Converter
::
GetUnicodeStringFromUTF8
(
oReader
.
GetCur
(),
(
LONG
)
nLen
));
oReader
.
Skip
(
nLen
);
}
if
(
fonts
.
GetCount
()
==
arrOld
.
GetCount
())
if
(
fonts
.
size
()
==
arrOld
.
size
())
{
int
nCountFonts
=
fonts
.
GetCount
();
int
nCountFonts
=
(
int
)
fonts
.
size
();
bool
bIsBreak
=
false
;
for
(
int
i
=
0
;
i
<
nCountFonts
;
++
i
)
{
...
...
@@ -726,7 +726,7 @@ std::vector<std::wstring> CApplicationFontsWorker::CheckApplication(bool bIsNeed
std
::
string
sAllFontsJS
=
NSFile
::
CUtf8Converter
::
GetUtf8StringFromUnicode2
(
oWriterJS
.
GetBuffer
(),
(
LONG
)
oWriterJS
.
GetCurSize
());
oStream
.
WriteStringA2
(
sAllFontsJS
.
c_str
(),
(
int
)
sAllFontsJS
.
length
());
int
nCountF
=
fonts
.
GetCount
();
int
nCountF
=
(
int
)
fonts
.
size
();
oStream
.
WriteLONG
((
LONG
)
nCountF
);
for
(
int
i
=
0
;
i
<
nCountF
;
++
i
)
...
...
DesktopEditor/fontengine/ApplicationFonts_ios.mm
View file @
8c43c781
...
...
@@ -7,12 +7,12 @@
#import <UIKit/UIKit.h>
CArray
<
std
::
wstring
>
CApplicationFonts
::
GetSetupFontFiles_ios
()
std
::
vector
<
std
::
wstring
>
CApplicationFonts
::
GetSetupFontFiles_ios
()
{
CArray
<
std
::
wstring
>
oArray
;
std
::
vector
<
std
::
wstring
>
oArray
;
NSDirectory
::
GetFiles2
(
L"/System/Library/Fonts"
,
oArray
,
true
);
if
(
oArray
.
GetCount
()
==
0
)
if
(
oArray
.
size
()
==
0
)
{
NSDirectory
::
GetFiles2
(
L"/Library/Fonts"
,
oArray
,
true
);
}
...
...
DesktopEditor/ios_projects/PdfWriter/AscEditorPDFPrinter.mm
View file @
8c43c781
...
...
@@ -31,7 +31,7 @@ bool CAscEditorPDFPrinter::Print(std::string strBase64, std::wstring strDstFile)
CApplicationFonts
oFonts
;
CFontManager
*
pFontManager
=
NULL
;
CArray
<
std
::
wstring
>
fonts
;
std
::
vector
<
std
::
wstring
>
fonts
;
if
(
m_bUseSystemFonts
)
{
fonts
=
oFonts
.
GetSetupFontFiles
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment