[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - svx/source

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Wed May 1 08:09:54 UTC 2019


 svx/source/svdraw/svdmrkv.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6fe0ebb25bc846392b02cd67c2c08c6e92c3ee47
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed May 1 10:01:08 2019 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed May 1 10:09:19 2019 +0200

    Fix build after commit 6d63cb8749811ff407c3b3f523a329bcaab05542
    
    Failed on Windows with
    
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(925): error C2079: 'aDragParameters' uses undefined class 'std::array<int,5>'
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(927): error C3312: no callable 'begin' function found for type 'int'
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(927): error C3312: no callable 'end' function found for type 'int'
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(931): error C2065: 'rParam': undeclared identifier
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(935): error C2109: subscript requires array or pointer type
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(936): error C2109: subscript requires array or pointer type
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(937): error C2109: subscript requires array or pointer type
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(938): error C2109: subscript requires array or pointer type
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(941): error C2109: subscript requires array or pointer type
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(944): error C2109: subscript requires array or pointer type
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(945): error C2109: subscript requires array or pointer type
      C:/lo/src/core2/svx/source/svdraw/svdmrkv.cxx(930): error C2043: illegal break
      make[1]: *** [C:/lo/src/core2/solenv/gbuild/LinkTarget.mk:293: C:/lo/src/core2/workdir/CxxObject/svx/source/svdraw/svdmrkv.o] Error 2
    
    Change-Id: Iaf2762a43a7eefce582bb187dd6978d5b28564e5
    Reviewed-on: https://gerrit.libreoffice.org/71616
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 90865f7d5d02..08afd9d091df 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -56,6 +56,7 @@
 #include <sfx2/lokhelper.hxx>
 #include <sfx2/lokcharthelper.hxx>
 #include <sfx2/viewsh.hxx>
+#include <array>
 
 using namespace com::sun::star;
 


More information about the Libreoffice-commits mailing list