[ooo-build-commit] .: 2 commits - bonobo/AUTHORS bonobo/autogen.sh bonobo/configure.ac bonobo/COPYING bonobo/data bonobo/intltool-extract.in bonobo/intltool-merge.in bonobo/intltool-update.in bonobo/local-build.sh bonobo/Makefile.am bonobo/NEWS bonobo/po bonobo/README bonobo/src patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Tue Sep 28 08:16:34 PDT 2010
bonobo/AUTHORS | 1
bonobo/COPYING | 8
bonobo/Makefile.am | 10
bonobo/NEWS | 2
bonobo/README | 17
bonobo/autogen.sh | 130 ---
bonobo/configure.ac | 137 ----
bonobo/data/GNOME_OpenOfficeOrg.server.in.in | 62 -
bonobo/data/Makefile.am | 41 -
bonobo/data/ooo-bonobo-control-ui.xml | 72 --
bonobo/data/ooo-bonobo-uno-bootstraprc.in | 2
bonobo/data/ooo-bonobo.in | 4
bonobo/intltool-extract.in | 389 -----------
bonobo/intltool-merge.in | 908 ---------------------------
bonobo/intltool-update.in | 642 -------------------
bonobo/local-build.sh | 6
bonobo/po/POTFILES.in | 3
bonobo/po/be at latin.po | 161 ----
bonobo/po/de.po | 162 ----
bonobo/src/Makefile.am | 31
bonobo/src/main.cxx | 62 -
bonobo/src/ooo-bonobo-control.cxx | 498 --------------
bonobo/src/ooo-bonobo-control.h | 33
bonobo/src/remote-uno-helper.cxx | 126 ---
bonobo/src/remote-uno-helper.h | 9
bonobo/src/services.h | 21
bonobo/src/star-frame-widget.cxx | 256 -------
bonobo/src/star-frame-widget.h | 51 -
bonobo/src/string-macros.h | 117 ---
bonobo/src/test.cxx | 137 ----
patches/dev300/debian-splash.diff | 2
31 files changed, 1 insertion(+), 4099 deletions(-)
New commits:
commit 4d622f5b5c69accc7556a671010817d3df2fb7df
Author: Rene Engelhard <rene at debian.org>
Date: Tue Sep 28 17:16:04 2010 +0200
remove obsolete bonobo/ directory
diff --git a/bonobo/AUTHORS b/bonobo/AUTHORS
deleted file mode 100644
index f409edf..0000000
--- a/bonobo/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Martin Kretzschmar <martink at ximian.com>
diff --git a/bonobo/COPYING b/bonobo/COPYING
deleted file mode 100644
index 6a6e7f2..0000000
--- a/bonobo/COPYING
+++ /dev/null
@@ -1,8 +0,0 @@
-You may only copy and distribute this program consistent with the
-requirements and distribute this Program consistent with the
-requirements of either the GNU General Public License (GPL) and GNU
-Lesser General Public License (LGPL) or the Sun Industry Standards
-Source License (SISSL), respectively, depending on whether you elected
-to obtain access to this program via the GPL/LGPL Option or the SISSL
-Option. Copies of the GPL, LGPL and SISSL licenses can be found
-http://www.openoffice.org/project/www/license.html
diff --git a/bonobo/Makefile.am b/bonobo/Makefile.am
deleted file mode 100644
index db93e41..0000000
--- a/bonobo/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS=src data po
-
-intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
-
-EXTRA_DIST= $(intltool_extra)
-
-DISTCLEANFILES = \
- intltool-extract \
- intltool-merge \
- intltool-update
diff --git a/bonobo/NEWS b/bonobo/NEWS
deleted file mode 100644
index 139597f..0000000
--- a/bonobo/NEWS
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/bonobo/README b/bonobo/README
deleted file mode 100644
index a0133f7..0000000
--- a/bonobo/README
+++ /dev/null
@@ -1,17 +0,0 @@
-0) Don't read the code and expect anything beautiful.
-
-1) in src/main.cxx change /demo/schmidt.sxw, (any format that OOo can read goes)
-
-2) ./configure --with-ooo-solver-dir=/home/martin/Build/ooo/openoffice.org-1.0.99+1.1rc4/solver/645/unxlngi4.pro --with-ooo-install-dir=/usr/lib/openoffice
-
-3) export LD_LIBRARY_PATH=/usr/lib/ooo-1.1.0/program:$LD_LIBRARY_PATH
-
-4) make; make install; restart bonobo-activation-server
-
-5) (removed)
-
-6) start the bonobo server (we need LD_LIBRARY_PATH): src/ooo-bonobo
-
-7) in nautilus, open your document file with the OpenOffice.org Document viewer
-
-8) (removed)
diff --git a/bonobo/autogen.sh b/bonobo/autogen.sh
deleted file mode 100755
index 63fab0c..0000000
--- a/bonobo/autogen.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=ooo-bonobo
-TEST_TYPE=-d
-FILE=src
-
-DIE=0
-
-if glib-gettextize --version < /dev/null > /dev/null 2>&1 ; then
- gettextize_version=`glib-gettextize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $gettextize_version in
- 2.*)
- have_gettextize=true
- ;;
- esac
-fi
-if $have_gettextize ; then : ; else
- echo
- echo "You must have glib 2.0 or later installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
-fi
-
-have_intltoolize=false
-if intltoolize --version < /dev/null > /dev/null 2>&1 ; then
- intltool_version=`intltoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $intltool_version in
- 0.2[56789]*|0.[3456789]*)
- have_intltoolize=true
- ;;
- esac
-fi
-if $have_intltoolize ; then : ; else
- echo
- echo "You must have intltool 0.25 installed to compile $PROJECT."
- echo "Install the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-fi
-
-have_autoconf=false
-if autoconf --version < /dev/null > /dev/null 2>&1 ; then
- autoconf_version=`autoconf --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
- case $autoconf_version in
- 2.5*)
- have_autoconf=true
- ;;
- esac
-fi
-if $have_autoconf ; then : ; else
- echo
- echo "You must have autoconf installed to compile $PROJECT."
- echo "libtool the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-fi
-
-if automake-1.6 --version < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake-1.6
- ACLOCAL=aclocal-1.6
-else
- echo
- echo "You must have automake >= 1.6 installed to compile $PROJECT."
- echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.6.0.tar.gz"
- echo "(or a newer version if it is available)"
- AUTOMAKE=automake
- ACLOCAL=aclocal
-fi
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-test $TEST_TYPE $FILE || {
- echo "You must run this script in the top-level $PROJECT directory"
- exit 1
-}
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
- fi
-fi
-
-if test -z "$ACLOCAL_FLAGS"; then
-
- acdir=`$ACLOCAL --print-ac-dir`
- m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4"
-
- for file in $m4list
- do
- if [ ! -f "$acdir/$file" ]; then
- echo "WARNING: aclocal's directory is $acdir, but..."
- echo " no file $acdir/$file"
- echo " You may see fatal macro warnings below."
- echo " If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
- echo " environment variable to \"-I /some/dir\", or install"
- echo " $acdir/$file."
- echo ""
- fi
- done
-fi
-
-$ACLOCAL $ACLOCAL_FLAGS
-
-glib-gettextize --copy --force
-# intltoolize --copy --force --automake
-libtoolize --copy --automake
-
-$AUTOMAKE --add-missing --copy
-autoconf
-
-# optional feature autoheader
-#autoheader
-
-cd $ORIGDIR
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
- echo "Running configure..."
- ($srcdir/configure --enable-maintainer-mode "$@" \
- && echo -e "\nNow type 'make' to compile $PROJECT.")
-fi
diff --git a/bonobo/configure.ac b/bonobo/configure.ac
deleted file mode 100644
index d6d9b4a..0000000
--- a/bonobo/configure.ac
+++ /dev/null
@@ -1,137 +0,0 @@
-AC_PREREQ(2.53)
-AC_INIT(src/main.cxx)
-
-AM_INIT_AUTOMAKE(ooo-bonobo, 0.0.1)
-
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CC
-AC_PROG_CXX
-AC_STDC_HEADERS
-AM_PROG_LIBTOOL
-
-GETTEXT_PACKAGE=ooo-bonobo
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
-AC_SUBST(GETTEXT_PACKAGE)
-
-ALL_LINGUAS="be at latin de"
-AM_GLIB_GNU_GETTEXT
-AC_PROG_INTLTOOL
-
-AC_ARG_ENABLE(
- [strict-tests],
- AC_HELP_STRING([--enable-strict-tests],
- [check for the presence of headers, binaries, etc.]),,
- [enable_strict_tests="no"])
-
-dnl FIXME
-TAG=`$srcdir/../bin/latest-patchset $srcdir/../patches`;
-BASEDIR=`pwd`/..
-
-AC_ARG_WITH(
- [ooo-builddir],
- AC_HELP_STRING([--with-ooo-builddir],
- [define the directory where openoffice.org will be compiled, e.g. the root of an ooo cvs checkout.]),
- [OOBUILDDIR="${withval}"],
- [if test "z$with_src" = "z"; then
- OOBUILDDIR=$BASEDIR/build/$TAG
- else
- OOBUILDDIR=$with_src/$TAG
- fi])
-
-ac_solver_dir="$OOBUILDDIR/solver/645/unxlngi4.pro"
-
-AC_ARG_WITH(
- [ooo-solver-dir],
- AC_HELP_STRING([--with-ooo-solver-dir=DIR],
- [path to your OpenOffice.org solver]),
- [ac_solver_dir="${withval}"],)
-
-ac_ooodev_bindir="${ac_solver_dir}/bin"
-ac_ooodev_includes="${ac_solver_dir}/inc"
-ac_ooodev_libdir="${ac_solver_dir}/lib"
-
-AC_ARG_WITH(
- [ooo-install-dir],
- AC_HELP_STRING([--with-ooo-install-dir=DIR],
- [path to your OpenOffice.org installation]),
- [OOO_INSTALLDIR=${withval}],
- [OOO_INSTALLDIR=${libdir}/ooo-1.1])
-AC_SUBST(OOO_INSTALLDIR)
-
-PKG_CHECK_MODULES(OOO_BONOBO, gtk+-2.0 libgnome-2.0 libbonoboui-2.0)
-
-ac_cppflags_safe="$CPPFLAGS"
-CPPFLAGS="-I$ac_ooodev_includes"
-AC_CHECK_HEADERS([sal/config.h],
- [],
- test "z$enable_strict_tests" = "zno" || AC_MSG_ERROR([[OpenOffice.org include files not found, try '--with-ooo-solver-dir=/path/to/solver']]))
-OOO_BONOBO_CFLAGS="$OOO_BONOBO_CFLAGS -I$ac_ooodev_includes"
-CPPFLAGS="$ac_cppflags_safe"
-
-AC_PATH_PROG([REGMERGE], [regmerge], [], [$ac_ooodev_bindir:$PATH])
-if test -z "$REGMERGE" ; then
- if test "z$enable_strict_tests" = "zno"; then
- REGMERGE="$ac_ooodev_bindir/regmerge"
- else
- AC_MSG_ERROR([regmerge not found, try '--with-ooo-solver-dir=location_of_ODK'.])
- fi
-fi
-dnl FIXME
-REGMERGE="LD_LIBRARY_PATH=$ac_ooodev_libdir:\$\$LD_LIBRARY_PATH $REGMERGE"
-AC_SUBST(REGMERGE)
-
-AC_PATH_PROG([REGCOMP], [regcomp], [], [$ac_ooodev_bindir:$PATH])
-if test -z "$REGCOMP" ; then
- if test "z$enable_strict_tests" = "zno"; then
- REGCOMP="$ac_ooodev_bindir/regcomp"
- else
- AC_MSG_ERROR([regcomp not found, try '--with-ooo-solver-dir=location_of_ODK'.])
- fi
-fi
-dnl FIXME
-REGCOMP="LD_LIBRARY_PATH=$ac_ooodev_libdir:\$\$LD_LIBRARY_PATH $REGCOMP"
-AC_SUBST(REGCOMP)
-
-if test ! -d "$ac_ooodev_libdir" && test "z$enable_strict_tests" != "zno" ; then
- AC_MSG_ERROR([[OpenOffice.org libraries not found. Please use --with-ooo-solver-dir=/path/to/solver]])
-fi
-OOO_BONOBO_LIBS="$OOO_BONOBO_LIBS -L$ac_ooodev_libdir"
-OOODEV_LIBDIR="$ac_ooodev_libdir"
-AC_SUBST(OOODEV_LIBDIR)
-
-dnl Type Registry (types.rdb = offapi + udkapi)
-AC_CHECK_FILE([$ac_ooodev_bindir/types.rdb],
- [],
- test "z$enable_strict_tests" = "zno" || AC_MSG_ERROR([[udkapi.rdb not found. Please use --with-ooo-install-dir=/path/to/ooo-installation]]))
-
-DKREGISTRYNAME="$ac_ooodev_bindir/types.rdb"
-AC_SUBST(DKREGISTRYNAME)
-
-dnl FIXME
-GUI=UNX
-COM=GCC
-OS=LINUX
-CPPU_ENV=gcc3
-
-OOO_BONOBO_CFLAGS="$OOO_BONOBO_CFLAGS -D$GUI -D$COM -D$OS -DCPPU_ENV=$CPPU_ENV"
-
-dnl FIXME
-CPPUHELPERLIB=-lcppuhelpergcc3
-CPPULIB=-lcppu
-SALHELPERLIB=-lsalhelpergcc3
-SALLIB=-lsal
-STLPORTLIB=-lstlport_gcc
-
-OOO_BONOBO_LIBS="$OOO_BONOBO_LIBS $CPPUHELPERLIB $CPPULIB $SALHELPERLIB $SALLIB $STLPORTLIB"
-
-AC_SUBST(OOO_BONOBO_CFLAGS)
-AC_SUBST(OOO_BONOBO_LIBS)
-
-AC_OUTPUT([
-Makefile
-data/Makefile
-src/Makefile
-po/Makefile.in
-])
diff --git a/bonobo/data/GNOME_OpenOfficeOrg.server.in.in b/bonobo/data/GNOME_OpenOfficeOrg.server.in.in
deleted file mode 100644
index 89e011e..0000000
--- a/bonobo/data/GNOME_OpenOfficeOrg.server.in.in
+++ /dev/null
@@ -1,62 +0,0 @@
-<oaf_info>
-
- <oaf_server iid="OAFIID:GNOME_OpenOfficeOrg_Factory"
- type="exe"
- location="@LIBEXECDIR@/ooo-bonobo">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:Bonobo/GenericFactory:1.0"/>
- </oaf_attribute>
-
- <oaf_attribute name="name" type="string"
- _value="OpenOffice.org viewer factory"/>
-
- </oaf_server>
-
- <oaf_server iid="OAFIID:GNOME_OpenOfficeOrg_Control"
- type="factory"
- location="OAFIID:GNOME_OpenOfficeOrg_Factory">
-
- <oaf_attribute name="repo_ids" type="stringv">
- <item value="IDL:Bonobo/Control:1.0"/>
- <item value="IDL:Bonobo/PersistFile:1.0"/>
- <item value="IDL:Bonobo/Persist:1.0"/>
- <item value="IDL:Bonobo/Unknown:1.0"/>
- </oaf_attribute>
-
- <oaf_attribute name="name" type="string" _value="OpenOffice.org Viewer"/>
- <oaf_attribute name="bonobo:editable" type="boolean" value="false"/>
- <oaf_attribute name="bonobo:supported_mime_types" type="stringv">
- <item value="application/vnd.sun.xml.writer"/>
- <item value="application/vnd.sun.xml.calc"/>
- <item value="application/vnd.sun.xml.calc.template"/>
- <item value="application/vnd.sun.xml.draw"/>
- <item value="application/vnd.sun.xml.draw.template"/>
- <item value="application/vnd.sun.xml.impress"/>
- <item value="application/vnd.sun.xml.impress.template"/>
- <item value="application/vnd.sun.xml.math"/>
- <item value="application/vnd.sun.xml.writer"/>
- <item value="application/vnd.sun.xml.writer.global"/>
- <item value="application/vnd.sun.xml.writer.template"/>
- <item value="application/vnd.stardivision.calc"/>
- <item value="application/vnd.stardivision.chart"/>
- <item value="application/vnd.stardivision.draw"/>
- <item value="application/vnd.stardivision.impress"/>
- <item value="application/vnd.stardivision.mail"/>
- <item value="application/vnd.stardivision.math"/>
- <item value="application/vnd.stardivision.writer"/>
- <item value="application/msword"/>
- <item value="application/excel"/>
- <item value="application/powerpoint"/>
- <item value="application/rtf"/>
- <item value="application/vnd.ms-excel"/>
- <item value="application/vnd.lotus-1-2-3"/>
- <item value="application/vnd.ms-powerpoint"/>
- </oaf_attribute>
-
- <oaf_attribute name="nautilus:view_as_name" type="string"
- _value="OpenOffice.org Document"/>
-
- </oaf_server>
-
-</oaf_info>
diff --git a/bonobo/data/Makefile.am b/bonobo/data/Makefile.am
deleted file mode 100644
index 3a6f160..0000000
--- a/bonobo/data/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-server_in_files = GNOME_OpenOfficeOrg.server.in.in
-
-serverdir = $(libdir)/bonobo/servers
-server_DATA = $(server_in_files:.server.in.in=.server)
-
-%.server.in: %.server.in.in
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
- at INTLTOOL_SERVER_RULE@
-
-rdbdir = $(libdir)/ooo-bonobo
-rdb_DATA = ooo-bonobo.rdb
-
-ooo-bonobo.rdb:
- $(REGMERGE) $@.tmp / $(DKREGISTRYNAME)
- $(REGCOMP) -register -r $@.tmp -c $(OOODEV_LIBDIR)/connector.uno$(SHAREDLIBEXT)
- $(REGCOMP) -register -r $@.tmp -c $(OOODEV_LIBDIR)/remotebridge.uno$(SHAREDLIBEXT)
- $(REGCOMP) -register -r $@.tmp -c $(OOODEV_LIBDIR)/bridgefac.uno$(SHAREDLIBEXT)
- $(REGCOMP) -register -r $@.tmp -c $(OOODEV_LIBDIR)/uuresolver.uno$(SHARELIBEXT)
- mv $@.tmp $@
-
-ini_in_files = ooo-bonobo-uno-bootstraprc.in
-inidir = $(datadir)/ooo-bonobo
-ini_DATA = $(ini_in_files:rc.in=rc)
-
-%rc: %rc.in
- sed -e "s|\@RDBDIR\@|$(rdbdir)|" $< > $@
-
-uidir = $(datadir)/gnome-2.0/ui
-ui_DATA = ooo-bonobo-control-ui.xml
-
-libexec_SCRIPTS = ooo-bonobo
-
-ooo-bonobo: ooo-bonobo.in
- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- -e "s|\@OOO_LIBDIR\@|$(OOO_INSTALLDIR)/program|" $< > $@
-
-BUILT_SOURCES=$(ini_DATA) $(rdb_DATA) $(server_DATA) $(libexec_SCRIPTS)
-CLEANFILES=$(BUILT_SOURCES)
-
-EXTRA_DIST=$(server_in_files) $(ini_in_files) $(ui_DATA) ooo-bonobo.in
diff --git a/bonobo/data/ooo-bonobo-control-ui.xml b/bonobo/data/ooo-bonobo-control-ui.xml
deleted file mode 100644
index dd1daf5..0000000
--- a/bonobo/data/ooo-bonobo-control-ui.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Root>
- <commands>
- <cmd name="FileSaveAs" _label="Save as"
- _tip="Save the current file with a different name"
- accel="*Control**Shift*s"
- pixtype="stock" pixname="Save As"/>
-
- <cmd name="FileExport" _label="Export"
- _tip="Save the current file in a different format"/>
-
- <cmd name="FileExportPDF" _label="Export as PDF"
- _tip="Export the current file as PDF file"/>
-
- <cmd name="FilePrint" _label="Print"
- _tip="Print the current file" accel="*Control*P"
- pixtype="stock" pixname="Print"/>
-
- <cmd name="FileProperties" _label="Properties"
- _tip="View properties of the displayed document"
- pixtype="stock" pixname="Properties"/>
-
- <cmd name="EditCopy" _label="Copy"
- _tip="Copy the selection" pixtype="stock" pixname="Copy"
- accel="*Control*c"/>
-
- <cmd name="ZoomIn" _label="Zoom In"
- _tip="Expand to a larger size" accel="*Control*plus"
- pixtype="stock" pixname="Zoom-In"/>
-
- <cmd name="ZoomOut" _label="Zoom Out"
- _tip="Shrink to a smaller size" accel="*Control*minus"
- pixtype="stock" pixname="Zoom-Out"/>
-
- <cmd name="ZoomNormal" _label="Normal Size"
- _tip="Show the contents at the normal size"
- pixtype="stock" pixname="Zoom-100"/>
-
- <cmd name="ZoomFit" _label="Best Fit"
- _tip="Size to fit the page"
- pixtype="stock" pixname="Zoom-Fit"/>
- </commands>
-
- <menu>
-
- <submenu name="File" _label="_File">
- <placeholder name="Open Placeholder">
- <menuitem name="FileSaveAs" _label="Save _as..." verb=""/>
- <menuitem name="FileExport" _label="E_xport..." verb=""/>
- <menuitem name="FileExportPDF" _label="Export as _PDF..." verb=""/>
- </placeholder>
-
- <placeholder name="File Items Placeholder">
- <menuitem name="FilePrint" _label="_Print..." verb=""/>
- <menuitem name="FileProperties" _label="Proper_ties" verb=""/>
- </placeholder>
- </submenu>
-
- <submenu name="Edit" _label="_Edit">
- <menuitem name="Copy" _label="_Copy" verb="EditCopy"/>
- </submenu>
-
- <submenu name="View" _label="_View">
- <placeholder name="Zoom Items Placeholder">
- <menuitem name="Zoom In" _label="Zoom _In" verb="ZoomIn"/>
- <menuitem name="Zoom Out" _label="Zoom _Out" verb="ZoomOut"/>
- <menuitem name="Zoom Normal" _label="Normal Si_ze" verb="ZoomNormal"/>
- <menuitem name="Zoom Fit" _label="Best _Fit" verb="ZoomFit"/>
- </placeholder>
- </submenu>
-
- </menu>
-</Root>
diff --git a/bonobo/data/ooo-bonobo-uno-bootstraprc.in b/bonobo/data/ooo-bonobo-uno-bootstraprc.in
deleted file mode 100644
index 1a36c38..0000000
--- a/bonobo/data/ooo-bonobo-uno-bootstraprc.in
+++ /dev/null
@@ -1,2 +0,0 @@
-UNO_TYPES=@RDBDIR@/ooo-bonobo.rdb
-UNO_SERVICES=@RDBDIR@/ooo-bonobo.rdb
diff --git a/bonobo/data/ooo-bonobo.in b/bonobo/data/ooo-bonobo.in
deleted file mode 100755
index 0d145c8..0000000
--- a/bonobo/data/ooo-bonobo.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-LD_LIBRARY_PATH=@OOO_LIBDIR@:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-exec @LIBEXECDIR@/ooo-bonobo.bin "$@"
diff --git a/bonobo/intltool-extract.in b/bonobo/intltool-extract.in
deleted file mode 100644
index d98b2bf..0000000
--- a/bonobo/intltool-extract.in
+++ /dev/null
@@ -1,389 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-
-#
-# The Intltool Message Extractor
-#
-# Copyright (C) 2000-2001 Free Software Foundation.
-#
-# Intltool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Intltool 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Authors: Kenneth Christiansen <kenneth at gnu.org>
-# Darin Adler <darin at bentspoon.com>
-#
-
-## Release information
-my $PROGRAM = "intltool-extract";
-my $PACKAGE = "intltool";
-my $VERSION = "0.25";
-
-## Loaded modules
-use strict;
-use File::Basename;
-use Getopt::Long;
-
-## Scalars used by the option stuff
-my $TYPE_ARG = "0";
-my $LOCAL_ARG = "0";
-my $HELP_ARG = "0";
-my $VERSION_ARG = "0";
-my $UPDATE_ARG = "0";
-my $QUIET_ARG = "0";
-
-my $FILE;
-my $OUTFILE;
-
-my $gettext_type = "";
-my $input;
-my %messages = ();
-
-## Use this instead of \w for XML files to handle more possible characters.
-my $w = "[-A-Za-z0-9._:]";
-
-## Always print first
-$| = 1;
-
-## Handle options
-GetOptions (
- "type=s" => \$TYPE_ARG,
- "local|l" => \$LOCAL_ARG,
- "help|h" => \$HELP_ARG,
- "version|v" => \$VERSION_ARG,
- "update" => \$UPDATE_ARG,
- "quiet|q" => \$QUIET_ARG,
- ) or &error;
-
-&split_on_argument;
-
-
-## Check for options.
-## This section will check for the different options.
-
-sub split_on_argument {
-
- if ($VERSION_ARG) {
- &version;
-
- } elsif ($HELP_ARG) {
- &help;
-
- } elsif ($LOCAL_ARG) {
- &place_local;
- &extract;
-
- } elsif ($UPDATE_ARG) {
- &place_normal;
- &extract;
-
- } elsif (@ARGV > 0) {
- &place_normal;
- &message;
- &extract;
-
- } else {
- &help;
-
- }
-}
-
-sub place_normal {
- $FILE = $ARGV[0];
- $OUTFILE = "$FILE.h";
-}
-
-sub place_local {
- $OUTFILE = fileparse($FILE, ());
- if (!-e "tmp/") {
- system("mkdir tmp/");
- }
- $OUTFILE = "./tmp/$OUTFILE.h"
-}
-
-sub determine_type {
- if ($TYPE_ARG =~ /^gettext\/(.*)/) {
- $gettext_type=$1
- }
-}
-
-## Sub for printing release information
-sub version{
- print "${PROGRAM} (${PACKAGE}) $VERSION\n";
- print "Copyright (C) 2000 Free Software Foundation, Inc.\n";
- print "Written by Kenneth Christiansen, 2000.\n\n";
- print "This is free software; see the source for copying conditions. There is NO\n";
- print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
- exit;
-}
-
-## Sub for printing usage information
-sub help{
- print "Usage: ${PROGRAM} [FILENAME] [OPTIONS] ...\n";
- print "Generates a header file from an xml source file.\n\nGrabs all strings ";
- print "between <_translatable_node> and it's end tag,\nwhere tag are all allowed ";
- print "xml tags. Read the docs for more info.\n\n";
- print " -v, --version shows the version\n";
- print " -h, --help shows this help page\n";
- print " -q, --quiet quiet mode\n";
- print "\nReport bugs to <kenneth\@gnu.org>.\n";
- exit;
-}
-
-## Sub for printing error messages
-sub error{
- print "Try `${PROGRAM} --help' for more information.\n";
- exit;
-}
-
-sub message {
- print "Generating C format header file for translation.\n";
-}
-
-sub extract {
- &determine_type;
-
- &convert ($FILE);
-
- open OUT, ">$OUTFILE";
- &msg_write;
- close OUT;
-
- print "Wrote $OUTFILE\n" unless $QUIET_ARG;
-}
-
-sub convert($) {
-
- ## Reading the file
- {
- local (*IN);
- local $/; #slurp mode
- open (IN, "<$FILE") || die "can't open $FILE: $!";
- $input = <IN>;
- }
-
- &type_ini if $gettext_type eq "ini";
- &type_keys if $gettext_type eq "keys";
- &type_xml if $gettext_type eq "xml";
- &type_glade if $gettext_type eq "glade";
- &type_scheme if $gettext_type eq "scheme";
- &type_schemas if $gettext_type eq "schemas";
- &type_rfc822deb if $gettext_type eq "rfc822deb";
-}
-
-sub entity_decode_minimal
-{
- local ($_) = @_;
-
- s/'/'/g; # '
- s/"/"/g; # "
- s/&/&/g;
-
- return $_;
-}
-
-sub entity_decode
-{
- local ($_) = @_;
-
- s/'/'/g; # '
- s/"/"/g; # "
- s/&/&/g;
- s/</</g;
- s/>/>/g;
-
- return $_;
-}
-
-sub escape_char
-{
- return '\"' if $_ eq '"';
- return '\n' if $_ eq "\n";
- return '\\' if $_ eq '\\';
-
- return $_;
-}
-
-sub escape
-{
- my ($string) = @_;
- return join "", map &escape_char, split //, $string;
-}
-
-sub type_ini {
- ### For generic translatable desktop files ###
- while ($input =~ /^_.*=(.*)$/mg) {
- $messages{$1} = [];
- }
-}
-
-sub type_keys {
- ### For generic translatable mime/keys files ###
- while ($input =~ /^\s*_\w+=(.*)$/mg) {
- $messages{$1} = [];
- }
-}
-
-sub type_xml {
- ### For generic translatable XML files ###
-
- while ($input =~ /\s_$w+=\"([^"]+)\"/sg) { # "
- $messages{entity_decode_minimal($1)} = [];
- }
-
- while ($input =~ /<_($w+)(?: xml:space="($w+)")?>(.+?)<\/_\1>/sg) {
- $_ = $3;
- if (!defined($2) || $2 ne "preserve") {
- s/\s+/ /g;
- s/^ //;
- s/ $//;
- }
- $messages{entity_decode_minimal($_)} = [];
- }
-}
-
-sub type_schemas {
- ### For schemas XML files ###
-
- # FIXME: We should handle escaped < (less than)
- while ($input =~ /
- <locale\ name="C">\s*
- (<default>\s*(.*?)\s*<\/default>\s*)?
- (<short>\s*(.*?)\s*<\/short>\s*)?
- (<long>\s*(.*?)\s*<\/long>\s*)?
- <\/locale>
- /sgx) {
- my @totranslate = ($2,$4,$6);
- foreach (@totranslate) {
- next if !$_;
- s/\s+/ /g;
- $messages{entity_decode_minimal($_)} = [];
- }
- }
-}
-
-sub type_rfc822deb {
- ### For rfc822-style Debian configuration files ###
-
- while ($input =~ /(?:^|\n)_[^:]+:\s*(.*?)(?=\n\S|$)/sg) {
- my @str_list = rfc822deb_split($1);
- for my $str (@str_list) {
- # As rfc822deb is for configuration files, duplicates
- # should never happen. Developers must use the
- # [] construct to make msgid unique, see also intltool-merge
- print STDERR "Warning: msgid multiply defined:\n $str\n"
- if defined($messages{$str});
- $messages{$str} = [];
- }
- }
-}
-
-sub rfc822deb_split {
- # Debian defines a special way to deal with rfc822-style files:
- # when a value contain newlines, it consists of
- # 1. a short form (first line)
- # 2. a long description, all lines begin with a space,
- # and paragraphs are separated by a single dot on a line
- # This routine returns an array of all paragraphs, and reformat
- # them.
- my $text = shift;
- $text =~ s/^ //mg;
- return ($text) if $text !~ /\n/;
-
- $text =~ s/([^\n]*)\n//;
- my @list = ($1);
- my $str = '';
- for my $line (split (/\n/, $text)) {
- chomp $line;
- $line =~ /\s+$/;
- if ($line =~ /^\.$/) {
- # New paragraph
- $str =~ s/\s*$//;
- push(@list, $str);
- $str = '';
- } elsif ($line =~ /^\s/) {
- # Line which must not be reformatted
- $str .= "\n" if length ($str) && $str !~ /\n$/;
- $str .= $line."\n";
- } else {
- # Continuation line, remove newline
- $str .= " " if length ($str) && $str !~ /[\n ]$/;
- $str .= $line;
- }
- }
- $str =~ s/\s*$//;
- push(@list, $str) if length ($str);
- return @list;
-}
-
-sub type_glade {
- ### For translatable Glade XML files ###
-
- my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message";
-
- while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) {
- # Glade sometimes uses tags that normally mark translatable things for
- # little bits of non-translatable content. We work around this by not
- # translating strings that only includes something like label4 or window1.
- $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
- }
-
- while ($input =~ /<items>(..[^<]*)<\/items>/sg) {
- for my $item (split (/\n/, $1)) {
- $messages{entity_decode($item)} = [];
- }
- }
-
- ## handle new glade files
- while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"[^>]*>([^<]+)<\/\1>/sg) {
- $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
- }
- while ($input =~ /<atkaction\s+action_name="([^>]*)"\s+description="([^>]+)"\/>/sg) {
- $messages{entity_decode_minimal($2)} = [];
- }
-}
-
-sub type_scheme {
- while ($input =~ /_\(?"((?:[^"\\]+|\\.)*)"\)?/sg) {
- $messages{$1} = [];
- }
-}
-
-sub msg_write {
- for my $message (sort keys %messages) {
- print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/;
-
- my @lines = split (/\n/, $message, -1);
- for (my $n = 0; $n < @lines; $n++) {
- if ($n == 0) {
- print OUT "char *s = N_(\"";
- } else {
- print OUT " \"";
- }
-
- print OUT escape($lines[$n]);
-
- if ($n < @lines - 1) {
- print OUT "\\n\"\n";
- } else {
- print OUT "\");\n";
- }
- }
- }
-}
-
diff --git a/bonobo/intltool-merge.in b/bonobo/intltool-merge.in
deleted file mode 100644
index f1d53b1..0000000
--- a/bonobo/intltool-merge.in
+++ /dev/null
@@ -1,908 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-
-#
-# The Intltool Message Merger
-#
-# Copyright (C) 2000, 2002 Free Software Foundation.
-# Copyright (C) 2000, 2001 Eazel, Inc
-#
-# Intltool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 published by the Free Software Foundation.
-#
-# Intltool 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Authors: Maciej Stachowiak <mjs at noisehavoc.org>
-# Kenneth Christiansen <kenneth at gnu.org>
-# Darin Adler <darin at bentspoon.com>
-#
-# Proper XML UTF-8'ification written by Cyrille Chepelov <chepelov at calixo.net>
-#
-
-## Release information
-my $PROGRAM = "intltool-merge";
-my $PACKAGE = "intltool";
-my $VERSION = "0.25";
-
-## Loaded modules
-use strict;
-use Getopt::Long;
-use Text::Wrap;
-
-## Scalars used by the option stuff
-my $HELP_ARG = 0;
-my $VERSION_ARG = 0;
-my $BA_STYLE_ARG = 0;
-my $XML_STYLE_ARG = 0;
-my $KEYS_STYLE_ARG = 0;
-my $DESKTOP_STYLE_ARG = 0;
-my $SCHEMAS_STYLE_ARG = 0;
-my $RFC822DEB_STYLE_ARG = 0;
-my $QUIET_ARG = 0;
-my $PASS_THROUGH_ARG = 0;
-my $UTF8_ARG = 0;
-my $cache_file;
-
-## Handle options
-GetOptions
-(
- "help" => \$HELP_ARG,
- "version" => \$VERSION_ARG,
- "quiet|q" => \$QUIET_ARG,
- "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility
- "ba-style|b" => \$BA_STYLE_ARG,
- "xml-style|x" => \$XML_STYLE_ARG,
- "keys-style|k" => \$KEYS_STYLE_ARG,
- "desktop-style|d" => \$DESKTOP_STYLE_ARG,
- "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
- "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
- "pass-through|p" => \$PASS_THROUGH_ARG,
- "utf8|u" => \$UTF8_ARG,
- "cache|c=s" => \$cache_file
- ) or &error;
-
-my $PO_DIR;
-my $FILE;
-my $OUTFILE;
-
-my %po_files_by_lang = ();
-my %translations = ();
-
-# Use this instead of \w for XML files to handle more possible characters.
-my $w = "[-A-Za-z0-9._:]";
-
-# XML quoted string contents
-my $q = "[^\\\"]*";
-
-## Check for options.
-
-if ($VERSION_ARG)
-{
- &print_version;
-}
-elsif ($HELP_ARG)
-{
- &print_help;
-}
-elsif ($BA_STYLE_ARG && @ARGV > 2)
-{
- &preparation;
- &print_message;
- &ba_merge_translations;
- &finalize;
-}
-elsif ($XML_STYLE_ARG && @ARGV > 2)
-{
- &utf8_sanity_check;
- &preparation;
- &print_message;
- &xml_merge_translations;
- &finalize;
-}
-elsif ($KEYS_STYLE_ARG && @ARGV > 2)
-{
- &utf8_sanity_check;
- &preparation;
- &print_message;
- &keys_merge_translations;
- &finalize;
-}
-elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
-{
- &preparation;
- &print_message;
- &desktop_merge_translations;
- &finalize;
-}
-elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2)
-{
- &preparation;
- &print_message;
- &schemas_merge_translations;
- &finalize;
-}
-elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2)
-{
- &preparation;
- &print_message;
- &rfc822deb_merge_translations;
- &finalize;
-}
-else
-{
- &print_help;
-}
-
-exit;
-
-## Sub for printing release information
-sub print_version
-{
- print "${PROGRAM} (${PACKAGE}) ${VERSION}\n";
- print "Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.\n\n";
- print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n";
- print "Copyright (C) 2000-2001 Eazel, Inc.\n";
- print "This is free software; see the source for copying conditions. There is NO\n";
- print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
- exit;
-}
-
-## Sub for printing usage information
-sub print_help
-{
- print "Usage: ${PROGRAM} [OPTIONS] PO_DIRECTORY FILENAME OUTPUT_FILE\n";
- print "Generates an output file that includes translated versions of some attributes,\n";
- print "from an untranslated source and a po directory that includes translations.\n\n";
- print " -b, --ba-style includes translations in the bonobo-activation style\n";
- print " -d, --desktop-style includes translations in the desktop style\n";
- print " -k, --keys-style includes translations in the keys style\n";
- print " -s, --schemas-style includes translations in the schemas style\n";
- print " -r, --rfc822deb-style includes translations in the RFC822 style\n";
- print " -x, --xml-style includes translations in the standard xml style\n";
- print " -u, --utf8 convert all strings to UTF-8 before merging\n";
- print " -p, --pass-through use strings as found in .po files, without\n";
- print " conversion (STRONGLY unrecommended with -x)\n";
- print " -q, --quiet suppress most messages\n";
- print " --help display this help and exit\n";
- print " --version output version information and exit\n";
- print "\nReport bugs to bugzilla.gnome.org, module intltool, or contact us through \n";
- print "<xml-i18n-tools-list\@gnome.org>.\n";
- exit;
-}
-
-
-## Sub for printing error messages
-sub print_error
-{
- print "Try `${PROGRAM} --help' for more information.\n";
- exit;
-}
-
-
-sub print_message
-{
- print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG;
-}
-
-
-sub preparation
-{
- $PO_DIR = $ARGV[0];
- $FILE = $ARGV[1];
- $OUTFILE = $ARGV[2];
-
- &gather_po_files;
- &get_translation_database;
-}
-
-# General-purpose code for looking up translations in .po files
-
-sub po_file2lang
-{
- my ($tmp) = @_;
- $tmp =~ s/^.*\/(.*)\.po$/$1/;
- return $tmp;
-}
-
-sub gather_po_files
-{
- for my $po_file (glob "$PO_DIR/*.po") {
- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
- }
-}
-
-sub get_local_charset
-{
- my ($encoding) = @_;
- my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/usr/lib/charset.alias";
-
- # seek character encoding aliases in charset.alias (glib)
-
- if (open CHARSET_ALIAS, $alias_file)
- {
- while (<CHARSET_ALIAS>)
- {
- next if /^\#/;
- return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i)
- }
-
- close CHARSET_ALIAS;
- }
-
- # if not found, return input string
-
- return $encoding;
-}
-
-sub get_po_encoding
-{
- my ($in_po_file) = @_;
- my $encoding = "";
-
- open IN_PO_FILE, $in_po_file or die;
- while (<IN_PO_FILE>)
- {
- ## example: "Content-Type: text/plain; charset=ISO-8859-1\n"
- if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/)
- {
- $encoding = $1;
- last;
- }
- }
- close IN_PO_FILE;
-
- if (!$encoding)
- {
- print "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n";
- $encoding = "ISO-8859-1";
- }
-
- $encoding = get_local_charset($encoding);
-
- return $encoding
-}
-
-sub utf8_sanity_check
-{
- if (!$UTF8_ARG)
- {
- if (!$PASS_THROUGH_ARG)
- {
- $PASS_THROUGH_ARG="1";
- }
- }
-}
-
-sub get_translation_database
-{
- if ($cache_file) {
- &get_cached_translation_database;
- } else {
- &create_translation_database;
- }
-}
-
-sub get_newest_po_age
-{
- my $newest_age;
-
- foreach my $file (values %po_files_by_lang)
- {
- my $file_age = -M $file;
- $newest_age = $file_age if !$newest_age || $file_age < $newest_age;
- }
-
- return $newest_age;
-}
-
-sub create_cache
-{
- print "Generating and caching the translation database\n" unless $QUIET_ARG;
-
- &create_translation_database;
-
- open CACHE, ">$cache_file" || die;
- print CACHE join "\x01", %translations;
- close CACHE;
-}
-
-sub load_cache
-{
- print "Found cached translation database\n" unless $QUIET_ARG;
-
- my $contents;
- open CACHE, "<$cache_file" || die;
- {
- local $/;
- $contents = <CACHE>;
- }
- close CACHE;
- %translations = split "\x01", $contents;
-}
-
-sub get_cached_translation_database
-{
- my $cache_file_age = -M $cache_file;
- if (defined $cache_file_age)
- {
- if ($cache_file_age <= &get_newest_po_age)
- {
- &load_cache;
- return;
- }
- print "Found too-old cached translation database\n" unless $QUIET_ARG;
- }
-
- &create_cache;
-}
-
-sub create_translation_database
-{
- for my $lang (keys %po_files_by_lang)
- {
- my $po_file = $po_files_by_lang{$lang};
-
- if ($UTF8_ARG)
- {
- my $encoding = get_po_encoding ($po_file);
-
- if (lc $encoding eq "utf-8")
- {
- open PO_FILE, "<$po_file";
- }
- else
- {
- my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv";
- open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
- }
- }
- else
- {
- open PO_FILE, "<$po_file";
- }
-
- my $nextfuzzy = 0;
- my $inmsgid = 0;
- my $inmsgstr = 0;
- my $msgid = "";
- my $msgstr = "";
-
- while (<PO_FILE>)
- {
- $nextfuzzy = 1 if /^#, fuzzy/;
-
- if (/^msgid "((\\.|[^\\])*)"/ )
- {
- $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
- $msgid = "";
- $msgstr = "";
-
- if ($nextfuzzy) {
- $inmsgid = 0;
- } else {
- $msgid = unescape_po_string($1);
- $inmsgid = 1;
- }
- $inmsgstr = 0;
- $nextfuzzy = 0;
- }
-
- if (/^msgstr "((\\.|[^\\])*)"/)
- {
- $msgstr = unescape_po_string($1);
- $inmsgstr = 1;
- $inmsgid = 0;
- }
-
- if (/^"((\\.|[^\\])*)"/)
- {
- $msgid .= unescape_po_string($1) if $inmsgid;
- $msgstr .= unescape_po_string($1) if $inmsgstr;
- }
- }
- $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
- }
-}
-
-sub finalize
-{
-}
-
-sub unescape_one_sequence
-{
- my ($sequence) = @_;
-
- return "\\" if $sequence eq "\\\\";
- return "\"" if $sequence eq "\\\"";
- return "\n" if $sequence eq "\\n";
-
- # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal),
- # \xXX (hex) and has a comment saying they want to handle \u and \U.
-
- return $sequence;
-}
-
-sub unescape_po_string
-{
- my ($string) = @_;
-
- $string =~ s/(\\.)/unescape_one_sequence($1)/eg;
-
- return $string;
-}
-
-## NOTE: deal with < - < but not > - > because it seems its ok to have
-## > in the entity. For further info please look at #84738.
-sub entity_decode
-{
- local ($_) = @_;
-
- s/'/'/g; # '
- s/"/"/g; # "
- s/&/&/g;
- s/</</g;
-
- return $_;
-}
-
-sub entity_encode
-{
- my ($pre_encoded) = @_;
-
- my @list_of_chars = unpack ('C*', $pre_encoded);
-
- if ($PASS_THROUGH_ARG)
- {
- return join ('', map (&entity_encode_int_even_high_bit, @list_of_chars));
- }
- else
- {
- return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
- }
-}
-
-sub entity_encode_int_minimalist
-{
- return """ if $_ == 34;
- return "&" if $_ == 38;
- return "'" if $_ == 39;
- return "<" if $_ == 60;
- return chr $_;
-}
-
-sub entity_encode_int_even_high_bit
-{
- if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60)
- {
- # the ($_ > 127) should probably be removed
- return "&#" . $_ . ";";
- }
- else
- {
- return chr $_;
- }
-}
-
-sub entity_encoded_translation
-{
- my ($lang, $string) = @_;
-
- my $translation = $translations{$lang, $string};
- return $string if !$translation;
- return entity_encode ($translation);
-}
-
-## XML (bonobo-activation specific) merge code
-
-sub ba_merge_translations
-{
- my $source;
-
- {
- local $/; # slurp mode
- open INPUT, "<$FILE" or die "can't open $FILE: $!";
- $source = <INPUT>;
- close INPUT;
- }
-
- open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!";
-
- while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s)
- {
- print OUTPUT $1;
-
- my $node = $2 . "\n";
-
- my @strings = ();
- $_ = $node;
- while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) {
- push @strings, entity_decode($3);
- }
- print OUTPUT;
-
- my %langs;
- for my $string (@strings)
- {
- for my $lang (keys %po_files_by_lang)
- {
- $langs{$lang} = 1 if $translations{$lang, $string};
- }
- }
-
- for my $lang (sort keys %langs)
- {
- $_ = $node;
- s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s;
- s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg;
- print OUTPUT;
- }
- }
-
- print OUTPUT $source;
-
- close OUTPUT;
-}
-
-
-## XML (non-bonobo-activation) merge code
-
-sub xml_merge_translations
-{
- my $source;
-
- {
- local $/; # slurp mode
- open INPUT, "<$FILE" or die "can't open $FILE: $!";
- $source = <INPUT>;
- close INPUT;
- }
-
- open OUTPUT, ">$OUTFILE" or die;
-
- # FIXME: support attribute translations
-
- # Empty nodes never need translation, so unmark all of them.
- # For example, <_foo/> is just replaced by <foo/>.
- $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-
- # Support for <_foo>blah</_foo> style translations.
- while ($source =~ s|^(.*?)([ \t]*)<\s*_($w+)\s*>(.*?)<\s*/_\3\s*>([ \t]*\n)?||s)
- {
- print OUTPUT $1;
-
- my $spaces = $2;
- my $tag = $3;
- my $string = $4;
-
- print OUTPUT "$spaces<$tag>$string</$tag>\n";
-
- $string =~ s/\s+/ /g;
- $string =~ s/^ //;
- $string =~ s/ $//;
- $string = entity_decode($string);
-
- for my $lang (sort keys %po_files_by_lang)
- {
- my $translation = $translations{$lang, $string};
- next if !$translation;
- $translation = entity_encode($translation);
- print OUTPUT "$spaces<$tag xml:lang=\"$lang\">$translation</$tag>\n";
- }
- }
-
- print OUTPUT $source;
-
- close OUTPUT;
-}
-
-sub keys_merge_translations
-{
- open INPUT, "<${FILE}" or die;
- open OUTPUT, ">${OUTFILE}" or die;
-
- while (<INPUT>)
- {
- if (s/^(\s*)_(\w+=(.*))/$1$2/)
- {
- my $string = $3;
-
- print OUTPUT;
-
- my $non_translated_line = $_;
-
- for my $lang (sort keys %po_files_by_lang)
- {
- my $translation = $translations{$lang, $string};
- next if !$translation;
-
- $_ = $non_translated_line;
- s/(\w+)=.*/[$lang]$1=$translation/;
- print OUTPUT;
- }
- }
- else
- {
- print OUTPUT;
- }
- }
-
- close OUTPUT;
- close INPUT;
-}
-
-sub desktop_merge_translations
-{
- open INPUT, "<${FILE}" or die;
- open OUTPUT, ">${OUTFILE}" or die;
-
- while (<INPUT>)
- {
- if (s/^(\s*)_(\w+=(.*))/$1$2/)
- {
- my $string = $3;
-
- print OUTPUT;
-
- my $non_translated_line = $_;
-
- for my $lang (sort keys %po_files_by_lang)
- {
- my $translation = $translations{$lang, $string};
- next if !$translation;
-
- $_ = $non_translated_line;
- s/(\w+)=.*/${1}[$lang]=$translation/;
- print OUTPUT;
- }
- }
- else
- {
- print OUTPUT;
- }
- }
-
- close OUTPUT;
- close INPUT;
-}
-
-sub schemas_merge_translations
-{
- my $source;
-
- {
- local $/; # slurp mode
- open INPUT, "<$FILE" or die "can't open $FILE: $!";
- $source = <INPUT>;
- close INPUT;
- }
-
- open OUTPUT, ">$OUTFILE" or die;
-
- # FIXME: support attribute translations
-
- # Empty nodes never need translation, so unmark all of them.
- # For example, <_foo/> is just replaced by <foo/>.
- $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-
- while ($source =~ s/
- (.*?)
- (\s+)(<locale\ name="C">(\s*)
- (<default>\s*(.*?)\s*<\/default>)?(\s*)
- (<short>\s*(.*?)\s*<\/short>)?(\s*)
- (<long>\s*(.*?)\s*<\/long>)?(\s*)
- <\/locale>)
- //sx)
- {
- print OUTPUT $1;
-
- my $locale_start_spaces = $2 ? $2 : '';
- my $default_spaces = $4 ? $4 : '';
- my $short_spaces = $7 ? $7 : '';
- my $long_spaces = $10 ? $10 : '';
- my $locale_end_spaces = $13 ? $13 : '';
- my $c_default_block = $3 ? $3 : '';
- my $default_string = $6 ? $6 : '';
- my $short_string = $9 ? $9 : '';
- my $long_string = $12 ? $12 : '';
-
- $c_default_block =~ s/default>\[.*?\]/default>/s;
-
- print OUTPUT "$locale_start_spaces$c_default_block";
-
- $default_string =~ s/\s+/ /g;
- $default_string = entity_decode($default_string);
- $short_string =~ s/\s+/ /g;
- $short_string = entity_decode($short_string);
- $long_string =~ s/\s+/ /g;
- $long_string = entity_decode($long_string);
-
- for my $lang (sort keys %po_files_by_lang)
- {
- my $default_translation = $translations{$lang, $default_string};
- my $short_translation = $translations{$lang, $short_string};
- my $long_translation = $translations{$lang, $long_string};
-
- next if (!$default_translation && !$short_translation &&
- !$long_translation);
-
- print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
-
- print OUTPUT "$default_spaces";
-
- if ($default_translation)
- {
- $default_translation = entity_encode($default_translation);
- print OUTPUT "<default>$default_translation</default>";
- }
-
- print OUTPUT "$short_spaces";
-
- if ($short_translation)
- {
- $short_translation = entity_encode($short_translation);
- print OUTPUT "<short>$short_translation</short>";
- }
-
- print OUTPUT "$long_spaces";
-
- if ($long_translation)
- {
- $long_translation = entity_encode($long_translation);
- print OUTPUT "<long>$long_translation</long>";
- }
-
- print OUTPUT "$locale_end_spaces</locale>";
- }
- }
-
- print OUTPUT $source;
-
- close OUTPUT;
-}
-
-sub rfc822deb_merge_translations
-{
- my $source;
-
- $Text::Wrap::huge = 'overflow';
-
- {
- local $/; # slurp mode
- open INPUT, "<$FILE" or die "can't open $FILE: $!";
- $source = <INPUT>;
- close INPUT;
- }
-
- open OUTPUT, ">${OUTFILE}" or die;
-
- while ($source =~ /(^|\n+)(_)?([^:_\n]+)(:\s*)(.*?)(?=\n[\S\n]|$)/sg)
- {
- my $sep = $1;
- my $non_translated_line = $3.$4;
- my $string = $5;
- my $is_translatable = defined($2);
- # Remove [] dummy strings
- $string =~ s/\[\s[^\[\]]*\]$//;
- $non_translated_line .= $string;
-
- print OUTPUT $sep.$non_translated_line;
-
- if ($is_translatable)
- {
- my @str_list = rfc822deb_split($string);
-
- for my $lang (sort keys %po_files_by_lang)
- {
- my $is_translated = 1;
- my $str_translated = '';
- my $first = 1;
-
- for my $str (@str_list)
- {
- my $translation = $translations{$lang, $str};
-
- if (!$translation)
- {
- $is_translated = 0;
- last;
- }
-
- # $translation may also contain [] dummy
- # strings, mostly to indicate an empty string
- $translation =~ s/\[\s[^\[\]]*\]$//;
-
- if ($first)
- {
- $str_translated .=
- Text::Tabs::expand($translation) .
- "\n";
- }
- else
- {
- $str_translated .= Text::Tabs::expand(
- Text::Wrap::wrap(' ', ' ', $translation)) .
- "\n .\n";
- }
- $first = 0;
-
- # To fix some problems with Text::Wrap::wrap
- $str_translated =~ s/(\n )+\n/\n .\n/g;
- }
- next unless $is_translated;
-
- $str_translated =~ s/\n \.\n$//;
- $str_translated =~ s/\s+$//;
-
- $_ = $non_translated_line;
- s/^(\w+):\s*.*/$sep${1}-$lang: $str_translated/s;
- print OUTPUT;
- }
- }
- }
- print OUTPUT "\n";
-
- close OUTPUT;
- close INPUT;
-}
-
-sub rfc822deb_split
-{
- # Debian defines a special way to deal with rfc822-style files:
- # when a value contain newlines, it consists of
- # 1. a short form (first line)
- # 2. a long description, all lines begin with a space,
- # and paragraphs are separated by a single dot on a line
- # This routine returns an array of all paragraphs, and reformat
- # them.
- my $text = shift;
- $text =~ s/^ //mg;
- return ($text) if $text !~ /\n/;
-
- $text =~ s/([^\n]*)\n//;
- my @list = ($1);
- my $str = '';
-
- for my $line (split (/\n/, $text))
- {
- chomp $line;
- $line =~ /\s+$/;
-
- if ($line =~ /^\.$/)
- {
- # New paragraph
- $str =~ s/\s*$//;
- push(@list, $str);
- $str = '';
- }
- elsif ($line =~ /^\s/)
- {
- # Line which must not be reformatted
- $str .= "\n" if length ($str) && $str !~ /\n$/;
- $str .= $line."\n";
- }
- else
- {
- # Continuation line, remove newline
- $str .= " " if length ($str) && $str !~ /[\n ]$/;
- $str .= $line;
- }
- }
-
- $str =~ s/\s*$//;
- push(@list, $str) if length ($str);
-
- return @list;
-}
-
diff --git a/bonobo/intltool-update.in b/bonobo/intltool-update.in
deleted file mode 100644
index 2004a59..0000000
--- a/bonobo/intltool-update.in
+++ /dev/null
@@ -1,642 +0,0 @@
-#!@INTLTOOL_PERL@ -w
-
-#
-# The Intltool Message Updater
-#
-# Copyright (C) 2000-2002 Free Software Foundation.
-#
-# Intltool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 published by the Free Software Foundation.
-#
-# Intltool 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
-# Authors: Kenneth Christiansen <kenneth at gnu.org>
-# Maciej Stachowiak
-# Darin Adler <darin at bentspoon.com>
-
-## Release information
-my $PROGRAM = "intltool-update";
-my $VERSION = "0.25";
-my $PACKAGE = "intltool";
-
-## Loaded modules
-use strict;
-use Getopt::Long;
-use Cwd;
-use File::Copy;
-use File::Find;
-
-## Scalars used by the option stuff
-my $HELP_ARG = 0;
-my $VERSION_ARG = 0;
-my $DIST_ARG = 0;
-my $POT_ARG = 0;
-my $HEADERS_ARG = 0;
-my $MAINTAIN_ARG = 0;
-my $REPORT_ARG = 0;
-my $VERBOSE = 0;
-my $GETTEXT_PACKAGE = "";
-
-my @languages;
-my %po_files_by_lang = ();
-
-# Regular expressions to categorize file types.
-# FIXME: Please check if the following is correct
-
-my $xml_extension =
-"xml(\.in)*|". # .in is not required
-"ui|".
-"glade2?(\.in)*|". # .in is not required
-"scm(\.in)*|". # .in is not required
-"oaf(\.in)+|".
-"etspec|".
-"sheet(\.in)+|".
-"schemas(\.in)+|".
-"pong(\.in)+";
-
-my $ini_extension =
-"desktop(\.in)+|".
-"caves(\.in)+|".
-"directory(\.in)+|".
-"soundlist(\.in)+|".
-"keys(\.in)+|".
-"theme(\.in)+|".
-"server(\.in)+";
-
-## Always print as the first thing
-$| = 1;
-
-## Handle options
-GetOptions
-(
- "help" => \$HELP_ARG,
- "version" => \$VERSION_ARG,
- "dist|d" => \$DIST_ARG,
- "pot|p" => \$POT_ARG,
- "headers|s" => \$HEADERS_ARG,
- "maintain|m" => \$MAINTAIN_ARG,
- "report|r" => \$REPORT_ARG,
- "verbose|x" => \$VERBOSE,
- "gettext-package|g=s" => \$GETTEXT_PACKAGE,
- ) or &print_error_invalid_option;
-
-&print_help if $HELP_ARG;
-&print_version if $VERSION_ARG;
-
-my $arg_count = ($DIST_ARG > 0)
- + ($POT_ARG > 0)
- + ($HEADERS_ARG > 0)
- + ($MAINTAIN_ARG > 0)
- + ($REPORT_ARG > 0);
-&print_help if $arg_count > 1;
-
-# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &find_package_name;
-
-if ($DIST_ARG) {
- if ($ARGV[0] =~ /^[a-z]/){
- &update_po_file ($ARGV[0]);
- &print_status ($ARGV[0]);
- } else {
- &print_help;
- }
-} elsif ($POT_ARG) {
- &generate_headers;
- &generate_po_template;
-} elsif ($HEADERS_ARG) {
- &generate_headers;
-} elsif ($MAINTAIN_ARG) {
- &find_leftout_files;
-} elsif ($REPORT_ARG) {
- &print_report;
-} else {
- if ($ARGV[0] =~ /^[a-z]/) {
- &main ($ARGV[0]);
- } else {
- &print_help;
- }
-}
-
-exit;
-
-#########
-
-sub print_version
-{
- ## Print version information
- print "${PROGRAM} (${PACKAGE}) $VERSION\n";
- print "Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.\n\n";
- print "Copyright (C) 2000-2002 Free Software Foundation, Inc.\n";
- print "This is free software; see the source for copying conditions. There is NO\n";
- print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
- exit;
-}
-
-sub print_help
-{
- ## Print usage information
- print "Usage: ${PROGRAM} [OPTIONS] ...LANGCODE\n";
- print "Updates PO template files and merge them with the translations.\n\n";
- print " -p, --pot generate the PO template only\n";
- print " -s, --headers generate the header files in POTFILES.in\n";
- print " -m, --maintain search for left out files from POTFILES.in\n";
- print " -r, --report display a status report for the module.\n";
- print " -x, --verbose display lots of feedback\n";
- print " --help display this help and exit\n";
- print " --version output version information and exit\n";
- print "\nExamples of use:\n";
- print "${PROGRAM} --pot just creates a new PO template from the source\n";
- print "${PROGRAM} da created new PO template and updated the da.po file\n\n";
- print "Report bugs to bugzilla.gnome.org, module 'intltool'.\n";
- exit;
-}
-
-sub main
-{
- my ($lang) = @_;
-
- ## Report error if the language file supplied
- ## to the command line is non-existent
- &print_error_not_existing("$lang.po") if ! -s "$lang.po";
-
- print "Working, please wait..." unless $VERBOSE;
- &generate_headers;
- &generate_po_template;
- &update_po_file ($lang);
- &print_status ($lang);
-}
-
-sub determine_type ($)
-{
- my $type = $_;
- my $gettext_type;
-
- # FIXME: Use $xml_extentions, and maybe do all this even nicer
- my $xml_regex =
- "(?:xml(\.in)*|ui|oaf(?:\.in)+|server(?:\.in)+|sheet(?:\.in)+|".
- "pong(?:\.in)+|etspec|schemas(?:\.in)+)";
- my $ini_regex =
- "(?:desktop(?:\.in)+|theme(?:\.in)+|caves(?:\.in)+|directory(?:\.in)+|".
- "soundlist(?:\.in)+)";
-
- if ($type =~ /\[type: gettext\/([^\]].*)]/) {
- $gettext_type=$1;
- }
- elsif ($type =~ /schemas(\.in)+$/) {
- $gettext_type="schemas";
- }
- elsif ($type =~ /$xml_regex$/) {
- $gettext_type="xml";
- }
- elsif ($type =~ /glade2?(\.in)*$/) {
- $gettext_type="glade";
- }
- elsif ($type =~ /$ini_regex$/) {
- $gettext_type="ini";
- }
- elsif ($type =~ /scm(\.in)*$/) {
- $gettext_type="scheme";
- }
- elsif ($type =~ /keys(\.in)+$/) {
- $gettext_type="keys";
- }
- else { $gettext_type=""; }
-
- return "gettext\/$gettext_type";
-}
-
-sub find_leftout_files
-{
- my (@buf_i18n_plain,
- @buf_i18n_xml,
- @buf_i18n_xml_unmarked,
- @buf_i18n_ini,
- @buf_potfiles,
- @buf_potfiles_ignore,
- @buf_allfiles,
- @buf_allfiles_sorted,
- @buf_potfiles_sorted
- );
-
- ## Search and find all translatable files
- find sub {
- push @buf_i18n_plain, "$File::Find::name" if /\.(c|y|cc|cpp|c\+\+|h|gob)$/
- }, "..";
- find sub {
- push @buf_i18n_xml, "$File::Find::name" if /\.($xml_extension)$/
- }, "..";
- find sub {
- push @buf_i18n_ini, "$File::Find::name" if /\.($ini_extension)$/
- }, "..";
- find sub {
- push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/
- }, "..";
-
-
- open POTFILES, "POTFILES.in" or die "$PROGRAM: there's no POTFILES.in!\n";
-
- @buf_potfiles = grep /^[^#]/, <POTFILES>;
- foreach (@buf_potfiles) {
- s/^\[.*]\s*//;
- }
-
- print "Searching for missing translatable files...\n" if $VERBOSE;
-
- ## Check if we should ignore some found files, when
- ## comparing with POTFILES.in
- foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") {
- if (-s $ignore) {
- open FILE, $ignore;
- while (<FILE>) {
- if (/^[^#]/){
- push @buf_potfiles_ignore, $_;
- }
- }
- print "Found $ignore: Ignoring files...\n" if $VERBOSE;
- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
- }
- }
-
- foreach my $file (@buf_i18n_plain)
- {
- my $in_comment = 0;
- my $in_macro = 0;
-
- open FILE, "<$file";
- while (<FILE>)
- {
- # Handle continued multi-line comment.
- if ($in_comment)
- {
- next unless s-.*\*/--;
- $in_comment = 0;
- }
-
- # Handle continued macro.
- if ($in_macro)
- {
- $in_macro = 0 unless /\\$/;
- next;
- }
-
- # Handle start of macro (or any preprocessor directive).
- if (/^\s*\#/)
- {
- $in_macro = 1 if /^([^\\]|\\.)*\\$/;
- next;
- }
-
- # Handle comments and quoted text.
- while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
- {
- my $match = $1;
- if ($match eq "/*")
- {
- if (!s-/\*.*?\*/--)
- {
- s-/\*.*--;
- $in_comment = 1;
- }
- }
- elsif ($match eq "//")
- {
- s-//.*--;
- }
- else # ' or "
- {
- if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
- {
- warn "mismatched quotes at line $. in $file\n";
- s-$match.*--;
- }
- }
- }
-
-
- if (/_\(QUOTEDTEXT/)
- {
- ## Remove the first 3 chars and add newline
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
- last;
- }
- }
- close FILE;
- }
-
- foreach my $file (@buf_i18n_xml) {
- open FILE, "<$file";
- while (<FILE>) {
- if (/\s_(.*)=\"/ || /translatable=\"yes\"/){
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
- last;
- }
- }
- }
-
- foreach my $file (@buf_i18n_ini){
- open FILE, "<$file";
- while (<FILE>) {
- if (/_(.*)=/){
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
- last;
- }
- }
- }
-
- foreach my $file (@buf_i18n_xml_unmarked){
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
- }
-
-
- @buf_allfiles_sorted = sort (@buf_allfiles);
- @buf_potfiles_sorted = sort (@buf_potfiles);
-
- my %in2;
- foreach (@buf_potfiles_sorted) {
- $in2{$_} = 1;
- }
-
- my @result;
-
- foreach (@buf_allfiles_sorted){
- if (!exists($in2{$_})){
- push @result, $_
- }
- }
-
- ## Save file with information about the files missing
- ## if any, and give information about this procedure.
- if (@result) {
- print "\n" if $VERBOSE;
- open OUT, ">missing";
- print OUT @result;
- print "The following files contain translations and are currently not in use. Please\n";
- print "consider adding these to the POTFILES.in file, located in the po/ directory.\n\n";
- print @result, "\n";
- print "If some of these files are left out on purpose then please add them to\n";
- print "POTFILES.skip instead of POTFILES.in. A file 'missing' containing this list\n";
- print "of left out files has been written in the current directory.\n";
- }
-
- ## If there is nothing to complain about, notify the user
- else {
- print "\nAll files containing translations are present in POTFILES.in.\n";
- }
-}
-
-sub print_error_invalid_option
-{
- ## Handle invalid arguments
- print "Try `${PROGRAM} --help' for more information.\n";
- exit 1;
-}
-
-sub generate_headers
-{
- my $EXTRACT = `which intltool-extract 2>/dev/null`;
- chomp $EXTRACT;
-
- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
-
- ## Generate the .h header files, so we can allow glade and
- ## xml translation support
- if (! -s $EXTRACT)
- {
- print "\n *** The intltool-extract script wasn't found!"
- ."\n *** Without it, intltool-update can not generate files.\n";
- exit;
- }
- else
- {
- open FILE, "<POTFILES.in";
- while (<FILE>) {
- chomp;
-
- ## Find xml files in POTFILES.in and generate the
- ## files with help from the extract script
-
- my $gettext_type= &determine_type ($1);
-
- if (/\.($xml_extension|$ini_extension)$/ || /^\[/){
- $_ =~ s/^\[[^\[].*]\s*//;
- my $filename = "../$_";
-
- if ($VERBOSE){
- system($EXTRACT, "--update", "--type=$gettext_type", $filename);
- } else {
- system($EXTRACT, "--update", "--type=$gettext_type", "--quiet", $filename);
- }
- }
- }
- close FILE;
- }
-}
-
-sub generate_po_template
-{
- ## Generate the potfiles from the POTFILES.in file
-
- print "Building the $MODULE.pot...\n" if $VERBOSE;
-
- move ("POTFILES.in", "POTFILES.in.old");
-
- open INFILE, "<POTFILES.in.old";
- open OUTFILE, ">POTFILES.in";
- while (<INFILE>) {
- chomp;
- if (/\.($xml_extension|$ini_extension)$/ || /^\[/) {
- s/^\[.*]\s*//;
- print OUTFILE "$_.h\n";
- } else {
- print OUTFILE "$_\n";
- }
- }
- close OUTFILE;
- close INFILE;
-
- system ("xgettext", "--default-domain\=$MODULE",
- "--directory\=\.\.",
- "--add-comments",
- "--keyword\=\_",
- "--keyword\=N\_",
- "--keyword\=U\_",
- "--files-from\=\.\/POTFILES\.in");
-
- move ("POTFILES.in.old", "POTFILES.in");
-
- print "Removing generated header (.h) files..." if $VERBOSE;
-
- open FILE, "<POTFILES.in";
-
- while (<FILE>)
- {
- chomp;
- unlink "../$_.h" if /\.($xml_extension|$ini_extension)$/;
- }
-
- close FILE;
- print "done\n" if $VERBOSE;
-
- if (!-e "$MODULE.po") {
- print "WARNING: It seems that none of the files in POTFILES.in ".
- "contain marked strings\n";
- exit (1);
- }
-
- system ("rm", "-f", "$MODULE.pot");
- move ("$MODULE.po", "$MODULE.pot") or die "$PROGRAM: couldn't move $MODULE.po to $MODULE.pot.\n";
-
- print "Wrote $MODULE.pot\n" if $VERBOSE;
-}
-
-sub update_po_file
-{
- my ($lang) = @_;
-
- print "Merging $lang.po with $MODULE.pot..." if $VERBOSE;
-
- copy ("$lang.po", "$lang.po.old") || die "copy failed: $!";
-
- # Perform merge, remove backup file and the "messages" trash file
- # generated by gettext
- system ("msgmerge", "$lang.po.old", "$MODULE.pot", "-o", "$lang.po");
- unlink "$lang.po.old";
- unlink "messages";
-}
-
-sub print_error_not_existing
-{
- my ($file) = @_;
-
- ## Report error if supplied language file is non-existing
- print "$PROGRAM: $file does not exist!\n";
- print "Try '$PROGRAM --help' for more information.\n";
- exit;
-}
-
-sub gather_po_files
-{
- my @po_files = glob ("./*.po");
-
- @languages = map (&po_file2lang, @po_files);
-
- foreach my $lang (@languages) {
- $po_files_by_lang{$lang} = shift (@po_files);
- }
-}
-
-sub po_file2lang ($)
-{
- my $tmp = $_;
- $tmp =~ s/^.*\/(.*)\.po$/$1/;
- return $tmp;
-}
-
-sub print_status
-{
- my ($lang) = @_;
-
- system ("msgfmt", "--statistics", "$lang.po");
- print "\n";
-}
-
-sub print_report
-{
- &generate_headers;
- &generate_po_template;
- &gather_po_files;
-
- foreach my $lang (@languages) {
- print "$lang: ";
- &update_po_file ($lang);
- }
-
- print "\n\n * Current translation support in $MODULE \n\n";
-
- foreach my $lang (@languages){
- print "$lang: ";
- system ("msgfmt", "--statistics", "$lang.po");
- }
-}
-
-sub find_package_name
-{
- my $base_dirname = getcwd();
- $base_dirname =~ s at .*/@@;
-
- my ($conf_in, $src_dir);
-
- if ($base_dirname =~ /^po(-.+)?$/) {
- if (-f "../configure.in") {
- $conf_in = "../configure.in";
- } elsif (-f "../configure.ac") {
- $conf_in = "../configure.ac";
- } else {
- my $makefile_source;
- local (*IN);
- open IN, "<Makefile" || die "can't open Makefile: $!";
-
- while (<IN>) {
- if (/^top_srcdir[ \t]*=/) {
- $src_dir = $_;
- # print "${src_dir}\n";
-
- $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
- # print "${src_dir}\n";
- chomp $src_dir;
- $conf_in = "$src_dir" . "/configure.in" . "\n";
- last;
- }
- }
- $conf_in || die "Cannot find top_srcdir in Makefile."
- }
-
- my %varhash = ();
- my $conf_source; {
- local (*IN);
- open (IN, "<$conf_in") || die "can't open $conf_in: $!";
- while (<IN>) {
- if (/^(\w+)=(\S+)/) { $varhash{$1} = $2 };
- }
- seek (IN, 0, 0);
- local $/; # slurp mode
- $conf_source = <IN>;
- }
-
- my $name = "";
- $name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m;
- if ($conf_source =~ /^AC_INIT\([\s\[]*([^,\)\s\]]+)\]?\s*,/m) {
- $name = $1;
- $varhash{"AC_PACKAGE_NAME"} = $1;
- }
- $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\s\]]+)/m;
-
- $name = "\$AC_PACKAGE_NAME" if "$name" eq "AC_PACKAGE_NAME";
-
- my $oldname = "";
- while (($name =~ /[\$](\S+)/) && ("$oldname" ne "$name")) {
- $oldname = $name;
- if (exists $varhash{$1}) {
- $name =~ s/[\$](\S+)/$varhash{$1}/;
- }
- }
- return $name if $name;
- }
-
- print "$PROGRAM: Unable to determine package name.\n" .
- "Make sure to run this script inside the po directory.\n";
- exit;
-}
diff --git a/bonobo/local-build.sh b/bonobo/local-build.sh
deleted file mode 100755
index e40e2b2..0000000
--- a/bonobo/local-build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TAG='OOO_1_1_0'
-CWD=`pwd`;
-./autogen.sh --with-ooo-solver-dir=$CWD/../build/$TAG/solver/645/unxlngi4.pro --with-ooo-install-dir=/usr/lib/ooo-1.1.0 --prefix=/usr --sysconfdir=/etc
-make
diff --git a/bonobo/po/POTFILES.in b/bonobo/po/POTFILES.in
deleted file mode 100644
index ac7b48f..0000000
--- a/bonobo/po/POTFILES.in
+++ /dev/null
@@ -1,3 +0,0 @@
-src/main.cxx
-data/GNOME_OpenOfficeOrg.server.in.in
-data/ooo-bonobo-control-ui.xml
diff --git a/bonobo/po/be at latin.po b/bonobo/po/be at latin.po
deleted file mode 100644
index 1ae1e33..0000000
--- a/bonobo/po/be at latin.po
+++ /dev/null
@@ -1,161 +0,0 @@
-# Biełaruski pierakład ooo-build.
-# Copyright (c) 2007 Ihar Hrachyshka.
-# This file is distributed under the same license as the ooo-build package.
-# Ihar Hrachyshka <ihar.hrachyshka at gmail.com>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ooo-build\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-13 02:00+0300\n"
-"PO-Revision-Date: 2007-09-13 02:01+0300\n"
-"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>\n"
-"Language-Team: Belarusian Latin <i18n at mova.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. extern "C"
-#: ../data/GNOME_OpenOfficeOrg.server.in.in.h:1
-msgid "OpenOffice.org Document"
-msgstr "Dakument OpenOffice.org"
-
-#: ../data/GNOME_OpenOfficeOrg.server.in.in.h:2
-msgid "OpenOffice.org Viewer"
-msgstr "Prahladalnik OpenOffice.org"
-
-#: ../data/GNOME_OpenOfficeOrg.server.in.in.h:3
-msgid "OpenOffice.org viewer factory"
-msgstr "Fabryka prahladalnika OpenOffice.org"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:1
-msgid "Best Fit"
-msgstr "Najlepiej dapasuj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:2
-msgid "Best _Fit"
-msgstr "Najlepiej _dapasuj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:3
-msgid "Copy"
-msgstr "Skapijuj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:4
-msgid "Copy the selection"
-msgstr "Skapijuj zaznaÄanaje"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:5
-msgid "E_xport..."
-msgstr "E_kspartuj..."
-
-#: ../data/ooo-bonobo-control-ui.xml.h:6
-msgid "Expand to a larger size"
-msgstr "RaÅ›ciahni da bolÅ¡ych pamieraÅ"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:7
-msgid "Export"
-msgstr "Ekspartuj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:8
-msgid "Export as PDF"
-msgstr "Ekspartuj jak PDF"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:9
-msgid "Export as _PDF..."
-msgstr "Ekspartuj jak _PDF..."
-
-#: ../data/ooo-bonobo-control-ui.xml.h:10
-msgid "Export the current file as PDF file"
-msgstr "Ekspartuj dziejny fajł jak PDF"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:11
-msgid "Normal Si_ze"
-msgstr "_ZvyÄajny pamier"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:12
-msgid "Normal Size"
-msgstr "ZvyÄajny pamier"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:13
-msgid "Print"
-msgstr "Vydrukuj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:14
-msgid "Print the current file"
-msgstr "Vydrukuj dziejny fajł"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:15
-msgid "Proper_ties"
-msgstr "_Ułaścivaści"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:16
-msgid "Properties"
-msgstr "Ułaścivaści"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:17
-msgid "Save _as..."
-msgstr "Zapišy _jak..."
-
-#: ../data/ooo-bonobo-control-ui.xml.h:18
-msgid "Save as"
-msgstr "Zapišy jak"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:19
-msgid "Save the current file in a different format"
-msgstr "Zapišy dziejny fajł ź inšym farmatam"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:20
-msgid "Save the current file with a different name"
-msgstr "Zapišy dziejny fajł ź inšaj nazvaj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:21
-msgid "Show the contents at the normal size"
-msgstr "Pakažy źmieÅ›civa zvyÄajnym pamieram"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:22
-msgid "Shrink to a smaller size"
-msgstr "ÅšciÅ›ni da mienÅ¡ych pamieraÅ"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:23
-msgid "Size to fit the page"
-msgstr "Dapasavać pamiery da staronki"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:24
-msgid "View properties of the displayed document"
-msgstr "Pakažy ÅÅ‚aÅ›civaÅ›ci pakazanaha dakumentu"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:25
-msgid "Zoom In"
-msgstr "PavialiÄ"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:26
-msgid "Zoom Out"
-msgstr "Pamienš"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:27
-msgid "Zoom _In"
-msgstr "Pa_vialiÄ"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:28
-msgid "Zoom _Out"
-msgstr "Pa_mienš"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:29
-msgid "_Copy"
-msgstr "_Skapijuj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:30
-msgid "_Edit"
-msgstr "_Redahuj"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:31
-msgid "_File"
-msgstr "_Fajł"
-
-#: ../data/ooo-bonobo-control-ui.xml.h:32
-msgid "_Print..."
-msgstr "_Vydrukuj..."
-
-#: ../data/ooo-bonobo-control-ui.xml.h:33
-msgid "_View"
-msgstr "_Vyhlad"
diff --git a/bonobo/po/de.po b/bonobo/po/de.po
deleted file mode 100644
index 3f51d9d..0000000
--- a/bonobo/po/de.po
+++ /dev/null
@@ -1,162 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-10-28 18:08+0000\n"
-"PO-Revision-Date: 2003-10-06 13:12+0200\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
-
-#. extern "C"
-#: data/GNOME_OpenOfficeOrg.server.in.in.h:1
-msgid "OpenOffice.org Document"
-msgstr "OpenOffice.org-Dokument"
-
-#: data/GNOME_OpenOfficeOrg.server.in.in.h:2
-msgid "OpenOffice.org Viewer"
-msgstr "OpenOffice.org-Ansicht"
-
-#: data/GNOME_OpenOfficeOrg.server.in.in.h:3
-msgid "OpenOffice.org viewer factory"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:1
-msgid "Best Fit"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:2
-msgid "Best _Fit"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:3
-msgid "Copy"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:4
-msgid "Copy the selection"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:5
-msgid "E_xport..."
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:6
-msgid "Expand to a larger size"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:7
-msgid "Export"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:8
-msgid "Export as PDF"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:9
-msgid "Export as _PDF..."
-msgstr "Als _PDF exportieren..."
-
-#: data/ooo-bonobo-control-ui.xml.h:10
-msgid "Export the current file as PDF file"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:11
-msgid "Normal Si_ze"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:12
-msgid "Normal Size"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:13
-msgid "Print"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:14
-msgid "Print the current file"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:15
-msgid "Proper_ties"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:16
-msgid "Properties"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:17
-msgid "Save _as..."
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:18
-msgid "Save as"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:19
-msgid "Save the current file in a different format"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:20
-msgid "Save the current file with a different name"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:21
-msgid "Show the contents at the normal size"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:22
-msgid "Shrink to a smaller size"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:23
-msgid "Size to fit the page"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:24
-msgid "View properties of the displayed document"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:25
-msgid "Zoom In"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:26
-msgid "Zoom Out"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:27
-msgid "Zoom _In"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:28
-msgid "Zoom _Out"
-msgstr ""
-
-#: data/ooo-bonobo-control-ui.xml.h:29
-msgid "_Copy"
-msgstr "_Kopieren"
-
-#: data/ooo-bonobo-control-ui.xml.h:30
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: data/ooo-bonobo-control-ui.xml.h:31
-msgid "_File"
-msgstr "_Datei"
-
-#: data/ooo-bonobo-control-ui.xml.h:32
-msgid "_Print..."
-msgstr "_Drucken..."
-
-#: data/ooo-bonobo-control-ui.xml.h:33
-msgid "_View"
-msgstr "_Ansicht"
diff --git a/bonobo/src/Makefile.am b/bonobo/src/Makefile.am
deleted file mode 100644
index 418a9a6..0000000
--- a/bonobo/src/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-INCLUDES = \
- -DINIFILE=\"$(datadir)/ooo-bonobo/ooo-bonobo-uno-bootstraprc\" \
- -DDATADIR=\""$(datadir)"\" \
- -DRDBFILE=\""$(libdir)/ooo-bonobo/ooo-bonobo.rdb"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(OOO_BONOBO_CFLAGS)
-
-LDADD = \
- $(OOO_BONOBO_LIBS)
-
-libexec_PROGRAMS = ooo-bonobo.bin
-
-noinst_PROGRAMS = test
-
-test_SOURCES = \
- remote-uno-helper.cxx \
- remote-uno-helper.h \
- star-frame-widget.cxx \
- star-frame-widget.h \
- test.cxx
-
-ooo_bonobo_bin_SOURCES = \
- ooo-bonobo-control.cxx \
- ooo-bonobo-control.h \
- remote-uno-helper.cxx \
- remote-uno-helper.h \
- services.h \
- star-frame-widget.cxx \
- star-frame-widget.h \
- string-macros.h \
- main.cxx
diff --git a/bonobo/src/main.cxx b/bonobo/src/main.cxx
deleted file mode 100644
index 4bd25ea..0000000
--- a/bonobo/src/main.cxx
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <string.h>
-#include <gtk/gtk.h>
-#include <libbonoboui.h>
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
-#include <com/sun/star/document/XTypeDetection.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-
-#include "ooo-bonobo-control.h"
-#include "remote-uno-helper.h"
-#include "services.h"
-#include "string-macros.h"
-#include "star-frame-widget.h"
-
-#define OAFIID "OAFIID:GNOME_OpenOfficeOrg_Control"
-
-using namespace com::sun::star;
-using namespace com::sun::star::beans;
-
-using rtl::OUString;
-using com::sun::star::uno::Reference;
-
-extern "C" {
-
-static BonoboObject *
-factory( BonoboGenericFactory *factory,
- const char *component_id,
- gpointer data )
-{
- if( !strcmp( component_id, OAFIID ) )
- {
- Reference< uno::XComponentContext > xRemoteContext = getComponentContext();
- g_assert( xRemoteContext.is() );
-
- BonoboControl *pControl =
- ooo_bonobo_control_new( xRemoteContext );
-
- return BONOBO_OBJECT( pControl );
- }
- return NULL;
-}
-
-int
-main( int argc, char *argv[] )
-{
- bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );
- bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
- textdomain( GETTEXT_PACKAGE );
-
- BONOBO_FACTORY_INIT( "ooo-bonobo", VERSION, &argc, argv );
- return bonobo_generic_factory_main( "OAFIID:GNOME_OpenOfficeOrg_Factory", factory, NULL );
-}
-
-} // extern "C"
diff --git a/bonobo/src/ooo-bonobo-control.cxx b/bonobo/src/ooo-bonobo-control.cxx
deleted file mode 100644
index 04040df..0000000
--- a/bonobo/src/ooo-bonobo-control.cxx
+++ /dev/null
@@ -1,498 +0,0 @@
-#include "ooo-bonobo-control.h"
-
-#include <libbonoboui.h>
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
-#include <com/sun/star/document/XTypeDetection.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/view/DocumentZoomType.hpp>
-
-#include "services.h"
-#include "star-frame-widget.h"
-
-#define OAFIID "OAFIID:GNOME_OpenOfficeOrg_Control"
-// 16% is the minimum for sc, sw crashes at <5%, sd can go down to 4%
-#define MIN_ZOOM 16
-// 500% is the maximum for sc, sw crashes at 1000%+, sd can go to 3600%
-#define MAX_ZOOM 500
-#define CLAMP_ZOOM(x) CLAMP(x, MIN_ZOOM, MAX_ZOOM)
-
-using namespace com::sun::star;
-using namespace com::sun::star::beans;
-
-using rtl::OUString;
-using com::sun::star::uno::Reference;
-
-struct _OOoBonoboControlPrivate {
- GtkWidget *hbox;
- StarFrameWidget *sfw;
- BonoboZoomable *zoomable;
-
- rtl::OUString uri;
- gboolean pending_load;
-};
-
-BONOBO_CLASS_BOILERPLATE( OOoBonoboControl, ooo_bonobo_control,
- BonoboControl, BONOBO_TYPE_CONTROL);
-
-#define URL_SAVEASDOC DECLARE_ASCII( "slot:5502" )
-#define URL_EXPORTDOC DECLARE_ASCII( "slot:5829" )
-#define URL_EXPORTDOCASPDF DECLARE_ASCII( "slot:6673" )
-#define URL_PRINTDOC DECLARE_ASCII( "slot:5504" )
-#define URL_DOCINFO DECLARE_ASCII( "slot:5535" )
-#define URL_COPY DECLARE_ASCII( "slot:5711" )
-
-static void
-zoomable_report_zoom_level_changed( BonoboZoomable *zoomable,
- Reference< XPropertySet > view_properties )
-{
- sal_Int16 zoom;
- uno::Any a = view_properties->getPropertyValue( DECLARE_ASCII( "ZoomValue" ) );
- a >>= zoom;
-
- CORBA_float zoom_level = zoom / 100.0;
- bonobo_zoomable_report_zoom_level_changed( zoomable, zoom_level, NULL );
-}
-
-static void
-zoomable_set_zoom_level_cb (BonoboZoomable *zoomable,
- CORBA_float new_zoom_level,
- OOoBonoboControl *user_data)
-{
- g_return_if_fail (IS_OOO_BONOBO_CONTROL (user_data));
-
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- Reference< XPropertySet > view_properties(
- star_frame_widget_get_view_properties( control->priv->sfw ) );
-
- if( !view_properties.is() )
- return;
-
- view_properties->setPropertyValue(
- DECLARE_ASCII( "ZoomType" ),
- uno::makeAny( (sal_Int16) view::DocumentZoomType::BY_VALUE ));
- view_properties->setPropertyValue(
- DECLARE_ASCII( "ZoomValue" ),
- uno::makeAny( (sal_Int16) ( CLAMP_ZOOM( new_zoom_level * 100 ) ) ) );
-
- zoomable_report_zoom_level_changed( zoomable, view_properties );
-}
-
-static void
-zoom_in_cb (GtkObject *source, gpointer user_data)
-{
- g_return_if_fail (IS_OOO_BONOBO_CONTROL (user_data));
-
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- Reference< XPropertySet > view_properties(
- star_frame_widget_get_view_properties( control->priv->sfw ) );
-
- if( !view_properties.is() )
- return;
-
- uno::Any a = view_properties->getPropertyValue( DECLARE_ASCII( "ZoomValue" ) );
- sal_Int16 view_zoom;
- a >>= view_zoom;
-
- view_zoom = ( sal_Int16 )( view_zoom * 1.2 );
- view_zoom = CLAMP_ZOOM( view_zoom );
-
- view_properties->setPropertyValue(
- DECLARE_ASCII( "ZoomType" ),
- uno::makeAny( (sal_Int16) view::DocumentZoomType::BY_VALUE ));
- view_properties->setPropertyValue( DECLARE_ASCII( "ZoomValue" ),
- uno::makeAny( view_zoom ) );
-
- zoomable_report_zoom_level_changed( control->priv->zoomable,
- view_properties );
-}
-
-static void
-zoom_out_cb (GtkObject *source, gpointer user_data)
-{
- g_return_if_fail (IS_OOO_BONOBO_CONTROL (user_data));
-
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- Reference< XPropertySet > view_properties(
- star_frame_widget_get_view_properties( control->priv->sfw ) );
-
- if( !view_properties.is() )
- return;
-
- uno::Any a = view_properties->getPropertyValue( DECLARE_ASCII( "ZoomValue" ) );
- sal_Int16 view_zoom;
- a >>= view_zoom;
-
- view_zoom = ( sal_Int16 )( view_zoom / 1.2 );
- view_zoom = CLAMP_ZOOM( view_zoom );
-
- view_properties->setPropertyValue(
- DECLARE_ASCII( "ZoomType" ),
- uno::makeAny( (sal_Int16) view::DocumentZoomType::BY_VALUE ));
- view_properties->setPropertyValue( DECLARE_ASCII( "ZoomValue" ),
- uno::makeAny( view_zoom ) );
-
- zoomable_report_zoom_level_changed( control->priv->zoomable,
- view_properties );
-}
-
-static void
-zoom_to_fit_cb (GtkObject *source, gpointer user_data)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- star_frame_widget_zoom_page_width( control->priv->sfw );
-
- zoomable_report_zoom_level_changed(
- control->priv->zoomable,
- star_frame_widget_get_view_properties( control->priv->sfw ) );
-}
-
-static void
-zoom_to_default_cb (GtkObject *source, gpointer user_data)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- star_frame_widget_zoom_100( control->priv->sfw );
-
- zoomable_report_zoom_level_changed(
- control->priv->zoomable,
- star_frame_widget_get_view_properties( control->priv->sfw ) );
-}
-
-static void
-verb_FileSaveAs_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- util::URL url;
- url.Complete = URL_SAVEASDOC;
-
- star_frame_widget_dispatch_slot_url( control->priv->sfw, url,
- uno::Sequence< PropertyValue >(0) );
-}
-
-static void
-verb_FileExport_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- util::URL url;
- url.Complete = URL_EXPORTDOC;
-
- star_frame_widget_dispatch_slot_url( control->priv->sfw, url,
- uno::Sequence< PropertyValue >(0) );
-}
-
-static void
-verb_FileExportPDF_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- util::URL url;
- url.Complete = URL_EXPORTDOCASPDF;
-
- star_frame_widget_dispatch_slot_url( control->priv->sfw, url,
- uno::Sequence< PropertyValue >(0) );
-}
-
-static void
-verb_FilePrint_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- util::URL url;
- url.Complete = URL_PRINTDOC;
-
- star_frame_widget_dispatch_slot_url( control->priv->sfw, url,
- uno::Sequence< PropertyValue >(0) );
-}
-
-static void
-verb_FileProperties_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- util::URL url;
- url.Complete = URL_DOCINFO;
-
- star_frame_widget_dispatch_slot_url( control->priv->sfw, url,
- uno::Sequence< PropertyValue >(0) );
-}
-
-
-// FIXME make insensitive when selection is empty
-static void
-verb_EditCopy_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- util::URL url;
- url.Complete = URL_COPY;
-
- star_frame_widget_dispatch_slot_url( control->priv->sfw, url,
- uno::Sequence< PropertyValue >(0) );
-}
-
-static void
-verb_ZoomIn_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- zoom_in_cb( NULL, user_data );
-}
-
-static void
-verb_ZoomOut_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- zoom_out_cb( NULL, user_data );
-}
-
-static void
-verb_ZoomNormal_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- zoom_to_default_cb( NULL, user_data );
-}
-
-static void
-verb_ZoomFit_cb( BonoboUIComponent *uic, gpointer user_data, const char *cname)
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- star_frame_widget_zoom_page_width( control->priv->sfw );
-}
-
-static void
-FrameLoadFileFromUrl( Reference< frame::XFrame > xFrame,
- Reference< lang::XMultiServiceFactory > xSMgr,
- OUString sUrl )
-{
- Reference< document::XTypeDetection > xTypeDetection(
- xSMgr->createInstance( SERVICENAME_TYPEDETECTION ), uno::UNO_QUERY );
- g_assert( xTypeDetection.is() );
-
- OUString sTypeName( xTypeDetection->queryTypeByURL( sUrl ) );
-
- Reference< lang::XMultiServiceFactory > xFrameLoaderFactory(
- xSMgr->createInstance( SERVICENAME_FRAMELOADERFACTORY ),
- uno::UNO_QUERY );
-
- Reference< frame::XSynchronousFrameLoader > xFrameLoader(
- xFrameLoaderFactory->createInstance( sTypeName ),
- uno::UNO_QUERY );
- g_assert( xFrameLoader.is() );
-
- uno::Sequence< PropertyValue > aProperties( 3 );
-
- aProperties[ 0 ] = PropertyValue( DECLARE_ASCII( "FileName" ),
- 0,
- uno::makeAny( sUrl ),
- PropertyState_DIRECT_VALUE );
-
- aProperties[ 1 ] = PropertyValue( DECLARE_ASCII( "TypeName" ),
- 0,
- uno::makeAny( sTypeName ),
- PropertyState_DIRECT_VALUE );
-
- aProperties[ 2 ] = PropertyValue( DECLARE_ASCII( "ReadOnly" ),
- 0,
- uno::makeAny( sal_True ),
- PropertyState_DIRECT_VALUE );
-
- xFrameLoader->load( aProperties, xFrame );
-}
-
-static int
-load_uri( BonoboPersistFile *pf, const CORBA_char *text_uri,
- CORBA_Environment *ev, gpointer user_data )
-{
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- control->priv->uri =
- DECLARE_ASCII( "file://" ) + B2U( rtl::OString( text_uri ) );
- if( GTK_WIDGET_REALIZED( control->priv->sfw ) ) {
- // FIXME implement
- FrameLoadFileFromUrl(
- star_frame_widget_get_frame( control->priv->sfw ),
- control->priv->sfw->service_manager,
- control->priv->uri );
- control->priv->pending_load = FALSE;
- } else {
- control->priv->pending_load = TRUE;
- }
-}
-
-static void
-frame_widget_realize( GtkWidget *widget, gpointer user_data )
-{
- StarFrameWidget *pSocket = STAR_FRAME_WIDGET( widget );
- OOoBonoboControl *control = OOO_BONOBO_CONTROL( user_data );
-
- Reference< frame::XFrame > xFrame(
- star_frame_widget_get_frame( STAR_FRAME_WIDGET( pSocket ) ) );
- g_assert( xFrame.is() );
-
- if( control->priv->pending_load ) {
- FrameLoadFileFromUrl( xFrame, pSocket->service_manager, control->priv->uri );
-
- // change to full screen mode (the frame)
- star_frame_widget_set_fullscreen( pSocket, sal_True );
- control->priv->pending_load = FALSE;
- }
-}
-
-static BonoboUIVerb verbs[] = {
- BONOBO_UI_VERB( "FileSaveAs", verb_FileSaveAs_cb ),
- BONOBO_UI_VERB( "FileExport", verb_FileExport_cb ),
- BONOBO_UI_VERB( "FileExportPDF", verb_FileExportPDF_cb ),
- BONOBO_UI_VERB( "FilePrint", verb_FilePrint_cb ),
- BONOBO_UI_VERB( "FileProperties", verb_FileProperties_cb ),
-
- BONOBO_UI_VERB( "EditCopy", verb_EditCopy_cb ),
-
- BONOBO_UI_VERB( "ZoomIn", verb_ZoomIn_cb ),
- BONOBO_UI_VERB( "ZoomOut", verb_ZoomOut_cb ),
- BONOBO_UI_VERB( "ZoomNormal", verb_ZoomNormal_cb ),
- BONOBO_UI_VERB( "ZoomFit", verb_ZoomFit_cb ),
-
- BONOBO_UI_VERB_END
-};
-
-static void
-ooo_bonobo_control_activate( BonoboControl *control, gboolean activate )
-{
- gtk_widget_show( GTK_WIDGET( OOO_BONOBO_CONTROL( control )->priv->sfw ) );
-
- BonoboUIComponent *ui_component = bonobo_control_get_ui_component( control );
- if( activate ) {
- Bonobo_UIContainer ui_container =
- bonobo_control_get_remote_ui_container( control, NULL );
-
- if( ui_container != CORBA_OBJECT_NIL ) {
- bonobo_ui_component_set_container( ui_component, ui_container, NULL );
- bonobo_ui_component_add_verb_list_with_data(
- ui_component, verbs, control );
- bonobo_ui_util_set_ui( ui_component, DATADIR,
- "ooo-bonobo-control-ui.xml",
- "ooo-bonobo", NULL );
- }
- } else {
- bonobo_ui_component_unset_container( ui_component, NULL );
- }
-
- BONOBO_CALL_PARENT( BONOBO_CONTROL_CLASS, activate, ( control, activate ) );
-}
-
-static void
-ooo_bonobo_control_finalize( GObject *object )
-{
- delete OOO_BONOBO_CONTROL( object )->priv;
- BONOBO_CALL_PARENT( G_OBJECT_CLASS, finalize, ( object ) );
-}
-
-static void
-ooo_bonobo_control_instance_init( OOoBonoboControl *control )
-{
- control->priv = new OOoBonoboControlPrivate;
-}
-
-static void
-ooo_bonobo_control_class_init( OOoBonoboControlClass *klass )
-{
- GObjectClass *object_class = G_OBJECT_CLASS( klass );
-
- object_class->finalize = ooo_bonobo_control_finalize;
-
- BonoboControlClass *control_class = BONOBO_CONTROL_CLASS( klass );
-
- control_class->activate = ooo_bonobo_control_activate;
-}
-
-#define MAGSTEP 1.2
-#define MAGSTEP2 MAGSTEP * MAGSTEP
-#define MAGSTEP4 MAGSTEP2 * MAGSTEP2
-#define IMAGSTEP 0.8333333333
-#define IMAGSTEP2 IMAGSTEP * IMAGSTEP
-#define IMAGSTEP4 IMAGSTEP2 * IMAGSTEP2
-
-static float preferred_zoom_levels [] = {
- IMAGSTEP4 * IMAGSTEP4, IMAGSTEP4 * IMAGSTEP2 * IMAGSTEP,
- IMAGSTEP4 * IMAGSTEP2, IMAGSTEP4 * IMAGSTEP, IMAGSTEP4,
- IMAGSTEP2 * IMAGSTEP, IMAGSTEP2, IMAGSTEP,
- 1.0,
- MAGSTEP, MAGSTEP2, MAGSTEP2 * MAGSTEP, MAGSTEP4,
- MAGSTEP4 * MAGSTEP, MAGSTEP4 * MAGSTEP2, MAGSTEP4 * MAGSTEP2 * MAGSTEP,
- MAGSTEP4 * MAGSTEP4
-};
-
-static const int n_zoom_levels = G_N_ELEMENTS( preferred_zoom_levels );
-
-BonoboControl *
-ooo_bonobo_control_new( Reference< XComponentContext > component_context )
-{
- g_return_val_if_fail( component_context.is(), NULL );
-
- OOoBonoboControl *control =
- OOO_BONOBO_CONTROL( g_object_new( TYPE_OOO_BONOBO_CONTROL, NULL ) );
-
- control->priv->hbox = gtk_hbox_new( FALSE, 0 );
- control->priv->sfw =
- STAR_FRAME_WIDGET( star_frame_widget_new( component_context ) );
- g_signal_connect( control->priv->sfw, "realize",
- G_CALLBACK( frame_widget_realize ), control );
-
- gtk_box_pack_start( GTK_BOX( control->priv->hbox ),
- GTK_WIDGET( control->priv->sfw ), TRUE, TRUE, 0 );
-
- gtk_widget_show( control->priv->hbox );
-
- BonoboPersistFile *persist_file =
- bonobo_persist_file_new( load_uri, NULL, OAFIID, control );
-
- BonoboZoomable *zoomable = bonobo_zoomable_new();
- control->priv->zoomable = zoomable;
-
- g_signal_connect (G_OBJECT (zoomable), "set_zoom_level",
- G_CALLBACK (zoomable_set_zoom_level_cb),
- control);
- g_signal_connect (G_OBJECT (zoomable), "zoom_in",
- G_CALLBACK (zoom_in_cb),
- control);
- g_signal_connect (G_OBJECT (zoomable), "zoom_out",
- G_CALLBACK (zoom_out_cb),
- control);
- g_signal_connect (G_OBJECT (zoomable), "zoom_to_fit",
- G_CALLBACK (zoom_to_fit_cb),
- control);
- g_signal_connect (G_OBJECT (zoomable), "zoom_to_default",
- G_CALLBACK (zoom_to_default_cb),
- control);
-
- bonobo_zoomable_set_parameters_full (
- control->priv->zoomable,
- 1.0,
- preferred_zoom_levels [0],
- preferred_zoom_levels [n_zoom_levels - 1],
- TRUE, TRUE, TRUE,
- preferred_zoom_levels,
- NULL,
- n_zoom_levels);
-
- bonobo_object_add_interface (BONOBO_OBJECT (control),
- BONOBO_OBJECT (zoomable));
-
- bonobo_object_add_interface( BONOBO_OBJECT( control ),
- BONOBO_OBJECT( persist_file ) );
-
- return bonobo_control_construct( BONOBO_CONTROL( control ),
- control->priv->hbox );
-}
diff --git a/bonobo/src/ooo-bonobo-control.h b/bonobo/src/ooo-bonobo-control.h
deleted file mode 100644
index ad9f513..0000000
--- a/bonobo/src/ooo-bonobo-control.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef OOO_BONOBO_CONTROL_H
-#define OOO_BONOBO_CONTROL_H
-
-#include <bonobo/bonobo-control.h>
-
-#include <rtl/ustring.hxx>
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#define TYPE_OOO_BONOBO_CONTROL (ooo_bonobo_control_get_type ())
-#define OOO_BONOBO_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_OOO_BONOBO_CONTROL, OOoBonoboControl))
-#define OOO_BONOBO_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_OOO_BONOBO_CONTROL, OOoBonoboControlClass))
-#define IS_OOO_BONOBO_CONTROL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_OOO_BONOBO_CONTROL))
-#define IS_OOO_BONOBO_CONTROL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_OOO_BONOBO_CONTROL))
-
-typedef struct _OOoBonoboControl OOoBonoboControl;
-typedef struct _OOoBonoboControlClass OOoBonoboControlClass;
-typedef struct _OOoBonoboControlPrivate OOoBonoboControlPrivate;
-
-struct _OOoBonoboControl {
- BonoboControl parent;
-
- OOoBonoboControlPrivate *priv;
-};
-
-struct _OOoBonoboControlClass {
- BonoboControlClass parent_class;
-};
-
-GType ooo_bonobo_control_get_type ();
-BonoboControl *ooo_bonobo_control_new ( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > component_context );
-
-#endif // OOO_BONOBO_CONTROL_H
diff --git a/bonobo/src/remote-uno-helper.cxx b/bonobo/src/remote-uno-helper.cxx
deleted file mode 100644
index 39b6287..0000000
--- a/bonobo/src/remote-uno-helper.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "remote-uno-helper.h"
-
-#include <unistd.h>
-
-#include <glib.h>
-
-#include <cppuhelper/bootstrap.hxx>
-#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-
-#include "services.h"
-
-#define UNO_BOOTSTRAP_INI DECLARE_ASCII( "file://" INIFILE )
-
-using namespace com::sun::star;
-using namespace com::sun::star::bridge;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::uno;
-
-using rtl::OUString;
-
-static OUString
-getPipeName()
-{
- return
- OUString::createFromAscii( g_get_user_name() ) +
- DECLARE_ASCII( "_ooo_bonobo" );
-}
-
-static Reference< XComponentContext >
-getRemoteComponentContext( const Reference< XComponentContext >& xComponentContext )
-{
- Reference< XMultiComponentFactory > xLocalSMgr(
- xComponentContext->getServiceManager() );
-
- Reference< XUnoUrlResolver > xUnoUrlResolver(
- xLocalSMgr->createInstanceWithContext( SERVICENAME_UNOURLRESOLVER,
- xComponentContext ),
- UNO_QUERY );
-
- Reference< XInterface > xInterface;
- OUString sConnect( DECLARE_ASCII( "uno:pipe,name=" ) +
- getPipeName() +
- DECLARE_ASCII( ";urp;StarOffice.ComponentContext" ) );
- try {
- xInterface = xUnoUrlResolver->resolve( sConnect );
- } catch( uno::Exception ) {
- g_message( "Trying to start OOo" );
-
- gchar *pArgv[5];
-
- pArgv[ 0 ] = "ooffice";
- pArgv[ 1 ] = g_strconcat( "-accept=pipe,name=",
- U2B( getPipeName() ).pData->buffer,
- ";urp;StarOffice.ComponentContext",
- NULL );
- pArgv[ 2 ] = "-bean";
- pArgv[ 3 ] = "-norestore";
- pArgv[ 4 ] = NULL;
-
- gboolean result = g_spawn_async( NULL, // Working directory
- pArgv, // Child's argv
- NULL, // Child's envp
- G_SPAWN_SEARCH_PATH,
- NULL, // Child setup function
- NULL, // User data for child_setup
- NULL, // &child_pid
- NULL); // GError ** FIXME
-
- g_free( pArgv[ 1 ] );
-
- if( !result ) {
- g_warning( "Unable to start OpenOffice.org" );
- exit(1);
- }
-
- for( int counter = 0; counter < 30; ++counter ) {
- try {
- g_message( "Trying to connect to OOo (%d)", counter + 2 );
- xInterface = xUnoUrlResolver->resolve( sConnect );
- break;
- } catch( uno::Exception ) {
- sleep( 1 );
- }
- }
- }
-
- if( !xInterface.is() ) {
- g_warning( "Unable to connect to OpenOffice.org" );
- exit( 2 );
- }
-
- Reference< XComponentContext > xRemoteComponentContext(
- xInterface, UNO_QUERY );
-
- return xRemoteComponentContext;
-}
-
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-getComponentContext()
-{
- if( !g_file_test( INIFILE, G_FILE_TEST_EXISTS ) )
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list