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
ad74a8ea
Commit
ad74a8ea
authored
Apr 11, 2017
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug #34747
parent
f50dda7c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
5 deletions
+20
-5
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
...RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
+10
-3
ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj
ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj
+10
-2
No files found.
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
View file @
ad74a8ea
...
...
@@ -661,7 +661,7 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
}
}
//todooo проверить что тут за путь ..
std
::
wstring
sOlePath
=
oParam
.
oReader
->
m_sPath
+
FILE_SEPARATOR_STR
+
sRelativePath
;
std
::
wstring
sOlePath
=
sRelativePath
;
POLE
::
Storage
*
storage
=
new
POLE
::
Storage
(
sOlePath
.
c_str
());
if
(
storage
)
...
...
@@ -693,8 +693,9 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
}
}
}
if
(
NULL
!=
aPictShape
&&
NULL
!=
oCurOle
)
if
(
NULL
!=
aPictShape
)
{
aPictShape
->
m_nShapeType
=
75
;
//NSOfficeDrawing::sptPictureFrame;
//надо пересчитать размеры картинки так чтобы scalex == 100 и scaley = 100
//если scalex != 100, то после редактирование ole киртинка сжимается(растягивается)
if
(
NULL
!=
aPictShape
->
m_oPicture
)
...
...
@@ -714,7 +715,9 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
}
}
}
}
if
(
NULL
!=
aPictShape
&&
NULL
!=
oCurOle
)
{
TextItemContainerPtr
oNewTextItemContainer
(
new
TextItemContainer
()
);
RtfParagraphPtr
pNewPar
(
new
RtfParagraph
()
);
...
...
@@ -725,6 +728,10 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
oCurOle
->
m_oResultPic
=
aPictShape
;
oOutputParagraph
.
AddItem
(
oCurOle
);
}
else
if
(
NULL
!=
aPictShape
)
{
oOutputParagraph
.
AddItem
(
aPictShape
);
}
}
}
break
;
case
OOX
:
:
et_w_drawing
:
...
...
ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj
View file @
ad74a8ea
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType=
"Visual C++"
Version=
"8
,
00"
Version=
"8
.
00"
Name=
"RtfFormatTest"
ProjectGUID=
"{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
RootNamespace=
"RtfFormatTest"
...
...
@@ -339,7 +339,7 @@
</References>
<Files>
<Filter
Name=
"
Source Files
"
Name=
"
Common
"
Filter=
"cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier=
"{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
...
...
@@ -391,10 +391,18 @@
RelativePath=
"..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
>
</File>
<File
RelativePath=
"..\..\Common\OfficeFileFormatChecker2.cpp"
>
</File>
<File
RelativePath=
"..\..\Common\3dParty\pole\pole.cpp"
>
</File>
<File
RelativePath=
"..\..\ASCOfficeDocxFile2\BinReader\Readers.cpp"
>
</File>
<File
RelativePath=
"..\..\ASCOfficeOdfFile\src\odf\svg_parser.cpp"
>
...
...
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