summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-05-07Bump version to 6.2-11cp-6.2-11CODE-4.2.3-1Andras Timar1-1/+1
Change-Id: I2064eef90fbf58055059ea60b33c5fe9cb2de0cb
2020-05-07added ability to switch sidebar deck on init.cxx for mobilewizardMert Tumer3-2/+25
Change-Id: I532398bc41e1c984c24b1d39e4844315a0a69847 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93162 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-06ICU requires that a collator charset data array is four-byte-alignedTor Lillqvist1-1/+1
See workdir/UnpackedTarball/icu/source/common/utrie2.cpp, the U_POINTER_MASK_LSB() check: if( length<=0 || (U_POINTER_MASK_LSB(data, 3)!=0) || valueBits<0 || UTRIE2_COUNT_VALUE_BITS<=valueBits ) { *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR; return 0; } Apparently the data pointer there is always a multiple of four bytes from the start of the data array that the gencoll_rule code generates. Change-Id: I9b98b01b49b5800e1db8b077a4221b82d59510bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93507 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-06Change default PDF version to 1.6 (released in 2004)Miklos Vajna6-9/+80
We already write markup which is newer than 1.5, but the PDF version was not changed. Fix the one violation I'm aware of. Printing is left unchanged, similar to how commit 99ac4ee05b039166eedfe361fb985682fd92dd13 (Change default PDF version to 1.5, 2018-04-24) updated the default last time. (cherry picked from commit 141e0449fdab89384564659191492b698e4b13d8) Conflicts: filter/source/pdf/pdfexport.cxx include/vcl/pdfwriter.hxx vcl/qa/cppunit/pdfexport/pdfexport.cxx Change-Id: I9598dc46fe7db428bd2eff98bebff8b3c873b4ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93503 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-06PDF export: fix handling of page sizes larger than 508 cmMiklos Vajna4-7/+75
The value of these coordinates are not allowed to be larger than 14 400, and Adobe Reader complains about them. Use UserUnit to declare in case we won't work with points anymore, but with a larger unit. This will mean UserUnit=2 in practice, since e.g. Draw has is page size limited to 600x600cm, so larger values won't happen, at least not for now. (cherry picked from commit 4830592b780833cf5eee2aef30bc9c5d444dfb24) Conflicts: vcl/qa/cppunit/pdfexport/pdfexport.cxx vcl/source/gdi/pdfwriter_impl.cxx vcl/source/gdi/pdfwriter_impl.hxx Change-Id: I8ee159f2571f4070aded85388792a215de86f7ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93502 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-05-06On iOS, avoid catching exceptions to just immediately exit or abort anywayTor Lillqvist2-0/+8
It is better to let the exception be uncaught and then catch that in the debugger. (Maybe even inspect its backtrace from a crash dump automatically sent from an end-user device.) Change-Id: Ice02d5cbd7f4a59eae7ce8a9fac47dec8b234a5e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93505 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-06Throw exceptions with useful messagesTor Lillqvist1-4/+22
Change-Id: Ic8e09d31db97c0cf2e1aaf006c96481d12deb2d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93506 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-05Move SalInstanceComboBox to header fileSzymon Kłos2-287/+341
Change-Id: Iafa449cc1ebba93cc69da194857ea33b8f8510b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93482 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-05-05Move SalInstanceEdit declaration to the header fileSzymon Kłos2-233/+304
Change-Id: I660de317b88c4e83ccc310743dc4ef5b4c955a21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89370 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93481 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-05-05Create header file for SalInstanceBuilderSzymon Kłos2-698/+963
Move more declarations for SalInstance to header file Change-Id: If8d7578d9a5926cdf565efbf0bc12719e5ef6fc2 b7240ffd003e202be04b462209cfb2abafcc18ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89102 Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93480 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-05-05tdf#129680 Make text edit outliner view show cursorJim Raykowski1-0/+6
Better placement of tdf#50530 fix 80f18e7e028e9ca431aef281ab98bea99ad19fa3 Change-Id: If6a83d94ebd52ada34d800f8270fa82b4260fdbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86099 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 1840ed1ede481d28c1a75e2767357866f6f1c55a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86957 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 9b4ffa3a111dd91842ae53e74454f0c752ba4ffe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93425 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Pranam Lashkari <lpranam@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-05tdf#131230: Sidebar: Can't set Automatic colorPranam Lashkari2-4/+3
This also solved the issue in sidebar with some controls when selecting an item it selects the item below Change-Id: I607b8bc44402b57b5c4833f918fb41b23ddf48c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93099 Tested-by: Marco Cecchetti <marco.cecchetti@collabora.com> Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
2020-05-03setuprc has to be a .PHONY target in order to get the current git hashAndras Timar1-0/+1
Change-Id: I7962966b9e0075715e419a375c74283e2a771e01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93351 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-05-01Incomplete OpAverage, OpCount must not be used in dynamic_castStephan Bergmann1-369/+376
...even in template code (which compilers often only analyze late during compilation, but which Clang trunk now apparently processes more aggressively, presumably since <https://github.com/llvm/llvm-project/commit/ 878a24ee244a24c39d1c57e9af2e88c621f7cce9> "Reapply 'Fix crash on switch conditions of non-integer types in templates'", emitting errors about incomplete types) Change-Id: I851d266007f72cc4063f299412eadacbc6084f70 Reviewed-on: https://gerrit.libreoffice.org/84657 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93248 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-01Extend loplugin:external to warn about classesStephan Bergmann1-2/+17
(Just for one source file, unlike the original commit.) ...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend loplugin:external to warn about enums". Cases where free functions were moved into an unnamed namespace along with a class, to not break ADL, are in: filter/source/svg/svgexport.cxx sc/source/filter/excel/xelink.cxx sc/source/filter/excel/xilink.cxx svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx All other free functions mentioning moved classes appear to be harmless and not give rise to (silent, even) ADL breakage. (One remaining TODO in compilerplugins/clang/external.cxx is that derived classes are not covered by computeAffectedTypes, even though they could also be affected by ADL-breakage--- but don't seem to be in any acutal case across the code base.) For friend declarations using elaborate type specifiers, like class C1 {}; class C2 { friend class C1; }; * If C2 (but not C1) is moved into an unnamed namespace, the friend declaration must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither qualified nor a template-id and the declaration is a function or an elaborated-type-specifier, the lookup to determine whether the entity has been previously declared shall not consider any scopes outside the innermost enclosing namespace.") * If C1 (but not C2) is moved into an unnamed namespace, the friend declaration must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882> "elaborated-type-specifier friend not looked up in unnamed namespace". Apart from that, to keep changes simple and mostly mechanical (which should help avoid regressions), out-of-line definitions of class members have been left in the enclosing (named) namespace. But explicit specializations of class templates had to be moved into the unnamed namespace to appease <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of template from unnamed namespace using unqualified-id in enclosing namespace". Also, accompanying declarations (of e.g. typedefs or static variables) that could arguably be moved into the unnamed namespace too have been left alone. And in some cases, mention of affected types in blacklists in other loplugins needed to be adapted. And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is not moved into an unnamed namespace (because it is declared in sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler doesn’t give this warning for types defined in the main .C file, as those are unlikely to have multiple definitions." (<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The warned-about classes also don't have multiple definitions in the given test, so disable the warning when including the .cxx. Original Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4 Change-Id: Idbb47dac7dfa1029da603c716ccc3a1d35687ea6 Reviewed-on: https://gerrit.libreoffice.org/83239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93247 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-01Cut down on -pthread/-lpthread proliferationStephan Bergmann37-64/+11
Building against libstdc++ effectively always requires -pthread anyway (as various standard C++ headers require it, see the comment added to solenv/gbuild/platform/unxgcc.mk), so many explicit uses of -pthread/-lpthread can be removed. Doing a (partial) test build on Linux with Clang -stdlib=libc++ suggests that libc++ indeed doesn't need -pthread as libstdc++ does. The remaining uses of -pthread/-lpthread are mostly in configure.ac for the various BSDs (which somebody else might want to clean up now), and related to external projects. I tried to be careful to remove -pthread/-lpthread from makefiles only when C++ object files are involved (so -pthread will now be included on the link command line by default). Change-Id: I936e082839cb9a434bd273ce5a1f187a4245dfa1 Reviewed-on: https://gerrit.libreoffice.org/71291 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93206 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-01Add --with-latest-c++ to explicitly opt in for -std=c++20/-std:c++latestStephan Bergmann1-2/+15
cd472d1d8489f30797f47d3f6dafede28c1feb90 "Compile as C++2a, where available" had started to unconditionally check for support of -std=c++2a (and later also -std=c++20) for Clang and GCC, but that can cause occasional issues especially for Linux distros, see e.g. 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 "replace boost::bimap in sdext pdfimport" or <https://bugzilla.redhat.com/show_bug.cgi?id=1818723> "/usr/include/boost/format/alt_sstream_impl.hpp incompatible with -std=c++20 (std::allocator::allocate hint argument)" (where 677c8de4fa79cd9b278b142013ba7f1c9e4e41c3 "external/boost: Adapt to std::allocator parts removed in C++20" is not picked up due to --with-system-boost). So better require an explicit opt-in via a new --with-latest-c++. And while at it, also make that enable -std:c++latest for MSVC. Change-Id: I2d1f03144fad9a7884562e56b1b76cab5eb8f080 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92555 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93204 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-01Include <cstdlib> for std::malloc() and std::free()Tor Lillqvist2-0/+2
Change-Id: Ice6964858f39709dfd7e55ed8d7fe2d71da6acad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93205 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-05-01tdf#40534 correctly match page with memory slabJan-Marek Glogowski2-52/+24
LO has a page manager to match system memory backbuffers with graphics memory on DX accelerated Windows. Internally this uses an other rectangle implementation, the SurfaceRect, which had some great comments like: // a size of [0,0] therefore denotes a one-by-one rectangle. In commit 230dbe2e43f3ee2cd285f9cdfe0d57e1ca08b8fe ("#144866# Add one pixel border around textures, a bunch of drivers clobber those with dirt), the allocation was increased by a pixel border, but this doesn't work correctly, because now an allocation of the page size wouldn't fit anymore into a page, because the pages size is decreased before comparison. In the end the mixup suffered from hard to handle off-by-one problems. This patch fixes the bug, but eventually SurfaceRect should be replaced by an extended basegfx::B2IBox. But since B2IBox uses two ranges, instead of a point and a size, it would need a lot of conversations to I2Point and I2Size objects with the current Page::insert algorithm. Change-Id: Ia725b4f8ed4fb270f2eb3734e492062bc7f13793 Reviewed-on: https://gerrit.libreoffice.org/80628 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 194e7ce17ae7ca278c12d03bc25684b7437f9785) Reviewed-on: https://gerrit.libreoffice.org/80669 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit edcb363f5eeefcc2ce28a2ab7a57d61b744466cd) Reviewed-on: https://gerrit.libreoffice.org/80878 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 5ce21a11ef300603599e4623171c161974582a28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93242 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2020-05-01lokit: fix autofilter window position...Dennis Francis1-1/+14
when client zoom is not 100%. The fix and the reasoning is same as that in lokit: fix validation dropdown's wrong position 3405f7f1b19738cad57b58259105ec87c1108466 Change-Id: I04837721d82b1e178cf5aa1130bbdaf77d13edae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93240 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-05-01Revert "lokit: scale the validation dropdown with client zoom"Dennis Francis1-20/+3
The scaling of the float window containg the listbox is unfortunately far from ideal at certain zoom levels and entry sizes. There are issues like too much extra spaces around the entries and around scrollbar if present. These issues need more work to fix. Until then lets revert this. Another issue is that we don't really want to zoom adjust any popups in mobile or android as this does not match the design of jsdialogs. This reverts the commit : 7787bac16cbe63698f56a9a70d9b1b217f3ea860 (master) a87e78df635d4a8e745bfffcf33d022d2a498afa (cp62) Change-Id: Ic31040b491e25b5113dfc8e70d3f73de204862e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93239 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-04-30external/firebird: Make comparison operator member functions constStephan Bergmann2-0/+53
see commit message of external/firebird/0001-Make-comparison-operator-member-functions-const.patch.1 for details Change-Id: I559e4b6ef2dbf3800ff5013dcde078d69296d2fb Reviewed-on: https://gerrit.libreoffice.org/81261 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93191 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-30iexternal/libstaroffice: Fix equality operator argumentsStephan Bergmann2-0/+59
see commit message of external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 for details Change-Id: Iff882eb1e8b7a71e659a4513772e9049645812fb Reviewed-on: https://gerrit.libreoffice.org/81256 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93184 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-30external/libwps: Make comparison operator member functions constStephan Bergmann2-0/+52
see commit message of external/libwps/0001-Make-comparison-operator-member-functions-const.patch for details Change-Id: Ib8702f57f47aacc08628ceaccce23b487660b95c Reviewed-on: https://gerrit.libreoffice.org/81249 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93183 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-30exernal/icu: Various C++20 comparison operator fixesStephan Bergmann2-0/+172
There are three patterns here: * Missing const (source/common/uvector.cpp, source/common/uvector.h): Overload resolution ambiguities when a synthesized canditate of operator == for a reversed-argument rewrite conflicts with the actual operator ==, due to the asymmetric const-ness of the implicit object parameter and the RHS parameter: > uniset.cpp:360:18: error: use of overloaded operator '!=' is ambiguous (with operand types 'icu_63::UVector' and 'icu_63::UVector') > if (*strings != *o.strings) return FALSE; > ~~~~~~~~ ^ ~~~~~~~~~~ > ./uvector.h:385:23: note: candidate function > inline UBool UVector::operator!=(const UVector& other) { > ^ > ./uvector.h:116:11: note: candidate function > UBool operator==(const UVector& other); > ^ > ./uvector.h:116:11: note: candidate function (with reversed parameter order) * UBool -> bool (source/i18n/tzrule.cpp, source/i18n/unicode/tzrule.h): [over.match.oper]/9 (of the current C++20 draft) states: "If a rewritten operator== candidate is selected [...], its return type shall be cv bool": > basictz.cpp:411:37: error: return type 'UBool' (aka 'signed char') of selected 'operator==' function for rewritten '==' comparison is not 'bool' > if (*(tzt0.getTo()) == *tar) { > ~~~~~~~~~~~~~~~ ^ ~~~~ > ./unicode/tzrule.h:675:19: note: declared here > virtual UBool operator==(const TimeZoneRule& that) const; > ^ * Additional operator != (source/i18n/unicode/rbtz.h, source/i18n/unicode/simpletz.h, source/i18n/unicode/smpdtfmt.h, source/i18n/unicode/stsearch.h, source/i18n/unicode/tzrule.h, source/i18n/unicode/vtzone.h): Similar to the previous pattern, but here the original operator used was !=, so an alternative fix (that reqires fewer changes to the code overall) is to add specific operator != overloads: > rbtz.cpp:79:15: error: use of overloaded operator '!=' is ambiguous (with operand types 'icu_63::RuleBasedTimeZone' and 'const icu_63::RuleBasedTimeZone') > if (*this != right) { > ~~~~~ ^ ~~~~~ > ./unicode/rbtz.h:87:19: note: candidate function > virtual UBool operator!=(const TimeZone& that) const; > ^ > ./unicode/rbtz.h:77:19: note: candidate function > virtual UBool operator==(const TimeZone& that) const; > ^ > ./unicode/rbtz.h:77:19: note: candidate function (with reversed parameter order) > rbtz.cpp:101:23: error: use of overloaded operator '!=' is ambiguous (with operand types 'icu_63::InitialTimeZoneRule' and 'icu_63::InitialTimeZoneRule') > if (*fInitialRule != *(rbtz->fInitialRule)) { > ~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~ > ./unicode/tzrule.h:257:19: note: candidate function > virtual UBool operator!=(const TimeZoneRule& that) const; > ^ > ./unicode/tzrule.h:248:18: note: candidate function > virtual bool operator==(const TimeZoneRule& that) const; > ^ > ./unicode/tzrule.h:248:18: note: candidate function (with reversed parameter order) > rbtz.cpp:535:23: error: use of overloaded operator '!=' is ambiguous (with operand types 'icu_63::InitialTimeZoneRule' and 'icu_63::InitialTimeZoneRule') > if (*fInitialRule != *(that.fInitialRule)) { > ~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~ > ./unicode/tzrule.h:257:19: note: candidate function > virtual UBool operator!=(const TimeZoneRule& that) const; > ^ > ./unicode/tzrule.h:248:18: note: candidate function > virtual bool operator==(const TimeZoneRule& that) const; > ^ > ./unicode/tzrule.h:248:18: note: candidate function (with reversed parameter order) > > olsontz.cpp:630:69: error: return type 'UBool' (aka 'signed char') of selected 'operator==' function for rewritten '!=' comparison is not 'bool' > || (finalZone != NULL && z->finalZone != NULL && *finalZone != *z->finalZone)) { > ~~~~~~~~~~ ^ ~~~~~~~~~~~~~ > ./unicode/simpletz.h:112:19: note: declared here > virtual UBool operator==(const TimeZone& that) const; > ^ > dtitvfmt.cpp:223:62: error: return type 'UBool' (aka 'signed char') of selected 'operator==' function for rewritten '!=' comparison is not 'bool' > if (fDateFormat && fmt->fDateFormat && (*fDateFormat != *fmt->fDateFormat)) {return FALSE;} > ~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~ > ./unicode/smpdtfmt.h:876:19: note: declared here > virtual UBool operator==(const Format& other) const; > ^ > stsearch.cpp:187:17: error: return type 'UBool' (aka 'signed char') of selected 'operator==' function for rewritten '!=' comparison is not 'bool' > if ((*this) != that) { > ~~~~~~~ ^ ~~~~ > ./unicode/stsearch.h:299:19: note: declared here > virtual UBool operator==(const SearchIterator &that) const; > ^ > vtzone.cpp:1003:15: error: use of overloaded operator '!=' is ambiguous (with operand types 'icu_63::VTimeZone' and 'const icu_63::VTimeZone') > if (*this != right) { > ~~~~~ ^ ~~~~~ > ./unicode/vtzone.h:83:19: note: candidate function > virtual UBool operator!=(const TimeZone& that) const; > ^ > ./unicode/vtzone.h:73:19: note: candidate function > virtual UBool operator==(const TimeZone& that) const; > ^ > ./unicode/vtzone.h:73:19: note: candidate function (with reversed parameter order) Change-Id: I38e01143d1ea0df3f43de53303fd710e41bae027 Reviewed-on: https://gerrit.libreoffice.org/81306 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93182 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-04-29lok: calc: input bar: send number of text lines to clientMarco Cecchetti2-1/+4
Change-Id: Iec919ef11e22ae5d02009570f446064e3f7bfe01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92690 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-29lok: calc: formula bar: improve selection handlingMarco Cecchetti1-0/+16
This patch provides some improvements for the single input line case with a multi-line text selection: - selection rectangles are correct when selection is expanded to the previous or the next line - two flag parameters for notifying the client if the start/end selection handles should be visible or they don't Change-Id: Ica0428786183c4b5a15870c43490bc69452c2a49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92121 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-29lok: formula input bar: get a function inserted in a not focused top viewMarco Cecchetti1-2/+14
Change-Id: Ia52ebbcad8d3febab85f19279859e901f8193c49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89548 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-29lok: remove sum and equal buttons from the formula barMarco Cecchetti1-16/+26
This patch removes sum and equal buttons from the formula bar in the lok case. A tentative to limit that to the mobile case has been done however the formula input bar is created before than the client view so we are not able to use the LibreOfficeKit::isMobile check. Change-Id: Icb820a0d77eb9295046997d2f3690d7f8b39680d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89453 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-29lok: formula bar: send whole function listMarco Cecchetti3-21/+182
Change-Id: Ibbd142652f3190387700f820e56c494b61bfa658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89199 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-29lok: set device form factor of the client on view creationMarco Cecchetti25-78/+83
This patch allows the lok core to know about the device form facor of the client requesting the creation of new view, immediately instead of a later time. When a new view is needed a "DeviceFormFactor" parameter is forwarded to lo_documentLoadWithOptions and doc_createViewWithOptions from the client. This parameter can have one of the following values: 'desktop', 'tablet','mobile' and it is used to set a global variable accessible by SfxLokHelper::setDeviceFormFactor and SfxLokHelper::getDeviceFormFactor. This global variable is retrived in the SfxViewShell constructor for setting SfxViewShell::maLOKDeviceFormFactor attribute. In SfxViewShell we have the following 3 methods: - bool isLOKDesktop() - bool isLOKTablet() - bool isLOKMobilePhone() which replace the following boolean functions: - comphelper::LibreOfficeKit::isTablet - comphelper::LibreOfficeKit::::isMobilePhone Change-Id: I9b36f354278df8c216fcb90f6a9da8256ec9c1e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92689 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-29tdf#132381: Avoid XOR paint in Crop dialogArmin Le Grand (Collabora)1-11/+47
Change-Id: I9d3709f9d2a09de1eaace916dc6033de13dbff86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93048 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-28add --enable-sal-log to CPLinux-LOKit.conf to help debugging release packagesAndras Timar1-0/+1
Change-Id: Ia724186ae93038eddb9e11c6678e6d8522846f85
2020-04-28tdf#130655 added callback interface to ::applyLineDashingArmin Le Grand (Collabora)2-179/+288
This version of the tooling method allows to avoid collecting line snippets in a return value PolyPolygon. Instead, offer lambda functions to get callbacks for created snippets. The original method using a B2DPolyPolygon return value is adapted to already use this, so serves as example of usage and ensures that only one identical algorithm is used. Change-Id: Ie306968a895ad280fc2425fb40b3244769216ba0
2020-04-28lokit: scale the validation dropdown with client zoomDennis Francis1-5/+22
For zoom > 2.0 and zoom < 0.5 the scaled dropdown looks either too oversized or tiny and makes the ui look unpolished, so the zoom factor is trimmed between this range and then used to scale the validation window. Change-Id: Ic69383f273cb32670b6012f59715250dbfcf627c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92915 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-04-28lokit: trim validation dropdown height to contentDennis Francis1-1/+5
The validation dropdown looks ugly for lists with small number of items as its height is hardcoded to SC_FILTERLISTBOX_LINES(=12) * TextHeight Instead lets use the number of entries in the list to determine the height if this count is less than SC_FILTERLISTBOX_LINES Change-Id: If026140044e6665159cd616c13a2eb57356ae53f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92914 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-04-28lokit: fix validation dropdown's wrong positionDennis Francis1-0/+16
Reverse the zoom scale on the position of the dropdown before letting the vcl::FloatingWindow convert this to twips without any scale information. Without this reverse scaling, the dropdown will be incorrect due to double application of the same zoom (one in core and one in client). Change-Id: I73de12593b13e1bc9fb0514bec23c20d440d8923 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92913 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com>
2020-04-28resolved clashing of two idsPranam Lashkari3-7/+7
Multiple SvxFillAttrBox objects having the same ID 'fillattr' caused the problem in online making it hard to distinguish for different function Change-Id: Ic5a29ea75fb442d7e495761faf4a10d6ab212829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92976 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-28lok: fix the window type of the metric field controlHenry Castro3-4/+4
Change-Id: I286be638a562e3042c1c91e40cb60a9c98938360 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92796 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-28lok: add MetricFieldUIObject classHenry Castro5-0/+88
Add new action "VALUE" to set the value number for metric input controls Change-Id: I5058260c2e1562cfc6d10508d5981d185c5f2212 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92738 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com>
2020-04-28lok: fix wrong metric conversion of the metric input controlHenry Castro4-3/+20
The client side does not work well if the browser has different locale, and the input element conversion fails or change to a different value, so the value is converted to a neutral locale. Change-Id: I89f96844603a8552609d486590c7de752cb5a95c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92395 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-04-27remove macro tab for image dialog in onlinePranam Lashkari1-0/+4
Change-Id: I02de19e8048fd045a6ef6bdcc655c9911f0f9f01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92958 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-26vcl: When exporintg PDF write the correct page of embedded PDFTomaž Vajngerl2-2/+10
We can display PDF as an graphic in the document, where the PDF is treated as a vector graphic and rendered with Pdfium. When in that case we export the document as PDF, we can insert the original PDF page as an reference XObject. This workes fine, however the PDF as an graphic also contains the page number, which page should be rendered. This was not taken into account in the PDF export - it was hardcored to first page. This extends the support so it reads the page index from the graphic, and sets the correct PDF page. Change-Id: I15188ee495f9b3fcc3aa7df6f4bad4fa09903c6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92923 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-04-25resolved: page gradient reset on reopening docPranam Lashkari1-3/+9
in mobile phone Slide background set to gradient becomes black/white after reopening Change-Id: Ib579856c3df8b89c74b381f3d79870c467802848 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92830 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-24[cp] Enable MSP patchingAndras Timar7-4/+10
(cherry picked from commit ae8938f8848bcce96e21ee207c0226ff0a3cb4a2) Change-Id: I1de9776e161161daf7349be304e05d5bb959f891 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92847 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-04-23Added separate color picker for slide background gradientPranam Lashkari3-14/+37
Change-Id: I27b60244f011cb482affa5f47cde170daf3fc309 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92741 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-23resolved: Impress mobile Choosing a different type of shape fill crashesPranam Lashkari3-7/+7
Change-Id: Idd8dbba866b64089055880ffad9b5cbd9b12ca85 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92687 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-04-22sw: prefer ODF over RTF when pasting from WriterMiklos Vajna5-0/+192
Regression from commit e9e6d4b058e13165f3dde1ca7822eec97dfe8aa7 (tdf#116685: Make the RICHTEXT take precedence over EMBED_SOURCE., 2019-09-26), the problem was that now we always prefer RTF over ODF when pasting into Writer. The commit made sense for Calc->Writer paste, but it causes formatting loss for Writer -> Writer paste. The exact use-case was copy&paste of numberings where the pasted content got paragraph indent as direct formatting, so shift-tab at the paragraph start changed only the bullet type, not the indentation -- but it's easy to imagine several other cases where a roundtrip via ODF provides better results than RTF. Fix the problem by leaving the above commit in place, but extending SwTransferable::Paste() so that it prefers ODF over RTF in case of a Writer->Writer paste (and leaves the non-Writer -> Writer paste behavior unchanged to avoid the unwanted OLE objects). Conflicts: sw/Module_sw.mk sw/source/uibase/dochdl/swdtflvr.cxx Change-Id: Ida745bba65c5a210021cea0d267c02900fc6398a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92713 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-22lokit: fix edit-text/view-cursor positionDennis Francis7-37/+223
in case of views with heterogeneous zooms. 1. EditText render position fix The EditView has an 'output-area' which is used to clip the rectangle we pass to the Paint() call. It also holds on to the ScGridWindow instance where the edit started. The 'output-area' of the EditView is in the coordinates/units of the MapMode of the ScGridWindow it holds. So we need to temporarily change the MapMode and 'output-area' of the EditView in agreement to the device(with the current view's zoom settings) where we are going to paint to. After we call the Paint(), we rollback the original settings of the EditView. 2. EditViewCursor position fix Before this change the cursor position in twips (calculated based on pixel aligned cell position in the view where editing occurred) is broadcasted to all the client-views. If the clients have different zooms, then simply scaling this common cursor position in the client for its zoom is not going to be accurate enough (due to the non-linear Logic->Pixel->Logic transformation involving pixel rounding). This is very visible if you are editing far away from A1 (like Z50). The fix is to turn off this broadcast for calc-cell editing and send view specific edit-cursor invalidation messages. This is accompanied by a online.git patch that removes unnessecary broadcast of view-cursor invalidation messages which messes up things again. "Do not broadcast view-cursor invalidation messages" Change-Id: Ib2fbbe4b6f93f26fc85d6adaa8684dd4397d886f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92631 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-04-21Update git submodulesAndras Timar1-0/+0
* Update helpcontent2 from branch 'distro/collabora/cp-6.2' to 83873f5dbe4714c732c9562ca03b81d15c26250d - [cp] add info about xapian omega search and the cp-query template Change-Id: I69ca4486d6e382b35773728146c8487fff93e80b