Age | Commit message (Collapse) | Author |
|
Change-Id: Ic84899bf34f98382e6cc1ffc14310b1667279ee2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132214
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
* Converted symbolic constants with #define in mftools.hxx to:
a) 'enum' where facing multiple values of the same category with
similar prefixes, or enums from the [MS-WMF] / [MS-EMF]
b) extracted the underlying integral type from the above documents
c) 'constexpr' where there was a single value
* Where possible, 'enum class' in 'emfio' namespace is used
* Some enums with binary or comparison operations are not converted
MappingMode, TextAlignmentMode, RasterOperations, PenStyle
CharacterSet, ExtTextOutOptions, PitchFont, FamilyFont, WeightFont
Change-Id: I144b2df4722e23d3b0c0aca7880cf603faa80686
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124099
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
|
|
Change-Id: I30206c68ecf1829ba0094e6259b8ed7dc05f2e9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131103
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
|
|
See tdf#42949 for motivation
Change-Id: I49a3ce10dee4b03f99156f5b641f69448e1d5617
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128479
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
|
|
Rather than make all the BasePrimitive2D classes bear the cost of being an UNO
object, we just wrap the top level BasePrimitive2D in this class when we need
to pass them over UNO.
This reduces the locking overhead when doing normal drawinglayer operations,
and reduces the size of drawinglayer objects and the cost of initialising
them, which shaves 5% off the load/display time of a large barchart.
Add new drawinglayer::convertPrimitive2DContainerToBitmapEx utility
method to avoid needing to convert to Sequence<XPrimitive2D>
Change-Id: I553eaa4c16ba016b098cb21f6c55f5008f0d9b53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126487
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Ica8f0a6e3d30dba3b5a083e3c04522073de8303f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127233
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
since...
Date: Wed Jun 2 17:01:55 2021 +0200
WMF: add more SAL warnings in case record was not implemented
Change-Id: I1d58c4093817403caa5f1112b5d4d5a4e638b799
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116618
Change-Id: Ib82efbc93405b7fafb661f698a772593d2495bd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126454
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
The previous patch 149bd802623d6d83ec9aa04514b938494f7f01f6 only
partially fixed the problem, and the size of the graphical objects
was wrongly calculated. This patch fixes this problem.
The fix can be tested with:
make CPPUNIT_TEST_NAME="testTdf145873" -sr \
CppunitTest_vcl_pdfexport
This test exports the PPTX to PDF and checks the size of the objects.
The previous test for this issue which exported to SVG is removed, as
it could not test the current situation.
Change-Id: I97bed99811eaf8236ded84ffe0c1a7d3d1b5bad5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125924
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
|
|
EMF can have WMF embedded inside it. The sample PPTX file contains an
EMF file consisting of several GDIcomment records in which embed a
Placeable WMF file without some records related to the size of the
WMF. It reaches pStm->SetError( SVSTREAM_FILEFORMAT_ERROR ); in
emfio/source/reader/wmfreader.cxx:1982 which causes to the problem
in loading the file.
With this fix, the EMF file will be displayed. Without the fix, the
EMF file will be displayed as blank.
Regression from
commit 5e4e1cdb1e14354b42838e1dfcf82873b3071896
tdf#88163 Fix font size for placeable wmf files
The fix can be tested with:
make CPPUNIT_TEST_NAME="testTdf145873" -sr \
CppunitTest_sd_svg_export_tests
Change-Id: I04babd5029ba123fdd03758eef2be69faf45fda8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125796
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
|
|
* Converted multiple symbolic constants using #define in wmfreader.cxx
to enum
Change-Id: Ie55f27414c230cd624cacb805897933707244ed6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122734
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
* Replaced multiplying by magic number 57.29577951308 with
basegfx::rad2deg() which is equal to 180.0/M_PI
* Instances of this could be found using:
git grep 57.29577951308 *.cxx *.hxx
Change-Id: I0ae99a5d63d104b79c6df2dc88e9dda6973a1d3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124226
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
|
|
Use o3tl::convert instead of homemade constants; unify logic and
move common code out of the switch.
Change-Id: I31e53d04017aac7d6a2f435adb9233b9c0e3ba6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124939
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
The variables xSrc, ySrc (x/y positions) and cxSrc, cySrc (x/y size)
come from [MS-EMF] documentation, "EMR_STRETCHDIBITS Record" section.
By calculating the difference between Bitmap x size and cxSrc (called
nWidthDiff), and also Bitmap y size and cySrc (called nHeightDiff),
the conditions used to test if it is OK to crop are simplified, and
are better readable.
Redundant checks (nWidthDiff >= 0) and (nHeightDiff >= 0) are removed
because it is now obvious that when they are bigger than non-negative
xSrc and ySrc, thus they themselves can not be negative.
Change-Id: I8e82c3d469377f21d34b57f3d50f977cf71004ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124096
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
* Make usage of ETO_PDY flag more visible with introducing nBytesEach
variable
* Add comments for reading OutputDx
ETO_PDY flag indicates that we should read twice values
compared to the number of characters in the output string.
Values are stored in an array of 32-bit unsigned integers called
OutputDx, so there will be either 8 bytes or 4 bytes each
depending on ETO_PDY is set or not.
Change-Id: I3892c95bd9ad80b3c414e2556f91bd5218b22c3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124097
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
not much else can be done as far as I can see except to saturate
Change-Id: Ifb7e47b03c76eca26b7340b047032e971401e86b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124619
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I4b6b6f2ba0c4dd013489b334822e6639f265c6b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124539
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Makes code simpler, and std::span can be constructed from std::vector
too.
Change-Id: Iae26b53c52148c19d9068a63126a7393d098d654
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124507
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Tested-by: Jenkins
|
|
Change-Id: I36ddc11b39763dc77086591fe9bb756195b4294f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124459
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
so we get bounds checking in debug mode
Note that I cannot just pass around the std::vectors
involved because there is a place in editeng which
calls with a subset of a vector.
Change-Id: I5088a139593c27bf9cbe5d843ab4b0048ac6d508
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124330
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
* Replacing std::unique_ptr<char[]> with std::vector<char>
* The data bytes are read into the vector internal storage
* Modification of the internal storage of the vector using the
pointer returned by data() is allowed by the standard
C++ Standard, revision n4830, section 2.3.11.4 Data [vector.data]
Returns: A pointer such that [data(), data() + size()) is a valid
range. For a non-emptyvector, data() == addressof(front()).
https://github.com/cplusplus/draft/blob/main/papers/n4835.pdf
* It could be replaced with std::string when data is not modified
Example: 6c13e5a92ed4b6a10458cd5d5741ddb3d816df4e
* std::vector<char> is useful when working with C functions that
get "char *" for writing data. In this case, std::string is not
usable, because data() method for it returns "const char *".
Change-Id: Ife6013b16a1803c3ad7b0c64aa0cb4c8cf4373ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123764
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: I277dc957798093001f9a3935f97db8ac0314e6a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123022
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Change-Id: If50af8538e31e4fb1ee1486ec2b91963c094e7e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123007
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
I have moved the header file to include/vcl/rendercontext as this will
eventually be part of the RenderContext split from OutputDevice.
State and associated enums have also been moved to the vcl namespace. I
have also moved ComplexTextLayoutFlags into the vcl::text namespace.
Change-Id: I0abbf560e75b45a272854b267e948c240cd69091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
The problems in tdf#88163 can be categorized into two parts, as
described in d25906087918c085239aac30fd72cb65aa7b9eb4:
First, the problem with the wmf files without the placeable header.
Second, the problem with the wmf files with the placeable header.
The above mentioned patch fixed the first part, and this patch fixes
the second part.
The problem was that upon seeing 22-byte placeable header, the
records related to the size of the wmf like META_SETWINDOWORG (0x20b)
and META_SETWINDOWEXT (0x20c) and others were ignored. These records
were read in WmfReader::GetPlaceableBound() for the wmf files without
placeable header. Adding this method for the wmf files with placeable
header fixed the wrong calculation of bounds, which previously lead
to wrong size of text.
It should be noted that the scale in the placeable header is used,
but the bounds are ignored for now.
A new test named testTdf88163PlaceableWmf() is added that can be
checked with:
make CPPUNIT_TEST_NAME="testTdf88163PlaceableWmf" -sr \
CppunitTest_emfio_wmf
Change-Id: I820c2e5922972cb5d555d98ef70c7581cd9f02d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122095
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
|
|
The condition nPlanes != 1 is checked in the previous if statement and if it the content of nPlanes is anything other than 1, it would have used the break to exit the switch case. Thus, there is no need to check nPlanes == 1 again.
Change-Id: I1e07b48af16de40d39eabb6f2b666e41b0b0432e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122451
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: Ib65191933b91b74c6dd03ae3cfaa6e6cf8dd2434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122210
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I6dc1f110054eefefffd7b58cafa8240a69bb176e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121995
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
sidestep the resize behaviour of SvMemoryStream by using an honest
std::vector and make it use that buffer
Change-Id: Ic5e405010ac076fc04e1ca8dc6dbb495162101ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121832
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I4c88389de1a7f6cf4ceac278b264a0ec71fba86d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121747
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I4a96b4e687f57ee38686dc03d87ba29de3ec0e98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121708
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ib8b337609afa4f588878a1e08eb74fca28fc0534
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121666
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ia50f9def88e8435fb5ce3267cbd3fdfcaa72ef4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121646
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
Change-Id: I53383a71b4a362409773f8f1123982e8d2c5a324
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121631
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
because I'm trying to track down a related heap corruption, and that is
much easier if the access to the array is checked by the std::vector
debug runtime
Change-Id: Ia665f5cebb7f14d88942e88b4b400ad3c28ef5d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121527
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: I6546ef38c6e84193c00ea5fcac621fdec93e0ab7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121593
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I626eb1847484f7bc6af7eed45b891307718c5263
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121596
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I6cd0e9b518bf6f40e0221fd2e9f3c5fb6199e14f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121574
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I71d3b07c7ca2467b7bc1db5350dbdeb1f8910cb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121478
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I3eaf680052ada10b6a6e8fded6e806d6045d0fac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121538
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I7cd46af148471de516860046c04f71b6ae5fea89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121522
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
The problems in tdf#88163 can be categorized into two parts:
1. A regression which is caused by the commit
a9020e461803964a206d5551884b70717eed165c. The font size for text is
wrongly calculated for wmf files WITHOUT the placeable header.
2. A long-lasting bug that has existed from LO 3.5 (tested with
various LibreOffice versions from 3.5 to master). The font size for
text is wrongly calculated for wmf files WITH the placeable header.
This patch solves the first part. In this patch the way wmf is scaled
is changed using mnUnitsPerInch as a variable that controls the scale.
The previous method was dividing the left/right/top/bottom fields of
aPlaceableBound which caused the bad scaling of text.
The second problem still remains, and possibly can be solved by usign
the old scaling method that was previously used here (dividing pos
values of aPlaceableBound), but the scaling factor should be
calculated, which varies in different wmf files. More study should be
done to solve this part.
Values used for the example "visio_import_source.wmf" used in the test
WmfTest::testNonPlaceableWmf() are slightly changed, but the rendering
should not noticeably change, except the fix for the text font size.
A new test WmfTest::testTdf88163NonPlaceableWmf() is added which
checks for both font height and text boxes' positions. Font height
can depend on the exact font that is used for Roman in the platform,
so it vary between Linux, Windows and macOS. Thus, a range is used
for ensuring that the font height is correct.
By visual inspection, it is confirmed that this fix does not affect
fdo#74336 and the fix for it still works for attachment 93188.
Change-Id: I55bf38ba4345a0aa48c3e522976a2a5c32f7ec8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121272
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
Change-Id: Id14f525e84c22caa8f974f2f1d9f398f8d8e2df8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121532
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: Idaeb060e54fcb401f483abeb17e4f40dfd7ae20d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121374
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ia1e6d4c71d4bd228f2a9bb5fd2f5dbf54b94700d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121396
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I9e7be23fd8a52cfd0976ca358d848cbe11e84c2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121355
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I40ab9dc8b320990abcf89630984892e040a8544d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121380
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
test for eof condition before comparing the uninit val
Change-Id: Ie27c80f6c8103af4283181c522794eb878ccf588
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121373
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ie08cae55b638be5756d801b10b4546eb6c985f7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121379
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Icaef0cca9ca7bce76a7eb7ecd54c492f9ffcaad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121376
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
|
|
Change-Id: I3244f5c83a02f41ec379188b1fedbdd9e511967c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121318
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|