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

Mike Kaganski mike.kaganski at collabora.com
Fri Feb 2 04:58:56 UTC 2018


 sc/source/ui/vba/vbaformatconditions.hxx |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

New commits:
commit eb52aba8006307295558b8ecb90d57970d293b44
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 20:54:50 2018 +0300

    sc: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: I133e053d19fd39b575f7daf0e70fb5ba5442ec47
    Reviewed-on: https://gerrit.libreoffice.org/49044
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx
index 0978bc1875ab..6e2c662a0323 100644
--- a/sc/source/ui/vba/vbaformatconditions.hxx
+++ b/sc/source/ui/vba/vbaformatconditions.hxx
@@ -29,15 +29,6 @@
 
 // This class is used only as a target for casting, it seems,
 // and no objects of this type are created as such, I think.
-// So avoid MSVC warnings:
-// warning C4510: 'ScVbaFormatConditions' : default constructor could not be generated
-// warning C4610: class 'ScVbaFormatConditions' can never be instantiated - user defined constructor required
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4510)
-#pragma warning(disable: 4610)
-#endif
 
 class ScVbaFormatConditions: public CollTestImplHelper< ov::excel::XFormatConditions >
 {
@@ -67,11 +58,9 @@ public:
     // XHelperInterface
     virtual OUString getServiceImplName() override;
     virtual css::uno::Sequence<OUString> getServiceNames() override;
-};
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+    ScVbaFormatConditions() = delete;
+};
 
 #endif // INCLUDED_SC_SOURCE_UI_VBA_VBAFORMATCONDITIONS_HXX
 


More information about the Libreoffice-commits mailing list