summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-12-01fdo#66826 - Add DOS CR/LR line endings to please patch 2.7 under cygwindistro/collabora/cp-4.0Michael Meeks0-0/+0
2021-12-01i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliablyDamjan Jovanovic1-1/+13
In the Java UNO bridge, UnoRuntime.generateOid() generated the object-specific part of the OID using java.lang.Object.hashCode(), which is only 32 bits long, and is commonly overriden and could thus return values from an even smaller range, so OID collisions were quite likely. This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the object-specific part of the OID, and store these in an object => oid java.util.WeakHashMap, making OID collisions almost impossible. Patch by: me Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at googlemail dot com) (cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118) Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95 Reviewed-on: https://gerrit.libreoffice.org/41576 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2016-06-29SwXDispatchProviderInterceptor: implement frame::XInterceptorInfoMiklos Vajna2-3/+16
With this, framework::InterceptionHelper can make a better decision what interceptor to call: it can avoid calling SwXDispatchProviderInterceptor when the sw code would just call the previous interceptor anyway. Reviewed-on: https://gerrit.libreoffice.org/25961 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit b0d819ac5667a07f629f2acb5d3c542fa76d348b) Conflicts: sw/source/uibase/inc/unodispatch.hxx sw/source/uibase/uno/unodispatch.cxx Change-Id: I92897f2c8baa264dc9ccbc11b63f415da30a910d
2016-06-29framework: last dispatchInterceptor gets asked firstThorsten Behrens1-9/+8
Align implementation with API contract as spelled out in offapi/com/sun/star/frame/XDispatchProviderInterception.idl - no idea why this change happenend in 2003: Date: Fri Apr 4 16:16:05 2003 +0000 INTEGRATION: CWS fwk01 (1.1.72); FILE MERGED 2003/04/01 12:40:09 as 1.1.72.1: #107642# change order of used interception objects At any rate, with this change extensions actually get a chance to see dispatch requests first, and process/ignore at will. Change-Id: I58876150ee6d67e592f41b3e82a9ffc314e091a3 Reviewed-on: https://gerrit.libreoffice.org/25215 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 08cf2fd01064306eef7fdbb5b62320947c4d1089)
2016-06-29framework: avoid excessive queryDispatch callsThorsten Behrens1-7/+14
Make better use of the css::frame::XInterceptorInfo interface, to avoid calling queryDispatch() pointlessly on interfaces that have explicitely opted out. Since that already broadcasts which urls we're interested in - so just don't bother calling entries who are not matching. Reviewed-on: https://gerrit.libreoffice.org/25214 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 27b6cdb5ab5af33dbba561923c8db81e144c88b9) Conflicts: framework/source/dispatch/interceptionhelper.cxx Change-Id: Id5e780568fd60c38f4cee4ee800d747d65a31dae
2016-06-29tdf#96949 Remove global static variable m_bPreferrFirstInterceptor and ...shubhamtibra2-22/+1
... unused code Remove global static variable "m_bPreferrFirstInterceptor" which is always true, and remove the ifs where it is false. Reviewed-on: https://gerrit.libreoffice.org/21519 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 5d4f1f6f630d4382679087a4fb0da364c9c9692b) Conflicts: framework/inc/dispatch/interceptionhelper.hxx framework/source/dispatch/interceptionhelper.cxx Change-Id: I54dcea7a6010c825a66020ec3f7448bb32d120b8
2016-06-29framework: register DispatchDisabler serviceMiklos Vajna1-0/+3
Change-Id: I72d9f8b00ba8b2e4e5dc70d7fd77e13ccf9d3bcc Reviewed-on: https://gerrit.libreoffice.org/24940 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 1f041bf31e071611a15ffa1559d2f5df05a685f0)
2016-06-29framework: initial implementation of a dispatch disabler.Michael Meeks6-3/+295
This should allow remote, eg. URE dispatchers to trivially disable lots of the UI without requiring a large volume of round-trip IPC. Reviewed-on: https://gerrit.libreoffice.org/24938 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 02833c03ee856a62d7185829b7c47bc088e086cc) Conflicts: framework/inc/services.h Change-Id: Ibd0681ac993196f826b4ed411da5ffedb7f85786
2016-06-29Silence javadoc 8 errorsMiklos Vajna11-36/+34
Just the minimal amount of changes to fix the build. Change-Id: I307f4df108caa96ec489ec151bfa47837480b92d
2014-06-12openssl-0.9.8za -- fixes multiple CVEscp-4.0-24Andras Timar9-52/+52
Change-Id: I99595b4de670b42497cb2bf7a19f6a53237c8168
2014-06-11Bump for 4.0-24Andras Timar2-14/+14
Change-Id: I439af02c4bbbd886260ec70234de38d4c3c8324c
2014-06-10openssl-0.9.8za -- fixes multiple CVEsAndras Timar1-1/+1
Change-Id: Id4a2d2af49518317511da194a582d3bb18c346f7
2014-05-28build fixAndras Timar1-1/+1
Change-Id: If249946cb33d984dbe9eeec3889ea80246df3a52
2014-05-28MSWord uses \xb for linebreaks in DB fields (bnc#878854)Luboš Luňák1-0/+2
Change-Id: I9b1e4f8dc44d3f6f41e395f6e5f3c1fdeff52441
2014-04-23add parameter to supress dialogMathias Supp3-6/+9
With the new parameter you can now supress the dialog for document compare in writer. Change-Id: I984ee75552e5c006332331510df5d437b687903f (cherry picked from commit 450cb7831f077df43582de15631de3886888e9e0) Conflicts: sw/source/ui/uiview/view2.cxx
2014-04-23OLE: Turn an OSL_ENSURE() into a real condition.Jan Holesovsky1-6/+5
This is part of some STAMPIT workaround; no idea what it is, but for sure it causes problems with PowerPoint OLE in Writer - so let's avoid updating if it is not "STAMPIT". Change-Id: I266b419ba3461c547f7ee8e447ef64a47a8511e8
2014-04-23Re-introduce code to try to get GDI metafile replacement imageTor Lillqvist4-3/+29
The code was commented out in 2009 (with any rationale lost from version history) and then cleaned away in 2011. Re-introduce the bit that tries FORMAT_GDIMETAFILE. The other part was commented out in 2009 in CWS metropatch01_DEV300, with any reasoning behind it lost in history, and then cleaned away in 2010. Re-introduce the bit that tries FORMAT_GDIMETAFILE. Seems to work for data that produces a reasonably sized metafile. Also limit the GDI metafile size to 100000 actions. Excel can copy huge metafiles to the clipboard, with over 3 million of actions, which are 1) unusable, and 2) crash LibreOffice because of their size. Change-Id: I80a4ed1681c3833ef1a4b595623387e9d136a774
2014-04-22enhwmf.cxx merge fixAndras Timar3-483/+475
2014-04-22enhwmf.cxx merge fixAndras Timar1-370/+296
Change-Id: I41e2b8ad7348e274e147317ea04b094c9101c859
2014-04-22EMF/WMF: fix rendering of pen styles (dash, dot, dashdot, dashdotdot)Andras Timar3-40/+48
Change-Id: I226bac370601b75f2589f7a7c5e8830746b31e2e
2014-04-22WMF: parse line cap and line joinAndras Timar1-1/+27
Change-Id: I5a19a724856938d5a0495ee1e454582238dbd3f0
2014-04-22EMF/WMF: parse line cap and line joinAndras Timar1-705/+806
Conflicts: vcl/source/filter/wmf/enhwmf.cxx Change-Id: I081ae9c24e48912631dcfe4aba8a06ff2680aaf5
2014-04-22fdo#77088 WMF - replace 32-bit min/max assumption with constTomaž Vajngerl2-4/+6
Added RECT_MIN and RECT_MAX which represent the minimum and maximum value a Rectangle object can hold. In WMF we used a 32-bit assumption what the min and max value could be (0x7fffffff, 0x80000000) which causes problems on 64-bit systems. Change-Id: Ic62daebbc2708cdeb7b0cf7b694bd9940eb98313
2014-04-10build fixAndras Timar1-1/+1
Change-Id: I9b4e4f3fc60ee84e3c180360cc452ab1d9592acd
2014-04-09fdo#77229 EMF+ rendering: improve EmfPlusSetClipPath's CombineModeExclude caseMiklos Vajna1-1/+23
This is still not perfect, but at least we now don't do the opposite of what was asked. Change-Id: I5e144c5ec2987902e65b2eb472259d9c39bbbd11 (cherry picked from commit c2af50eb6df396c957890a6b912b8f3185893551) Conflicts: cppcanvas/source/mtfrenderer/emfplus.cxx
2014-04-09fdo#77140 embeddedobj: avoid unneeded conversion in ConvertBufferToFormat()Miklos Vajna2-0/+13
The primary reason is not performance: on export currently we loose some EMF+ properties. While it would be good to fix all those problems one by one, this is a small fix to avoid all kind of roundtrip problems in this situation. Change-Id: If5e1c1eabd8290f36b538e374c9707ae17097786 (cherry picked from commit 2a7fdf2a7bb7345c49c988dfd1fcdb41cebb8a1e)
2014-04-03About box background image fixcp-4.0-23Andras Timar1-45/+3
Change-Id: Ie4e47efb95b4e4890507b4cb0aa6cc73fc6757ce
2014-04-03Bump for 4.0-23Andras Timar2-14/+14
Change-Id: I0b147a43b85de8f0c025abf6abc176e8e185d902
2014-04-03Related: #i124516# handle bad surrogate pairs gracefully on WindowsHerbert Dürr1-5/+12
When running into invalid Unicode surrogate pairs the text layout code on Windows ran into massive problems like crashes. This change detects the situation of an invalid surrogate pair and falls back to treat it as a simple character instead of requesting a complex glyph fallback. (cherry picked from commit 913f1fc4b1362f6e91595af5ae10c4cba79fd355) Change-Id: I2988f4b64061d0a5df211f6f0f04b1f235fcd6a5 (cherry picked from commit 67688d3118b1a361d5dbdaa78e918815c163d75c)
2014-04-03Resolves: #i124453# check if the resulting polygon...Jürgen Schmidt1-0/+13
has already exceeded the number of points (2^16) that can be handled by a tools polygon (cherry picked from commit 804e547d70552fd64e1344d538427f8898824b43) Change-Id: I437a84493e264f7b650561599170e831da20c9aa (cherry picked from commit a9582c05f854cad02710178ab7fa79498573269e) (cherry picked from commit ab71a4512557b7290cd7b1b4923463052acf164e)
2014-04-03init a few more stream-read svm elementsCaolán McNamara2-19/+22
(cherry picked from commit 67c6ea0c426c2796fc1b80cbe2cb0347686db90d) Conflicts: vcl/source/gdi/metaact.cxx Change-Id: I3dfa2485afbe66131b86764374d53181b55c2346 (cherry picked from commit 21212a65c5653bdc38cea426710e68ed40c66eb8)
2014-04-03valgrind: Conditional jump or move depends on uninitialised valueCaolán McNamara1-1/+1
Change-Id: I1939d376afe5dd5c67f378ffb2520a066dc99077 (cherry picked from commit 6efbc4598aea1e87c1569c7beef13d44b1a4202c) (cherry picked from commit 1742008dd0d83f3e69b6e09d9e3223d0c5d28096)
2014-04-03detect add to table beyond MAX_TABLE_SIZECaolán McNamara1-9/+33
Change-Id: I9b1357e583620c59898cd7a649a5b39a6d7e3739 (cherry picked from commit e326b5e06d74685b1853d61c465e5be0b5bf1595) (cherry picked from commit 4e2c5ffa89b77e4d6b0a1dc964d330d2ae3636d6)
2014-04-03valgrind: Conditional jump or move depends on uninitialised valueCaolán McNamara1-1/+1
(cherry picked from commit e3dad060929de9beeeed2978f1b1427a91152073) Conflicts: vcl/source/gdi/metaact.cxx Change-Id: Ia0b22f7c394d1c2387d1cad7e3d99c79eaeca81a (cherry picked from commit a37f474a2272c505778774cd1d92897d8a744863)
2014-04-03n#870234: Import gradfill for text colors.Muthu Subramanian3-0/+9
Uses the first color from the gradfill list. (Which is better than plain black!) Ported from: cfc76de83e3c0a56abd30a8f3bd7c69d3500d223 Change-Id: I57a3a54a8053a8ce320acbd02940f10941165d1c
2014-04-03n#862510: anchorCtr controls the anchoring as well.Muthu Subramanian3-4/+5
Ported from: c17eb67460293fbe72ffa8e80cd10743df493afa Change-Id: I7b5885c3ac9ec30970bdb8b2c9318dc181dda5bd
2014-04-03n#862510: Fix text rotation.Muthu Subramanian1-1/+2
Fix breaks document in n#783433 - the one there is damaged - resaving it using mso 2010 should fix the problem there. Ported from: e3e12b1d1e36e1a0d4fc4c6423b584d677693897 Change-Id: I56fbefa9de6b0714592cc64dffc011b27d1907f4
2014-04-03n#862510: Ignore baseline attributes with zero.Muthu Subramanian1-1/+1
Ported from 19abfaffe74b925e4428943d14187a7008797982 Change-Id: I5447c16193f7c3e619ce10658c9696014d3d5a22
2014-04-03n#821567: Use BitmapURL only if its valid.Muthu Subramanian1-2/+5
Ported from bf2ff0468e06770f9320c652a2332f7ec137d061
2014-04-03n#821567: Import PPTX background images with table-name.Muthu Subramanian3-2/+21
Ported from 2ec4d410de5bd98527336a9dc49abb76656373df
2014-04-03Stick to a single O[U]String hash functionStephan Bergmann11-138/+12
Ported from: 042725a5dadc9f2c6368ca451b6d20046129b8af Change-Id: I87f11d9101e21bdadaaffb719a762d0030639cb1
2014-04-03String cleanups.Muthu Subramanian3-1/+23
Change-Id: Ia4a9630822678a7b9ea6e5af87e58cfd0ebacff3
2014-04-03n#757432: Styles (rename &) copy to different decks.Muthu Subramanian5-2/+161
Ported from: a4cd841541a729d7b8126d27d91fa28e30b01403 Change-Id: I73ebaec651a195afbf60f5338c487c7750298fef
2014-04-03Move string hash function into String class.Muthu Subramanian6-11/+64
Change-Id: If229f3a8c4b4fd1e5f0c28618e29eded7b7853da
2014-03-21OSX install background image 72 DPIAndras Timar1-0/+0
Change-Id: Ia9d24745c453643cf15247385929a1e22bac4d46
2014-03-19purple brand themeAndras Timar9-467/+347
Change-Id: I6c7a64a201f33eff23e8da14e331be1c5db8c9bb
2014-03-07fdo#60833 user's wordbook should be selected by defaultAndras Timar1-3/+3
Change-Id: Ib0614af5201bfcc17058761e5a38333902924b31
2014-02-24OOXML chart import: ignore rot values outside the valid rangeAndras Timar1-0/+5
Change-Id: I506a78a024d761d1d263a7bb1dcbf09a4bbcf4ef
2014-02-23we only support simple labels in the InternalDataProvider, bnc#864396Markus Mohrhard1-0/+28
Change-Id: Ie31c5c73bb5185125fd4493c4e476997e2e9bc63
2014-02-20new brand imagesAndras Timar9-276/+480
Change-Id: Ib40cd570aefb6b6a7b3665d680a3bd00fc184a18