[Libreoffice-commits] core.git: include/sot sot/source

[Stephan Bergmann]

 include/sot/factory.hxx       |    5 +----
 sot/source/base/factory.cxx   |    4 +---
 sot/source/base/object.cxx    |    8 +++-----
 sot/source/sdstor/storage.cxx |   16 ++++++----------
 4 files changed, 11 insertions(+), 22 deletions(-)

New commits:
commit 8b7ec376c38886ed26520034db35ce094b94c114
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 3 21:03:01 2015 +0200

    -Werror,-Wunused-private-field
    
    Change-Id: I59979f84602276c9a8aa1ffc1d145c1ef8f0a31f

diff --git a/include/sot/factory.hxx b/include/sot/factory.hxx
index 18f093b..659dae8 100644
--- a/include/sot/factory.hxx
+++ b/include/sot/factory.hxx
@@ -39,8 +39,6 @@ class SOT_DLLPUBLIC SotFactory : public SvGlobalName
     sal_uInt16          nSuperCount;    // Anzahl der Superklassen
     const SotFactory ** pSuperClasses;  // Superklassen
 
-    OUString            aClassName;
-
 protected:
     virtual             ~SotFactory();
 public:
@@ -51,8 +49,7 @@ public:
     static  const SotFactory *      Find( const SvGlobalName & );
 #endif
 
-            SotFactory( const SvGlobalName &,
-                        const OUString & rClassName );
+            SotFactory( const SvGlobalName & );
 
     void                PutSuperClass( const SotFactory * );
 
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 3fc95ad..3310739 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -74,12 +74,10 @@ SotData_Impl * SOTDATA()
 |*    Beschreibung
 *************************************************************************/
 
-SotFactory::SotFactory( const SvGlobalName & rName,
-                        const OUString & rClassName )
+SotFactory::SotFactory( const SvGlobalName & rName )
     : SvGlobalName  ( rName )
     , nSuperCount   ( 0 )
     , pSuperClasses ( NULL )
-    , aClassName    ( rClassName )
 {
 #ifdef DBG_UTIL
     SvGlobalName aEmptyName;
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 3ed71d7..1cb951b 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -24,9 +24,8 @@
 class SotObjectFactory : public SotFactory
 {
 public:
-        SotObjectFactory( const SvGlobalName & rName,
-                          const OUString & rClassName )
-            : SotFactory( rName, rClassName )
+        SotObjectFactory( const SvGlobalName & rName )
+            : SotFactory( rName )
         {}
 };
 
@@ -38,8 +37,7 @@ SotFactory * SotObject::ClassFactory()
     {
         *ppFactory = new SotObjectFactory(
                            SvGlobalName( 0xf44b7830, 0xf83c, 0x11d0,
-                               0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ),
-                           OUString( "SotObject" ) );
+                               0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) );
     }
     return *ppFactory;
 }
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 6730712..70dd249 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -45,9 +45,8 @@ using namespace ::com::sun::star;
 class SotStorageStreamFactory : public SotFactory
 {
 public:
-        SotStorageStreamFactory( const SvGlobalName & rName,
-                                 const OUString & rClassName )
-            : SotFactory( rName, rClassName )
+        SotStorageStreamFactory( const SvGlobalName & rName )
+            : SotFactory( rName )
         {}
 };
 
@@ -59,8 +58,7 @@ SotFactory * SotStorageStream::ClassFactory()
     {
         *ppFactory = new SotStorageStreamFactory(
                             SvGlobalName( 0xd7deb420, 0xf902, 0x11d0,
-                                0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ),
-                            OUString( "SotStorageStream" ) );
+                                0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) );
         (*ppFactory)->PutSuperClass( SotObject::ClassFactory() );
     }
     return *ppFactory;
@@ -306,9 +304,8 @@ bool SotStorageStream::SetProperty( const OUString& rName, const ::com::sun::sta
 class SotStorageFactory : public SotFactory
 {
 public:
-        SotStorageFactory( const SvGlobalName & rName,
-                           const OUString & rClassName )
-            : SotFactory( rName, rClassName )
+        SotStorageFactory( const SvGlobalName & rName )
+            : SotFactory( rName )
         {}
 };
 
@@ -320,8 +317,7 @@ SotFactory * SotStorage::ClassFactory()
     {
         *ppFactory = new SotStorageFactory(
                                SvGlobalName( 0x980ce7e0, 0xf905, 0x11d0,
-                                        0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ),
-                               OUString( "SotStorage" ) );
+                                        0xaa, 0xa1, 0x0, 0xa0, 0x24, 0x9d, 0x55, 0x90 ) );
         (*ppFactory)->PutSuperClass( SotObject::ClassFactory() );
     }
     return *ppFactory;