loplugin:deletedspecial

Change-Id: I37eb6c976779aeec829d312920ab1d18884c0f2f

3 files changed, 14 insertions, 24 deletions

diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 86f3321863b8..167a7d285be0 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -100,34 +100,33 @@ struct StdHlinkInfo
 
 
 /** Static helper functions for OLE import/export. */
-class OOX_DLLPUBLIC OleHelper
+namespace OleHelper
 {
-public:
     /** Returns the UNO RGB color from the passed encoded OLE color.
 
         @param bDefaultColorBgr
             True = OLE default color type is treated as BGR color.
             False = OLE default color type is treated as palette color.
      */
-    static sal_Int32    decodeOleColor(
+    OOX_DLLPUBLIC sal_Int32    decodeOleColor(
                             const GraphicHelper& rGraphicHelper,
                             sal_uInt32 nOleColor,
                             bool bDefaultColorBgr = true );
 
     /** Returns the OLE color from the passed UNO RGB color.
      */
-    static sal_uInt32   encodeOleColor( sal_Int32 nRgbColor );
+    OOX_DLLPUBLIC sal_uInt32   encodeOleColor( sal_Int32 nRgbColor );
 
     /** Imports a GUID from the passed binary stream and returns its string
         representation (in uppercase characters).
      */
-    static OUString importGuid( BinaryInputStream& rInStrm );
-    static void exportGuid( BinaryOutputStream& rOutStrm, const SvGlobalName& rId );
+    OOX_DLLPUBLIC OUString importGuid( BinaryInputStream& rInStrm );
+    OOX_DLLPUBLIC void exportGuid( BinaryOutputStream& rOutStrm, const SvGlobalName& rId );
 
     /** Imports an OLE StdFont font structure from the current position of the
         passed binary stream.
      */
-    static bool         importStdFont(
+    OOX_DLLPUBLIC bool         importStdFont(
                             StdFontInfo& orFontInfo,
                             BinaryInputStream& rInStrm,
                             bool bWithGuid );
@@ -135,15 +134,11 @@ public:
     /** Imports an OLE StdPic picture from the current position of the passed
         binary stream.
      */
-    static bool         importStdPic(
+    OOX_DLLPUBLIC bool         importStdPic(
                             StreamDataSequence& orGraphicData,
                             BinaryInputStream& rInStrm,
                             bool bWithGuid );
-
-private:
-                        OleHelper();        // not implemented
-                        ~OleHelper();       // not implemented
-};
+}
 
 // ideally it would be great to get rid of SvxMSConvertOCXControls
 // however msfilter/source/msfilter/svdfppt.cxx still uses
diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx
index 3f9202f5b1cb..75ad1b57e1a9 100644
--- a/include/oox/ole/vbahelper.hxx
+++ b/include/oox/ole/vbahelper.hxx
@@ -52,9 +52,8 @@ const sal_uInt16 VBA_ID_PROJECTVERSION          = 0x0009;
 
 
 /** Static helper functions for the VBA filters. */
-class VbaHelper
+namespace VbaHelper
 {
-public:
     /** Reads the next record from the VBA directory stream 'dir'.
 
         @param rnRecId  (out parameter) The record identifier of the new record.
@@ -64,7 +63,7 @@ public:
         @return  True = next record successfully read. False on any error, or
             if the stream is EOF.
      */
-    static bool         readDirRecord(
+    bool         readDirRecord(
                             sal_uInt16& rnRecId,
                             StreamDataSequence& rRecData,
                             BinaryInputStream& rInStrm );
@@ -78,15 +77,11 @@ public:
         @return  True = Equality sign separator found, and the returned key and
             value are not empty. False otherwise.
      */
-    static bool         extractKeyValue(
+    bool         extractKeyValue(
                             OUString& rKey,
                             OUString& rValue,
                             const OUString& rKeyValue );
-
-private:
-                        VbaHelper();
-                        ~VbaHelper();
-};
+}
 
 
 
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 72a225b55b22..ff2bf71d871e 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -155,8 +155,8 @@ protected:
     void                finalizeImport();
 
 private:
-                        VbaProject( const VbaProject& );
-    VbaProject&         operator=( const VbaProject& );
+                        VbaProject( const VbaProject& ) SAL_DELETED_FUNCTION;
+    VbaProject&         operator=( const VbaProject& ) SAL_DELETED_FUNCTION;
 
     /** Returns the Basic or dialog library container. */
     ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >