[Libreoffice-commits] core.git: include/oox

[Mike Kaganski (via logerrit)]

 include/oox/helper/graphichelper.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 30a17b05fb8a860c1e53cb7cfc405b1cea0a9d15
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sat Jun 19 23:05:03 2021 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sun Jun 20 17:30:27 2021 +0200

    Include the header to workaround MSVC bug (shows with disabled pch)
    
    https://developercommunity.visualstudio.com/t/error-c2027-use-of-undefined-type-with-declspecdll/1455069
    
      [build CXX] oox/source/core/filterbase.cxx
      C:\lo\src\core\include\rtl/ref.hxx(129): error C2027: use of undefined type 'OutputDevice'
      C:\lo\src\core\include\oox/helper/graphichelper.hxx(50): note: see declaration of 'OutputDevice'
      C:\lo\src\core\include\rtl/ref.hxx(127): note: while compiling class template member function 'rtl::Reference<reference_type>::~Reference(void)'
      with
      [
      reference_type=OutputDevice
      ]
      C:\lo\src\core\include\vcl/vclptr.hxx(216): note: see reference to function template instantiation 'rtl::Reference<reference_type>::~Reference(void)' being comp
      iled
      with
      [
      reference_type=OutputDevice
      ]
      C:\lo\src\core\include\vcl/vclptr.hxx(64): note: see reference to class template instantiation 'rtl::Reference<reference_type>' being compiled
      with
      [
      reference_type=OutputDevice
      ]
      C:\lo\src\core\include\oox/helper/graphichelper.hxx(140): note: see reference to class template instantiation 'VclPtr<OutputDevice>' being compiled
      make[1]: *** [C:/lo/src/core/solenv/gbuild/LinkTarget.mk:301: C:/lo/src/build/workdir/CxxObject/oox/source/core/filterbase.o] Error 2
    
    Change-Id: I50ee1bf97b7075224525525ef074c0ffcc168485
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117507
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 6e6a255d9bd6..7735a15306a8 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -32,6 +32,7 @@
 #include <sal/types.h>
 #include <com/sun/star/graphic/XGraphicProvider2.hpp>
 #include <com/sun/star/graphic/XGraphicMapper.hpp>
+#include <vcl/outdev.hxx> // Workaround for MSVC bug - can't forward-declare OutputDevice
 #include <vcl/vclptr.hxx>
 
 struct WmfExternal;
@@ -47,7 +48,6 @@ namespace com::sun::star {
     namespace graphic { class XGraphicProvider; }
     namespace uno { class XComponentContext; }
 }
-class OutputDevice;
 
 namespace oox {