configure.in | 35 ----
solenv/bin/localize | 2
wizards/com/sun/star/wizards/common/Resource.java.orig | 140 -----------------
3 files changed, 2 insertions(+), 175 deletions(-)
New commits:
commit ceddf468263491fa89068497285df279f96ff5eb
Author: Rene Engelhard <r...@debian.org>
Date: Fri Oct 28 13:54:54 2011 +0200
remove obsolete --with-system-translate-toolkit
diff --git a/configure.in b/configure.in
index b69aeb6..d95dc7c 100644
--- a/configure.in
+++ b/configure.in
@@ -690,7 +690,7 @@ AC_ARG_WITH(external-thes-dir,
AC_ARG_WITH(system-libs,
AS_HELP_STRING([--with-system-libs],
[Use libraries already on system -- enables all --with-system-* flags
except
- mozilla and translate-toolkit.]),
+ mozilla.]),
,)
AC_ARG_WITH(system-headers,
@@ -757,10 +757,6 @@ AC_ARG_WITH(system-libxml,
[Use libxml already on system.]),
,)
-AC_ARG_WITH(system-translate-toolkit,
- AS_HELP_STRING([--with-system-translate-toolkit],
- [Use translate-toolkit already on system.]))
-
AC_ARG_WITH(system-icu,
AS_HELP_STRING([--with-system-icu],
[Use icu already on system.]))
@@ -5053,35 +5049,6 @@ AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LIBS)
dnl ===================================================================
-dnl Check for system translate-toolkit
-dnl ===================================================================
-AC_MSG_CHECKING([which translate-toolkit to use])
-if test "$with_system_translate_toolkit" = "yes" ; then
- AC_MSG_RESULT([system])
- SYSTEM_TRANSLATE_TOOLKIT=YES
-
- AC_PATH_PROGS(OO2PO, oo2po)
- if test -z "$OO2PO"; then
- AC_MSG_ERROR([install translate-toolkit or use
--without-system-translate-toolkit])
- fi
-
- AC_PATH_PROGS(PO2OO, po2oo)
- if test -z "$PO2OO"; then
- AC_MSG_ERROR([install translate-toolkit or use
--without-system-translate-toolkit])
- fi
-
- $PO2OO --help | grep -q '\-\-skipsource'
- if test $? -ne 0 ; then
- AC_MSG_ERROR([$PO2OO does not support --skipsource; use
translate-toolkit >= 1.9 or use --without-system-translate-toolkit])
- fi
-else
- AC_MSG_RESULT([internal])
- SYSTEM_TRANSLATE_TOOLKIT=NO
- BUILD_TYPE="$BUILD_TYPE TRANSLATE_TOOLKIT"
-fi
-AC_SUBST(SYSTEM_TRANSLATE_TOOLKIT)
-
-dnl ===================================================================
dnl Check for system Berkeley db
dnl ===================================================================
AC_MSG_CHECKING([which db to use])
commit 3c904c0d5c864a1b5b9a333c4e667326131b689d
Author: Rene Engelhard <r...@debian.org>
Date: Wed Oct 26 00:13:35 2011 +0200
remove Resource.java.orig
diff --git a/wizards/com/sun/star/wizards/common/Resource.java.orig
b/wizards/com/sun/star/wizards/common/Resource.java.orig
deleted file mode 100644
index c7eb3e4..0000000
--- a/wizards/com/sun/star/wizards/common/Resource.java.orig
+++ /dev/null
@@ -1,140 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-package com.sun.star.wizards.common;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.script.XInvocation;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.uno.XInterface;
-import com.sun.star.uno.UnoRuntime;
-
-public class Resource
-{
-
- XMultiServiceFactory xMSF;
- String Module;
- XIndexAccess xStringIndexAccess;
- XIndexAccess xStringListIndexAccess;
-
- /** Creates a new instance of Resource
- * @param _xMSF
- * @param _Unit
- * @param _Module
- */
- public Resource(XMultiServiceFactory _xMSF, String _Unit /* unused */,
String _Module)
- {
- this.xMSF = _xMSF;
- this.Module = _Module;
- try
- {
- Object[] aArgs = new Object[1];
- aArgs[0] = this.Module;
- XInterface xResource = (XInterface)
xMSF.createInstanceWithArguments(
- "org.libreoffice.resource.ResourceIndexAccess",
- aArgs);
- if (xResource == null)
- throw new Exception("could not initialize
ResourceIndexAccess");
- XNameAccess xNameAccess = (XNameAccess)UnoRuntime.queryInterface(
- XNameAccess.class,
- xResource);
- if (xNameAccess == null)
- throw new Exception("ResourceIndexAccess is no XNameAccess");
- this.xStringIndexAccess = (XIndexAccess)UnoRuntime.queryInterface(
- XIndexAccess.class,
- xNameAccess.getByName("String"));
- this.xStringListIndexAccess =
(XIndexAccess)UnoRuntime.queryInterface(
- XIndexAccess.class,
- xNameAccess.getByName("StringList"));
- if(this.xStringListIndexAccess == null)
- throw new Exception("could not initialize
xStringListIndexAccess");
- if(this.xStringIndexAccess == null)
- throw new Exception("could not initialize xStringIndexAccess");
- }
- catch (Exception exception)
- {
- exception.printStackTrace();
- showCommonResourceError(xMSF);
- }
- }
-
- public String getResText(int nID)
- {
- try
- {
- return (String)this.xStringIndexAccess.getByIndex(nID);
- }
- catch (Exception exception)
- {
- exception.printStackTrace();
- throw new java.lang.IllegalArgumentException("Resource with ID not
" + String.valueOf(nID) + "not found");
- }
- }
-
- public PropertyValue[] getStringList(int nID)
- {
- try
- {
- return
(PropertyValue[])this.xStringListIndexAccess.getByIndex(nID);
- }
- catch (Exception exception)
- {
- exception.printStackTrace();
- throw new java.lang.IllegalArgumentException("Resource with ID not
" + String.valueOf(nID) + "not found");
- }
- }
-
- public String[] getResArray(int nID, int iCount)
- {
- try
- {
- String[] ResArray = new String[iCount];
- for (int i = 0; i < iCount; i++)
- {
- ResArray[i] = getResText(nID + i);
- }
- return ResArray;
- }
- catch (Exception exception)
- {
- exception.printStackTrace(System.out);
- throw new java.lang.IllegalArgumentException("Resource with ID
not" + String.valueOf(nID) + "not found");
- }
- }
-
- public static void showCommonResourceError(XMultiServiceFactory xMSF)
- {
- String ProductName = Configuration.getProductName(xMSF);
- String sError = "The files required could not be found.\nPlease start
the %PRODUCTNAME Setup and choose 'Repair'.";
- sError = JavaTools.replaceSubString(sError, ProductName,
"%PRODUCTNAME");
- SystemDialog.showMessageBox(xMSF, "ErrorBox",
com.sun.star.awt.VclWindowPeerAttribute.OK, sError);
- }
-}
commit 247022697064703f9fede3801df6867405979d26
Author: Rene Engelhard <r...@debian.org>
Date: Tue Oct 25 23:23:03 2011 +0200
pushd is a bashism, use #!/bin/bash in solenv/bin/localize
diff --git a/solenv/bin/localize b/solenv/bin/localize
index fc1ae47..7cf035c 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
if [ x${SOLARENV}x = xx ]; then
echo No environment found, please use 'setsolar'
exit 1
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
