reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 2
unodevtools/Executable_skeletonmaker.mk | 6 -
unodevtools/inc/unodevtools/options.hxx | 5 -
unodevtools/source/skeletonmaker/skeletonmaker.cxx | 37
+---------
unodevtools/source/unodevtools/options.cxx | 13 ---
5 files changed, 12 insertions(+), 51 deletions(-)
New commits:
commit 87cb8d784cd4d279d82aafd03d82d33843e5b316
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 16:10:29 2013 +0200
java.lang.String.isEmpty is only since 1.6
Change-Id: I43fd404e96192af3c0a8734c4547cee3b906c935
diff --git
a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 4d0a797..f6c4658 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -258,7 +258,7 @@ public class SDBCReportDataFactory implements
DataSourceFactory
prefix =
(String)column.getPropertyValue("TableName");
if (prefix == null)
prefix = "";
- if (!prefix.isEmpty())
+ if (prefix.length() != 0)
{
prefix = quote + prefix + quote + ".";
}
commit 8937fac2167d9c62479f3f6a57c50a35c900c00d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 15:47:46 2013 +0200
uno-skeletonmaker does not bootstrap UNO
...so mentioning env:INIFILENAME and env:UNO_TYPES is misleading.
Change-Id: Ia91ad691c58d226bc445b3355dffb82ba7ddbef5
diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index 0ef5d24..b393793 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -47,10 +47,6 @@ static const char usageText[] =
" name(s) and the corresponding command(s) have to be specified
with the\n"
" '-p' option.\n"
"\n options:\n"
-" -env:INIFILENAME=<url> url specifies a URL to an UNO ini|rc file of an\n"
-" existing UNO environment (URE, office
installation).\n"
-" -env:UNO_TYPES=<url> url specifies a binary type library file. It can
be\n"
-" a space separated list of urls.\n"
" -a, --all list all interface methods, not only the direct\n"
" ones\n"
" --(java4|java5|cpp) select the target language\n"
@@ -82,9 +78,7 @@ static const char usageText[] =
" sub-command 'component'. If path=stdout the
generated\n"
" code is generated on standard out instead of a
file.\n"
" -l <file> specifies a binary type library (can be used
more\n"
-" than once). The type library is integrated as an\n"
-" additional type provider in the bootstrapped
type\n"
-" system.\n"
+" than once).\n"
" -n <name> specifies an implementation name for the
component\n"
" (used as classname, filename and
package|namespace\n"
" name). In 'dump' mode it is used as classname
(e.g.\n"
@@ -107,17 +101,13 @@ static const char usageText[] =
void printUsageAndExit(const char* programname, const char* version)
{
std::cerr
- << "\n using: " << programname
- << " (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>)\n"
+ << "\n using: " << programname << "\n"
<< " dump [<options>] -t <type> ...\n"
- << " " << programname
- << " (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>)\n"
+ << " " << programname << "\n"
<< " component [<options>] -n <name> -t <type> ...\n"
- << " " << programname
- << " (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>)\n"
+ << " " << programname << "\n"
<< " calc-add-in [<options>] -n <name> -t
<add-in_service>\n"
- << " " << programname
- << " (-env:INIFILENAME=<url> | -env:UNO_TYPES=<url>)\n"
+ << " " << programname << "\n"
<< " add-on [<options>] -n <name> -p
<protocol_name:command,...>\n"
<< " " << programname << " -V, --version\n"
<< " " << programname << " -h, --help\n"
commit 7b3bef772d65f064393a764e1a6ef468dbf1b18d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 15:39:38 2013 +0200
No need to have uno-skeletonmaker depend on udkapi
...just for RuntimeException, which can be replaced with
CannotDumpException.
Change-Id: I258f5fe534d589b33e988f7e585168c1bc6990f8
diff --git a/unodevtools/Executable_skeletonmaker.mk
b/unodevtools/Executable_skeletonmaker.mk
index f021485..1cb142e 100644
--- a/unodevtools/Executable_skeletonmaker.mk
+++ b/unodevtools/Executable_skeletonmaker.mk
@@ -28,10 +28,6 @@ $(eval $(call gb_Executable_Executable,uno-skeletonmaker))
$(eval $(call gb_Executable_use_external,uno-skeletonmaker,boost_headers))
-$(eval $(call gb_Executable_use_api,uno-skeletonmaker,\
- udkapi \
-))
-
$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\
-I$(SRCDIR)/unodevtools/inc \
$$(INCLUDE) \
@@ -41,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,uno-skeletonmaker,\
reg \
sal \
salhelper \
- cppu \
- cppuhelper \
unoidl \
))
diff --git a/unodevtools/inc/unodevtools/options.hxx
b/unodevtools/inc/unodevtools/options.hxx
index e134782..8c98192 100644
--- a/unodevtools/inc/unodevtools/options.hxx
+++ b/unodevtools/inc/unodevtools/options.hxx
@@ -22,15 +22,14 @@
#include "sal/config.h"
-#include <com/sun/star/uno/RuntimeException.hpp>
#include <rtl/ustrbuf.hxx>
namespace unodevtools {
//-------------------------------------------------------------------------------
sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
- sal_uInt32 * pnIndex, const OUString & aArg)
- throw (com::sun::star::uno::RuntimeException);
+ sal_uInt32 * pnIndex, const OUString & aArg);
+ // throws CannotDumpException
//-------------------------------------------------------------------------------
sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index 8dd5d63..0ef5d24 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -21,17 +21,13 @@
#include "codemaker/typemanager.hxx"
#include "sal/main.h"
#include "rtl/process.h"
-#include "rtl/ustrbuf.hxx"
#include "unodevtools/options.hxx"
#include "skeletonjava.hxx"
#include "skeletoncpp.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-
using namespace ::rtl;
using namespace ::skeletonmaker;
using namespace ::unodevtools;
-using namespace ::com::sun::star::uno;
namespace {
@@ -269,12 +265,7 @@ SAL_IMPLEMENT_MAIN()
// else illegal argument
- OUStringBuffer buf( 64 );
- buf.append("unexpected parameter \"");
- buf.append(arg);
- buf.append("\"!");
- throw RuntimeException(buf.makeStringAndClear(),
- css::uno::Reference< XInterface >());
+ throw CannotDumpException("unexpected parameter \"" + arg + "\"!");
}
if ( types.empty() && options.componenttype != 3) {
@@ -331,12 +322,6 @@ SAL_IMPLEMENT_MAIN()
} catch (const CannotDumpException & e) {
std::cout.flush();
std::cerr << "\nError: " << e.getMessage() << std::endl;
- } catch(const Exception& e) {
- std::cout.flush();
- std::cerr
- << "\nError: "
- << OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()
- << std::endl;
}
return 0;
diff --git a/unodevtools/source/unodevtools/options.cxx
b/unodevtools/source/unodevtools/options.cxx
index 534e87e..ec02646 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -19,14 +19,11 @@
#include <stdio.h>
+#include "codemaker/global.hxx"
#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
#include "rtl/process.h"
-#include "com/sun/star/uno/RuntimeException.hpp"
-
using namespace ::rtl;
-using namespace ::com::sun::star::uno;
namespace unodevtools {
@@ -41,7 +38,6 @@ static void out( const sal_Char * pText )
//-------------------------------------------------------------------------------
sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_uInt32 * pnIndex, const OUString & aArg)
- throw (RuntimeException)
{
const OUString dash = OUString("-");
if(aArg.indexOf(dash) != 0)
@@ -60,11 +56,8 @@ sal_Bool readOption( OUString * pValue, const sal_Char *
pOpt,
if (*pnIndex >= rtl_getAppCommandArgCount() ||
pValue->copy(1).equals(dash))
{
- OUStringBuffer buf( 32 );
- buf.append( "incomplete option \"-" );
- buf.appendAscii( pOpt );
- buf.append( "\" given!" );
- throw RuntimeException( buf.makeStringAndClear(), Reference<
XInterface >() );
+ throw CannotDumpException(
+ "incomplete option \"-" + aOpt + "\" given!");
} else {
#if OSL_DEBUG_LEVEL > 1
out( "\n> identified option -" );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
