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
6bdfa26c
Commit
6bdfa26c
authored
Sep 06, 2017
by
Alexey.Musinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
up
parent
a5bae649
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
52 additions
and
2 deletions
+52
-2
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj
...d/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj
+4
-0
X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h
...verter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h
+2
-1
X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm
...erter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm
+40
-0
X2tConverter/test/iosTest/TestIOSX2tConverter/ViewController.m
...nverter/test/iosTest/TestIOSX2tConverter/ViewController.m
+4
-1
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
+2
-0
No files found.
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj
View file @
6bdfa26c
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
/* Begin PBXBuildFile section */
/* Begin PBXBuildFile section */
17C8DEC71ACD696100902C85
/* X2tConverter.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17C27A191AC2DB3D00E1D003
/* X2tConverter.mm */
;
};
17C8DEC71ACD696100902C85
/* X2tConverter.mm in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17C27A191AC2DB3D00E1D003
/* X2tConverter.mm */
;
};
17C8DECC1ACD696100902C85
/* X2tConverter.h in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17C27A171AC2DB3D00E1D003
/* X2tConverter.h */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
17C8DECC1ACD696100902C85
/* X2tConverter.h in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17C27A171AC2DB3D00E1D003
/* X2tConverter.h */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
6911A9691F6036DA0061AB4D
/* OfficeFileErrorDescription.h in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
6911A9681F6036DA0061AB4D
/* OfficeFileErrorDescription.h */
;
settings
=
{
ATTRIBUTES
=
(
Public
,
);
};
};
691A8BD31E2FA68F00DCB54A
/* liblibxml2.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
691A8BD01E2FA67E00DCB54A
/* liblibxml2.a */
;
};
691A8BD31E2FA68F00DCB54A
/* liblibxml2.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
691A8BD01E2FA67E00DCB54A
/* liblibxml2.a */
;
};
69415F271CB51C37003E771B
/* libOfficeUtils.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
69415F241CB51C2A003E771B
/* libOfficeUtils.a */
;
};
69415F271CB51C37003E771B
/* libOfficeUtils.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
69415F241CB51C2A003E771B
/* libOfficeUtils.a */
;
};
69415F311CB51D41003E771B
/* libASCOfficeDocxFile2Lib_ios.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17E17F5B1AC457CD00BEA2EA
/* libASCOfficeDocxFile2Lib_ios.a */
;
};
69415F311CB51D41003E771B
/* libASCOfficeDocxFile2Lib_ios.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17E17F5B1AC457CD00BEA2EA
/* libASCOfficeDocxFile2Lib_ios.a */
;
};
...
@@ -444,6 +445,7 @@
...
@@ -444,6 +445,7 @@
17C27A191AC2DB3D00E1D003
/* X2tConverter.mm */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
X2tConverter.mm
;
sourceTree
=
"<group>"
;
};
17C27A191AC2DB3D00E1D003
/* X2tConverter.mm */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.cpp.objcpp
;
path
=
X2tConverter.mm
;
sourceTree
=
"<group>"
;
};
17C8DED01ACD696100902C85
/* libX2tConverter.a */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
archive.ar
;
includeInIndex
=
0
;
path
=
libX2tConverter.a
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
17C8DED01ACD696100902C85
/* libX2tConverter.a */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
archive.ar
;
includeInIndex
=
0
;
path
=
libX2tConverter.a
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
17E17F561AC457CD00BEA2EA
/* ASCOfficeDocxFile2Lib.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
ASCOfficeDocxFile2Lib.xcodeproj
;
path
=
../../../../ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj
;
sourceTree
=
"<group>"
;
};
17E17F561AC457CD00BEA2EA
/* ASCOfficeDocxFile2Lib.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
ASCOfficeDocxFile2Lib.xcodeproj
;
path
=
../../../../ASCOfficeDocxFile2/Mac/ASCOfficeDocxFile2Lib.xcodeproj
;
sourceTree
=
"<group>"
;
};
6911A9681F6036DA0061AB4D
/* OfficeFileErrorDescription.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
OfficeFileErrorDescription.h
;
path
=
../../../../../Common/OfficeFileErrorDescription.h
;
sourceTree
=
"<group>"
;
};
691A8BCB1E2FA67E00DCB54A
/* libxml2.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
libxml2.xcodeproj
;
path
=
../../../../DesktopEditor/xml/mac/libxml2.xcodeproj
;
sourceTree
=
"<group>"
;
};
691A8BCB1E2FA67E00DCB54A
/* libxml2.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
libxml2.xcodeproj
;
path
=
../../../../DesktopEditor/xml/mac/libxml2.xcodeproj
;
sourceTree
=
"<group>"
;
};
69415F1F1CB51C29003E771B
/* OfficeUtils.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
OfficeUtils.xcodeproj
;
path
=
../../../../OfficeUtils/OfficeUtils.xcodeproj
;
sourceTree
=
"<group>"
;
};
69415F1F1CB51C29003E771B
/* OfficeUtils.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
OfficeUtils.xcodeproj
;
path
=
../../../../OfficeUtils/OfficeUtils.xcodeproj
;
sourceTree
=
"<group>"
;
};
69415FAE1CB5243F003E771B
/* mng.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
mng.xcodeproj
;
path
=
../../../../DesktopEditor/mac_build/cximage/mng/mng.xcodeproj
;
sourceTree
=
"<group>"
;
};
69415FAE1CB5243F003E771B
/* mng.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
mng.xcodeproj
;
path
=
../../../../DesktopEditor/mac_build/cximage/mng/mng.xcodeproj
;
sourceTree
=
"<group>"
;
};
...
@@ -664,6 +666,7 @@
...
@@ -664,6 +666,7 @@
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
6967B1181E27A9D500A129E2
/* OfficeFileFormatChecker */
,
6967B1181E27A9D500A129E2
/* OfficeFileFormatChecker */
,
6911A9681F6036DA0061AB4D
/* OfficeFileErrorDescription.h */
,
6967BEAF1E27D16A00A129E2
/* ASCConverters_ios.cpp */
,
6967BEAF1E27D16A00A129E2
/* ASCConverters_ios.cpp */
,
6967AFB31E27940600A129E2
/* ASCConverters.h */
,
6967AFB31E27940600A129E2
/* ASCConverters.h */
,
6967AFAE1E2793A500A129E2
/* cextracttools.cpp */
,
6967AFAE1E2793A500A129E2
/* cextracttools.cpp */
,
...
@@ -825,6 +828,7 @@
...
@@ -825,6 +828,7 @@
buildActionMask
=
2147483647
;
buildActionMask
=
2147483647
;
files
=
(
files
=
(
6967AFB11E2793A500A129E2
/* cextracttools.h in Headers */
,
6967AFB11E2793A500A129E2
/* cextracttools.h in Headers */
,
6911A9691F6036DA0061AB4D
/* OfficeFileErrorDescription.h in Headers */
,
6967B10F1E27A65600A129E2
/* OfficeFileFormatChecker.h in Headers */
,
6967B10F1E27A65600A129E2
/* OfficeFileFormatChecker.h in Headers */
,
6967AFB51E27940600A129E2
/* ASCConverters.h in Headers */
,
6967AFB51E27940600A129E2
/* ASCConverters.h in Headers */
,
17C8DECC1ACD696100902C85
/* X2tConverter.h in Headers */
,
17C8DECC1ACD696100902C85
/* X2tConverter.h in Headers */
,
...
...
X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.h
View file @
6bdfa26c
...
@@ -34,7 +34,8 @@
...
@@ -34,7 +34,8 @@
@interface
X2tConverter
:
NSObject
@interface
X2tConverter
:
NSObject
@property
(
strong
,
nonatomic
)
NSString
*
password
;
@property
(
strong
)
NSString
*
password
;
@property
(
assign
)
BOOL
isNoBase64
;
-
(
int
)
sdk_docx2doct_bin
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
;
-
(
int
)
sdk_docx2doct_bin
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
;
-
(
int
)
sdk_docx2doct
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
;
-
(
int
)
sdk_docx2doct
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
;
...
...
X2tConverter/build/Mac/X2tConverter/X2tConverter/X2tConverter.mm
View file @
6bdfa26c
...
@@ -54,6 +54,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -54,6 +54,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
docx2doct_bin
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
docx2doct_bin
(
from
,
to
,
temp
,
oInputParams
);
}
}
...
@@ -65,6 +69,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -65,6 +69,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
docx2doct
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
docx2doct
(
from
,
to
,
temp
,
oInputParams
);
}
}
-
(
int
)
sdk_doct_bin2docx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
-
(
int
)
sdk_doct_bin2docx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
...
@@ -77,6 +85,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -77,6 +85,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
doct_bin2docx
(
from
,
to
,
temp
,
bFromChanges
,
themeDir
,
oInputParams
);
return
NExtractTools
::
doct_bin2docx
(
from
,
to
,
temp
,
bFromChanges
,
themeDir
,
oInputParams
);
}
}
-
(
int
)
sdk_doct2docx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
-
(
int
)
sdk_doct2docx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
...
@@ -89,6 +101,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -89,6 +101,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
doct2docx
(
from
,
to
,
temp
,
bFromChanges
,
themeDir
,
oInputParams
);
return
NExtractTools
::
doct2docx
(
from
,
to
,
temp
,
bFromChanges
,
themeDir
,
oInputParams
);
}
}
-
(
int
)
sdk_xlsx2xlst_bin
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
-
(
int
)
sdk_xlsx2xlst_bin
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
...
@@ -99,6 +115,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -99,6 +115,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
xlsx2xlst_bin
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
xlsx2xlst_bin
(
from
,
to
,
temp
,
oInputParams
);
}
}
...
@@ -110,6 +130,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -110,6 +130,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
xlsx2xlst
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
xlsx2xlst
(
from
,
to
,
temp
,
oInputParams
);
}
}
-
(
int
)
sdk_xlst_bin2xlsx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
-
(
int
)
sdk_xlst_bin2xlsx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
...
@@ -144,6 +168,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -144,6 +168,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
pptx2pptt_bin
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
pptx2pptt_bin
(
from
,
to
,
temp
,
oInputParams
);
}
}
-
(
int
)
sdk_pptx2pptt
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
-
(
int
)
sdk_pptx2pptt
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
...
@@ -154,6 +182,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -154,6 +182,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
pptx2pptt
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
pptx2pptt
(
from
,
to
,
temp
,
oInputParams
);
}
}
-
(
int
)
sdk_pptt_bin2pptx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
-
(
int
)
sdk_pptt_bin2pptx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
fromChanges
:(
NSNumber
*
)
fromChanges
nsThemeDir
:(
NSString
*
)
nsThemeDir
{
...
@@ -190,6 +222,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -190,6 +222,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
csv2xlst
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
csv2xlst
(
from
,
to
,
temp
,
oInputParams
);
}
}
-
(
int
)
sdk_csv2xlsx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
xmlOptions
:(
NSString
*
)
xmlOptions
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
-
(
int
)
sdk_csv2xlsx
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
xmlOptions
:(
NSString
*
)
xmlOptions
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
...
@@ -202,6 +238,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
...
@@ -202,6 +238,10 @@ static std::wstring nsstring_to_wstring(NSString* nsstring)
NExtractTools
::
InputParams
oInputParams
;
NExtractTools
::
InputParams
oInputParams
;
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
oInputParams
.
m_sFontDir
=
new
std
::
wstring
(
nsstring_to_wstring
(
nsFontPath
));
if
(
self
.
password
)
{
oInputParams
.
m_sPassword
=
new
std
::
wstring
(
nsstring_to_wstring
(
self
.
password
));
}
return
NExtractTools
::
csv2xlsx
(
from
,
to
,
temp
,
oInputParams
);
return
NExtractTools
::
csv2xlsx
(
from
,
to
,
temp
,
oInputParams
);
}
}
-
(
int
)
sdk_xlst2csv
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
xmlOptions
:(
NSString
*
)
xmlOptions
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
-
(
int
)
sdk_xlst2csv
:(
NSString
*
)
nsFrom
nsTo
:(
NSString
*
)
nsTo
xmlOptions
:(
NSString
*
)
xmlOptions
nsTemp
:(
NSString
*
)
nsTemp
nsFontPath
:(
NSString
*
)
nsFontPath
{
...
...
X2tConverter/test/iosTest/TestIOSX2tConverter/ViewController.m
View file @
6bdfa26c
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
#import "ViewController.h"
#import "ViewController.h"
#import "X2tConverter.h"
#import "X2tConverter.h"
#import "OfficeFileErrorDescription.h"
@interface
ViewController
()
@interface
ViewController
()
...
@@ -113,7 +114,9 @@
...
@@ -113,7 +114,9 @@
X2tConverter
*
conv
=
[[
X2tConverter
alloc
]
init
];
X2tConverter
*
conv
=
[[
X2tConverter
alloc
]
init
];
conv
.
password
=
@"555"
;
conv
.
password
=
@"555"
;
[
conv
sdk_xlsx2xlst_bin
:
fullFileName
nsTo
:
fullFileNameTo
nsTemp
:
tempDir
nsFontPath
:
fontsPath
];
if
((
int
)
AVS_FILEUTILS_ERROR_CONVERT_PASSWORD
==
[
conv
sdk_xlsx2xlst_bin
:
fullFileName
nsTo
:
fullFileNameTo
nsTemp
:
tempDir
nsFontPath
:
fontsPath
])
{
NSLog
(
@"Error password : %@"
,
conv
.
password
);
}
NSLog
(
@"xlst output : %@"
,
fullFileNameTo
);
NSLog
(
@"xlst output : %@"
,
fullFileNameTo
);
}
}
...
...
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
View file @
6bdfa26c
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
17DAB68B1ACC371F005AF479
/* Base */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
name
=
Base
;
path
=
Base.lproj/LaunchScreen.xib
;
sourceTree
=
"<group>"
;
};
17DAB68B1ACC371F005AF479
/* Base */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
name
=
Base
;
path
=
Base.lproj/LaunchScreen.xib
;
sourceTree
=
"<group>"
;
};
17DAB70D1ACC3B90005AF479
/* demo.docx */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file
;
path
=
demo.docx
;
sourceTree
=
"<group>"
;
};
17DAB70D1ACC3B90005AF479
/* demo.docx */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file
;
path
=
demo.docx
;
sourceTree
=
"<group>"
;
};
6905975F1CA137D000000D4D
/* X2tConverter.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
X2tConverter.h
;
path
=
../../../build/Mac/X2tConverter/X2tConverter/X2tConverter.h
;
sourceTree
=
"<group>"
;
};
6905975F1CA137D000000D4D
/* X2tConverter.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
X2tConverter.h
;
path
=
../../../build/Mac/X2tConverter/X2tConverter/X2tConverter.h
;
sourceTree
=
"<group>"
;
};
6911A96B1F6044770061AB4D
/* OfficeFileErrorDescription.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
OfficeFileErrorDescription.h
;
path
=
/Volumes/Storage/sources/core/X2tConverter/build/Mac/X2tConverter/X2tConverter/../../../../../Common/OfficeFileErrorDescription.h
;
sourceTree
=
"<absolute>"
;
};
6967BEB21E27D5BE00A129E2
/* libiconv.tbd */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"sourcecode.text-based-dylib-definition"
;
name
=
libiconv.tbd
;
path
=
usr/lib/libiconv.tbd
;
sourceTree
=
SDKROOT
;
};
6967BEB21E27D5BE00A129E2
/* libiconv.tbd */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"sourcecode.text-based-dylib-definition"
;
name
=
libiconv.tbd
;
path
=
usr/lib/libiconv.tbd
;
sourceTree
=
SDKROOT
;
};
698810C41F4DA87A00E4C541
/* libcryptopp.a */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
archive.ar
;
name
=
libcryptopp.a
;
path
=
../../../Common/3dParty/cryptopp/libcryptopp.a
;
sourceTree
=
"<group>"
;
};
698810C41F4DA87A00E4C541
/* libcryptopp.a */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
archive.ar
;
name
=
libcryptopp.a
;
path
=
../../../Common/3dParty/cryptopp/libcryptopp.a
;
sourceTree
=
"<group>"
;
};
69920A3A1E016F9700E7E6EE
/* X2tConverter.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
X2tConverter.xcodeproj
;
path
=
../../build/Mac/X2tConverter/X2tConverter.xcodeproj
;
sourceTree
=
"<group>"
;
};
69920A3A1E016F9700E7E6EE
/* X2tConverter.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
X2tConverter.xcodeproj
;
path
=
../../build/Mac/X2tConverter/X2tConverter.xcodeproj
;
sourceTree
=
"<group>"
;
};
...
@@ -80,6 +81,7 @@
...
@@ -80,6 +81,7 @@
17C1FB191ACC3E3B006B99B3
/* SDK */
=
{
17C1FB191ACC3E3B006B99B3
/* SDK */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
6911A96B1F6044770061AB4D
/* OfficeFileErrorDescription.h */
,
6905975F1CA137D000000D4D
/* X2tConverter.h */
,
6905975F1CA137D000000D4D
/* X2tConverter.h */
,
);
);
name
=
SDK
;
name
=
SDK
;
...
...
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