summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-31 20:43:37 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-01 17:55:42 +0100
commita584c0a27de9cbd81bc1a6e502868ffc52cc67ad (patch)
tree41d61e3bbfbd6dc09e0c42d3226ab6a6f9447f74 /include/oox
parentf365bca51e5ef5f28fb9f8c1cb972a6b719dfdb9 (diff)
oox: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I3b3f46be30fce0f9193ee8d52159b16d022d903f Reviewed-on: https://gerrit.libreoffice.org/49039 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/helper/binaryinputstream.hxx7
-rw-r--r--include/oox/helper/binaryoutputstream.hxx7
2 files changed, 0 insertions, 14 deletions
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 905b7d3bbac3..c6b59459f0d8 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -193,14 +193,7 @@ 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 21f563227fd8..fe0ce9ae34c5 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -90,14 +90,7 @@ 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;