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
95dcf366
Commit
95dcf366
authored
Dec 16, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://github.com/ONLYOFFICE/core
into develop
parents
29ae0bdc
717d91a1
Changes
28
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
1632 additions
and
1199 deletions
+1632
-1199
ASCOfficeDocFile/Common/FormatUtils.h
ASCOfficeDocFile/Common/FormatUtils.h
+2
-30
ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
+66
-57
ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h
ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h
+28
-25
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shape.h
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shape.h
+3
-3
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h
...ceDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h
+14
-0
ASCOfficeDocFile/DocDocxConverter/OleObject.cpp
ASCOfficeDocFile/DocDocxConverter/OleObject.cpp
+303
-0
ASCOfficeDocFile/DocDocxConverter/OleObject.h
ASCOfficeDocFile/DocDocxConverter/OleObject.h
+10
-268
ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h
ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h
+1
-16
ASCOfficeDocFile/DocDocxConverter/Tbkd.h
ASCOfficeDocFile/DocDocxConverter/Tbkd.h
+2
-2
ASCOfficeDocFile/DocDocxConverter/TextboxMapping.h
ASCOfficeDocFile/DocDocxConverter/TextboxMapping.h
+1
-2
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
+6
-9
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.h
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.h
+2
-3
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp
+760
-728
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h
+3
-2
ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.h
ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.h
+2
-0
ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp
ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp
+1
-1
ASCOfficeDocFile/DocDocxConverter/WordDocument.h
ASCOfficeDocFile/DocDocxConverter/WordDocument.h
+1
-1
ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
+4
-0
ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
+4
-7
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp
+1
-1
Common/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj
...on/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj
+0
-20
DesktopEditor/doctrenderer/docbuilder_p.h
DesktopEditor/doctrenderer/docbuilder_p.h
+34
-0
Makefile
Makefile
+4
-0
UnicodeConverter/build/UnicodeConverter/UnicodeConverter.xcodeproj/project.pbxproj
...icodeConverter/UnicodeConverter.xcodeproj/project.pbxproj
+302
-0
UnicodeConverter/build/UnicodeConverter/UnicodeConverter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
...er.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+7
-0
UnicodeConverter/build/UnicodeConverter/UnicodeConverter/NOTE.txt
...onverter/build/UnicodeConverter/UnicodeConverter/NOTE.txt
+1
-0
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj
...d/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj
+45
-2
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
+25
-22
No files found.
ASCOfficeDocFile/Common/FormatUtils.h
View file @
95dcf366
...
...
@@ -766,18 +766,11 @@ namespace DocFormatUtils
static
inline
std
::
wstring
IntToWideString
(
int
value
)
{
#if defined(_WIN32) || defined (_WIN64)
wchar_t
buff
[
33
]
=
{};
_itow
(
value
,
buff
,
10
);
return
std
::
wstring
(
buff
);
#else
return
(
std
::
to_wstring
(
value
));
#endif
}
static
inline
std
::
wstring
DoubleToWideString
(
double
value
)
{
std
::
wstringstream
src
;
std
::
wstringstream
src
;
src
<<
value
;
return
std
::
wstring
(
src
.
str
());
...
...
@@ -785,8 +778,7 @@ namespace DocFormatUtils
static
inline
std
::
string
DoubleToString
(
double
value
)
{
std
::
stringstream
src
;
std
::
stringstream
src
;
src
<<
value
;
return
std
::
string
(
src
.
str
());
...
...
@@ -813,36 +805,16 @@ namespace DocFormatUtils
static
inline
std
::
wstring
IntToFormattedWideString
(
int
value
,
const
wchar_t
*
format
)
{
// const int size = 33;
// wchar_t strValue[size] = L"\0";
if
(
format
==
NULL
)
return
L""
;
// swprintf_s( strValue, size, format, value );
//// }
// CString format_str;
// format_str.Format(format , value);
std
::
wstringstream
sstream
;
sstream
<<
boost
::
wformat
(
format
)
%
value
;
return
sstream
.
str
();
//return string2std_string( format_str );
}
static
inline
std
::
wstring
DoubleToFormattedWideString
(
double
value
,
wchar_t
*
format
)
{
if
(
format
==
NULL
)
return
L""
;
//std::wstring wstr;
//if ( format != NULL )
//{
// CString strValue;
// strValue.Format(format, value);
// wstr = string2std_string( strValue );
//}
//return wstr;
std
::
wstringstream
sstream
;
sstream
<<
boost
::
wformat
(
format
)
%
value
;
return
sstream
.
str
();
...
...
ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp
View file @
95dcf366
This diff is collapsed.
Click to expand it.
ASCOfficeDocFile/DocDocxConverter/DocumentMapping.h
View file @
95dcf366
...
...
@@ -70,68 +70,70 @@ namespace DocFileFormat
public:
DocumentMapping
(
ConversionContext
*
context
,
IMapping
*
caller
);
DocumentMapping
(
ConversionContext
*
context
,
XMLTools
::
CStringXmlWriter
*
writer
,
IMapping
*
caller
);
virtual
~
DocumentMapping
();
virtual
void
Apply
(
IVisitable
*
visited
)
=
0
;
//--------------------------------- 4571833.doc
std
::
wstring
m_shapeIdOwner
;
std
::
wstring
getOLEObject
()
{
return
_lastOLEObject
;
}
protected:
//
/
Looks into the section table to find out if this CP is the current of a section
// Looks into the section table to find out if this CP is the current of a section
int
getCurrentSection
(
int
cp
);
//
/
Looks into the section table to find out if this CP is the end of a section
// Looks into the section table to find out if this CP is the end of a section
bool
isSectionEnd
(
int
cp
);
//
/
Writes a Paragraph that starts at the given cp and
//
/
ends at the next paragraph end mark or section end mark
// Writes a Paragraph that starts at the given cp and
// ends at the next paragraph end mark or section end mark
int
writeParagraph
(
int
cp
);
//
/
Writes a Paragraph that starts at the given cpStart and
//
/
ends at the given cpEnd
// Writes a Paragraph that starts at the given cpStart and
// ends at the given cpEnd
int
writeParagraph
(
int
initialCp
,
int
cpEnd
,
bool
sectionEnd
,
bool
lastBad
=
false
);
//
/
Writes a Paragraph RSID
// Writes a Paragraph RSID
void
writeParagraphRsid
(
const
ParagraphPropertyExceptions
*
papx
);
//
/
Writes a run with the given characters and CHPX
// Writes a run with the given characters and CHPX
int
writeRun
(
std
::
vector
<
wchar_t
>*
chars
,
CharacterPropertyExceptions
*
chpx
,
int
initialCp
);
//
/
Writes the given text to the document
// Writes the given text to the document
int
writeText
(
std
::
vector
<
wchar_t
>*
chars
,
int
initialCp
,
CharacterPropertyExceptions
*
chpx
,
bool
writeDeletedText
);
void
writeTextElement
(
const
std
::
wstring
&
text
,
const
std
::
wstring
&
textType
);
void
writeTextStart
(
const
std
::
wstring
&
textType
,
bool
preserve_space
);
void
writeTextEnd
(
const
std
::
wstring
&
textType
);
//
/
Searches for bookmarks in the list of characters.
// Searches for bookmarks in the list of characters.
std
::
vector
<
int
>
searchBookmarks
(
std
::
vector
<
wchar_t
>*
chars
,
int
initialCp
);
ParagraphPropertyExceptions
*
findValidPapx
(
int
fc
);
//
/
Splits a list of characters into several lists
// Splits a list of characters into several lists
std
::
list
<
std
::
vector
<
wchar_t
>
>*
splitCharList
(
std
::
vector
<
wchar_t
>*
chars
,
std
::
vector
<
int
>*
splitIndices
);
//
/
Writes the table starts at the given cp value
// Writes the table starts at the given cp value
int
writeTable
(
int
initialCp
,
unsigned
int
nestingLevel
);
//
/
Builds a list that contains the width of the several columns of the table.
// Builds a list that contains the width of the several columns of the table.
std
::
vector
<
short
>*
buildTableGrid
(
int
initialCp
,
unsigned
int
nestingLevel
);
//
/
Finds the FC of the next row end mark.
// Finds the FC of the next row end mark.
int
findRowEndFc
(
int
initialCp
,
int
&
rowEndCp
,
unsigned
int
nestingLevel
);
//
/
Finds the FC of the next row end mark.
// Finds the FC of the next row end mark.
int
findRowEndFc
(
int
initialCp
,
unsigned
int
nestingLevel
);
//
/
Writes the table row that starts at the given cp value and ends at the next row end mark
// Writes the table row that starts at the given cp value and ends at the next row end mark
int
writeTableRow
(
int
initialCp
,
std
::
vector
<
short
>*
grid
,
unsigned
int
nestingLevel
);
//
/
Writes the table cell that starts at the given cp value and ends at the next cell end mark
// Writes the table cell that starts at the given cp value and ends at the next cell end mark
int
writeTableCell
(
int
initialCp
,
TablePropertyExceptions
*
tapx
,
std
::
vector
<
short
>*
grid
,
int
&
gridIndex
,
int
cellIndex
,
unsigned
int
nestingLevel
);
int
findCellEndCp
(
int
initialCp
,
unsigned
int
nestingLevel
);
bool
writeBookmarks
(
int
cp
);
bool
writeBookmarkStart
(
short
id
);
bool
writeBookmarkEnd
(
short
id
);
//
/
Checks if the CHPX is special
// Checks if the CHPX is special
bool
isSpecial
(
CharacterPropertyExceptions
*
chpx
);
//
/
Finds the SEPX that is valid for the given CP.
// Finds the SEPX that is valid for the given CP.
SectionPropertyExceptions
*
findValidSepx
(
int
cp
);
//
/
Searches the given vector for the next FieldEnd character.
// Searches the given vector for the next FieldEnd character.
int
searchNextTextMark
(
std
::
vector
<
wchar_t
>*
chars
,
int
initialCp
,
wchar_t
mark
);
private:
Symbol
getSymbol
(
const
CharacterPropertyExceptions
*
chpx
);
Symbol
getSymbol
(
const
CharacterPropertyExceptions
*
chpx
);
//----------------------------------------------------------------------------------------------------------------------
bool
m_bInternalXmlWriter
;
protected:
WordDocument
*
m_document
;
ConversionContext
*
m_context
;
IMapping
*
_caller
;
ParagraphPropertyExceptions
*
_lastValidPapx
;
...
...
@@ -149,5 +151,6 @@ namespace DocFileFormat
bool
_writeWebHidden
;
unsigned
int
_fldCharCounter
;
std
::
wstring
_writeAfterRun
;
std
::
wstring
_lastOLEObject
;
};
}
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shape.h
View file @
95dcf366
...
...
@@ -67,7 +67,7 @@ namespace DocFileFormat
virtual
~
Shape
()
{
RELEASEOBJECT
(
this
->
shapeType
);
RELEASEOBJECT
(
shapeType
);
}
Shape
(
IBinaryReader
*
_reader
,
unsigned
int
size
,
unsigned
int
typeCode
,
unsigned
int
version
,
unsigned
int
instance
)
:
...
...
@@ -107,12 +107,12 @@ namespace DocFileFormat
inline
int
GetShapeID
()
const
{
return
this
->
spid
;
return
spid
;
}
inline
ShapeType
*
GetShapeType
()
const
{
return
this
->
shapeType
;
return
shapeType
;
}
template
<
class
T
>
bool
is
()
const
...
...
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h
View file @
95dcf366
...
...
@@ -83,6 +83,20 @@ namespace DocFileFormat
}
return
false
;
}
bool
isOLE
()
{
int
ret
=
0
;
for
(
std
::
vector
<
Record
*>::
const_iterator
iter
=
this
->
Children
.
begin
();
iter
!=
this
->
Children
.
end
();
iter
++
)
{
Shape
*
sh
=
dynamic_cast
<
Shape
*>
(
*
iter
);
if
(
sh
)
{
return
sh
->
fOleShape
;
}
}
return
false
;
}
virtual
~
ShapeContainer
()
{
}
...
...
ASCOfficeDocFile/DocDocxConverter/OleObject.cpp
0 → 100644
View file @
95dcf366
/*
* (c) Copyright Ascensio System SIA 2010-2016
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
* EU, LV-1021.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
#pragma once
#include "OleObject.h"
namespace
DocFileFormat
{
OleObject
::
OleObject
(
const
CharacterPropertyExceptions
*
chpx
,
StructuredStorageReader
*
docStorage
,
bool
bOlderVersion_
)
:
bLinked
(
false
),
updateMode
(
NoLink
),
bOlderVersion
(
bOlderVersion_
),
isEquation
(
false
),
isEmbedded
(
false
)
{
if
(
!
docStorage
)
return
;
if
(
!
chpx
)
return
;
oleStorage
=
docStorage
->
GetStorage
();
if
(
!
oleStorage
)
return
;
HRESULT
res
=
S_OK
;
POLE
::
Stream
*
ObjectPoolStorage
=
new
POLE
::
Stream
(
oleStorage
,
"ObjectPool"
);
if
(
ObjectPoolStorage
)
{
ObjectId
=
getOleEntryName
(
chpx
);
std
::
string
sObjectId
(
ObjectId
.
begin
(),
ObjectId
.
end
()
);
{
std
::
string
name
=
"ObjectPool/"
+
sObjectId
+
"/"
;
processOleStream
(
name
+
"Ole"
);
if
(
bLinked
)
{
processLinkInfoStream
(
name
+
"LinkInfo"
);
}
else
{
processCompObjStream
(
name
+
"CompObj"
);
}
processPICStream
(
name
+
"PIC"
);
processEquationNativeStream
(
name
+
"Equation Native"
);
}
delete
ObjectPoolStorage
;
}
}
void
OleObject
::
processLinkInfoStream
(
const
std
::
string
&
linkStream
)
{
try
{
POLE
::
Stream
*
pLinkStream
=
NULL
;
HRESULT
res
=
S_OK
;
pLinkStream
=
//oleStorage->stream(linkStream);
new
POLE
::
Stream
(
oleStorage
,
linkStream
);
if
(
pLinkStream
)
{
VirtualStreamReader
reader
(
pLinkStream
,
0
,
false
);
//there are two versions of the Link string, one contains ANSI characters, the other contains
//unicode characters.
//Both strings seem not to be standardized:
//The length prefix is a character count EXCLUDING the terminating zero
//Read the ANSI version
short
cch
=
reader
.
ReadInt16
();
unsigned
char
*
str
=
reader
.
ReadBytes
(
cch
,
true
);
FormatUtils
::
GetSTLCollectionFromBytes
<
std
::
wstring
>
(
&
this
->
Link
,
str
,
cch
,
ENCODING_WINDOWS_1250
);
RELEASEARRAYOBJECTS
(
str
);
//skip the terminating zero of the ANSI string
//even if the characters are ANSI chars, the terminating zero has 2 bytes
reader
.
ReadBytes
(
2
,
false
);
//skip the next 4 bytes (flags?)
reader
.
ReadBytes
(
4
,
false
);
//Read the Unicode version
this
->
Link
.
clear
();
cch
=
reader
.
ReadInt16
();
str
=
reader
.
ReadBytes
(
(
cch
*
2
),
true
);
FormatUtils
::
GetSTLCollectionFromBytes
<
std
::
wstring
>
(
&
this
->
Link
,
str
,
(
cch
*
2
),
ENCODING_UTF16
);
RELEASEARRAYOBJECTS
(
str
);
//skip the terminating zero of the Unicode string
reader
.
ReadBytes
(
2
,
false
);
delete
pLinkStream
;
}
}
catch
(...)
{
}
}
void
OleObject
::
processEquationNativeStream
(
const
std
::
string
&
eqStream
)
{
try
{
POLE
::
Stream
*
pCompStream
=
NULL
;
HRESULT
res
=
S_OK
;
pCompStream
=
new
POLE
::
Stream
(
oleStorage
,
eqStream
);
if
(
pCompStream
)
{
VirtualStreamReader
reader
(
pCompStream
,
0
,
false
);
int
sz
=
reader
.
GetSize
();
unsigned
char
*
Buffer
=
reader
.
ReadBytes
(
sz
,
true
);
if
(
Buffer
&&
sz
>
0
)
{
isEquation
=
true
;
delete
[]
Buffer
;
}
delete
pCompStream
;
}
}
catch
(...)
{
}
}
void
OleObject
::
processPICStream
(
const
std
::
string
&
picStream
)
{
try
{
HRESULT
res
=
S_OK
;
POLE
::
Stream
*
pPICStream
=
new
POLE
::
Stream
(
oleStorage
,
picStream
);
if
(
pPICStream
)
{
VirtualStreamReader
reader
(
pPICStream
,
0
,
false
);
int
sz
=
reader
.
GetSize
();
int
cbHeader
=
reader
.
ReadUInt32
();
reader
.
ReadBytes
(
4
,
false
);
int
x
=
reader
.
ReadUInt32
();
int
y
=
reader
.
ReadUInt32
();
pictureDesciptor
.
dyaGoal
=
reader
.
ReadUInt32
();
pictureDesciptor
.
dxaGoal
=
reader
.
ReadUInt32
();
reader
.
ReadBytes
(
20
,
false
);
pictureDesciptor
.
mx
=
reader
.
ReadUInt32
();
pictureDesciptor
.
my
=
reader
.
ReadUInt32
();
}
}
catch
(...)
{
}
}
void
OleObject
::
processCompObjStream
(
const
std
::
string
&
compStream
)
{
try
{
HRESULT
res
=
S_OK
;
POLE
::
Stream
*
pCompStream
=
new
POLE
::
Stream
(
oleStorage
,
compStream
);
if
(
pCompStream
)
{
VirtualStreamReader
reader
(
pCompStream
,
0
,
false
);
//skip the CompObjHeader
reader
.
ReadBytes
(
28
,
false
);
int
sz_obj
=
reader
.
GetSize
()
-
reader
.
GetPosition
();
if
(
sz_obj
>
4
)
{
UserType
=
reader
.
ReadLengthPrefixedAnsiString
(
sz_obj
);
sz_obj
=
reader
.
GetSize
()
-
reader
.
GetPosition
();
if
(
sz_obj
>
4
)
ClipboardFormat
=
reader
.
ReadLengthPrefixedAnsiString
(
sz_obj
);
sz_obj
=
reader
.
GetSize
()
-
reader
.
GetPosition
();
if
(
sz_obj
>
4
)
Program
=
reader
.
ReadLengthPrefixedAnsiString
(
sz_obj
);
}
delete
pCompStream
;
}
}
catch
(...)
{
}
}
void
OleObject
::
processOleStream
(
const
std
::
string
&
oleStreamName
)
{
try
{
POLE
::
Stream
*
pOleStream
;
HRESULT
res
=
S_OK
;
pOleStream
=
new
POLE
::
Stream
(
oleStorage
,
oleStreamName
);
if
(
pOleStream
)
{
VirtualStreamReader
reader
(
pOleStream
,
0
,
false
);
//skip version
reader
.
ReadBytes
(
4
,
false
);
//read the embedded/linked flag
int
flag
=
reader
.
ReadInt32
();
bLinked
=
FormatUtils
::
BitmaskToBool
(
flag
,
0x1
);
//Link update option
this
->
updateMode
=
(
LinkUpdateOption
)
reader
.
ReadInt32
();
switch
(
this
->
updateMode
)
{
case
NoLink
:
{
this
->
UpdateMode
=
L"NoLink"
;
}
break
;
case
Always
:
{
this
->
UpdateMode
=
L"Always"
;
}
break
;
case
OnCall
:
{
this
->
UpdateMode
=
L"OnCall"
;
}
break
;
}
delete
pOleStream
;
}
}
catch
(...)
{
}
}
std
::
wstring
OleObject
::
getOleEntryName
(
const
CharacterPropertyExceptions
*
chpx
)
{
std
::
wstring
ret
;
if
(
chpx
!=
NULL
)
{
for
(
std
::
list
<
SinglePropertyModifier
>::
const_iterator
iter
=
chpx
->
grpprl
->
begin
();
iter
!=
chpx
->
grpprl
->
end
();
iter
++
)
{
if
(
iter
->
OpCode
==
sprmCPicLocation
||
iter
->
OpCode
==
sprmOldCPicLocation
)
{
ret
=
(
L"_"
+
FormatUtils
::
IntToWideString
(
FormatUtils
::
BytesToUInt32
(
iter
->
Arguments
,
0
,
iter
->
argumentsSize
)
)
);
break
;
}
}
}
return
ret
;
}
}
ASCOfficeDocFile/DocDocxConverter/OleObject.h
View file @
95dcf366
...
...
@@ -68,276 +68,18 @@ namespace DocFileFormat
PictureDescriptor
pictureDesciptor
;
OleObject
(
const
CharacterPropertyExceptions
*
chpx
,
StructuredStorageReader
*
docStorage
,
bool
bOlderVersion_
)
:
bLinked
(
false
),
updateMode
(
NoLink
),
bOlderVersion
(
bOlderVersion_
)
{
isEquation
=
isEmbedded
=
false
;
oleStorage
=
docStorage
->
GetStorage
();
if
(
(
chpx
!=
NULL
)
&&
(
docStorage
!=
NULL
)
)
{
HRESULT
res
=
S_OK
;
POLE
::
Stream
*
ObjectPoolStorage
=
new
POLE
::
Stream
(
oleStorage
,
"ObjectPool"
);
if
(
ObjectPoolStorage
)
{
ObjectId
=
getOleEntryName
(
chpx
);
std
::
string
sObjectId
(
ObjectId
.
begin
(),
ObjectId
.
end
()
);
{
std
::
string
name
=
"ObjectPool/"
+
sObjectId
+
"/"
;
processOleStream
(
name
+
"Ole"
);
if
(
bLinked
)
{
processLinkInfoStream
(
name
+
"LinkInfo"
);
}
else
{
processCompObjStream
(
name
+
"CompObj"
);
}
processPICStream
(
name
+
"PIC"
);
processEquationNativeStream
(
name
+
"Equation Native"
);
}
delete
ObjectPoolStorage
;
}
}
}
virtual
~
OleObject
()
{
}
OleObject
(
const
CharacterPropertyExceptions
*
chpx
,
StructuredStorageReader
*
docStorage
,
bool
bOlderVersion_
);
virtual
~
OleObject
()
{}
private:
POLE
::
Storage
*
oleStorage
;
void
processLinkInfoStream
(
const
std
::
string
&
linkStream
)
{
try
{
POLE
::
Stream
*
pLinkStream
=
NULL
;
HRESULT
res
=
S_OK
;
pLinkStream
=
//oleStorage->stream(linkStream);
new
POLE
::
Stream
(
oleStorage
,
linkStream
);
if
(
pLinkStream
)
{
VirtualStreamReader
reader
(
pLinkStream
,
0
,
false
);
//there are two versions of the Link string, one contains ANSI characters, the other contains
//unicode characters.
//Both strings seem not to be standardized:
//The length prefix is a character count EXCLUDING the terminating zero
//Read the ANSI version
short
cch
=
reader
.
ReadInt16
();
unsigned
char
*
str
=
reader
.
ReadBytes
(
cch
,
true
);
FormatUtils
::
GetSTLCollectionFromBytes
<
std
::
wstring
>
(
&
this
->
Link
,
str
,
cch
,
ENCODING_WINDOWS_1250
);
RELEASEARRAYOBJECTS
(
str
);
//skip the terminating zero of the ANSI string
//even if the characters are ANSI chars, the terminating zero has 2 bytes
reader
.
ReadBytes
(
2
,
false
);
//skip the next 4 bytes (flags?)
reader
.
ReadBytes
(
4
,
false
);
//Read the Unicode version
this
->
Link
.
clear
();
cch
=
reader
.
ReadInt16
();
str
=
reader
.
ReadBytes
(
(
cch
*
2
),
true
);
FormatUtils
::
GetSTLCollectionFromBytes
<
std
::
wstring
>
(
&
this
->
Link
,
str
,
(
cch
*
2
),
ENCODING_UTF16
);
RELEASEARRAYOBJECTS
(
str
);
//skip the terminating zero of the Unicode string
reader
.
ReadBytes
(
2
,
false
);
delete
pLinkStream
;
}
}
catch
(...)
{
}
}
void
processEquationNativeStream
(
const
std
::
string
&
eqStream
)
{
try
{
POLE
::
Stream
*
pCompStream
=
NULL
;
HRESULT
res
=
S_OK
;
pCompStream
=
new
POLE
::
Stream
(
oleStorage
,
eqStream
);
if
(
pCompStream
)
{
VirtualStreamReader
reader
(
pCompStream
,
0
,
false
);
int
sz
=
reader
.
GetSize
();
unsigned
char
*
Buffer
=
reader
.
ReadBytes
(
sz
,
true
);
if
(
Buffer
&&
sz
>
0
)
{
isEquation
=
true
;
delete
[]
Buffer
;
}
delete
pCompStream
;
}
}
catch
(...)
{
}
}
void
processPICStream
(
const
std
::
string
&
picStream
)
{
try
{
HRESULT
res
=
S_OK
;
POLE
::
Stream
*
pPICStream
=
new
POLE
::
Stream
(
oleStorage
,
picStream
);
if
(
pPICStream
)
{
VirtualStreamReader
reader
(
pPICStream
,
0
,
false
);
int
sz
=
reader
.
GetSize
();
int
cbHeader
=
reader
.
ReadUInt32
();
reader
.
ReadBytes
(
4
,
false
);
int
x
=
reader
.
ReadUInt32
();
int
y
=
reader
.
ReadUInt32
();
pictureDesciptor
.
dyaGoal
=
reader
.
ReadUInt32
();
pictureDesciptor
.
dxaGoal
=
reader
.
ReadUInt32
();
reader
.
ReadBytes
(
20
,
false
);
pictureDesciptor
.
mx
=
reader
.
ReadUInt32
();
pictureDesciptor
.
my
=
reader
.
ReadUInt32
();
}
}
catch
(...)
{
}
}
void
processCompObjStream
(
const
std
::
string
&
compStream
)
{
try
{
HRESULT
res
=
S_OK
;
POLE
::
Stream
*
pCompStream
=
new
POLE
::
Stream
(
oleStorage
,
compStream
);
if
(
pCompStream
)
{
VirtualStreamReader
reader
(
pCompStream
,
0
,
false
);
//skip the CompObjHeader
reader
.
ReadBytes
(
28
,
false
);
int
sz_obj
=
reader
.
GetSize
()
-
reader
.
GetPosition
();
if
(
sz_obj
>
4
)
{
UserType
=
reader
.
ReadLengthPrefixedAnsiString
(
sz_obj
);
sz_obj
=
reader
.
GetSize
()
-
reader
.
GetPosition
();
if
(
sz_obj
>
4
)
ClipboardFormat
=
reader
.
ReadLengthPrefixedAnsiString
(
sz_obj
);
sz_obj
=
reader
.
GetSize
()
-
reader
.
GetPosition
();
if
(
sz_obj
>
4
)
Program
=
reader
.
ReadLengthPrefixedAnsiString
(
sz_obj
);
}
delete
pCompStream
;
}
}
catch
(...)
{
}
}
void
processOleStream
(
const
std
::
string
&
oleStreamName
)
{
try
{
POLE
::
Stream
*
pOleStream
;
HRESULT
res
=
S_OK
;
pOleStream
=
new
POLE
::
Stream
(
oleStorage
,
oleStreamName
);
if
(
pOleStream
)
{
VirtualStreamReader
reader
(
pOleStream
,
0
,
false
);
//skip version
reader
.
ReadBytes
(
4
,
false
);
//read the embedded/linked flag
int
flag
=
reader
.
ReadInt32
();
bLinked
=
FormatUtils
::
BitmaskToBool
(
flag
,
0x1
);
//Link update option
this
->
updateMode
=
(
LinkUpdateOption
)
reader
.
ReadInt32
();
switch
(
this
->
updateMode
)
{
case
NoLink
:
{
this
->
UpdateMode
=
_T
(
"NoLink"
);
}
break
;
case
Always
:
{
this
->
UpdateMode
=
_T
(
"Always"
);
}
break
;
case
OnCall
:
{
this
->
UpdateMode
=
_T
(
"OnCall"
);
}
break
;
}
delete
pOleStream
;
}
}
catch
(...)
{
}
}
std
::
wstring
getOleEntryName
(
const
CharacterPropertyExceptions
*
chpx
)
{
std
::
wstring
ret
;
if
(
chpx
!=
NULL
)
{
for
(
std
::
list
<
SinglePropertyModifier
>::
const_iterator
iter
=
chpx
->
grpprl
->
begin
();
iter
!=
chpx
->
grpprl
->
end
();
iter
++
)
{
if
(
iter
->
OpCode
==
sprmCPicLocation
||
iter
->
OpCode
==
sprmOldCPicLocation
)
{
ret
=
(
_T
(
"_"
)
+
FormatUtils
::
IntToWideString
(
FormatUtils
::
BytesToUInt32
(
iter
->
Arguments
,
0
,
iter
->
argumentsSize
)
)
);
break
;
}
}
}
return
ret
;
}
};
void
processLinkInfoStream
(
const
std
::
string
&
linkStream
);
void
processEquationNativeStream
(
const
std
::
string
&
eqStream
);
void
processPICStream
(
const
std
::
string
&
picStream
);
void
processCompObjStream
(
const
std
::
string
&
compStream
);
void
processOleStream
(
const
std
::
string
&
oleStreamName
);
std
::
wstring
getOleEntryName
(
const
CharacterPropertyExceptions
*
chpx
);
};
}
ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h
View file @
95dcf366
...
...
@@ -67,7 +67,6 @@ namespace DocFileFormat
}
m_pXmlWriter
->
WriteNodeBegin
(
_T
(
"o:OLEObject"
),
TRUE
);
//type
if
(
ole
->
bLinked
)
{
int
relID
=
m_context
->
_docx
->
RegisterExternalOLEObject
(
_caller
,
ole
->
ClipboardFormat
,
ole
->
Link
);
...
...
@@ -88,22 +87,13 @@ namespace DocFileFormat
m_pXmlWriter
->
WriteAttribute
(
_T
(
"r:id"
),
(
std
::
wstring
(
_T
(
"rId"
)
)
+
FormatUtils
::
IntToWideString
(
relID
)
).
c_str
()
);
m_pXmlWriter
->
WriteAttribute
(
_T
(
"Type"
),
_T
(
"Embed"
)
);
//copy the object
copyEmbeddedObject
(
ole
);
}
//ProgID
m_pXmlWriter
->
WriteAttribute
(
_T
(
"ProgID"
),
ole
->
Program
.
c_str
()
);
//ShapeId
m_pXmlWriter
->
WriteAttribute
(
_T
(
"ShapeID"
),
_shapeId
.
c_str
()
);
//DrawAspect
m_pXmlWriter
->
WriteAttribute
(
_T
(
"DrawAspect"
),
_T
(
"Content"
)
);
//ObjectID
m_pXmlWriter
->
WriteAttribute
(
_T
(
"ObjectID"
),
ole
->
ObjectId
.
c_str
()
);
m_pXmlWriter
->
WriteNodeEnd
(
_T
(
""
),
TRUE
,
FALSE
);
m_pXmlWriter
->
WriteNodeEnd
(
_T
(
"o:OLEObject"
)
);
...
...
@@ -165,20 +155,15 @@ namespace DocFileFormat
}
private:
// Writes the embedded OLE object from the ObjectPool of the binary file to the OpenXml Package.
inline
void
copyEmbeddedObject
(
const
OleObject
*
ole
)
{
if
(
ole
!=
NULL
)
{
//!!!TODO: There is issue with some Office OLE Objects. Word can't open *.xls object (Excel.Chart) with set CLSID and
//some Power Point Presentations, and Word Documents. Open Office CAN start this objects!!!
std
::
wstring
clsid
;
std
::
wstring
exelChart
=
_T
(
"Excel.Chart"
);
if
(
std
::
search
(
ole
->
Program
.
begin
(),
ole
->
Program
.
end
(),
exelChart
.
begin
(),
exelChart
.
end
()
)
==
ole
->
Program
.
end
()
)
{
//??
{
clsid
=
ole
->
ClassId
;
}
OleObjectFileStructure
object_descr
(
OleObjectMapping
::
GetTargetExt
(
ole
->
ClipboardFormat
),
ole
->
ObjectId
,
clsid
);
...
...
ASCOfficeDocFile/DocDocxConverter/Tbkd.h
View file @
95dcf366
...
...
@@ -96,6 +96,8 @@ namespace DocFileFormat
{
friend
class
TextboxMapping
;
public:
static
const
int
STRUCTURE_SIZE
=
22
;
struct
FTXBXSReusable
{
int
iNextReuse
;
...
...
@@ -108,8 +110,6 @@ namespace DocFileFormat
int
cTxbxEdit
;
// This value MUST be zero and MUST be ignored.
};
static
const
int
STRUCTURE_SIZE
=
22
;
FTXBXS
()
{
...
...
ASCOfficeDocFile/DocDocxConverter/TextboxMapping.h
View file @
95dcf366
...
...
@@ -50,9 +50,8 @@ namespace DocFileFormat
void
SetTextboxStyle
(
const
std
::
wstring
&
style
);
private:
static
int
TextboxCount
;
static
int
TextboxCount
;
int
m_nTBIndex
;
double
m_dxTextLeft
;
...
...
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp
View file @
95dcf366
...
...
@@ -189,7 +189,6 @@ namespace DocFileFormat
return
res
;
}
//---------------------------------------------------------------
static
int
count_vml_objects
=
0
;
void
VMLPictureMapping
::
appendStyleProperty
(
std
::
wstring
*
b
,
const
std
::
wstring
&
propName
,
const
std
::
wstring
&
propValue
)
const
{
if
(
b
!=
NULL
)
...
...
@@ -215,8 +214,6 @@ namespace DocFileFormat
m_isEmbedded
=
false
;
m_imageData
=
new
XMLTools
::
XMLElement
<
wchar_t
>
(
_T
(
"v:imagedata"
)
);
m_ShapeId
=
std
::
wstring
(
L"_x0000_i"
)
+
FormatUtils
::
IntToWideString
(
1024
+
(
count_vml_objects
++
));
}
VMLPictureMapping
::~
VMLPictureMapping
()
...
...
@@ -263,7 +260,12 @@ namespace DocFileFormat
m_pXmlWriter
->
WriteAttribute
(
_T
(
"type"
),
std
::
wstring
(
_T
(
"#"
)
+
VMLShapeTypeMapping
::
GenerateTypeId
(
&
type
)).
c_str
());
m_pXmlWriter
->
WriteAttribute
(
_T
(
"id"
),
m_ShapeId
.
c_str
()
);
count_vml_objects
++
;
if
(
m_shapeId
.
empty
())
m_shapeId
=
std
::
wstring
(
L"_x0000_s"
)
+
FormatUtils
::
IntToWideString
(
1024
+
count_vml_objects
);
m_pXmlWriter
->
WriteAttribute
(
_T
(
"id"
),
m_shapeId
.
c_str
()
);
if
(
m_isOlePreview
)
{
...
...
@@ -426,11 +428,6 @@ namespace DocFileFormat
m_pXmlWriter
->
WriteNodeEnd
(
_T
(
"v:shape"
)
);
}
std
::
wstring
VMLPictureMapping
::
GetShapeId
()
const
{
return
m_ShapeId
;
}
void
VMLPictureMapping
::
writePictureBorder
(
const
std
::
wstring
&
name
,
const
BorderCode
*
brc
)
{
if
(
!
brc
||
name
.
empty
())
return
;
...
...
ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.h
View file @
95dcf366
...
...
@@ -54,8 +54,6 @@ namespace DocFileFormat
VMLPictureMapping
(
ConversionContext
*
ctx
,
XMLTools
::
CStringXmlWriter
*
writer
,
bool
olePreview
,
IMapping
*
caller
,
bool
isInlinePicture
=
false
);
virtual
~
VMLPictureMapping
();
virtual
void
Apply
(
IVisitable
*
visited
);
std
::
wstring
GetShapeId
()
const
;
private:
/// Writes a border element
void
writePictureBorder
(
const
std
::
wstring
&
name
,
const
BorderCode
*
brc
);
...
...
@@ -75,12 +73,13 @@ namespace DocFileFormat
bool
m_isEmbedded
;
std
::
string
m_embeddedData
;
std
::
wstring
m_equationXml
;
std
::
wstring
m_shapeId
;
private:
ConversionContext
*
m_ctx
;
IMapping
*
m_caller
;
int
m_nImageId
;
std
::
wstring
m_ShapeId
;
bool
m_isOlePreview
;
bool
m_isInlinePicture
;
...
...
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp
View file @
95dcf366
This diff is collapsed.
Click to expand it.
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h
View file @
95dcf366
...
...
@@ -68,7 +68,8 @@ namespace DocFileFormat
static
std
::
wstring
mapHorizontalPosition
(
PositionHorizontal
hPos
);
static
std
::
wstring
mapHorizontalPositionRelative
(
int
hRel
);
bool
m_isBullete
;
bool
m_isBullete
;
std
::
wstring
m_shapeId
;
private:
void
ApplyPrimitives
(
DrawingPrimitives
*
primitives
);
...
...
@@ -129,7 +130,7 @@ namespace DocFileFormat
BlipStoreContainer
*
m_pBlipStore
;
int
m_nImageId
;
std
::
wstring
m_textPathStyle
;
ConversionContext
*
m_c
tx
;
ConversionContext
*
m_c
ontext
;
PictureDescriptor
*
m_pict
;
XMLTools
::
XMLElement
<
wchar_t
>
m_fill
;
...
...
ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.h
View file @
95dcf366
...
...
@@ -37,6 +37,8 @@
namespace
DocFileFormat
{
static
int
count_vml_objects
=
0
;
class
VMLShapeTypeMapping
:
public
PropertiesMapping
,
public
IMapping
{
private:
...
...
ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp
View file @
95dcf366
...
...
@@ -268,7 +268,7 @@ namespace DocFileFormat
OfficeDrawingPlex
=
new
Plex
<
Spa
>
(
Spa
::
GetSize
(
bOlderVersion
),
TableStream
,
FIB
->
m_FibWord97
.
fcPlcSpaMom
,
FIB
->
m_FibWord97
.
lcbPlcSpaMom
,
bOlderVersion
);
OfficeDrawingPlexHeader
=
new
Plex
<
Spa
>
(
Spa
::
GetSize
(
bOlderVersion
),
TableStream
,
FIB
->
m_FibWord97
.
fcPlcSpaHdr
,
FIB
->
m_FibWord97
.
lcbPlcSpaHdr
,
bOlderVersion
);
TextboxIndividualPlex
=
new
Plex
<
EmptyStructure
>
(
EmptyStructure
::
STRUCTURE_SIZE
,
TableStream
,
FIB
->
m_FibWord97
.
fcPlcftxbxTxt
,
FIB
->
m_FibWord97
.
lcbPlcftxbxTxt
,
bOlderVersion
);
TextboxIndividualPlex
=
new
Plex
<
FTXBXS
>
(
FTXBXS
::
STRUCTURE_SIZE
,
TableStream
,
FIB
->
m_FibWord97
.
fcPlcftxbxTxt
,
FIB
->
m_FibWord97
.
lcbPlcftxbxTxt
,
bOlderVersion
);
SectionPlex
=
new
Plex
<
SectionDescriptor
>
(
SectionDescriptor
::
STRUCTURE_SIZE
,
TableStream
,
FIB
->
m_FibWord97
.
fcPlcfSed
,
FIB
->
m_FibWord97
.
lcbPlcfSed
,
bOlderVersion
);
BookmarkStartPlex
=
new
Plex
<
BookmarkFirst
>
(
BookmarkFirst
::
STRUCTURE_SIZE
,
TableStream
,
FIB
->
m_FibWord97
.
fcPlcfBkf
,
FIB
->
m_FibWord97
.
lcbPlcfBkf
,
bOlderVersion
);
...
...
ASCOfficeDocFile/DocDocxConverter/WordDocument.h
View file @
95dcf366
...
...
@@ -187,7 +187,7 @@ namespace DocFileFormat
Plex
<
EmptyStructure
>
*
HeaderStoriesPlex
;
//A plex of the header document
Plex
<
EmptyStructure
>
*
IndividualCommentsPlex
;
// A plex with all ATRDPre10 structs
Plex
<
EmptyStructure
>
*
TextboxIndividualPlex
;
Plex
<
FTXBXS
>
*
TextboxIndividualPlex
;
Plex
<
Tbkd
>
*
TextboxBreakPlex
;
// Describes the breaks inside the textbox subdocument
Plex
<
Tbkd
>
*
TextboxBreakPlexHeader
;
// Describes the breaks inside the header textbox subdocument
...
...
ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj
View file @
95dcf366
...
...
@@ -555,6 +555,10 @@
RelativePath=
"..\..\DocDocxConverter\OfficeArtContent.h"
>
</File>
<File
RelativePath=
"..\..\DocDocxConverter\OleObject.cpp"
>
</File>
<File
RelativePath=
"..\..\DocDocxConverter\OleObject.h"
>
...
...
ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
View file @
95dcf366
...
...
@@ -48,7 +48,6 @@ SOURCES += \
..
/
source
/
OdfFormat
/
header_footer
.
cpp
\
..
/
source
/
OdfFormat
/
list
.
cpp
\
..
/
source
/
OdfFormat
/
mediaitems
.
cpp
\
..
/
source
/
OdfFormat
/
mediaitems_utils
.
cpp
\
..
/
source
/
OdfFormat
/
number_style
.
cpp
\
..
/
source
/
OdfFormat
/
object_package
.
cpp
\
..
/
source
/
OdfFormat
/
odf_chart_context
.
cpp
\
...
...
@@ -99,7 +98,10 @@ SOURCES += \
..
/
source
/
Oox2OdfConverter
/
ConverterChart
.
cpp
\
..
/
source
/
Oox2OdfConverter
/
ConvertVml
.
cpp
\
..
/
source
/
Oox2OdfConverter
/
DocxConverter
.
cpp
\
..
/
source
/
Oox2OdfConverter
/
XlsxConverter
.
cpp
..
/
source
/
Oox2OdfConverter
/
XlsxConverter
.
cpp
\
..
/
source
/
OdfFormat
/
odf_settings_context
.
cpp
\
..
/
source
/
OdfFormat
/
office_settings
.
cpp
\
..
/
source
/
OdfFormat
/
mediaitems_utils
.
cpp
}
...
...
@@ -112,7 +114,6 @@ HEADERS += \
..
/
source
/
OdfFormat
/
header_footer
.
h
\
..
/
source
/
OdfFormat
/
list
.
h
\
..
/
source
/
OdfFormat
/
mediaitems
.
h
\
..
/
source
/
OdfFormat
/
mediaitems_utils
.
h
\
..
/
source
/
OdfFormat
/
number_style
.
h
\
..
/
source
/
OdfFormat
/
object_package
.
h
\
..
/
source
/
OdfFormat
/
odf_chart_context
.
h
\
...
...
@@ -185,7 +186,3 @@ HEADERS += \
..
/
source
/
OdfFormat
/
Shapes
/
oox_shapeWordArt
.
h
\
..
/
source
/
OdfFormat
/
odf_settings_context
.
h
\
..
/
source
/
OdfFormat
/
office_settings
.
h
SOURCES
+=
\
..
/
source
/
OdfFormat
/
odf_settings_context
.
cpp
\
..
/
source
/
OdfFormat
/
office_settings
.
cpp
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp
View file @
95dcf366
...
...
@@ -1218,7 +1218,7 @@ CString RtfStyle::RenderToOOXBegin(RenderParameter oRenderParameter)
if
(
PROP_DEF
!=
m_bPersonal
)
sResult
+=
L"<w:personal w:val=
\"
true
\"
/>"
;
if
(
PROP_DEF
!=
m_bCompose
)
sResult
+=
L"<w:personalCompose w:val=
\"
true
\"
/>"
;
if
(
PROP_DEF
!=
m_bReply
)
sResult
+=
L"<w:personalReply w:val=
\"
true
\"
/>"
;
if
(
PROP_DEF
==
m_nSemiHidden
)
sResult
+=
L"<w:semiHidden/>"
;
if
(
1
==
m_nSemiHidden
)
sResult
+=
L"<w:semiHidden/>"
;
if
(
PROP_DEF
!=
m_bQFormat
)
sResult
+=
L"<w:qformat/>"
;
if
(
PROP_DEF
!=
m_nPriority
)
sResult
.
AppendFormat
(
L"<w:uiPriority w:val=
\"
%d
\"
/>"
,
m_nPriority
);
if
(
PROP_DEF
!=
m_bUnhiddenWhenUse
)
sResult
+=
L"<w:unhideWhenUsed/>"
;
...
...
Common/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj
View file @
95dcf366
...
...
@@ -9,9 +9,6 @@
/* Begin PBXBuildFile section */
1732414A1BBEC90000E67992
/* pole.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
173241431BBEC90000E67992
/* pole.cpp */
;
};
1732414C1BBEC90000E67992
/* pole.h in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
173241441BBEC90000E67992
/* pole.h */
;
};
1732463D1BBEDC2C00E67992
/* UnicodeConverter_Encodings.h in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
173246391BBEDC2C00E67992
/* UnicodeConverter_Encodings.h */
;
};
1732463F1BBEDC2C00E67992
/* UnicodeConverter.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1732463A1BBEDC2C00E67992
/* UnicodeConverter.cpp */
;
};
173246411BBEDC2C00E67992
/* UnicodeConverter.h in Headers */
=
{
isa
=
PBXBuildFile
;
fileRef
=
1732463B1BBEDC2C00E67992
/* UnicodeConverter.h */
;
};
17C1FB941ACC4250006B99B3
/* Hyperlink.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17E6A0621AC4262700F28F8B
/* Hyperlink.cpp */
;
};
17C1FB951ACC4250006B99B3
/* Sdt.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17E6A06D1AC4262700F28F8B
/* Sdt.cpp */
;
};
17C1FB961ACC4250006B99B3
/* oMathContent.cpp in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17E6A0801AC4262700F28F8B
/* oMathContent.cpp */
;
};
...
...
@@ -264,9 +261,6 @@
/* Begin PBXFileReference section */
173241431BBEC90000E67992
/* pole.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
path
=
pole.cpp
;
sourceTree
=
"<group>"
;
};
173241441BBEC90000E67992
/* pole.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
pole.h
;
sourceTree
=
"<group>"
;
};
173246391BBEDC2C00E67992
/* UnicodeConverter_Encodings.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
UnicodeConverter_Encodings.h
;
path
=
../../../UnicodeConverter/UnicodeConverter_Encodings.h
;
sourceTree
=
"<group>"
;
};
1732463A1BBEDC2C00E67992
/* UnicodeConverter.cpp */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.cpp.cpp
;
name
=
UnicodeConverter.cpp
;
path
=
../../../UnicodeConverter/UnicodeConverter.cpp
;
sourceTree
=
"<group>"
;
};
1732463B1BBEDC2C00E67992
/* UnicodeConverter.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
name
=
UnicodeConverter.h
;
path
=
../../../UnicodeConverter/UnicodeConverter.h
;
sourceTree
=
"<group>"
;
};
17C1FC9C1ACC4250006B99B3
/* libDocxFormatLib_ios.a */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
archive.ar
;
includeInIndex
=
0
;
path
=
libDocxFormatLib_ios.a
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
17E69FED1AC4262700F28F8B
/* ASCString.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ASCString.h
;
sourceTree
=
"<group>"
;
};
17E69FEE1AC4262700F28F8B
/* ASCWinAPI.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
ASCWinAPI.h
;
sourceTree
=
"<group>"
;
};
...
...
@@ -545,16 +539,6 @@
path
=
../../3dParty/pole
;
sourceTree
=
"<group>"
;
};
173246361BBEDC2300E67992
/* UnicodeConverter */
=
{
isa
=
PBXGroup
;
children
=
(
173246391BBEDC2C00E67992
/* UnicodeConverter_Encodings.h */
,
1732463B1BBEDC2C00E67992
/* UnicodeConverter.h */
,
1732463A1BBEDC2C00E67992
/* UnicodeConverter.cpp */
,
);
name
=
UnicodeConverter
;
sourceTree
=
"<group>"
;
};
17E69FD31AC4259800F28F8B
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -583,7 +567,6 @@
17E69FEB1AC4262700F28F8B
/* Source */
=
{
isa
=
PBXGroup
;
children
=
(
173246361BBEDC2300E67992
/* UnicodeConverter */
,
173241401BBEC90000E67992
/* pole */
,
17E69FEC1AC4262700F28F8B
/* Base */
,
17E69FF51AC4262700F28F8B
/* Common */
,
...
...
@@ -1133,7 +1116,6 @@
17C1FBFC1ACC4250006B99B3
/* SimpleTypes_Shared.h in Headers */
,
17C1FBFD1ACC4250006B99B3
/* DefinedNames.h in Headers */
,
17C1FBFE1ACC4250006B99B3
/* File.h in Headers */
,
1732463D1BBEDC2C00E67992
/* UnicodeConverter_Encodings.h in Headers */
,
17C1FBFF1ACC4250006B99B3
/* Pic.h in Headers */
,
69415F541CB51D9E003E771B
/* DrawingGraphic.h in Headers */
,
17C1FC001ACC4250006B99B3
/* Worksheet.h in Headers */
,
...
...
@@ -1239,7 +1221,6 @@
17C1FC681ACC4250006B99B3
/* Fonts.h in Headers */
,
17C1FC691ACC4250006B99B3
/* Footnote.h in Headers */
,
69415F5B1CB51D9E003E771B
/* DrawingShared.h in Headers */
,
173246411BBEDC2C00E67992
/* UnicodeConverter.h in Headers */
,
17C1FC6A1ACC4250006B99B3
/* ComplexTypes.h in Headers */
,
17C1FC6C1ACC4250006B99B3
/* RunContent.h in Headers */
,
17C1FC6D1ACC4250006B99B3
/* External.h in Headers */
,
...
...
@@ -1367,7 +1348,6 @@
17C1FBAB1ACC4250006B99B3
/* FileFactory_Spreadsheet.cpp in Sources */
,
17C1FBAC1ACC4250006B99B3
/* AlternateContent.cpp in Sources */
,
17C1FBAD1ACC4250006B99B3
/* SmartTag.cpp in Sources */
,
1732463F1BBEDC2C00E67992
/* UnicodeConverter.cpp in Sources */
,
17C1FBAE1ACC4250006B99B3
/* oMath.cpp in Sources */
,
17C1FBAF1ACC4250006B99B3
/* ChartSerialize.cpp in Sources */
,
17C1FBB01ACC4250006B99B3
/* IFileContainer_Spreadsheet.cpp in Sources */
,
...
...
DesktopEditor/doctrenderer/docbuilder_p.h
View file @
95dcf366
...
...
@@ -83,6 +83,7 @@ public:
v8
::
Local
<
v8
::
Context
>
m_context
;
int
m_nFileType
;
std
::
string
m_sUtf8ArgumentJSON
;
public:
...
...
@@ -211,6 +212,31 @@ public:
}
LOGGER_SPEED_LAP
(
"run"
)
if
(
true
)
{
std
::
string
sArg
=
m_sUtf8ArgumentJSON
;
if
(
sArg
.
empty
())
sArg
=
"{}"
;
NSCommon
::
string_replaceA
(
sArg
,
"
\\
"
,
"
\\\\
"
);
NSCommon
::
string_replaceA
(
sArg
,
"
\"
"
,
"
\\\"
"
);
std
::
string
sArgument
=
"var Argument = JSON.parse(
\"
"
+
sArg
+
"
\"
);"
;
v8
::
Local
<
v8
::
String
>
_sourceArg
=
v8
::
String
::
NewFromUtf8
(
m_isolate
,
sArgument
.
c_str
());
v8
::
Local
<
v8
::
Script
>
_scriptArg
=
v8
::
Script
::
Compile
(
_sourceArg
);
_scriptArg
->
Run
();
if
(
try_catch
.
HasCaught
())
{
std
::
wstring
strCode
=
to_cstring
(
try_catch
.
Message
()
->
GetSourceLine
());
std
::
wstring
strException
=
to_cstring
(
try_catch
.
Message
()
->
Get
());
_LOGGING_ERROR_
(
L"sdk_argument_code"
,
strCode
);
_LOGGING_ERROR_
(
L"sdk_argument"
,
strException
);
return
false
;
}
}
CNativeControl
*
pNative
=
NULL
;
bool
bIsBreak
=
false
;
...
...
@@ -401,12 +427,14 @@ namespace NSDoctRenderer
m_bCheckFonts
=
false
;
m_sWorkDir
=
L""
;
m_bSaveWithDoctrendererMode
=
false
;
m_sArgumentJSON
=
""
;
}
public:
bool
m_bCheckFonts
;
std
::
wstring
m_sWorkDir
;
bool
m_bSaveWithDoctrendererMode
;
std
::
string
m_sArgumentJSON
;
};
class
CDocBuilder_Private
...
...
@@ -1095,6 +1123,7 @@ namespace NSDoctRenderer
{
m_pWorker
=
new
CV8RealTimeWorker
();
m_pWorker
->
m_nFileType
=
m_nFileType
;
m_pWorker
->
m_sUtf8ArgumentJSON
=
m_oParams
.
m_sArgumentJSON
;
bool
bOpen
=
m_pWorker
->
OpenFile
(
m_sX2tPath
,
m_sFileDir
,
GetScript
());
if
(
!
bOpen
)
...
...
@@ -1419,6 +1448,11 @@ namespace NSDoctRenderer
m_pInternal
->
m_oParams
.
m_bCheckFonts
=
true
;
else
if
(
sParam
==
"--work-directory"
)
m_pInternal
->
m_oParams
.
m_sWorkDir
=
std
::
wstring
(
value
);
else
if
(
sParam
==
"--argument"
)
{
std
::
wstring
sArg
(
value
);
m_pInternal
->
m_oParams
.
m_sArgumentJSON
=
U_TO_UTF8
(
sArg
);
}
}
void
CDocBuilder
::
SetPropertyW
(
const
wchar_t
*
param
,
const
wchar_t
*
value
)
{
...
...
Makefile
View file @
95dcf366
...
...
@@ -212,6 +212,8 @@ ASCDOCUMENTSCORE_DEP += $(LIBXML)
PDFREADER_DEP
+=
$(HTMLRENDERER)
PDFWRITER_DEP
+=
$(UNICODECONVERTER)
#Template for next statment:
#FOO_MAKE := $(basename $(FOO_PRO)).build/Makefile
#$(FOO): $(FOO_MAKE)
...
...
@@ -256,6 +258,8 @@ $(ASCDOCUMENTSCORE): $(ASCDOCUMENTSCORE_DEP)
$(PDFREADER)
:
$(PDFREADER_DEP)
$(PDFWRITER)
:
$(PDFWRITER_DEP)
%.build/Makefile
:
%.pro
mkdir
-p
$(
dir
$@
)
&&
cd
$(
dir
$@
)
&&
qmake
-r
$<
...
...
UnicodeConverter/build/UnicodeConverter/UnicodeConverter.xcodeproj/project.pbxproj
0 → 100644
View file @
95dcf366
This diff is collapsed.
Click to expand it.
UnicodeConverter/build/UnicodeConverter/UnicodeConverter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
0 → 100644
View file @
95dcf366
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version =
"1.0"
>
<FileRef
location =
"self:UnicodeConverter.xcodeproj"
>
</FileRef>
</Workspace>
UnicodeConverter/build/UnicodeConverter/UnicodeConverter/NOTE.txt
0 → 100644
View file @
95dcf366
DO NOT REMOVE FOLDER FOR XCODE
\ No newline at end of file
X2tConverter/build/Mac/X2tConverter/X2tConverter.xcodeproj/project.pbxproj
View file @
95dcf366
...
...
@@ -44,6 +44,7 @@
69DA32F71CEE100E00E10AF0
/* libmetafile_ios.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
69DA32311CEE08DD00E10AF0
/* libmetafile_ios.a */
;
};
69DA32F81CEE100E00E10AF0
/* libPPTXFormatLib_ios.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
69DA32611CEE09BB00E10AF0
/* libPPTXFormatLib_ios.a */
;
};
69DA32F91CEE100E00E10AF0
/* libraster_ios.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
69DA32491CEE094A00E10AF0
/* libraster_ios.a */
;
};
69EC66D91E01775B003527E2
/* libUnicodeConverter.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
69EC66D21E01770D003527E2
/* libUnicodeConverter.a */
;
};
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
...
...
@@ -341,6 +342,20 @@
remoteGlobalIDString
=
17C1FB8E1ACC4250006B99B3
;
remoteInfo
=
DocxFormatLib
;
};
69EC66D11E01770D003527E2
/* PBXContainerItemProxy */
=
{
isa
=
PBXContainerItemProxy
;
containerPortal
=
69EC66CD1E01770C003527E2
/* UnicodeConverter.xcodeproj */
;
proxyType
=
2
;
remoteGlobalIDString
=
69EC66C11E0176F2003527E2
;
remoteInfo
=
UnicodeConverter
;
};
69EC66D71E01774D003527E2
/* PBXContainerItemProxy */
=
{
isa
=
PBXContainerItemProxy
;
containerPortal
=
69EC66CD1E01770C003527E2
/* UnicodeConverter.xcodeproj */
;
proxyType
=
1
;
remoteGlobalIDString
=
69EC66C01E0176F2003527E2
;
remoteInfo
=
UnicodeConverter
;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
...
...
@@ -368,6 +383,7 @@
69DA32501CEE095900E10AF0
/* freetype.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
freetype.xcodeproj
;
path
=
../../../../DesktopEditor/mac_build/freetype/freetype.xcodeproj
;
sourceTree
=
"<group>"
;
};
69DA32561CEE099000E10AF0
/* DocxFormatLib.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
DocxFormatLib.xcodeproj
;
path
=
../../../../Common/DocxFormat/Mac/DocxFormatLib.xcodeproj
;
sourceTree
=
"<group>"
;
};
69DA325C1CEE09BB00E10AF0
/* PPTXFormatLib.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
PPTXFormatLib.xcodeproj
;
path
=
../../../../ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj
;
sourceTree
=
"<group>"
;
};
69EC66CD1E01770C003527E2
/* UnicodeConverter.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
UnicodeConverter.xcodeproj
;
path
=
../../../../UnicodeConverter/build/UnicodeConverter/UnicodeConverter.xcodeproj
;
sourceTree
=
"<group>"
;
};
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
...
...
@@ -375,6 +391,7 @@
isa
=
PBXFrameworksBuildPhase
;
buildActionMask
=
2147483647
;
files
=
(
69EC66D91E01775B003527E2
/* libUnicodeConverter.a in Frameworks */
,
69DA32F11CEE100E00E10AF0
/* libagg_ios.a in Frameworks */
,
69DA32F21CEE100E00E10AF0
/* libcximage_ios.a in Frameworks */
,
69DA32F31CEE100E00E10AF0
/* libDocxFormatLib_ios.a in Frameworks */
,
...
...
@@ -413,6 +430,7 @@
17C27A0B1AC2DB3C00E1D003
=
{
isa
=
PBXGroup
;
children
=
(
69EC66CD1E01770C003527E2
/* UnicodeConverter.xcodeproj */
,
69415FAE1CB5243F003E771B
/* mng.xcodeproj */
,
69415FB11CB5243F003E771B
/* png.xcodeproj */
,
69415FB41CB5243F003E771B
/* raw.xcodeproj */
,
...
...
@@ -617,6 +635,14 @@
name
=
Products
;
sourceTree
=
"<group>"
;
};
69EC66CE1E01770C003527E2
/* Products */
=
{
isa
=
PBXGroup
;
children
=
(
69EC66D21E01770D003527E2
/* libUnicodeConverter.a */
,
);
name
=
Products
;
sourceTree
=
"<group>"
;
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
...
...
@@ -642,11 +668,11 @@
buildRules
=
(
);
dependencies
=
(
69EC66D81E01774D003527E2
/* PBXTargetDependency */
,
69DA32F01CEE100700E10AF0
/* PBXTargetDependency */
,
69DA32E
E1CEE1004
00E10AF0
/* PBXTargetDependency */
,
69DA32E
81CEE0FFD
00E10AF0
/* PBXTargetDependency */
,
69DA32EC1CEE100200E10AF0
/* PBXTargetDependency */
,
69DA32EA1CEE0FFF00E10AF0
/* PBXTargetDependency */
,
69DA32E81CEE0FFD00E10AF0
/* PBXTargetDependency */
,
69DA32E61CEE0FFB00E10AF0
/* PBXTargetDependency */
,
69DA32E41CEE0FF800E10AF0
/* PBXTargetDependency */
,
69DA32E21CEE0FF600E10AF0
/* PBXTargetDependency */
,
...
...
@@ -662,6 +688,7 @@
69415F261CB51C32003E771B
/* PBXTargetDependency */
,
698AF4C21C0745930080D889
/* PBXTargetDependency */
,
177C43311AD7C0E400055DD7
/* PBXTargetDependency */
,
69DA32EE1CEE100400E10AF0
/* PBXTargetDependency */
,
17C8DEDC1ACD6A3900902C85
/* PBXTargetDependency */
,
);
name
=
x2tconverter
;
...
...
@@ -773,6 +800,10 @@
ProductGroup
=
69415FB81CB5243F003E771B
/* Products */
;
ProjectRef
=
69415FB71CB5243F003E771B
/* tiff.xcodeproj */
;
},
{
ProductGroup
=
69EC66CE1E01770C003527E2
/* Products */
;
ProjectRef
=
69EC66CD1E01770C003527E2
/* UnicodeConverter.xcodeproj */
;
},
);
projectRoot
=
""
;
targets
=
(
...
...
@@ -930,6 +961,13 @@
remoteRef
=
69DA32601CEE09BB00E10AF0
/* PBXContainerItemProxy */
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
69EC66D21E01770D003527E2
/* libUnicodeConverter.a */
=
{
isa
=
PBXReferenceProxy
;
fileType
=
archive.ar
;
path
=
libUnicodeConverter.a
;
remoteRef
=
69EC66D11E01770D003527E2
/* PBXContainerItemProxy */
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
/* End PBXReferenceProxy section */
/* Begin PBXShellScriptBuildPhase section */
...
...
@@ -1065,6 +1103,11 @@
name
=
DocxFormatLib
;
targetProxy
=
69DA32EF1CEE100700E10AF0
/* PBXContainerItemProxy */
;
};
69EC66D81E01774D003527E2
/* PBXTargetDependency */
=
{
isa
=
PBXTargetDependency
;
name
=
UnicodeConverter
;
targetProxy
=
69EC66D71E01774D003527E2
/* PBXContainerItemProxy */
;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
...
...
X2tConverter/test/iosTest/iosTest.xcodeproj/project.pbxproj
View file @
95dcf366
...
...
@@ -17,20 +17,20 @@
17DAB6891ACC371F005AF479
/* Images.xcassets in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17DAB6881ACC371F005AF479
/* Images.xcassets */
;
};
17DAB68C1ACC371F005AF479
/* LaunchScreen.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17DAB68A1ACC371F005AF479
/* LaunchScreen.xib */
;
};
17DAB70E1ACC3B96005AF479
/* Demo-Hayden-Management-v2.docx in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
17DAB70D1ACC3B90005AF479
/* Demo-Hayden-Management-v2.docx */
;
};
69
65353A1D9E85BB0093C60D
/* libX2tConverter.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
696535371D9E85B00093C60D
/* libX2tConverter.a */
;
};
69
920A431E016FAB00E7E6EE
/* libX2tConverter.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
69920A401E016F9700E7E6EE
/* libX2tConverter.a */
;
};
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
69
6535361D9E85B00093C60D
/* PBXContainerItemProxy */
=
{
69
920A3F1E016F9700E7E6EE
/* PBXContainerItemProxy */
=
{
isa
=
PBXContainerItemProxy
;
containerPortal
=
69
6535311D9E85B00093C60D
/* X2tConverter.xcodeproj */
;
containerPortal
=
69
920A3A1E016F9700E7E6EE
/* X2tConverter.xcodeproj */
;
proxyType
=
2
;
remoteGlobalIDString
=
17C8DED01ACD696100902C85
;
remoteInfo
=
x2tconverter
;
};
69
6535381D9E85B40093C60D
/* PBXContainerItemProxy */
=
{
69
920A411E016F9F00E7E6EE
/* PBXContainerItemProxy */
=
{
isa
=
PBXContainerItemProxy
;
containerPortal
=
69
6535311D9E85B00093C60D
/* X2tConverter.xcodeproj */
;
containerPortal
=
69
920A3A1E016F9700E7E6EE
/* X2tConverter.xcodeproj */
;
proxyType
=
1
;
remoteGlobalIDString
=
17C8DEC11ACD696100902C85
;
remoteInfo
=
x2tconverter
;
...
...
@@ -53,7 +53,7 @@
17DAB68B1ACC371F005AF479
/* Base */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
name
=
Base
;
path
=
Base.lproj/LaunchScreen.xib
;
sourceTree
=
"<group>"
;
};
17DAB70D1ACC3B90005AF479
/* Demo-Hayden-Management-v2.docx */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file
;
path
=
"Demo-Hayden-Management-v2.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>"
;
};
69
6535311D9E85B00093C60D
/* X2tConverter.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
X2tConverter.xcodeproj
;
path
=
/Users/amusinov/sources/core/X2tConverter/build/Mac/TestMacX2tConverter/../X2tConverter/X2tConverter.xcodeproj
;
sourceTree
=
"<absolute
>"
;
};
69
920A3A1E016F9700E7E6EE
/* X2tConverter.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
X2tConverter.xcodeproj
;
path
=
../../build/Mac/X2tConverter/X2tConverter.xcodeproj
;
sourceTree
=
"<group
>"
;
};
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
...
...
@@ -61,7 +61,7 @@
isa
=
PBXFrameworksBuildPhase
;
buildActionMask
=
2147483647
;
files
=
(
69
65353A1D9E85BB0093C60D
/* libX2tConverter.a in Frameworks */
,
69
920A431E016FAB00E7E6EE
/* libX2tConverter.a in Frameworks */
,
);
runOnlyForDeploymentPostprocessing
=
0
;
};
...
...
@@ -79,7 +79,7 @@
17DAB66F1ACC371E005AF479
=
{
isa
=
PBXGroup
;
children
=
(
69
6535311D9E85B00093C60D
/* X2tConverter.xcodeproj */
,
69
920A3A1E016F9700E7E6EE
/* X2tConverter.xcodeproj */
,
17DAB67A1ACC371E005AF479
/* iosTest */
,
17DAB6791ACC371E005AF479
/* Products */
,
);
...
...
@@ -131,10 +131,10 @@
name
=
Files
;
sourceTree
=
"<group>"
;
};
69
6535321D9E85B00093C60D
/* Products */
=
{
69
920A3B1E016F9700E7E6EE
/* Products */
=
{
isa
=
PBXGroup
;
children
=
(
69
6535371D9E85B00093C60D
/* libX2tConverter.a */
,
69
920A401E016F9700E7E6EE
/* libX2tConverter.a */
,
);
name
=
Products
;
sourceTree
=
"<group>"
;
...
...
@@ -153,7 +153,7 @@
buildRules
=
(
);
dependencies
=
(
69
6535391D9E85B40093C60D
/* PBXTargetDependency */
,
69
920A421E016F9F00E7E6EE
/* PBXTargetDependency */
,
);
name
=
iosTest
;
productName
=
TestIOSX2tConverter
;
...
...
@@ -171,7 +171,8 @@
TargetAttributes
=
{
17DAB6771ACC371E005AF479
=
{
CreatedOnToolsVersion
=
6.2
;
ProvisioningStyle
=
Manual
;
DevelopmentTeam
=
2WH24U26GJ
;
ProvisioningStyle
=
Automatic
;
};
};
};
...
...
@@ -188,8 +189,8 @@
projectDirPath
=
""
;
projectReferences
=
(
{
ProductGroup
=
69
6535321D9E85B00093C60D
/* Products */
;
ProjectRef
=
69
6535311D9E85B00093C60D
/* X2tConverter.xcodeproj */
;
ProductGroup
=
69
920A3B1E016F9700E7E6EE
/* Products */
;
ProjectRef
=
69
920A3A1E016F9700E7E6EE
/* X2tConverter.xcodeproj */
;
},
);
projectRoot
=
""
;
...
...
@@ -200,11 +201,11 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
69
6535371D9E85B00093C60D
/* libX2tConverter.a */
=
{
69
920A401E016F9700E7E6EE
/* libX2tConverter.a */
=
{
isa
=
PBXReferenceProxy
;
fileType
=
archive.ar
;
path
=
libX2tConverter.a
;
remoteRef
=
69
6535361D9E85B00093C60D
/* PBXContainerItemProxy */
;
remoteRef
=
69
920A3F1E016F9700E7E6EE
/* PBXContainerItemProxy */
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
/* End PBXReferenceProxy section */
...
...
@@ -240,10 +241,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
69
6535391D9E85B40093C60D
/* PBXTargetDependency */
=
{
69
920A421E016F9F00E7E6EE
/* PBXTargetDependency */
=
{
isa
=
PBXTargetDependency
;
name
=
x2tconverter
;
targetProxy
=
69
6535381D9E85B40093C60D
/* PBXContainerItemProxy */
;
targetProxy
=
69
920A411E016F9F00E7E6EE
/* PBXContainerItemProxy */
;
};
/* End PBXTargetDependency section */
...
...
@@ -350,10 +351,11 @@
isa
=
XCBuildConfiguration
;
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
DEVELOPMENT_TEAM
=
""
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
DEVELOPMENT_TEAM
=
2WH24U26GJ
;
ENABLE_BITCODE
=
NO
;
INFOPLIST_FILE
=
TestIOSX2tConverter/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.3
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
OTHER_LDFLAGS
=
(
"-lstdc++"
,
...
...
@@ -369,10 +371,11 @@
isa
=
XCBuildConfiguration
;
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
DEVELOPMENT_TEAM
=
""
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
DEVELOPMENT_TEAM
=
2WH24U26GJ
;
ENABLE_BITCODE
=
NO
;
INFOPLIST_FILE
=
TestIOSX2tConverter/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.3
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
OTHER_LDFLAGS
=
(
"-lstdc++"
,
...
...
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