Revert "WIP: add cppumaker -U to directly read from .idl files"

This reverts commit c4113906d7, which is not
necessary after all with recent "Hook SourceProvider into unoidl::loadProvider."

codemaker/source/codemaker/typemanager.cxx

@@ -27,19 +27,15 @@
 #include "codemaker/typemanager.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/ustring.hxx"
-#include "unoidl/sourceprovider.hxx"
 #include "unoidl/unoidl.hxx"
 
 TypeManager::TypeManager(): manager_(new unoidl::Manager) {}
 
 TypeManager::~TypeManager() {}
 
-void TypeManager::loadProvider(OUString const & uri, bool source, bool primary)
-{
+void TypeManager::loadProvider(OUString const & uri, bool primary) {
     rtl::Reference< unoidl::Provider > prov(
-        source
-        ? new unoidl::SourceProvider(manager_, uri)
-        : unoidl::loadProvider(manager_, uri));
+        unoidl::loadProvider(manager_, uri));
     manager_->addProvider(prov);
     if (primary) {
         primaryProviders_.push_back(prov);

codemaker/source/cppumaker/cppumaker.cxx

@@ -52,15 +52,13 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
                  options.getExtraInputFiles().begin());
              i != options.getExtraInputFiles().end(); ++i)
         {
-            typeMgr->loadProvider(
-                convertToFileUrl(*i), options.isValid("-U"), false);
+            typeMgr->loadProvider(convertToFileUrl(*i), false);
         }
         for (std::vector< OString >::const_iterator i(
                  options.getInputFiles().begin());
              i != options.getInputFiles().end(); ++i)
         {
-            typeMgr->loadProvider(
-                convertToFileUrl(*i), options.isValid("-U"), true);
+            typeMgr->loadProvider(convertToFileUrl(*i), true);
         }
         codemaker::GeneratedTypeSet generated;
         if (options.isValid("-T")) {

codemaker/source/cppumaker/cppuoptions.cxx

@@ -139,19 +139,6 @@ sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
                         m_options["-T"] = OString(s);
                     }
                     break;
-                case 'U':
-                    if (av[i][2] != '\0')
-                    {
-                        OString tmp("'-U', please check");
-                        if (i <= ac - 1)
-                        {
-                            tmp += " your input '" + OString(av[i]) + "'";
-                        }
-
-                        throw IllegalArgument(tmp);
-                    }
-                    m_options["-U"] = "";
-                    break;
                 case 'L':
                     if (av[i][2] != '\0')
                     {
@@ -334,17 +321,9 @@ OString CppuOptions::prepareHelp()
     help += "    -O<path>   = path describes the root directory for the generated output.\n";
     help += "                 The output directory tree is generated under this directory.\n";
     help += "    -T<name>   = name specifies a type or a list of types. The output for this\n";
-    help += "      [t1;...]   type and all dependent types are generated. If no '-T' option is\n";
-    help += "                 specified, then output for all types is generated.\n";
+    help += "      [t1;...]   type is generated. If no '-T' option is specified,\n";
+    help += "                 then output for all types is generated.\n";
     help += "                 Example: 'com.sun.star.uno.XInterface' is a valid type.\n";
-    help += "    -U         = instead of interpreting file_1 ... file_n as type rdb files,\n";
-    help += "                 interpret them as (directories of) UNOIDL source files.  If no\n";
-    help += "                 '-T' option is given, each file_i must denote a UNOIDL file, and\n";
-    help += "                 headers are generated for all entities defined in those files.";
-    help += "                 Otherwise, each file_i must denote a directory, and an entity\n";
-    help += "                 com.sun.star.uno.XInterface specified with '-T' would be searched\n";
-    help += "                 for as com/sun/star/uno/XInterface.idl under each of those\n";
-    help += "                 directories in turn.";
     help += "    -L         = UNO type functions are generated lightweight, that means only\n";
     help += "                 the name and typeclass are given and everything else is retrieved\n";
     help += "                 from the type library dynamically. The default is that UNO type\n";

codemaker/source/javamaker/javamaker.cxx

@@ -52,13 +52,13 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
                  options.getExtraInputFiles().begin());
              i != options.getExtraInputFiles().end(); ++i)
         {
-            typeMgr->loadProvider(convertToFileUrl(*i), false, false);
+            typeMgr->loadProvider(convertToFileUrl(*i), false);
         }
         for (std::vector< rtl::OString >::const_iterator i(
                  options.getInputFiles().begin());
              i != options.getInputFiles().end(); ++i)
         {
-            typeMgr->loadProvider(convertToFileUrl(*i), false, true);
+            typeMgr->loadProvider(convertToFileUrl(*i), true);
         }
         codemaker::GeneratedTypeSet generated;
         if (options.isValid("-T")) {

include/codemaker/typemanager.hxx

@@ -42,7 +42,7 @@ class TypeManager: public salhelper::SimpleReferenceObject {
 public:
     TypeManager();
 
-    void loadProvider(OUString const & uri, bool source, bool primary);
+    void loadProvider(OUString const & uri, bool primary);
 
     bool foundAtPrimaryProvider(OUString const & name) const;
 

unodevtools/source/skeletonmaker/skeletonmaker.cxx

@@ -268,7 +268,7 @@ SAL_IMPLEMENT_MAIN()
     for (std::vector< OString >::const_iterator i(registries.begin());
          i != registries.end(); ++i)
     {
-        manager->loadProvider(convertToFileUrl(*i), false, true);
+        manager->loadProvider(convertToFileUrl(*i), true);
     }
 
     if ( options.dump ) {