codemaker/source/cppumaker/cppumaker.cxx | 4 ++-- codemaker/source/javamaker/javamaker.cxx | 4 ++-- include/codemaker/options.hxx | 2 -- unodevtools/source/skeletonmaker/skeletonmaker.cxx | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-)
New commits: commit bab43b23d5bf70279adbd767f982519d2144e953 Author: Stephan Bergmann <[email protected]> Date: Wed Apr 24 12:41:47 2013 +0200 Allow for (relative) pathname args for codemakers again Change-Id: I503d88b7d6fc44ef70d5071fddcec465e3fba856 diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx index 8869e87..3f0c665 100644 --- a/codemaker/source/cppumaker/cppumaker.cxx +++ b/codemaker/source/cppumaker/cppumaker.cxx @@ -52,13 +52,13 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { options.getExtraInputFiles().begin()); i != options.getExtraInputFiles().end(); ++i) { - typeMgr->loadProvider(b2u(*i), false); + typeMgr->loadProvider(convertToFileUrl(*i), false); } for (std::vector< OString >::const_iterator i( options.getInputFiles().begin()); i != options.getInputFiles().end(); ++i) { - typeMgr->loadProvider(b2u(*i), true); + typeMgr->loadProvider(convertToFileUrl(*i), true); } codemaker::GeneratedTypeSet generated; if (options.isValid("-T")) { diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx index 2b1a9d5..d74aafa 100644 --- a/codemaker/source/javamaker/javamaker.cxx +++ b/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(b2u(*i), false); + typeMgr->loadProvider(convertToFileUrl(*i), false); } for (std::vector< rtl::OString >::const_iterator i( options.getInputFiles().begin()); i != options.getInputFiles().end(); ++i) { - typeMgr->loadProvider(b2u(*i), true); + typeMgr->loadProvider(convertToFileUrl(*i), true); } codemaker::GeneratedTypeSet generated; if (options.isValid("-T")) { diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx index 98fab21..5904f29 100644 --- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx +++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx @@ -272,7 +272,7 @@ SAL_IMPLEMENT_MAIN() for (std::vector< OString >::const_iterator i(registries.begin()); i != registries.end(); ++i) { - manager->loadProvider(b2u(*i), true); + manager->loadProvider(convertToFileUrl(*i), true); } if ( options.dump ) { commit 0ce9a16b0c21db203b44c7542c05d51e7e44de03 Author: Stephan Bergmann <[email protected]> Date: Wed Apr 24 12:41:15 2013 +0200 Dead code Change-Id: Ia0b14d879e0ab22ff2fdeb09af836df4aed82ffb diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index 4a33e28..2290d83 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -59,8 +59,6 @@ public: const StringVector& getInputFiles(); - inline sal_uInt16 getNumberOfExtraInputFiles() const - { return (sal_uInt16)m_extra_input_files.size(); } inline const StringVector& getExtraInputFiles() const { return m_extra_input_files; } protected: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
