Commit Graph

508 Commits

Author SHA1 Message Date
Jan Holesovsky
20f9413f17 EMF+: Parse custom line cap data for start and end line caps.
Change-Id: I3a5f79e22500f53c3c61c173e0827c250b2a8fd0
2013-11-25 14:10:47 +01:00
Jan Holesovsky
172acd5bea EMF+: Small cleanup & more logging in preparation for line starts & ends.
Change-Id: I584f8a1680c6aa7b51b948a00213c285387b77c3
2013-11-25 14:10:47 +01:00
Jan Holesovsky
40977516a5 EMF+: Implement line dashing.
Change-Id: I9eb21c0a8b5baa5b0080845f61b12fc65034d959
2013-11-25 14:10:46 +01:00
Jan Holesovsky
6f6b12cb24 EMF+: Stroke size is always supposed to be absolute.
Change-Id: I7221311e5dee6384dc2d1c071bf6f1c61811895a
2013-11-25 14:10:45 +01:00
Noel Grandin
2241fd5302 remove unnecessary RTL_CONSTASCII_STRINGPARAM in OString::equalsIgnoreAsciiL
Convert code like:
    aStr.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("XGRAD_SEQ_BEGIN"))
to:
    aStr.equalsIgnoreAsciiCase("XGRAD_SEQ_BEGIN")
which compiles down to the same code.

Change-Id: Ia69289d853d292b2f27b68863cb6f6ecdbf1a71e
2013-11-22 08:07:18 +02:00
Noel Grandin
6eac9deadd remove unnecessary RTL_CONSTASCII_STRINGPARAM in OUString::equalsL
Convert code like this:
    if (aStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
to:
    if (aStr == "rem")
which compiles down to the same code.

Change-Id: I2dfa0f0a457c465948ecf720daaa45ff29d69de9
2013-11-21 13:29:29 +02:00
Noel Grandin
d454834895 Revert "remove RTL_CONSTASCII_STRINGPARAM in OString::equalsL calls"
This reverts commit acebbee971.

I mistakenly converted OUString::equalsL calls to OUString::startsWith
calls.
2013-11-20 16:38:28 +02:00
Noel Grandin
acebbee971 remove RTL_CONSTASCII_STRINGPARAM in OString::equalsL calls
Convert code like:
    if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
to:
    if (aByteStr.startsWith("rem"))

Change-Id: I09e40b3fdc87d59a8176c2a5f39cc6aa5cf5a576
2013-11-20 13:56:08 +02:00
Stephan Bergmann
39b594337d -Werror,-Wunused-member-function
Change-Id: I92c83ead449452679e539fad2316d391a1b59a62
2013-11-14 10:15:01 +01:00
Noel Grandin
aeb41c9b9b remove redundant calls to OUString constructor
Change code like this:
  aStr = OUString("xxxx");
into this:
  aStr = "xxxx";

Change-Id: I31cb92e21658d57bb9e14b65c179536eae8096f6
2013-11-04 10:11:07 +02:00
Tor Lillqvist
a7724966ab Bin comments that claim to say why some header is included
They are practically always useless, often misleading or obsolete.

Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-22 16:56:28 +03:00
Muthu Subramanian
3d0d0717e8 n#812793: Reverting the workaround. 2013-10-10 14:51:04 +05:30
Thorsten Behrens
21ec9beae2 XCanvas does no longer imply XBitmapCanvas
Remove the implication that XCanvas IS-A XBitmapCanvas, i.e. one can
access underlying pixels. That's a preparation for display-list based
canvas implementations, and was a rather silly assumption in the first
place.

Also fixes up all client sites.

Change-Id: I7a3d6f68ef46fe94b23cce7759cc0b8b6ca4dae9
2013-10-07 17:33:45 +02:00
Noel Grandin
abe49a8427 convert CPPCANVAS module from String to OUString
Change-Id: I12a219a50cc3a9b07c9852cc0d417f71797b9e15
2013-09-17 09:05:43 +02:00
Fridrich Štrba
21ee132af1 Revert some random work-in-progress that is most probably bitrotten
Revert "EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it"

This reverts commit 2b700a710e.

Revert "Pass also the bounding box in device units to the EMF+ part"

This reverts commit f387c5da5a.
2013-08-30 14:37:27 +02:00
Caolán McNamara
b9fa1e20f3 build on higher debug levels
Change-Id: I7f4d85f3e26ab8b19dae05c6907840b97a8af1d6
2013-08-24 14:02:48 +01:00
Eike Rathke
358d1a9948 use static LanguageTag::convertTo...() for standalone conversions
If no LanguageTag instance is at hand use the static methods to convert
between BCP 47 string, Locale and MS-LangID instead of creating
temporary instances.

Change-Id: I9597f768078eb81c840e84a5db5617f26bb7dc09
2013-07-13 11:55:16 +02:00
Mark Wielaard
cb14b1e56d Fix memory leak in EMFPPen.
Delete dashPattern, compoundArray, customStartCap and customEndCap
arrays if they were created in the destructor.

Change-Id: I5f3821b1ab0ac31a9cd4bc402c04090585953573
Reviewed-on: https://gerrit.libreoffice.org/4821
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-07-11 04:02:51 +00:00
Caolán McNamara
1970b28c5c merge duplicated code
Change-Id: Ib13f17a0fe3173f4cd0ae7139f56badb39dcb6cb
2013-07-10 09:50:06 +01:00
Caolán McNamara
6a9dc1a045 remove last XubString uses in cppcanvas
Change-Id: I2ebc11a972f9a806889e13e7f69e20cd91d2ae6e
2013-07-10 09:50:05 +01:00
Radu Ioan
61db96daa8 fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*

Change-Id: I26761cf1d4c1cfe21dec7d8ede6df6f177bf2c3e
Reviewed-on: https://gerrit.libreoffice.org/4620
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2013-07-03 07:59:33 +00:00
Stephan Bergmann
fdcd77cdd7 warning C4305: 'argument' : truncation from 'double' to 'float'
Change-Id: Ieee74fd7e7cec65304dd5de9c1368f5449b66407
2013-06-12 17:27:37 +02:00
Armin Le Grand
e717d1dcce Resolves: #i121237# Rework/Cleanup of Region code...
due to missing complete support for B2DPolygon class

(cherry picked from commit cab10eeb7878edf224a004fd7640bd4adf8d3c51)

Conflicts:
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	svx/source/sdr/overlay/overlaymanagerbuffered.cxx
	svx/source/svdraw/svdpntv.cxx
	vcl/aqua/source/gdi/salgdi.cxx
	vcl/inc/region.h
	vcl/inc/unx/gtk/gtkgdi.hxx
	vcl/inc/vcl/regband.hxx
	vcl/inc/vcl/region.hxx
	vcl/os2/source/gdi/salgdi.cxx
	vcl/source/gdi/bmpacc3.cxx
	vcl/source/gdi/outdev2.cxx
	vcl/source/gdi/outmap.cxx
	vcl/source/gdi/regband.cxx
	vcl/source/gdi/region.cxx
	vcl/source/window/window.cxx
	vcl/unx/generic/gdi/pspgraphics.cxx
	vcl/unx/headless/svpgdi.cxx
	vcl/unx/headless/svppspgraphics.cxx
	vcl/win/source/gdi/salgdi.cxx

Change-Id: Iee9a66ff431c3cecb7603e445147b67715de0f7d

Remove unused variable to prevent compiler warning

(cherry picked from commit 0ac65ccf079e3e22ac23cbe7ae546504c863c31f)

Change-Id: Icbcaa9d576a7e560d96debc7360bdbe9090b3fd3

Wrong comparison with bool corrected

(cherry picked from commit 612cefdcf6176b6bb847ce899d89af40ef313a90)

Change-Id: I1cf5de6734b588f78d8e870ba7b7860634b461ce
2013-06-12 14:31:10 +01:00
Fridrich Štrba
2b700a710e EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it
Change-Id: Ifa4f42c4f17a70c7238347a13897ef6742eb4679
2013-06-12 10:03:55 +02:00
Fridrich Štrba
f387c5da5a Pass also the bounding box in device units to the EMF+ part
Change-Id: I71d3029d4b3aafdc44d82b0bd9db9a54f9b8b81f
2013-06-12 07:03:49 +02:00
Fridrich Štrba
721f82c9bf Use a local variable for the points
Change-Id: Ibd274ecd7eaeadaaef9f2a17a0d721355a561431
2013-06-11 11:41:23 +02:00
Fridrich Štrba
eb0a738d1b Refactor a bit the code while reading it
Change-Id: I58693bb4ffe0f59365069a87fc30081ddf226eaa
2013-06-11 11:41:23 +02:00
Fridrich Štrba
2933de9ce0 Fix typo and make the debug output a bit more readable
Change-Id: I45cb5303bfcc1f3df8455ac454f3e1b3fc5a11e0
2013-06-11 11:41:23 +02:00
Armin Le Grand
385bb45473 Resolves: #i120604# unified and secured gradient tooling for primitives
(cherry picked from commit 05785d283e718aab182a5ea848de72e4a4b2efe3)

Conflicts:
	basegfx/inc/basegfx/tools/gradienttools.hxx
	basegfx/source/tools/gradienttools.cxx
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
	drawinglayer/inc/drawinglayer/texture/texture.hxx
	drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
	drawinglayer/source/processor2d/vclhelpergradient.cxx

Change-Id: I21f94e7b4eede094171a83a009ae19213e77f22c

Unname unused argument to prevent warnings.

(cherry picked from commit f7d4af835cf308bc9ece6fd84cbd14ba5be0adcd)

Change-Id: I44381f1e417c39dfbd1d4051079bbd09f0c61848
2013-06-11 10:32:54 +01:00
Michael Stahl
930127da85 cppcanvas: try to make MSVC tinderbox happy
Change-Id: If4fd5a788d3907a986e27f5f53d5995c7035f685
2013-06-07 20:54:33 +02:00
Michael Meeks
ed30996f8f fdo#65502 - EmfFillPie fix.
Change-Id: I395ef5f5175b9a2d758f4023605b8e2d4dce859f
2013-06-07 15:00:32 +01:00
Fridrich Štrba
abdbb847fa Transform the clipping polygon before using it
Change-Id: I71a00f7d4b80ef41b637889e51a414fac6883ba1
2013-06-07 15:35:48 +02:00
Fridrich Štrba
db73861949 log point types as numbers and not as ascii chars with the value of the number
Change-Id: Ia64c2b3a53f150afd3c194598dc3bf7d6c5d3b17
2013-06-07 10:47:57 +02:00
Armin Le Grand
7906c68057 Related: #i120994# Avoid same error for META_TEXTFILLCOLOR_ACTION...
and META_TEXTLINECOLOR_ACTION

(cherry picked from commit 839e9f69c68fd32a17fc90d31a68f0b2f0c2fff1)

Change-Id: I259ffb9d4710aae2334fd27c1ee0bbab0679df76
2013-06-04 20:08:24 +01:00
Tor Lillqvist
86c55c35ea Fix merge glitch (?)
Change-Id: I4cc5d49f8df63c46e50f2bfd64de7bd257ff9d76
2013-06-04 14:08:59 +03:00
Armin Le Grand
39e21050fe Resolves: #i120994# Corrected Line/FillColor OnOff state handling
(cherry picked from commit 2d1c3f406b3390587bd800d05a07e8349b4582f5)

Change-Id: I3ec3e83354c60c53263b8f823d6a0037dfc9130b
2013-06-04 11:09:20 +01:00
Radu Ioan
bd888a331b fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*

Change-Id: I0054bc90fdcaa2fef7e1d98a0528277be4fc341e
Reviewed-on: https://gerrit.libreoffice.org/3917
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-20 18:58:25 +00:00
Chris Sherlock
931984489e Janitorial: indent code correctly
Change-Id: I9fcbeb5f60df1a977347076dac82d4b5f7aba2c1
Reviewed-on: https://gerrit.libreoffice.org/3867
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-05-12 13:01:24 +00:00
David Tardon
2293815a63 fix build
Change-Id: Iae000243265335e3f0bc6bd8979c2131243c48f9
2013-05-12 07:37:00 +02:00
Chris Sherlock
00fbf73b07 EMF+ fixes
A number of fixes have been made to commit
256e42646b:

* Missing redirect in SAL_WARN - only gets picked up when DBG_LEVEL > 1
* Some errant newlines in SAL_INFO
* Some missing braces
* Missing semi-colon fixed (!)
* Changed int to sal_Int32 (causing ambiguity error)
* Add dumpWords to the SAL_WARN that ensures that size is not greater
  than length
* Show values when proessing EMF+ comment record (only enabled when
  DBG_LEVEL > 2)
* Missing std::hex in SAL_INFO

Change-Id: I059ba24964dd428a56a31d100109cfec938a8a49
Reviewed-on: https://gerrit.libreoffice.org/3861
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-12 05:19:56 +00:00
Chris Sherlock
e3c5f8f5d4 Fix: change to std::dec after having used std::hex
The basefield flag of a stream is persistent, which I didn't realise before.
This fixes commit 256e42646b

Change-Id: Ic0076c63ae6236ae75dcd79d108add27391b2125
Reviewed-on: https://gerrit.libreoffice.org/3842
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-10 13:10:04 +00:00
Thorsten Behrens
569f6b41c6 Don't leak all of the EMF+ graphic objects.
Change-Id: I7951a9d25da5feec997dd0643f8579f5bcd0ee0f
2013-05-08 20:50:09 +02:00
Stephan Bergmann
e50ef53102 Fix adaption to SAL_INFO
Change-Id: I12e32c0323e21946b795ca7f2af392930f55eed6
2013-05-06 12:19:05 +02:00
Chris Sherlock
256e42646b Convert EMFP_DEBUG to SAL_INFO, etc.
* Change to SAL_INFO instead of EMFP_DEBUG in emfplus.cxx
* Use #ifdef OSL_DEBUG > 1 to conditionally compile in debugging routines
* Remove some commented/conditionally compiled out code
* Change logging area for SAL_WARN from cppcanvas to cppcanvas.emf

Change-Id: I6db0021807634070cfa2fee0f07e32d235b3d2f3
Reviewed-on: https://gerrit.libreoffice.org/3782
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-05-06 09:39:43 +00:00
Chris Sherlock
af41ad9b94 Convert from EMFP_DEBUG to SAL_INFO
* Change to SAL_INFO instead of EMFP_DEBUG in implrenderer.cxx
* Add new log area cppcanvas.emf
* Update comment in log.hxx to reference the new location of log-areas.dox

Change-Id: I5d710725339f58a111a2f3494c3a72f685624322
Reviewed-on: https://gerrit.libreoffice.org/3726
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-05-02 06:55:31 +00:00
Noel Grandin
2f1a293e1a Clang cleanup, unaligned if statement
The extra semi-colons were confusing clang. Just remove the macro,
it's not adding any real value.

Change-Id: I7f7c312d2c0167a17e31624e197ae75b77fa0c2f
Reviewed-on: https://gerrit.libreoffice.org/3677
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-04-29 13:59:47 +00:00
Muthu Subramanian
5a1d773278 fdo#60638: Workaround should be in FillRects rather than FillPolygon. 2013-04-26 14:04:21 +05:30
Muthu Subramanian
4bc3ead064 n#812793: (Workaround) Transparent background import in EMF+.
EMF+ seems to have alpha of 0xff for transparent background!
2013-04-25 11:57:59 +05:30
Luboš Luňák
ba044b1e96 remove needless forward rtl::OUString declarations
Change-Id: I97d91a758dd82d64768d75c1d2ddd279de5f6034
2013-04-07 14:23:12 +02:00
Luboš Luňák
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 14:23:11 +02:00