summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2016-02-21 08:32:31 -0800
committerMichael Stahl <mstahl@redhat.com>2016-02-22 16:57:15 +0000
commitf09b79a4f016289e76af476fc8a5eb86e8f8dd92 (patch)
tree36b8d35f87be824fb0f51c62a3b733e3a7af1c10
parent17a6535b3b2e1f0246e7605c018eded37c4a583c (diff)
WaE vs2015 unreacheable code
Change-Id: I11241c8653194fdb0a85727fef85f2963f9e8228 Reviewed-on: https://gerrit.libreoffice.org/22602 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--include/oox/helper/binaryinputstream.hxx7
-rw-r--r--include/oox/helper/binaryoutputstream.hxx7
2 files changed, 14 insertions, 0 deletions
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index afc48d3c6351..fba55a0127c7 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -193,7 +193,14 @@ public:
protected:
/** This dummy default c'tor will never call the c'tor of the virtual base
class BinaryStreamBase as this class cannot be instantiated directly. */
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning( disable : 4702)
+#endif
BinaryInputStream() : BinaryStreamBase( false ) {}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
private:
BinaryInputStream( BinaryInputStream const& ) = delete;
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 4287441fb78c..486b4efa9d43 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -82,7 +82,14 @@ public:
protected:
/** This dummy default c'tor will never call the c'tor of the virtual base
class BinaryStreamBase as this class cannot be instantiated directly. */
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning( disable : 4702)
+#endif
BinaryOutputStream() : BinaryStreamBase( false ) {}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
private:
BinaryOutputStream( BinaryOutputStream const& ) = delete;