diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-14 12:06:08 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-14 19:32:31 +0200 |
| commit | 580e7bee057c7f865df777bdff6a7fedfb13076d (patch) | |
| tree | a7adfb2ec302374414ae1cf984c837f432344536 /svx | |
| parent | d8bb5bb58ef62bc0e32d17f00f5fe695c81b5606 (diff) | |
Workaround internal compiler error on tb77
As reported in https://ci.libreoffice.org/job/gerrit_windows/98360/console :
C:/cygwin/home/tdf/jenkins/workspace/gerrit_windows/svx/source/svdraw/svdedxv.cxx(2639): fatal error C1001: Internal compiler error.
(compiler file 'msc1.cpp', line 1591)
To work around this problem, try simplifying or changing the program near the locations listed above.
If possible please provide a repro here: https://developercommunity.visualstudio.com
Please choose the Technical Support command on the Visual C++
Help menu, or open the Technical Support help file for more information
C:/cygwin/home/tdf/jenkins/workspace/gerrit_windows/svx/source/svdraw/svdedxv.cxx(2631): note: while evaluating constexpr function 'svl::ItemsArray'
INTERNAL COMPILER ERROR in 'C:\PROGRA~2\MIB055~1\2019\COMMUN~1\VC\Tools\MSVC\1427~1.291\bin\Hostx64\x86\cl.exe'
Please choose the Technical Support command on the Visual C++
Help menu, or open the Technical Support help file for more information
tb77 uses VS 16.7.7 (cl.exe is under Tools/MSVC/14.27.29110); tb68 with
cl.exe under Tools/MSVC/14.28.29910 has no problems compiling this.
Let's make the code simple for now, until we upgrade the tooling on CI.
Change-Id: I10aaf289454c89b2f49b4be947627a9a3be30fde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117137
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 90cb57eb53e28ecb983001bf8f018577abb6d145)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117125
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 1bf140367ac1..7dac2e2dfb7a 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2629,21 +2629,18 @@ bool SdrObjEditView::SupportsFormatPaintbrush(SdrInventor nObjectInventor, static const sal_uInt16* GetFormatRangeImpl(bool bTextOnly) { - static constexpr auto gFull - = svl::ItemsArray({ { XATTR_LINE_FIRST, XATTR_LINE_LAST }, - { XATTR_FILL_FIRST, XATTRSET_FILL }, - { SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST }, - { SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST }, // table cell formats - { SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST }, - { SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST }, - { EE_PARA_START, EE_PARA_END }, - { EE_CHAR_START, EE_CHAR_END } }); - - static constexpr auto gTextOnly = svl::ItemsArray({ { SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST }, - { EE_PARA_START, EE_PARA_END }, - { EE_CHAR_START, EE_CHAR_END } }); - - return bTextOnly ? gTextOnly.data() : gFull.data(); + static const sal_uInt16 gFull[] + = { XATTR_LINE_FIRST, XATTR_LINE_LAST, XATTR_FILL_FIRST, + XATTRSET_FILL, SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, + SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, // table cell formats + SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST, + SDRATTR_TABLE_LAST, EE_PARA_START, EE_PARA_END, + EE_CHAR_START, EE_CHAR_END }; + + static const sal_uInt16 gTextOnly[] = { SDRATTR_MISC_FIRST, SDRATTR_MISC_LAST, EE_PARA_START, + EE_PARA_END, EE_CHAR_START, EE_CHAR_END }; + + return bTextOnly ? gTextOnly : gFull; } void SdrObjEditView::TakeFormatPaintBrush(std::shared_ptr<SfxItemSet>& rFormatSet) |