summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/oox/helper/graphichelper.hxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 7735a15306a8..eab39beffcf5 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -32,10 +32,10 @@
#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;
+class OutputDevice;
namespace com::sun::star {
namespace awt { struct Point; }
@@ -64,6 +64,13 @@ public:
const StorageRef& rxStorage );
virtual ~GraphicHelper();
+ // Avoid implicitly defined copy constructors/assignments for the DLLPUBLIC class (they may
+ // require forward-declared classes used internally to be defined in places using GraphicHelper)
+ GraphicHelper(const GraphicHelper&) = delete;
+ GraphicHelper(GraphicHelper&&) = delete;
+ GraphicHelper& operator=(const GraphicHelper&) = delete;
+ GraphicHelper& operator=(GraphicHelper&&) = delete;
+
// System colors and predefined colors ------------------------------------
/** Returns a system color specified by the passed XML token identifier. */