summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-14weld PageSizePopupCaolán McNamara
Change-Id: I989e2a6337f368ec388290f1e4af329865af9ec7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86749 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14loplugin:finalclasses in ooxNoel Grandin
Change-Id: I5d69ed1ba551a51b3a8124d5b9f0e565023e7404 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86743 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-14tdf#128226: make OpenSymbol font an internal resourceMike Kaganski
OpenSymbol is crucial for Math; so it is not just some font that could be used if present, but part of program resources. As such, it must be available with other program resources, and not depend on user preferences, like uninstallation of the font from system. This patch puts it into program/resource/common/fonts, and adds that path to the paths used for private fonts. This is in addition to share/fonts/truetype, which is optional, and is usually absent on most Linux and Windows installations (on Linux, it is usually in a separate package installing it to system fonts; on Windows, it is also installed to system by MSI). Change-Id: Ibf5e12e70dacb62b965035645fc53e9d83cd8793 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86649 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Rene Engelhard <rene@debian.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-14loplugin:finalclasses in basic..emfioNoel Grandin
Change-Id: I1b0df1a6cb5b8db9db09cb1d55d932459ab16d81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86741 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-14rework PageSizePopup to be a PopupWindowControllerCaolán McNamara
Change-Id: Ib8a0acbceca607b0820437d66e18c7cd8c16904e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86748 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14remove some unneeded includesCaolán McNamara
Change-Id: I798230983b612ee2b9a0f6cc17751a3a5d703e9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86744 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14AbstractSvxHlinkDlgMarkWnd is unusedNoel Grandin
since commit 74713b34a36577f19eb3194246de73fa4f2bb741 Date: Wed May 25 09:05:21 2016 +0200 loplugin:unusedmethods Change-Id: I0c70c169fff9e377688483c65ca6beb67ff06046 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86739 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-14remove some unneeded includesCaolán McNamara
Change-Id: Ic7add88f04fb53960c4d76414fb655cb4e5040b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86745 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14fix Skia CPU instruction set support (tdf#129546)Luboš Luňák
It was a mistake to compile the SkOpts.cpp file with the highest CPU set available. I got confused by what SK_CPU_SSE_LEVEL means. That setting is the lowest set supported, so we should leave it at whatever Skia's SkPreConfig.h detects it to be from the actual compiler flags (the ones used for building everything). SkOpts::init() does runtime checks only for sets _lower_ than what SK_CPU_SSE_LEVEL says, so by compiling the file with the highest set all these runtime checks got disabled and it was assumed that the set defined by SK_CPU_SSE_LEVEL is always available. Change-Id: I839370645a9cafbede2d37017b9332cc739fc317 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86682 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-01-14SvxCharViewControl is newly unusedCaolán McNamara
Change-Id: I8319f6498b6c2adf74c94c76d78aa02cabc01c64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86689 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14weld SfxCharmapCtrlCaolán McNamara
Change-Id: I36bb2d1b23fdb5afa4e5ab85e6989a95474e874e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86678 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14rework SfxCharmapCtrl to be a PopupWindowControllerCaolán McNamara
With MSVC, the changes to include/sfx2/charmappopup.hxx would cause spurious > isvt.lib(svtlo.dll) : error LNK2005: "public: virtual class com::sun::star::uno::Any __cdecl cppu::ImplInheritanceHelper<class svt::ToolboxController,class com::sun::star::lang::XServiceInfo>::queryInterface(class com::sun::star::uno::Type const &)" (?queryInterface@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z) already defined in classificationcontroller.o > isvt.lib(svtlo.dll) : error LNK2005: "public: virtual void __cdecl cppu::ImplInheritanceHelper<class svt::ToolboxController,class com::sun::star::lang::XServiceInfo>::acquire(void)" (?acquire@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAAXXZ) already defined in classificationcontroller.o > isvt.lib(svtlo.dll) : error LNK2005: "public: virtual void __cdecl cppu::ImplInheritanceHelper<class svt::ToolboxController,class com::sun::star::lang::XServiceInfo>::release(void)" (?release@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAAXXZ) already defined in classificationcontroller.o when linking Library_sfx (and which appears to be unrelated to the (implicit) /INCREMENTAL since 9739c37d8ad7c6fca269709674a6975fa7ebd191 "enable incremental linking on windows"), which requires the HACK in include/svtools/popupwindowcontroller.hxx. Change-Id: I74c4318e6216001f18d0cf5ed63e78ba2ab13cd3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86664 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14[pt_PT] Added 15 words to autocorrectMarco A.G.Pinto
Change-Id: I0d7c606581c00588334c628419e5a1fff09f1c40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86735 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-01-14tdf#128304 export TB_RL writing mode as eaVirtMark Hung
and import eaVirt to TextWritingMode instead of TextPreRotateAngle (-90) degree of CustomShapeGeometry. CJK text in TB_RL writing mode are upright in Writer. It corresponds to eaVirt by its defintion. Change-Id: I2a8bc6676ad6af06b06e023adaa2f201a028d426 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86637 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-14tdf#42949 Fix IWYU warnings in connectivity/*/*cxxGabor Kelemen
Except for platform specific drivers/ado and drivers/macab dirs Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I24b741cded8995e29ac3d518aeaa0d60b3c55b56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86317 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-14Silence -Werror,-Wdeprecated-declarations for nowNoel Grandin
...as seen with qt5 5.13.2-1.fc31 /home/noel/libo2/vcl/qt5/Qt5System.cxx:18:83: error: 'screenCount' is deprecated: Use QGuiApplication::screens() [-Werror,-Wdeprecated-declarations] ^ /home/noel/libo2/vcl/qt5/Qt5System.cxx:22:44: error: 'screenGeometry' is deprecated: Use QGuiApplication::screens() [-Werror,-Wdeprecated-declarations] QRect qRect = QApplication::desktop()->screenGeometry(nScreen); ^ Change-Id: I73385b56f58284fedf5acbfb914177e06f3512d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86736 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-14crashtesting: libstaroffice should use sender-lastname not send-lastnameCaolán McNamara
https://github.com/fosnola/libstaroffice/pull/7 Change-Id: Id4fe0bd016cf57d1b48055775d03cfc859ac557b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86715 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14ofz#20066 TimeoutCaolán McNamara
Change-Id: Idd0ac51279c99e17c6f890096c7b6daf1b1802ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86703 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-14tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctorMesut Çifci
Change-Id: I42b59c9d22edb987c55aace700934fdab95f83f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86719 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-01-14Related tdf#129836 - Alphabetize styles in the footnotes/endnotes dialogHeiko Tietze
Page and paragraph dropdowns were missing in Ie9bc4f63412dabd6032f0a9b7225384823f2f39a Change-Id: Ied25eeb1360718315190104213172da594e4b05c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86666 Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-01-14Related: tdf#127782 resize the print dialog to its optimum size...Caolán McNamara
after expander is activated Change-Id: I3f87243f0502829e048173987c8998898d351adf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86575 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-01-14Resolves tdf#127782 - New Print dialog is too highHeiko Tietze
Expander added Change-Id: Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86478 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-01-14pdf export dialog update general tab alignment updateandreas kainz
Change-Id: I78dd99e3ca79322553b7bf1788f628a3e0aba305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86720 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2020-01-14tdf#129516 DOCX import: fix incorrect z-order with textboxesMiklos Vajna
Commit 3272c1eb5563f3bda2caa24f32b1018372622109 (related tdf#100074: prepare group shapes text input via writerfilter, 2018-10-01) tweaked the oox code, so that later it'll be able to call back to writerfilter to parse group shape text. That makes sense, but it also removed the reset of the group shape context, which means that two subsequent group shapes are now imported as a single group shape with a merged child list. Reset the group shape context again when writerfilter asks for the XShape from oox. If this causes a problem for the above scenario later, then it could be considered to handle this in ShapeContextHandler::endFastElement(). Change-Id: I14f7f0bab2c66c8430313d5b2daffe3160a58c27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86712 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-14loplugin:finalclasses in i18npool..linguisticNoel Grandin
Change-Id: Ib903fb2fdb4c4c25f73053065b828dade8b63785 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86687 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-14use FastParser in reportdesignNoel Grandin
Change-Id: Ib012e7c814184eaeaab57200107e8bf4887058f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86707 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-14Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to 5a44291fac8fe16731bf0dff05ed40ae582f3461 - Signature lines are for text and spreadsheets Remove reference to Writer in signature line Help pages Change-Id: I8f454c67277af2236bf52bb290fcd5d606093a45 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86722 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-01-13tdf#129930: Dispose SystemClipboard service early enoughStephan Bergmann
At least on Windows, the related CMtaOleClipboard::m_hClipboardChangedNotifierThread thread would otherwise still run during cppuhelper::ServiceManager::disposing (but could try to create other UNO services, which then throws a DeploymentException). (There is also a GetSystemPrimarySelection similar to GetSystemClipboard in include/vcl/transfer.hxx, which might or might not turn out to have a similar issue.) Change-Id: Ia64e708cf0578e3a127c1a56fbace577ecf4ee1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86558 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-01-13crashtesting: downgrade assert to a warningCaolán McNamara
its asserts since... commit 5291c3ef56948a91166a597033f3e48e00d57403 Date: Sun Dec 1 05:41:43 2019 +1100 tdf#43157 basegfx: remove OSL_ENSURE preconditions on e.g. export of tdf12500-2.wmf to odg but its unclear what a fix might look like Change-Id: I26c1b1426a0d5ca7f25ca69cf1b720fe3344ce69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86714 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13sw reqif-xhtml export: fix non-well-formed output on Chinese textMiklos Vajna
And also search for the '"<" OOO_something' pattern, and fix up all cases where we forgot to call GetNamespace() when opening an element. Change-Id: I015e807c1ad0f96c7c4aaa97f7f61ae134cf3754 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86701 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-01-13remove some unneeded includesCaolán McNamara
Change-Id: I6d9cde8f8dad5be52e79946b4d0ec12989bb9ee3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86696 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13mobile: escape JSON for function wizard, and emit only on mobile.Michael Meeks
Otherwise typing "-> wa" into a cell gives JS exceptions. Change-Id: I5303186fe9f84e055d65cf1929ccf5a7a20cae35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86706 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2020-01-13tdf#129360: fix old unsigned underflowMike Kaganski
... discovered thanks to 62f3f3d92aa204eaaa063b30d7ade44df501b997: properties count may be 0, and unconditionally subtracting 3 from that will give a big number. Previously this was masked by a "Very Hot Fix" in SbxArray::GetRef that was dropped in the said commit. This unifies property count correction in the two places that use it: in WatchTreeListBox::RequestingChildren, where it was correct, and in WatchTreeListBox::UpdateWatches, where underflow happened. Change-Id: Ie980bc9571b2555cc2f643e770d824d5e2eb3731 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86700 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-01-13weld TextUnderlineControlCaolán McNamara
Change-Id: I9ebf3b1e9c4509c0568d26370d5a97c5c60baedd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86699 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13rework TextUnderlinePopup to be a PopupWindowControllerCaolán McNamara
Change-Id: I149777b827dd00e00e62b461836122861864f829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86697 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13weld TextCharacterSpacingControlCaolán McNamara
Change-Id: Id0789c8c590a120efa8585d45fe7f5cdb0077cbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86694 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13rework TextCharacterSpacingPopup to be a PopupWindowControllerCaolán McNamara
Change-Id: I3db8f93b99157f7ee8d6095f7dfc5c2b2e6890e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86690 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13rename NumValueSet back to SvxNumValueSetCaolán McNamara
Change-Id: I05cd8e336f818e80de40abb40cf739a7cbb540d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86665 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13update rotation immediately in sidebarCaolán McNamara
Change-Id: I7e44c3010bf44dca9c97548e040edf3af3573c43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86674 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13AbstractSvxMessDialog is unusedNoel Grandin
since commit 74713b34a36577f19eb3194246de73fa4f2bb741 Date: Wed May 25 09:05:21 2016 +0200 loplugin:unusedmethods Change-Id: I3605b189f6bd5264ead91e02c2a018a3dd5e1e98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86688 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-13tdf#129655 Sync TextWritingMode to frame direction.Mark Hung
Sync the text writing mode of a shape to the frame direction of the attached text box ( a text frame ). Change-Id: Ied9ff1a1d0f53d7ef78a83a086af0a2c1ca5eb36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86638 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-13tdf#129908 Crash at Data > Group and outlone > AutoOutlineNoel Grandin
regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa tdf#50916 Makes numbers of columns dynamic. Change-Id: Ie0eff58c7db5a3c85cfea480ca1fea5767fd8cfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86683 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-13loplugin:finalclasses in package..sfx2Noel Grandin
Change-Id: I2908abc13f16b0011fcb326e8405080cc30df74a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86684 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-13use FastParser in chart2Noel Grandin
Change-Id: I98e8649bdfd2ceb556621a8b2c3c3a29bfaf7498 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86677 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-13ofz#20051 if duplicate exists then m_ObjToRecMap points to deleted elementCaolán McNamara
Change-Id: I854410ba1d5c0a622b5ba9c6816a24a3477e5089 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86681 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-13tdf#75280 Convert inappropriate use of sal_uIntPtr to better integer typesYusuf Keten
Change-Id: Ia45fb0bc882411fe0bfcd1e83932d187b4873ab0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86214 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-01-13convert this warning to SAL_INFO for nowNoel Grandin
too noisy until I've done more conversion Change-Id: I1afe653683f12edc4516a40f609e6c1dc749c9e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86676 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-13convert dbaccess to FastParser APIsNoel Grandin
Noting that I use "& TOKEN_MASK" a lot because we can be dealing with either NAMESPACE_DB or NAMESPACE_DB_OASIS. Change-Id: I5ca0aac61e37dc903bb998a43b73b48df22e55fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86655 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-01-13Silence -Werror,-Wdeprecated-declarations for nowStephan Bergmann
...as seen with qt5-qtbase-devel-5.13.2-1.fc31.x86_64: > vcl/qt5/Qt5Frame.cxx:481:73: error: 'screenGeometry' is deprecated: Use QGuiApplication::screens() [-Werror,-Wdeprecated-declarations] > toSize(pScreen ? pScreen->size() : QApplication::desktop()->screenGeometry(0).size())); > ^ > /usr/include/qt5/QtWidgets/qdesktopwidget.h:79:5: note: 'screenGeometry' has been explicitly marked deprecated here > QT_DEPRECATED_X("Use QGuiApplication::screens()") const QRect screenGeometry(int screen = -1) const; > ^ [...] > vcl/qt5/Qt5Frame.cxx:490:56: error: 'screenNumber' is deprecated: Use QGuiApplication::screenAt() [-Werror,-Wdeprecated-declarations] > int nLeftScreen = QApplication::desktop()->screenNumber(QPoint(0, 0)); > ^ > /usr/include/qt5/QtWidgets/qdesktopwidget.h:75:5: note: 'screenNumber' has been explicitly marked deprecated here > QT_DEPRECATED_X("Use QGuiApplication::screenAt()") int screenNumber(const QPoint &) const; > ^ [...] Change-Id: I7db00ee0e7cd7f652af4f7426f9ea0172206d485 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86660 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-01-13Merge both x64 and x86 CRT merge modules into x64 MSIMike Kaganski
... because it contains x86 binaries in addition to x64: e.g., twain32shim, spsupp_x86. The opposite (inclusion of x64 MSM into x86 MSI) is not possible ( see https://stackoverflow.com/questions/58181986 ), so do it just for x64 MSI. And fix inclusion of CRT MSMs in VS2019, which were detected in configure.ac, but not used in scp2/source/ooo/vc_redist.scp. Change-Id: I3935fce751b1b6d04291fede6b82be25fe541582 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86667 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
generated by cgit (git 2.34.1) at 2024-07-19 22:58:19 +0000