summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2019-11-28jsdialog: rename duplicated ui object settransparencySzymon Kłos1-2/+2
We had two elements with the same name (one in the area, one in a graphic context) - that caused bottom panel in online not work correctly. Change-Id: I41b9604522157e2c31e68e40c49e42ff2ccdb280 Reviewed-on: https://gerrit.libreoffice.org/83974 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2019-11-05Add org_apache_openoffice_comp_sw_sidebar_SwPanelFactory_get_implementationTor Lillqvist1-0/+1
That was not enough to make the sidebar show up, though. Change-Id: I5b647e499d5cb06691ad312757836ad6a0cc588e
2019-10-22android: add support for 64bit buildChristian Lohmaier1-0/+15
Change-Id: Id8aae84308f6128351ae2f93c8fbc8941a0c7fc6 Reviewed-on: https://gerrit.libreoffice.org/79085 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/81225 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2019-10-22android: support NDK 19 and above (20 as of this commit)Christian Lohmaier2-25/+1
support for targeting API 14 and 15 was removed in NDK 18, so set minimum version to 16 mips support was removed in NDK 17 Clang now takes care about correct linking with libc++ shared or static, so don't manually specify them anymore. Same with __ANDROID_API_LEVEL__ define and the sysroot / isystem handling, that is all covered by a single -target <triple><version> simplifying things quite a bit. also align ownloud sdk values with main build.gradle Change-Id: Ib3ae4484e52214677e826270b731ecf7c5c15445 Reviewed-on: https://gerrit.libreoffice.org/77104 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/81223 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2019-10-17chart2: Move some headers to incMuhammet Kara1-3/+3
So that they will be accessible from inside the sidebar dir. Change-Id: Iaf7b1a800a3b35a5c497d8122f68c97c8cdc9eff Reviewed-on: https://gerrit.libreoffice.org/80922 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-09make impress sidebar work on iOS - missing PanelFactoryTomaž Vajngerl1-0/+1
add org_openoffice_comp_Draw_framework_PanelFactory_get_implementation make it build Reviewed-on: https://gerrit.libreoffice.org/80514 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 400cc072ab8498048aad7d07930e1503bb1a0406) Change-Id: I738fe4c2d08437986976eaa29483c30a5ba42e62 Reviewed-on: https://gerrit.libreoffice.org/80531 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2019-10-09Switch Android armeabi-v7a to libc++/libc++abi/libunwind tooStephan Bergmann1-11/+0
It had been left out in 4082a18406c18af7b4fcef7bd501c3679c3be56b "android: use unified headers and llvm-c++ STL (x86) with NDK 16" because "arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix that later". Making armeabi-v7a work with libc++ etc. required a number of changes, listed below, in this commit and in preceding ones. At least 32-bit x86 already worked with libc++ etc. prior to these changes in view mode, though it crashed in the experimental editing mode (enabled with strippedUIEditing in android/soruce/Makefile) as soon as one types in something, But it is not entirely clear to me why 32-bit x86 view mode didn't also fail similar to how I saw armeabi-v7a fail. (On 32-bit x86, these changes appear to neither improve nor worsen the current state, view mode still appears to work fine while editing still crashes upon typing anything. With these changes, editing mode on armeabi-v7a appears to work fine. But I tested armeabi-v7a only with a real device and 32-bit x86 only with an emulator, in case that might make a difference.) * Preceding <https://gerrit.libreoffice.org/#/c/64964/> "Move NSSLIBS to a more sensible place on the linker command line" plus this change's addition of -lunwind to the liblo-native-code.so linker command line make sure that liblo-native-code.so uses _Unwind_* functions from libunwind.a, instead of erroneously picking up the ones from libgcc.a that happen to be included in NSSLIB's nspr4 (-lgcc is automatically added to the end of the linker command line by the invoking compiler, that's how libgcc.a's _Unwind_* end up in NSSLIB's nspr4; it is neither clear to me why NSSLIB's nspr4, being a pure C library, uses _Unwind_* functions, nor why exception handling in liblo-native-code.so fails when using _Unwind_* functions from libgcc.a instead of from libunwind on armeabi-v7a, nor why that would work on 32-bit x86, but that's what I observed: ModuleManager::identify (framework/source/services/modulemanager.cxx) throws a css::lang::IllegalArgumentException, which calls __cxa_throw -> _Unwind_RaiseException, which ultimately lead to odd misbehavior and std::abort during stack unwinding when using _Unwind_RaiseException from libgcc.a instead of from libunwind). (There is no libunwind.* in android-ndk-r16b for 32-bit x86 at least, so is presumably using _Unwind_* functions from libgcc.a. It doesn't appear to make a difference if it indirectly uses those _Unwind_* functions from NSSLIB's nspr4, or directly from libgcc.a included in liblo-native-code.so if the $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) had a ",-lgcc" else branch.) * Preceding <https://gerrit.libreoffice.org/#/c/64965/> "Export RTTI symbols from liblo-native-code.so, for binary UNO bridge" makes sure that excpetions thrown from the binary UNO bridge can be caught by compiled catch clauses. Not sure why the corresponding state of bridges/source/cpp_uno/gcc3_linux_intel shouldn't have run into the same issue. * Preceding <https://gerrit.libreoffice.org/#/c/64966/> "Adapt gcc3_linux_arm __cxa_exception to NDK 18 libc++abi" makes sure that our version of __cxa_exception matches the version from libc++abi. This is clearly not relevant for 32-bit x86. (The comment there android-ndk-r18b, but the additional member is already present in android-ndk-r16b/sources/cxx-stl/llvm-libc++abi/src/cxa_exception.hpp, too.) The remainder of this change just drops old armeabi-v7a--specific workarounds that are no longer needed/no longer work. Change-Id: Ief4c2d562c5032abe6c3b94ca3b3394be6fcd4d3 Reviewed-on: https://gerrit.libreoffice.org/64973 Tested-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/80265 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-10-09postprocess: Some .svg images were missing previously.Jan Holesovsky1-8/+6
Change-Id: I6c42b1f94f6510e42049bc7c7fc040f17e6edae6 Reviewed-on: https://gerrit.libreoffice.org/66773 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/80259 Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-09-24use packagerevision for rpm, tooAndras Timar1-1/+1
Change-Id: I8e1431e8db870c2782f22f8450b97cef180f1e33
2019-09-22Replace remaining occurrences of LIBO_HEADLESS with HAVE_FEATURE_UIAndras Timar1-5/+0
Change-Id: Ie2b04ee443dece851d3d96afbc932aa64369c75c Reviewed-on: https://gerrit.libreoffice.org/79084 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-20Add css_comp_Impress_oox_PowerPointExportTor Lillqvist1-0/+2
Change-Id: I17d95cce0dd69e2ba8b4ebc7045544fc5659a249 (cherry picked from commit df91a0f2b3adad089982a07d80acddae17ba41c4) Reviewed-on: https://gerrit.libreoffice.org/79240 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20tdf#124364: Add some missing components from chart2, svtools, and xmloffTor Lillqvist1-0/+4
Change-Id: Ie9efd1c5b4f5f6ffa66215df27a78027ba0dea39 Reviewed-on: https://gerrit.libreoffice.org/79238 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20Add the Visio import filter constructorTor Lillqvist1-0/+2
Change-Id: I6f1ebf18e0565862703bcd4291f2705c8a605de0 (cherry picked from commit 8644530b7eb5e7d136a7d87b475baaa62756b109) Reviewed-on: https://gerrit.libreoffice.org/79237 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20The proxyfac component seems to be neededTor Lillqvist1-0/+1
Change-Id: Ib6ab095ea5c4b4a01afad5510208ad352dea5d76 Reviewed-on: https://gerrit.libreoffice.org/79216 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20tdf#124360: The cui component is needed in the iOS appTor Lillqvist1-0/+1
Used at least in the Edit > Edit Style... > Area > Color dialog for the Pick button.. Change-Id: I864ec5918482a2f8ee5c5d80b79eacd6e8fcd88e Reviewed-on: https://gerrit.libreoffice.org/79204 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-20tdf#124168: The libctllo.a is needed in the iOS app for ToCTor Lillqvist1-0/+1
After I added the share/template folder, the app then turns out to need this UNO component. Change-Id: I877dd8c730f49477e20c58515ee80bafdafaa6b7 Reviewed-on: https://gerrit.libreoffice.org/79188 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Add more missing constructors from chart2/source/chartcore.componentTor Lillqvist1-0/+14
I think it would be better if native-code.py parsed the .component files it is interested in and just copied the constructor names from them to its output? Or are there many cases where it is a carefully manually selected subset of constructors from some .component file that should be put in the generated native-code.h, not all? But even in that case, if some constructor should not be linked in to a mobile app, that could be handled by adding some specific attribute in the .component file. Change-Id: Ib947279610f6755f112d3571512406c5d0cd620d Reviewed-on: https://gerrit.libreoffice.org/79144 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19We need CartesianCoordinateSystem2d for chartsTor Lillqvist1-0/+1
Change-Id: I3edccbe29129f6d60a4ac4627a0ab646e4e42458 (cherry picked from commit 9bc20ed5e4338985d21542403cefaf3141fd481f) (cherry picked from commit 74ffc91e19e6a371c6279ad7a8b36ac441bbb0b1) Reviewed-on: https://gerrit.libreoffice.org/79143 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Add AnyCompareFactory_get_implementation and...Tor Lillqvist1-0/+2
... com_sun_star_comp_util_OfficeInstallationDirectories. Needed when loading a .ott document. Change-Id: I6074869074b47d2fb679132975520b18659b5c67 (cherry picked from commit f0b83878c2781ab6aa24bd5995155850920f4339) (cherry picked from commit dacb97ecdd623d033fdd475131e3c7dc87c17f52) Reviewed-on: https://gerrit.libreoffice.org/79138 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19We need svt, too, in the iOS app, for the image insertion featureTor Lillqvist1-0/+1
Change-Id: I5a656ab159eec44a537fc22da03763913372bc8f Reviewed-on: https://gerrit.libreoffice.org/79136 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-19Use the same solenv/bin/ooinstall as in the cp-5.3 branchTor Lillqvist1-1/+4
Specifically, pass the correct product name and not a hardcoded "LibreOffice" for the make_installer.pl script's -p option. As such, instsetoo_native/util/openoffice.lst.in hardcodes the product name as "CollaboraOffice" so we could as well do that also in ooinstall. (cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96) Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5 Reviewed-on: https://gerrit.libreoffice.org/55640 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4) Reviewed-on: https://gerrit.libreoffice.org/79128 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-18add OpenDyslexic fontAndras Timar1-0/+6
Change-Id: Ib05a6d6418563fd9333821594f0aca5ab724f3e8 Reviewed-on: https://gerrit.libreoffice.org/79099 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-16Take MsiMsp.Exe from Windows SDK 7.1AAndras Timar1-1/+1
Change-Id: I68914ca86fa9cabaac3ce28d9aa870a522cdb2da Reviewed-on: https://gerrit.libreoffice.org/78988 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-16Revert "We need UNO components from libmswordlo.a"Tor Lillqvist1-1/+0
Nah. We already have com_sun_star_comp_Writer_DocxExport_get_implementation as it is called in this branch. This reverts commit 98deb6e96f547e8eedff40c992fefe3514021447. Change-Id: Ic5db66420db9ef2477df8d9905ba3525f3b57e5b Reviewed-on: https://gerrit.libreoffice.org/79010 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-09-16We need UNO components from libmswordlo.aTor Lillqvist1-0/+1
They are needed for .docx and .rtf export at least. No idea how we have managed without it previously. Change-Id: Iff9224f92520e19d9baa691a9e7cd3c944004eed Reviewed-on: https://gerrit.libreoffice.org/78125 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 1a0bd0c6914bf93733c7ab3a27741fc1dc0e3f26) Reviewed-on: https://gerrit.libreoffice.org/78996
2019-09-03Added mobile friendly ui design for ConditionalFormattingDialogmerttumer1-0/+20
[ Miklos: added solenv/ bits to silence the same warnings as the non-mobile layout. ] (cherry picked from commit d2b4b608696e7a6ba7ed15c97972aa8ed3707bb2) Conflicts: sc/source/ui/condformat/condformatdlg.cxx sc/source/ui/condformat/condformatdlgentry.cxx solenv/sanitizers/ui/modules/scalc.suppr Change-Id: If2d91da45cf5eecf099f246320ffaf84f55708f1 Reviewed-on: https://gerrit.libreoffice.org/78307 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-03upload libvisio 0.1.7David Tardon1-3/+3
Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033 Reviewed-on: https://gerrit.libreoffice.org/77640 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/77885 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/78426 Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-03upload libabw 0.1.3David Tardon1-3/+3
Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951 Reviewed-on: https://gerrit.libreoffice.org/77639 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/77884 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/78425 Tested-by: Andras Timar <andras.timar@collabora.com>
2019-09-03android: Add the sidebar-related constructors to liblo-native-code.so.Jan Holesovsky1-0/+6
Change-Id: I25acb8965d190fc443d75357352e4d02c9b03cc2 Reviewed-on: https://gerrit.libreoffice.org/74265 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 05eca1ba63a2eca5e6d6be0b7a05bb6f53354ec6) Reviewed-on: https://gerrit.libreoffice.org/78449
2019-08-29tdf#124155 change "gradient tab page" - increment & angle sliderTomaž Vajngerl1-0/+1
Remove slider for increments as the increments should better be left to "auto" and rarely modified (setting a value means it will use a limitied amount of increments, but auto effectively means as much as it is needed and can use the native backend for drawing). OTOH use a slider for setting the "angle" as it is already present in hatch tab page. Angle needs a slider as it is usually one of the main properties of a gradient (especially linear). Increase the tab pages a bit (10px on every side) to have a bit of breating space for all the widgets. Reviewed-on: https://gerrit.libreoffice.org/70175 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 994b41a6c69d20637dcb95894c385f5c0102d600) Change-Id: I66167fe2c97b53bc3627237279332bdd59fb03d7
2019-08-13Add the guesslang component (to apps) in case it is essentialTor Lillqvist1-0/+1
(I saw warnings about it missing in the iOS app.) Change-Id: Ib286b107e529e80ec36ffb87059f4f5923867abe Reviewed-on: https://gerrit.libreoffice.org/77399 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-08-12tdf#124172: Use the MacOSXSpell library on iOS, tooTor Lillqvist1-1/+2
The code needed just a small amount of ifdefs to use UITextChecker on iOS instead of NSSpellChecker. Change-Id: I19edfffd3cc317a79beacc0b94668a6fd5ea3b32 Reviewed-on: https://gerrit.libreoffice.org/77357 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2019-08-12The FormattedField and GalleryPreview custom widgets are apparently goneTor Lillqvist1-2/+0
Change-Id: I47497ed29603853aad5a75f3779df32a9f32187f Reviewed-on: https://gerrit.libreoffice.org/77329 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2019-08-05desktop: turn on clang-format for lokclipboardMiklos Vajna1-2/+0
This had manual consistent formatting. Recently it was broken, so bring back consisency by using clang-format. Change-Id: If4303e379ddc77e5190f8e8e42737b4f7d680a71 Reviewed-on: https://gerrit.libreoffice.org/71857 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2019-07-11SmartArt: all visitors follow data presentation nodesGrzegorz Araminowicz1-0/+2
* visitors now are keeping track of current presentation node instead of looking it up by name * extracted visitor base class that follows if/else and for-each nodes * moved condition logic from ConditionAtom to visitor, as it depends on visitor state Change-Id: Iede86cd74a6098f2398a77b6cb3e9c6272dbfe4b Reviewed-on: https://gerrit.libreoffice.org/74732 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/75390 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Grzegorz Araminowicz <grzegorz.araminowicz@collabora.com>
2019-07-09Small fixes on autoredactdialog.uiMuhammet Kara1-2/+0
Change-Id: I14d8883d8a0bcba02327395a17bc56978649de4b Reviewed-on: https://gerrit.libreoffice.org/74374 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> (cherry picked from commit 8f324c74c134101c2fba64c3041a1438aba42c61) Reviewed-on: https://gerrit.libreoffice.org/74376 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-06-20Make spsupp*.dll usable on 64-bit WindowsMike Kaganski1-0/+1
Build spsupp for both x64 and x86, regardless of target platform. This allows to install the ActiveX component to be used by both 64-bit and 32-bit applications on 64-bit systems (especially IE, which runs both 64-bit and 32-bit processes simultaneously at least on Win10), no matter which LO (32/64) was installed. Move the DLLs from activex feature to ooo, to copy unconditionally. Registration of LO-specific component will be also unconditional; registration of replacement of MSO component will need own feature. This doesn't yet register the component in system: TODO later. Change-Id: Iccf5e73dfae306cb777f844d40611e23c4520a13 Reviewed-on: https://gerrit.libreoffice.org/71925 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/74410
2019-06-20Drop LINK_X64_BINARY: any MSVC linker is suitable for any target platformMike Kaganski1-2/+2
Change-Id: I8b080ad44f10e52fa5a726bd7cdf7dd8ff7e2dd4 Reviewed-on: https://gerrit.libreoffice.org/71913 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 0c0e73584f125025fb17d6be8f8050f3b7649c7d) Reviewed-on: https://gerrit.libreoffice.org/74413 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-06-20tdf#114635: reimplement TWAIN-based scan using 32-bit shim on WindowsMike Kaganski3-3/+20
Since TWAIN is only actually available as 32-bit component on Windows, to use it in a 64-bit program, we need a 32-bit shim program that does all actual communication with TWAIN subsystem. This change reimplements TWAIN implementation to be a separate 32-bit process. Image is transfered from the shim to main program using file mapping API. This reverts most of commit 585d9806961342e95f7318fb947bd31e9f86dee0. 64-bit LibreOffice doesn't bundle TWAIN DSM library now. TWAIN DSM source code is still used for TWAIN headers. Change-Id: I46f178ad36acd97a9eff156624b99036fcbb83f8 Reviewed-on: https://gerrit.libreoffice.org/65688 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/74415 Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-06-20Make spsupp_x64 independent of shell/CustomTarget_x64Mike Kaganski2-3/+2
... in preparation for further changes. Thanks to Noel Grandin for the hint! Change-Id: I2b223322d1d42099b56a74a92e3c39631d6b581c Reviewed-on: https://gerrit.libreoffice.org/72470 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/72501 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit d35eec7b26c7807092b78144b6c71639b9439612) Reviewed-on: https://gerrit.libreoffice.org/74406
2019-06-17Auto redaction dialog first iterationMuhammet Kara1-0/+2
* Add the uno command .uno:AutoRedact with the name 'Auto-Redact' * Add the dialog SfxAutoRedactDialog * Implement the basic functionality to show up when clicked on the menu/toolbar item. * Add the class TargetsTable to control the weld::TreeView which is used to list the targets * Add the struct RedactionTarget to keep info for individual targets Change-Id: Ic02dfb009590c0928a2ea7b0f8b19b4febca221a Reviewed-on: https://gerrit.libreoffice.org/72254 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/74226 Tested-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-06-15Restore original $licensepath of the optional EULA of MSI packageAndras Timar1-1/+1
Change-Id: If80ac5648f50deda7a16bc6661ced31357958d67 Reviewed-on: https://gerrit.libreoffice.org/70037 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2019-06-15single source file for licensing info with conditional textTamas Bunth1-1/+1
... for easier maintenance. This commit only introduces the framework. Follow up commits will update the license file. Advantages: * single source, multiple outputs (html, txt) * conditional text, i.e. output will not include license terms of components that are not configured in the build Change-Id: I0ffad41119228a0a26fd1b6ce19930ca6085adb2 Reviewed-on: https://gerrit.libreoffice.org/69396 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-06-15MSP: add System64 folder pathAndras Timar1-0/+1
Change-Id: I5dba3dfb3a68d33608f2c2a7db026063063982ec
2019-06-15Collabora Office OS X packagingAndras Timar2-7/+11
- added EULA (sla.r) in special OS X resource fork format - added volume icon which does not work ATM, TODO later - new dmg background image and adjusted .DS_Store - fixes to tolerate space in app bundle name Change-Id: Ia855d7d677136de951c2b9b31ee8d5583475dd41
2019-06-15hack to fix an MSP creation errorAndras Timar1-0/+2
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c (cherry picked from commit ded9e51fda12d01e381a5353e6ee412ec89548ff) (cherry picked from commit 07d93f57b99c077d6b3062ddafea56e021122111)
2019-06-15Collabora Office brandingAndras Timar2-2/+2
(cherry picked from commit c276d5ba1491dc237812cdf3d877a4ecec2ee1dc) (cherry picked from commit c085f9176bda7bad0234d0087ff87f27086fc333) Change-Id: I9e79c07aa3cbb70076d9bab07294062df4be02c6
2019-06-15Collabora Office EULAAndras Timar1-1/+1
Change-Id: Ia380db465f5094216cb36526f6cc178043376356
2019-05-22Add content_rating to AppData filesStephan Bergmann1-0/+1
At least building on Flathub makes presence of this information a hard requirement now (see <https://blogs.gnome.org/hughsie/2019/03/28/ new-appstream-validation-requirements/> and witness the failed <https://flathub.org/builds/#/builders/32/builds/3597>). The suggested way to calculate that information is via the form at <https://hughsie.github.io/oars/generate.html>, which I filled in as follows (the answers I selected are prefixed with "=>"): > By answering all the questions you can generate AppStream-compatible markup > for the upstream AppData file. > > If the user is able to "enable" NSFW or "adult" content, then this should be > included in the assessment even if it is turned off by default. > > What type of component are you generating content for: => Application that can connect to the Internet > OARS has multiple versions, and the newer versions include more questions > involving specific cultural and religious sensitivities. What version of OARS > metadata do you want to produce: => 1.0 (works with all clients) > Advertising > > Defined as the activity of producing advertisements for commercial products or > services. > > For example, this would include banners showing the Coca-Cola logo shown in a > Soccer game. => None > Gambling > > Defined as taking a risky action in the hope of a desired result. > > For example, this would include spinning a wheel to get in-app credits. => None > In-App Purchases > > Defined as items or points that a user can buy for use within a virtual world > to improve a character or enhance the playing experience. => None > Online Text-only Messaging > > Defined as any messaging system connected to the Internet. => None > Online Audio and Video Messaging > > Defined as any multimedia messaging system connected to the Internet. => None > Contact Details > > Defined as sharing identifiable details with other users to allow out-of-band > communication. => None > Information Sharing > > Defined as sharing information with a legal entity typically used for > advertising or for sending back diagnostic data. > > For example, this would include sending your purchasing history to Amazon. => None > Location Sharing > > Defined as sharing your physical real-time location. > > For example, this would include uploading the GPS co-ordinates of your current > location. NOTE: This does not include heuristic based location services, e.g. > GeoIP and others. => None > The following markup can be pasted into the existing application AppData file. > > <content_rating type="oars-1.0" /> Change-Id: I063484d8031892c20f88999c5a9beeae3666511c Reviewed-on: https://gerrit.libreoffice.org/72581 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0a13609598138a856e552ca3f35ea2d6fa433865) Reviewed-on: https://gerrit.libreoffice.org/72667 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-05-03Support "Preview in Web Browser" in Flatpak modeStephan Bergmann1-0/+2
...by storing the temporary HTML document in a location that can be accessed by the browser running outside the Flatpak sandbox. This reuses and extends the mechanism already in place for the new HTML-based help in Flatpak mode (see 72b936d70b7eaa6d9f5f911b27e3c955382de967 "Enable --help=html for flatpak"). This fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/85> "“Preview in Web Browser” does not work in Flatpak version". Change-Id: I5f73fd89139ffe6b8ab0dc501154b4f054a0ae5c Reviewed-on: https://gerrit.libreoffice.org/71570 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c61e7b9940cb30800d6f1000727f9cfd5de9fa5e) Reviewed-on: https://gerrit.libreoffice.org/71717 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>