[Libreoffice-commits] .: 3 commits - binaryurp/source configmgr/source rdbmaker/inc rdbmaker/source

[Stephan Bergmann]

 binaryurp/source/bridgefactory.cxx       |    1 -
 binaryurp/source/reader.cxx              |    1 -
 configmgr/source/services.cxx            |    1 -
 rdbmaker/inc/codemaker/registry.hxx      |    6 ------
 rdbmaker/inc/codemaker/typemanager.hxx   |   10 +---------
 rdbmaker/source/codemaker/dependency.cxx |    7 -------
 rdbmaker/source/rdbmaker/rdbmaker.cxx    |    6 +-----
 rdbmaker/source/rdbmaker/rdboptions.cxx  |    2 --
 8 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit a2e37bd3f0fe6d24c6fc0a4c7e4d5744c884e546
Author: Luke Petrolekas <luke.petrolekas at gmail.com>
Date:   Mon Mar 19 18:55:10 2012 -0400

    Delete commented out code

diff --git a/rdbmaker/inc/codemaker/registry.hxx b/rdbmaker/inc/codemaker/registry.hxx
index 7686cc5..eadbb7d 100644
--- a/rdbmaker/inc/codemaker/registry.hxx
+++ b/rdbmaker/inc/codemaker/registry.hxx
@@ -77,12 +77,6 @@ struct TypeReader_Impl
 
 class TypeReader
 {
-/*
-    inline TypeReader(const RegistryTypeReader_Api* pApi,
-                              const sal_uInt8* buffer,
-                              sal_uInt32 bufferLen,
-                              sal_Bool copyData);
-*/
 public:
     inline TypeReader()
         : m_pImpl(NULL)
diff --git a/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx
index b651e9b..6feba4d 100644
--- a/rdbmaker/inc/codemaker/typemanager.hxx
+++ b/rdbmaker/inc/codemaker/typemanager.hxx
@@ -125,15 +125,7 @@ public:
     {
         acquire();
     }
-/*
-    RegistryTypeManager& operator = ( const RegistryTypeManager& value )
-    {
-        release();
-        m_pImpl = value.m_pImpl;
-        acquire();
-        return *this;
-    }
-*/
+
     using TypeManager::init;
     sal_Bool init(sal_Bool bMerge, const StringVector& regFiles);
 
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index 0ca56c3..a8ceb25 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -113,7 +113,6 @@ sal_Bool TypeDependency::hasDependencies(const OString& type)
 
 void TypeDependency::setGenerated(const OString& type, sal_uInt16 genFlag)
 {
-//  m_pImpl->m_generatedTypes.insert(type);
     if (m_pImpl->m_generatedTypes.count(type) > 0)
         m_pImpl->m_generatedTypes[type]= m_pImpl->m_generatedTypes[type] | genFlag;
     else
@@ -122,12 +121,6 @@ void TypeDependency::setGenerated(const OString& type, sal_uInt16 genFlag)
 
 sal_Bool TypeDependency::isGenerated(const OString& type, sal_uInt16 genFlag)
 {
-/*
-    if (m_pImpl->m_generatedTypes.count(type) > 0)
-        return sal_True;
-
-    return sal_False;
-*/
     if (m_pImpl->m_generatedTypes.count(type) > 0 &&
         m_pImpl->m_generatedTypes[type] & genFlag)
     {
commit eb1c4f8ff0611bab1dd0ad92e25d82092a971731
Author: Luke Petrolekas <luke.petrolekas at gmail.com>
Date:   Mon Mar 19 18:12:35 2012 -0400

    Remove commented out code.

diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index a383346..490a8fd 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -456,11 +456,7 @@ int __cdecl main( int argc, char * argv[] )
                     ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies,
                                       &options, listFile, rootKey, filterTypes);
                 }
-/*
-                // produce only this type
-                ret = produceType(typeName.replace('.', '/'), typeMgr, typeDependencies,
-                                  &options, listFile, rootKey, filterTypes);
-*/
+
                 if (!ret)
                 {
                     fprintf(stderr, "%s ERROR: %s\n",
diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx
index cc78f7a..07478fd 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.cxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.cxx
@@ -350,8 +350,6 @@ OString RdbOptions::prepareHelp()
     help += "    -L           = specifies that only a text file is generated with the\n";
     help += "                   names of the specified types and their dependencies.\n";
     help += "                   Default is that a registry file will be created\n";
-//  help += "    -X<xmlfile>  = xmlfile specifies the name of an xml description where\n";
-//  help += "                   all types are specified which will be generated.\n";
     help += "    -T<name>     = name specifies a type or a list of types. The output for\n";
     help += "      [t1;...]     this type is generated.\n";
     help += "                   Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
commit a4abe212c193f369425f003a91116f65e9918c9a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 20 08:56:53 2012 +0100

    Unused includes

diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index 0edbaa0..f3e06ab 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -41,7 +41,6 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "rtl/ref.hxx"
 #include "sal/types.h"
-#include "uno/lbnames.h"
 
 #include "bridge.hxx"
 #include "bridgefactory.hxx"
diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index a871e11..5a4491e 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -53,7 +53,6 @@
 #include "typelib/typeclass.h"
 #include "typelib/typedescription.h"
 #include "typelib/typedescription.hxx"
-#include "uno/lbnames.h"
 
 #include "binaryany.hxx"
 #include "bridge.hxx"
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 72d6101..0e16b0f 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -36,7 +36,6 @@
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
-#include "uno/lbnames.h"
 #include "sal/types.h"
 
 #include "configurationprovider.hxx"