[Libreoffice-commits] core.git: sc/inc

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Tue Dec 17 10:13:12 UTC 2019


 sc/inc/tokenarray.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 269da06bae4105ddad17b1aa1ca8477cebbfaa76
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Dec 17 08:47:13 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Dec 17 11:12:04 2019 +0100

    ScSheetLimits must be a complete type here (Windows --disable-pch)
    
    ...after 113444f59dc7690850919155b9b164b1a686bbe7 "sc: rowcol: tdf#50916 create
    ScSheetLimits to hold by rtl::Reference", due to the MSVC rules of emitting
    definitions of implicit member functions of dllexport classes:
    
    > In file included from sc/source/ui/condformat/condformathelper.cxx:14:
    > In file included from sc/inc\conditio.hxx:30:
    > In file included from sc/inc/tokenarray.hxx:24:
    > include\rtl/ref.hxx(74,20): error: member access into incomplete type 'ScSheetLimits'
    >             m_pBody->acquire();
    >                    ^
    > sc/inc/tokenarray.hxx(69,5): note: in instantiation of member function 'rtl::Reference<ScSheetLimits>::Reference' requested here
    >     ScTokenArray( const ScTokenArray& ) = default;
    >     ^
    > sc/inc/tokenarray.hxx(47,8): note: forward declaration of 'ScSheetLimits'
    > struct ScSheetLimits;
    >        ^
    
    Change-Id: I4e79340f52e92b88c43fa5b78aa69ed49b367705
    Reviewed-on: https://gerrit.libreoffice.org/85260
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 37ccf6b67c06..fb8495fe7da1 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -22,6 +22,7 @@
 
 #include <formula/token.hxx>
 #include <rtl/ref.hxx>
+#include "document.hxx"
 #include "scdllapi.h"
 #include "types.hxx"
 #include "calcmacros.hxx"
@@ -44,7 +45,6 @@ class ColRowReorderMapType;
 struct ScRawToken;
 struct ScSingleRefData;
 struct ScComplexRefData;
-struct ScSheetLimits;
 
 class SAL_WARN_UNUSED SC_DLLPUBLIC ScTokenArray final : public formula::FormulaTokenArray
 {


More information about the Libreoffice-commits mailing list