Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2011-12-25 17:35:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice", Maintainer is "pmladek@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice-branding-upstream.changes 2011-09-23 02:10:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-branding-upstream.changes 2011-12-25 17:35:57.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
+
+- updated to libreoffice-3.4.4.3 (SUSE 3.4.4-rc1 == final)
+
+-------------------------------------------------------------------
libreoffice-help-en-US.changes: same change
libreoffice-help-group1.changes: same change
libreoffice-help-group2.changes: same change
libreoffice-help-group3.changes: same change
libreoffice-help-group4.changes: same change
libreoffice-help-group5.changes: same change
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2011-10-24 13:41:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2011-12-25 17:36:11.000000000 +0100
@@ -1,0 +2,64 @@
+Tue Dec 13 16:31:50 UTC 2011 - bwiedemann@suse.de
+
+- fix sha-bang in unopkg-sync-bundled script
+
+-------------------------------------------------------------------
+Mon Dec 5 18:27:38 UTC 2011 - llunak@suse.com
+
+- fix debuginfo missing for some binaries
+
+-------------------------------------------------------------------
+Sun Dec 4 14:03:04 UTC 2011 - jdmulloy@gmail.com
+
+- fix libreoffice-pyuno so that 'import uno' works in python
+ * add symlinks in python site-lib so that python can find uno modules
+ * pyuno-path.diff: add %_libdir/libreoffice/basis-link/program to
+ sys.path when 'import uno' is called so that additional pyuno modules
+ can be found by python
+
+-------------------------------------------------------------------
+Mon Nov 28 15:32:46 CET 2011 - pmladek@suse.cz
+
+- used the internal mysql cppconnector even for openSUSE-12.2;
+ it did not build with the system one
+
+-------------------------------------------------------------------
+Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz
+
+- updated to libreoffice-3.4.4.3 (SUSE 3.4.4-rc1 == final):
+ * base
+ * crash when inserting a constant in a query (fdo#38286)
+ * calc
+ * crash when modifying a named range
+ * speed up range name lookup by index (bnc#715104)
+ * recalculate matrix formula dimension correctly (fdo#39485)
+ * mark all formula cells dirty when appending a new sheet (fdo#35965)
+ * components
+ * handling of SAFEARRAY(s) in olebridge (fdo#38441)
+ * filters
+ * auto fit text VIEWING too small in PPT import (fdo#41245)
+ * impress
+ * hang in slideshow (fdo#32861)
+ * crash while dropping texture (fdo#38391)
+ * libs-core
+ * recognize .svg in ODF container (fdo#41995)
+ * dictionaries lost after LibO upgrade (fdo#37195)
+ * crash when "Find Record" button is clicked in Base (fdo#40701)
+ * fix the drawing of dotted and dashed borders in Calc (fdo#37129)
+ * VBA control events not working; broken eventattacher (bnc#718227)
+ * libs-extern-sys
+ * upgrade graphite to 1.0.3 to fix surrogate support
+ * libs-gui
+ * crash when changing screen resolution
+ * let Qt call XInitThreads() (fdo#40298)
+ * activation order crashes address database (fdo#41022)
+ * drawing of dotted and dashed borders in Calc (fdo#37129)
+ * translations
+ * update translations
+ * writer
+ * leak in PDF export (i#116448)
+ * crash when editing index (bnc#726174)
+ * crash while processing incorrect range of pages (fdo#35513)
+ * crash on closing document with footnotes (fdo#39510, lp#854626)
+
+-------------------------------------------------------------------
Old:
----
3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
correctly-init-xthreads-in-qt.diff
desktop-null-display-crash.diff
libreoffice-artwork-3.4.2.6.tar.bz2
libreoffice-base-3.4.2.6.tar.bz2
libreoffice-bootstrap-3.4.2.6.tar.bz2
libreoffice-calc-3.4.2.6.tar.bz2
libreoffice-components-3.4.2.6.tar.bz2
libreoffice-extensions-3.4.2.6.tar.bz2
libreoffice-extras-3.4.2.6.tar.bz2
libreoffice-filters-3.4.2.6.tar.bz2
libreoffice-help-3.4.2.6.tar.bz2
libreoffice-impress-3.4.2.6.tar.bz2
libreoffice-libs-core-3.4.2.6.tar.bz2
libreoffice-libs-extern-3.4.2.6.tar.bz2
libreoffice-libs-extern-sys-3.4.2.6.tar.bz2
libreoffice-libs-gui-3.4.2.6.tar.bz2
libreoffice-poppler-0.17.0.patch
libreoffice-postprocess-3.4.2.6.tar.bz2
libreoffice-sdk-3.4.2.6.tar.bz2
libreoffice-testing-3.4.2.6.tar.bz2
libreoffice-translations-3.4.2.6.tar.bz2
libreoffice-ure-3.4.2.6.tar.bz2
libreoffice-writer-3.4.2.6.tar.bz2
New:
----
3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
libreoffice-artwork-3.4.4.3.tar.bz2
libreoffice-base-3.4.4.3.tar.bz2
libreoffice-bootstrap-3.4.4.3.tar.bz2
libreoffice-calc-3.4.4.3.tar.bz2
libreoffice-components-3.4.4.3.tar.bz2
libreoffice-extensions-3.4.4.3.tar.bz2
libreoffice-extras-3.4.4.3.tar.bz2
libreoffice-filters-3.4.4.3.tar.bz2
libreoffice-help-3.4.4.3.tar.bz2
libreoffice-impress-3.4.4.3.tar.bz2
libreoffice-libs-core-3.4.4.3.tar.bz2
libreoffice-libs-extern-3.4.4.3.tar.bz2
libreoffice-libs-extern-sys-3.4.4.3.tar.bz2
libreoffice-libs-gui-3.4.4.3.tar.bz2
libreoffice-poppler-0.17.0-reject-fix.diff
libreoffice-postprocess-3.4.4.3.tar.bz2
libreoffice-sdk-3.4.4.3.tar.bz2
libreoffice-testing-3.4.4.3.tar.bz2
libreoffice-translations-3.4.4.3.tar.bz2
libreoffice-ure-3.4.4.3.tar.bz2
libreoffice-writer-3.4.4.3.tar.bz2
pyuno-path.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-branding-upstream.spec ++++++
--- /var/tmp/diff_new_pack.NdUB0o/_old 2011-12-25 17:36:27.000000000 +0100
+++ /var/tmp/diff_new_pack.NdUB0o/_new 2011-12-25 17:36:27.000000000 +0100
@@ -19,10 +19,10 @@
Name: libreoffice-branding-upstream
-Version: 3.4.2.6
+Version: 3.4.4.3
Release: 1
-%define lo_build_version 3.4.2.6
-%define lo_piece_version 3.4.2.6
+%define lo_build_version 3.4.4.3
+%define lo_piece_version 3.4.4.3
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
++++++ libreoffice-help-en-US.spec ++++++
--- /var/tmp/diff_new_pack.NdUB0o/_old 2011-12-25 17:36:27.000000000 +0100
+++ /var/tmp/diff_new_pack.NdUB0o/_new 2011-12-25 17:36:27.000000000 +0100
@@ -24,11 +24,11 @@
## Generated by:
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
###################################################################
-Version: 3.4.2.6
+Version: 3.4.4.3
Release: 1
%define piece help
-%define lo_build_version 3.4.2.6
-%define lo_piece_version 3.4.2.6
+%define lo_build_version 3.4.4.3
+%define lo_piece_version 3.4.4.3
%define lo_langs ""
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
++++++ libreoffice-help-group1.spec ++++++
--- /var/tmp/diff_new_pack.NdUB0o/_old 2011-12-25 17:36:27.000000000 +0100
+++ /var/tmp/diff_new_pack.NdUB0o/_new 2011-12-25 17:36:27.000000000 +0100
@@ -24,11 +24,11 @@
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
-Version: 3.4.2.6
+Version: 3.4.4.3
Release: 1
%define piece help
-%define lo_build_version 3.4.2.6
-%define lo_piece_version 3.4.2.6
+%define lo_build_version 3.4.4.3
+%define lo_piece_version 3.4.4.3
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
libreoffice-help-group2.spec: same change
libreoffice-help-group3.spec: same change
libreoffice-help-group4.spec: same change
libreoffice-help-group5.spec: same change
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.NdUB0o/_old 2011-12-25 17:36:27.000000000 +0100
+++ /var/tmp/diff_new_pack.NdUB0o/_new 2011-12-25 17:36:27.000000000 +0100
@@ -54,7 +54,7 @@
%if 0%{?suse_version}
BuildRequires: libmysqlclient-devel
%endif
-%if 0%{?suse_version} > 01210
+%if 0%{?suse_version} > 01220
# mysqlcppconn >= 1.0.6 is needed
BuildRequires: libmysqlcppconn-devel
%endif
@@ -170,7 +170,7 @@
%endif
License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT
Group: Productivity/Office/Suite
-Version: 3.4.2.6
+Version: 3.4.4.3
Release: 1
AutoReqProv: on
Requires: libreoffice-icon-themes = %version
@@ -498,7 +498,7 @@
Source1012: fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
Source1013: fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
Source1014: f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-Source1015: 3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
+Source1015: 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
Source1016: 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
Source1017: 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
Source1018: 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
@@ -554,10 +554,8 @@
Patch11: nlpsolver-no-broken-help.diff
# make sure that the extra jar files are bundled with the script provider extensions
Patch12: scripting-provider-build-dep.diff
-# fix build with poppler 0.17.0
-Patch13: libreoffice-poppler-0.17.0.patch
-# fix a crash on exit (backport from master)
-Patch14: desktop-null-display-crash.diff
+# revert problematic build fix for poppler 0.17.0 on older distributions
+Patch13: libreoffice-poppler-0.17.0-reject-fix.diff
# fix build dependency problem in svx
Patch15: svx-globlmn-hrc-build-dep.diff
# legacy Fragment PPTX import (bnc#699334)
@@ -572,12 +570,12 @@
Patch21: desktop-submenu.diff
# define bash completion for 'loffice' wrapper (bnc#719656)
Patch22: bash-completion-for-loffice.diff
-# let Qt call XInitThreads(), so that it knows it's been called (fdo#40298)
-Patch23: correctly-init-xthreads-in-qt.diff
# fix a bad assert; the following fix depends on this one
Patch24: avoid-wrong-asserts.diff
# fix horizontal scrollbars with KDE oxygen style (bnc#722918)
Patch25: horizontal-scrollbars-with-kde-oxygen-style.diff
+# add pyuno to python path
+Patch26: pyuno-path.diff
#
# PostgreSQL SDBC driver
Patch801: 801-sdbc-postgresql.diff
@@ -1350,11 +1348,10 @@
%patch10
%patch11
%patch12
-%if %suse_version > 1130
+%if %suse_version <= 1130
# cpp/poppler-version.h is not included in older poppler packages
-%patch13 -p1
+%patch13
%endif
-%patch14
%patch15
%patch16
%patch17
@@ -1363,9 +1360,9 @@
%patch20
%patch21
%patch22
-%patch23
%patch24 -p1
%patch25
+%patch26
# PostgreSQL SDBC driver
%patch801
%patch802
@@ -1447,7 +1444,10 @@
export JAVA_HOME=%{java_home}
%endif
# use RPM_OPT_FLAGS, ...
-export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
+ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
+CFLAGS="$ARCH_FLAGS"
+CXXFLAGS="$ARCH_FLAGS"
+export ARCH_FLAGS CFLAGS CXXFLAGS
# FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin"
%if %prepare_build != 0
@@ -1509,7 +1509,7 @@
--with-system-mysql \
--enable-ext-mysql-connector \
%endif
-%if 0%{?suse_version} > 01210
+%if 0%{?suse_version} > 01220
--with-system-mysql-cppconn \
%endif
%if 0%{?suse_version} > 01030 || 0%{?meego_version}
@@ -1679,7 +1679,7 @@
# helper script to update budled extensions cache
mkdir -p $RPM_BUILD_ROOT/%_prefix/sbin
cat << EOF > $RPM_BUILD_ROOT/%_prefix/sbin/unopkg-sync-bundled
-#/bin/sh
+#!/bin/sh
#Create the command which creates a temporary directory
INSTDIR=\`mktemp -d -t "userinstall.XXXXXX"\`
@@ -1739,6 +1739,12 @@
done
cd - >/dev/null
+################
+# Symlink uno.py and unohelper.py so that python can find them
+mkdir -p $RPM_BUILD_ROOT%python_sitelib
+ln -s %_libdir/libreoffice/basis-link/program/uno.py $RPM_BUILD_ROOT%python_sitelib/uno.py
+ln -s %_libdir/libreoffice/basis-link/program/unohelper.py $RPM_BUILD_ROOT%python_sitelib/unohelper.py
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2248,6 +2254,8 @@
%files -f file-lists/pyuno_list.txt pyuno
%defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/script-provider-for-python
+%python_sitelib/uno.py
+%python_sitelib/unohelper.py
%files -f file-lists/testtool_list.txt testtool
++++++ 3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz -> 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz ++++++
++++ 5075 lines of diff (skipped)
++++++ libreoffice-artwork-3.4.2.6.tar.bz2 -> libreoffice-artwork-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-artwork-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-artwork-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-base-3.4.2.6.tar.bz2 -> libreoffice-base-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/ChangeLog new/libreoffice-base-3.4.4.3/ChangeLog
--- old/libreoffice-base-3.4.2.6/ChangeLog 2011-09-07 19:39:50.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/ChangeLog 2011-11-22 19:06:25.000000000 +0100
@@ -1,3 +1,56 @@
+2011-11-22 Petr Mladek [4f8e912268be06f87d4de70a8c00bb4ea5edb1e6]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [b87d68f05b4f9c57b0858e99824fcd8615f345a8]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [9770410c1bf8800dcb1d317b7f720124fdbee4eb]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [10d10a6b2c2d45f6ca61b96c3b36b881d284e901]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-25 Petr Mladek [89ab6866ac6169ae33393df7bd65a15d6082c439]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [20ba7c31bb4f922b7875436aca762a67d2051c3b]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
+2011-10-24 Julien Nabet [718e2912d031280a52991157ffc024c5516eec32]
+
+Fix fdo#38286. Perhaps it could be simplified
+
+Signed-off-by: Petr Mladek
+
+2011-10-05 Caolán McNamara [3c7a0b5d5455805210262529fbd9815aed6fe267]
+
+tweak ambiguities for F-15 gcc 4.6.1-9
+
+
2011-09-07 Petr Mladek [3d5da2aae71b3f84e181ab6e2b8163268422b62b]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/dbaccess/source/core/dataaccess/databasedocument.cxx new/libreoffice-base-3.4.4.3/dbaccess/source/core/dataaccess/databasedocument.cxx
--- old/libreoffice-base-3.4.2.6/dbaccess/source/core/dataaccess/databasedocument.cxx 2011-05-20 18:04:53.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/dbaccess/source/core/dataaccess/databasedocument.cxx 2011-11-22 18:55:16.000000000 +0100
@@ -1696,10 +1696,13 @@
::osl::ClearableMutexGuard aGuard( m_aMutex );
OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
- // normally, nobody should explicitly dispose, but only XCloseable::close the document. And upon
- // closing, our controllers are closed, too
+ // normally, nobody should explicitly dispose, but only XCloseable::close
+ // the document. And upon closing, our controllers are closed, too
- aKeepAlive.push_back( m_xUIConfigurationManager );
+ {
+ uno::Referenceuno::XInterface xUIInterface = m_xUIConfigurationManager;
+ aKeepAlive.push_back( xUIInterface );
+ }
m_xUIConfigurationManager = NULL;
clearObjectContainer( m_xForms );
@@ -1721,10 +1724,16 @@
OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
impl_disposeControllerFrames_nothrow();
- aKeepAlive.push_back( m_xModuleManager );
+ {
+ uno::Referenceuno::XInterface xModuleInterface = m_xModuleManager;
+ aKeepAlive.push_back( xModuleInterface );
+ }
m_xModuleManager.clear();
- aKeepAlive.push_back( m_xTitleHelper );
+ {
+ uno::Referenceuno::XInterface xTitleInterface = m_xTitleHelper;
+ aKeepAlive.push_back( xTitleInterface );
+ }
m_xTitleHelper.clear();
m_pImpl.clear();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/dbaccess/source/ui/browser/unodatbr.cxx new/libreoffice-base-3.4.4.3/dbaccess/source/ui/browser/unodatbr.cxx
--- old/libreoffice-base-3.4.2.6/dbaccess/source/ui/browser/unodatbr.cxx 2011-05-20 18:04:53.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/dbaccess/source/ui/browser/unodatbr.cxx 2011-11-22 18:55:16.000000000 +0100
@@ -781,7 +781,7 @@
if ( xSupplier.is() )
aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier")), makeAny( xSupplier ) ) );
aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TreatAsNumber")), makeAny( (sal_Bool)bFormattedIsNumeric ) ) );
- aCopyProperties.push_back( PROPERTY_FORMATKEY );
+ aCopyProperties.push_back( static_cast(PROPERTY_FORMATKEY) );
break;
}
@@ -814,8 +814,8 @@
aInitialValues.push_back( NamedValue( sDefaultProperty, aDefault ) );
// transfer properties from the definition to the UNO-model :
- aCopyProperties.push_back( PROPERTY_HIDDEN );
- aCopyProperties.push_back( PROPERTY_WIDTH );
+ aCopyProperties.push_back( static_cast(PROPERTY_HIDDEN) );
+ aCopyProperties.push_back( static_cast(PROPERTY_WIDTH) );
// help text to display for the column
Any aDescription;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/dbaccess/source/ui/querydesign/QueryDesignView.cxx new/libreoffice-base-3.4.4.3/dbaccess/source/ui/querydesign/QueryDesignView.cxx
--- old/libreoffice-base-3.4.2.6/dbaccess/source/ui/querydesign/QueryDesignView.cxx 2011-05-19 11:04:08.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/dbaccess/source/ui/querydesign/QueryDesignView.cxx 2011-11-22 18:55:16.000000000 +0100
@@ -3193,7 +3193,18 @@
OQueryController& rController = static_cast(getController());
sal_Int32 nDataType = DataType::DOUBLE;
::rtl::OUString sFieldName = sFunctionTerm;
- OSQLParseNode* pFunctionName = pNode->getChild(0);
+ const OSQLParseNode* pFunctionName;
+ // Fix fdo#38286 : crash when constant in the query
+ // TODO : is it possible to have a child or children in the pNode ?
+ // if not this part could be simplified
+ if (pNode->count())
+ {
+ pFunctionName = pNode->getChild(0);
+ }
+ else
+ {
+ pFunctionName = pNode;
+ }
if ( !SQL_ISPUNCTUATION(pFunctionName,"{") )
{
if ( SQL_ISRULEOR2(pNode,length_exp,char_value_fct) )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/dbaccess/source/ui/querydesign/TableWindowAccess.cxx new/libreoffice-base-3.4.4.3/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
--- old/libreoffice-base-3.4.2.6/dbaccess/source/ui/querydesign/TableWindowAccess.cxx 2011-05-19 11:04:08.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/dbaccess/source/ui/querydesign/TableWindowAccess.cxx 2011-11-22 18:55:16.000000000 +0100
@@ -254,7 +254,11 @@
::std::vector< Reference<XInterface> > aRelations;
aRelations.reserve(5); // just guessing
for (; aIter != aEnd ; ++aIter )
- aRelations.push_back(getParentChild(aIter - pConnectionList->begin()));
+ {
+ uno::Referenceuno::XInterface xInterface =
+ getParentChild(aIter - pConnectionList->begin());
+ aRelations.push_back(xInterface);
+ }
Reference<XInterface> *pRelations = aRelations.empty() ? 0 : &aRelations[0];
Sequence< Reference<XInterface> > aSeq(pRelations, aRelations.size());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/reportdesign/source/filter/xml/xmlExport.cxx new/libreoffice-base-3.4.4.3/reportdesign/source/filter/xml/xmlExport.cxx
--- old/libreoffice-base-3.4.2.6/reportdesign/source/filter/xml/xmlExport.cxx 2011-05-19 11:04:09.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/reportdesign/source/filter/xml/xmlExport.cxx 2011-11-22 18:55:16.000000000 +0100
@@ -1201,15 +1201,15 @@
if ( !aPos.X )
{
sBorderProp = PROPERTY_BORDERLEFT;
- aProps.push_back(PROPERTY_BORDERRIGHT);
+ aProps.push_back(static_cast(PROPERTY_BORDERRIGHT));
}
else
{
sBorderProp = PROPERTY_BORDERRIGHT;
- aProps.push_back(PROPERTY_BORDERLEFT);
+ aProps.push_back(static_cast(PROPERTY_BORDERLEFT));
}
- aProps.push_back(PROPERTY_BORDERTOP);
- aProps.push_back(PROPERTY_BORDERBOTTOM);
+ aProps.push_back(static_cast(PROPERTY_BORDERTOP));
+ aProps.push_back(static_cast(PROPERTY_BORDERBOTTOM));
}
else // horizontal
{
@@ -1217,15 +1217,15 @@
if ( (aPos.Y + aSize.Height) == nSectionHeight )
{
sBorderProp = PROPERTY_BORDERBOTTOM;
- aProps.push_back(PROPERTY_BORDERTOP);
+ aProps.push_back(static_cast(PROPERTY_BORDERTOP));
}
else
{
sBorderProp = PROPERTY_BORDERTOP;
- aProps.push_back(PROPERTY_BORDERBOTTOM);
+ aProps.push_back(static_cast(PROPERTY_BORDERBOTTOM));
}
- aProps.push_back(PROPERTY_BORDERRIGHT);
- aProps.push_back(PROPERTY_BORDERLEFT);
+ aProps.push_back(static_cast(PROPERTY_BORDERRIGHT));
+ aProps.push_back(static_cast(PROPERTY_BORDERLEFT));
}
xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/reportdesign/source/ui/report/ReportController.cxx new/libreoffice-base-3.4.4.3/reportdesign/source/ui/report/ReportController.cxx
--- old/libreoffice-base-3.4.2.6/reportdesign/source/ui/report/ReportController.cxx 2011-05-19 11:04:10.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/reportdesign/source/ui/report/ReportController.cxx 2011-11-22 18:55:16.000000000 +0100
@@ -257,7 +257,8 @@
}
else
{
- _rControlsFormats.push_back(xReportControlFormat);
+ uno::Referenceuno::XInterface xInterface = xReportControlFormat;
+ _rControlsFormats.push_back(xInterface);
}
if ( !_xWindow.is() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-base-3.4.2.6/reportdesign/source/ui/report/ReportSection.cxx new/libreoffice-base-3.4.4.3/reportdesign/source/ui/report/ReportSection.cxx
--- old/libreoffice-base-3.4.2.6/reportdesign/source/ui/report/ReportSection.cxx 2011-05-19 11:04:10.000000000 +0200
+++ new/libreoffice-base-3.4.4.3/reportdesign/source/ui/report/ReportSection.cxx 2011-11-22 18:55:16.000000000 +0100
@@ -726,7 +726,11 @@
const SdrObject* pDlgEdObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
const OObjectBase* pObj = dynamic_cast(pDlgEdObj);
if ( pObj )
- _rSelection.push_back(pObj->getReportComponent());
+ {
+ uno::Referenceuno::XInterface xInterface =
+ pObj->getReportComponent();
+ _rSelection.push_back(xInterface);
+ }
}
}
}
++++++ libreoffice-bootstrap-3.4.2.6.tar.bz2 -> libreoffice-bootstrap-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/ChangeLog new/libreoffice-bootstrap-3.4.4.3/ChangeLog
--- old/libreoffice-bootstrap-3.4.2.6/ChangeLog 2011-09-07 19:35:58.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/ChangeLog 2011-11-22 19:02:23.000000000 +0100
@@ -1,3 +1,122 @@
+2011-11-22 Petr Mladek [421a2fac757df95a09746a9589787628f2529aba]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [9958efcae02896842d436d72b1512812b2b95f2b]
+
+bump release number to 1403
+
+
+2011-11-22 Petr Mladek [9b82ab65b9fa3dfe95a17a871c4bcacfd8dab0e8]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+Conflicts:
+ instsetoo_native/util/openoffice.lst
+ ooo.lst.in
+ solenv/inc/minor.mk
+
+2011-11-22 Petr Mladek [b3d45b5f6b8ccf58453ad92d941a7d5464237e03]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [4606023c956e8e2e9d81e9b2f1f8f0e7a4872a70]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-11-01 Petr Mladek [a06eb9bcbf26d31aab014d8aa2476dc4d628bb1a]
+
+bump product version to 3.4.4-rc2, release number to 402
+
+
+2011-10-26 Fridrich Štrba [aa4fc261e6ef4f2360fffe047c49f3900ae742ec]
+
+Remove a stray leading '+'
+
+Signed-off-by: Fridrich Štrba
+
+2011-10-26 Andras Timar [bdd32c97ab9f9ae0222fbf35c4f5fcaa417b28b2]
+
+use short paths, because '(x86)' in the path causes problem
+
+Signed-off-by: Fridrich Štrba
+
+2011-10-25 Petr Mladek [64612aa398b9994c4f77bab28ee056a5783561f4]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [0f47bcd002877464c50c7b4b2df46e2ca627c0a1]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
+2011-10-25 Petr Mladek [ae69437e119f4e1d8eca657694c0e719a4da6f83]
+
+bump product version to 3.4.4-rc1, release number to 401
+
+
+2011-10-25 Tor Lillqvist [a11c44b86e4459b6366b347e0406a860c80e0379]
+
+Fix building of the 64-bit Windows Explorer extension (fdo#36950)
+
+Don't confuse the 64-bit Explorer extension with a 64-bit LibreOffice,
+which is unfinished and highly experimental work. OOo has been
+building and distributing a 64-bit Explorer extension since long, and
+we should too. They used some secret Hamburg sauce when building it,
+though, but hopefully now it works here, too.
+
+Signed-off-by: Petr Mladek
+
+2011-10-20 Martin Hosken [522f633cb6a986c7ec01eb0b6bc6e84d70b5413a]
+
+Upgrade graphite to 1.0.3 fix surrogate support
+
+Signed-off-by: Michael Meeks
+
+2011-10-07 Andras Timar [499b16d59445aacdf767fd42bde2197f014d7ea1]
+
+add Scottish Gaelic (gd) UI support
+
+Signed-off-by Michael Meeks
+
+2011-09-30 Rene Engelhard [72a5f87cb3f0a367f1cd6a5cc15101acc83396fe]
+
+make configure check for cpp/poppler-version.h
+
+
+2011-09-20 Bjoern Michaelsen [b6b7eb97b48937132638aeeef18270624201a930]
+
+Revert "Call macosx-change-install-names on executables in gbuild, too."
+
+This reverts commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85.
+The cherry-pick was premature, it would have required an unfortunate number of
+follow-up commits to be picked too.
+
+Signed-off-by: Norbert Thiebaud
+Signed-off-by: Stephan Bergmann
+
+2011-09-19 Stephan Bergmann [a87a8ee5a1919f6f6b4b35668456c03bdd499c85]
+
+Call macosx-change-install-names on executables in gbuild, too.
+
+Signed-off-by: Bjoern Michaelsen
+
2011-09-07 Petr Mladek [846b2167d338687ae1465bf0ff62b91bf6411f92]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/bootstrap.ver new/libreoffice-bootstrap-3.4.4.3/bootstrap.ver
--- old/libreoffice-bootstrap-3.4.2.6/bootstrap.ver 2011-09-07 19:36:08.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/bootstrap.ver 2011-11-22 19:02:33.000000000 +0100
@@ -1 +1 @@
-lo_bootstrap_ver=3.4.2.6
+lo_bootstrap_ver=3.4.4.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/config.status new/libreoffice-bootstrap-3.4.4.3/config.status
--- old/libreoffice-bootstrap-3.4.2.6/config.status 2011-09-07 19:20:28.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/config.status 2011-11-22 18:57:06.000000000 +0100
@@ -540,9 +540,9 @@
"r translations"
S["WITH_LANG_LIST"]="en-US cs"
S["WITH_LANG"]="en-US cs"
-S["ALL_LANGS"]="en-US af ar as ast be bo bg br brx bn bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km k"\
-"n ko kok ks ku lo lt lv mai mk mn mni ml mr my ne nb nl nn nr nso om oc or pa-IN pl pt pt-BR ro ru rw sat sa-IN si sd sq sk sl sh sr ss st sv sw-TZ "\
-"te ta th tn tr ts tg ug uk uz ve vi xh zh-CN zh-TW zu"
+S["ALL_LANGS"]="en-US af ar as ast be bo bg br brx bn bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is it ja ka kk k"\
+"m kn ko kok ks ku lo lt lv mai mk mn mni ml mr my ne nb nl nn nr nso om oc or pa-IN pl pt pt-BR ro ru rw sat sa-IN si sd sq sk sl sh sr ss st sv sw-"\
+"TZ te ta th tn tr ts tg ug uk uz ve vi xh zh-CN zh-TW zu"
S["PRODUCTVERSION"]="3.4"
S["OOO_JUNIT_JAR"]=""
S["ANT_LIB"]="/usr/share/ant/lib"
@@ -927,6 +927,11 @@
S["SHOWINCLUDES_PREFIX"]=""
S["USE_MINGW"]=""
S["COMEX"]=""
+S["LIBMGR_X64_BINARY"]=""
+S["LINK_X64_BINARY"]=""
+S["CXX_X64_BINARY"]=""
+S["CC_X64_BINARY"]=""
+S["BUILD_X64"]=""
S["MSPDB_PATH"]=""
S["PERL"]="/usr/bin/perl"
S["WITH_LINKER_HASH_STYLE"]="gnu"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/configure new/libreoffice-bootstrap-3.4.4.3/configure
--- old/libreoffice-bootstrap-3.4.2.6/configure 2011-09-07 19:36:08.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/configure 2011-11-22 19:02:33.000000000 +0100
@@ -1044,6 +1044,11 @@
SHOWINCLUDES_PREFIX
USE_MINGW
COMEX
+LIBMGR_X64_BINARY
+LINK_X64_BINARY
+CXX_X64_BINARY
+CC_X64_BINARY
+BUILD_X64
MSPDB_PATH
PERL
WITH_LINKER_HASH_STYLE
@@ -2272,8 +2277,8 @@
--with-gcc-home=/the/path switch.
--disable-zenity Do not display a build icon in the notification area
(on unix) during build.
- --enable-cl-x64 Use the Microsoft C/C++ x64 compiler instead of the
- default x86 one.
+ --enable-cl-x64 Build a 64-bit LibreOffice using the Microsoft C/C++
+ x64 compiler.
--enable-extra-gallery Add extra gallery content.
--enable-extra-template Add extra temaplte content.
--enable-extra-sample Add extra sample content.
@@ -5647,8 +5652,8 @@
BUILD_TYPE="$BUILD_TYPE TWAIN"
- { $as_echo "$as_me:$LINENO: checking whether to use the Microsoft C/C++ x64 compiler" >&5
-$as_echo_n "checking whether to use the Microsoft C/C++ x64 compiler... " >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to build a 64-bit LibreOffice" >&5
+$as_echo_n "checking whether to build a 64-bit LibreOffice... " >&6; }
if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
CL_X64=""
{ $as_echo "$as_me:$LINENO: result: no" >&5
@@ -9013,6 +9018,8 @@
else
with_cl_home=`cygpath -u "$with_cl_home"`
fi
+ with_cl_home=`cygpath -d "$with_cl_home"`
+ with_cl_home=`cygpath -u "$with_cl_home"`
{ $as_echo "$as_me:$LINENO: result: $with_cl_home" >&5
$as_echo "$with_cl_home" >&6; }
@@ -9198,6 +9205,7 @@
export INCLUDE=`cygpath -d "$COMPATH/Include"`
{ $as_echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
$as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
+ # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
x = match( \\\$0, /..\\...\\...../ )
CCversion = substr( \\\$0, RSTART, RLENGTH)
@@ -9239,6 +9247,54 @@
{ $as_echo "$as_me:$LINENO: result: \"$SHOWINCLUDES_PREFIX\"" >&5
$as_echo "\"$SHOWINCLUDES_PREFIX\"" >&6; }
fi
+
+ # Check for 64-bit (cross-)compiler to use to build the 64-bit
+ # version of the Explorer extension (and maybe other small
+ # bits, too) needed when installing a 32-bit LibreOffice on a
+ # 64-bit OS. The 64-bit Explorer extension is a feature that
+ # has been present since long in OOo. Don't confuse it with
+ # building LibreOffice itself as 64-bit code, which is
+ # unfished work and highly experimental.
+
+ { $as_echo "$as_me:$LINENO: checking for a x64 compiler" >&5
+$as_echo_n "checking for a x64 compiler... " >&6; }
+ BUILD_X64=
+ CC_X64_BINARY=
+ LINK_X64_BINARY=
+ LIBMGR_X64_BINARY=
+
+ # Prefer native x64 compiler to cross-compiler, in case we are running
+ # the build on a 64-bit OS.
+ if "$with_cl_home/bin/amd64/cl.exe" -? /dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
+ elif "$with_cl_home/bin/x86_amd64/cl.exe" -? /dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
+ fi
+ if test "$BUILD_X64" = TRUE; then
+ { $as_echo "$as_me:$LINENO: result: found" >&5
+$as_echo "found" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: not found" >&5
+$as_echo "not found" >&6; }
+ { $as_echo "$as_me:$LINENO: WARNING: Installation set will not contain the 64-bit Explorer extension" >&5
+$as_echo "$as_me: WARNING: Installation set will not contain the 64-bit Explorer extension" >&2;}
+ fi
+
+
+ # These are passed to the environment through set_soenv.in as usual, and then
+ # used in set_wntx64.mk
+
+
+
+
else
{ $as_echo "$as_me:$LINENO: checking the MinGW C++ Compiler" >&5
$as_echo_n "checking the MinGW C++ Compiler... " >&6; }
@@ -32645,6 +32701,160 @@
$as_echo "yes" >&6; }
:
fi
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ save_CXXFLAGS=$CXXFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+ if test "${ac_cv_header_cpp_poppler_version_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for cpp/poppler-version.h" >&5
+$as_echo_n "checking for cpp/poppler-version.h... " >&6; }
+if test "${ac_cv_header_cpp_poppler_version_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cpp_poppler_version_h" >&5
+$as_echo "$ac_cv_header_cpp_poppler_version_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking cpp/poppler-version.h usability" >&5
+$as_echo_n "checking cpp/poppler-version.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking cpp/poppler-version.h presence" >&5
+$as_echo_n "checking cpp/poppler-version.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: cpp/poppler-version.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: cpp/poppler-version.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for cpp/poppler-version.h" >&5
+$as_echo_n "checking for cpp/poppler-version.h... " >&6; }
+if test "${ac_cv_header_cpp_poppler_version_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_cpp_poppler_version_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cpp_poppler_version_h" >&5
+$as_echo "$ac_cv_header_cpp_poppler_version_h" >&6; }
+
+fi
+if test "x$ac_cv_header_cpp_poppler_version_h" = x""yes; then
+ :
+else
+ { { $as_echo "$as_me:$LINENO: error: cpp/poppler-version.h not found. Install poppler" >&5
+$as_echo "$as_me: error: cpp/poppler-version.h not found. Install poppler" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
else
{ $as_echo "$as_me:$LINENO: result: internal" >&5
$as_echo "internal" >&6; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/configure.in new/libreoffice-bootstrap-3.4.4.3/configure.in
--- old/libreoffice-bootstrap-3.4.2.6/configure.in 2011-09-06 19:50:22.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/configure.in 2011-11-22 18:55:15.000000000 +0100
@@ -464,7 +464,7 @@
AC_ARG_ENABLE(cl-x64,
AS_HELP_STRING([--enable-cl-x64],
- [Use the Microsoft C/C++ x64 compiler instead of the default x86 one.]),
+ [Build a 64-bit LibreOffice using the Microsoft C/C++ x64 compiler.]),
,)
AC_ARG_ENABLE(extra-gallery,
@@ -1682,8 +1682,8 @@
dnl Include twain scanners
BUILD_TYPE="$BUILD_TYPE TWAIN"
- dnl Set the CL_X64 variable.
- AC_MSG_CHECKING([whether to use the Microsoft C/C++ x64 compiler])
+ dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
+ AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
if test "z$enable_cl_x64" = "z" -o "$enable_cl_x64" = "no"; then
CL_X64=""
AC_MSG_RESULT([no])
@@ -2251,6 +2251,8 @@
else
with_cl_home=`cygpath -u "$with_cl_home"`
fi
+ with_cl_home=`cygpath -d "$with_cl_home"`
+ with_cl_home=`cygpath -u "$with_cl_home"`
AC_MSG_RESULT([$with_cl_home])
dnl ===========================================================
@@ -2323,7 +2325,7 @@
export INCLUDE=`cygpath -d "$COMPATH/Include"`
dnl Check which Microsoft C/C++ compiler is found
AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
-dnl The following find microsoft, matches nn.nn.nnnn then pulls numbers out.
+ # The following finds Microsoft, matches nn.nn.nnnn then pulls numbers out.
CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
x = match( \\\$0, /..\\...\\...../ )
CCversion = substr( \\\$0, RSTART, RLENGTH)
@@ -2358,6 +2360,50 @@
else
AC_MSG_RESULT(["$SHOWINCLUDES_PREFIX"])
fi
+
+ # Check for 64-bit (cross-)compiler to use to build the 64-bit
+ # version of the Explorer extension (and maybe other small
+ # bits, too) needed when installing a 32-bit LibreOffice on a
+ # 64-bit OS. The 64-bit Explorer extension is a feature that
+ # has been present since long in OOo. Don't confuse it with
+ # building LibreOffice itself as 64-bit code, which is
+ # unfished work and highly experimental.
+
+ AC_MSG_CHECKING([for a x64 compiler])
+ BUILD_X64=
+ CC_X64_BINARY=
+ LINK_X64_BINARY=
+ LIBMGR_X64_BINARY=
+
+ # Prefer native x64 compiler to cross-compiler, in case we are running
+ # the build on a 64-bit OS.
+ if "$with_cl_home/bin/amd64/cl.exe" -? /dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/amd64/lib.exe"
+ elif "$with_cl_home/bin/x86_amd64/cl.exe" -? /dev/null 2>&1; then
+ BUILD_X64=TRUE
+ CC_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ CXX_X64_BINARY="$with_cl_home/bin/x86_amd64/cl.exe"
+ LINK_X64_BINARY="$with_cl_home/bin/x86_amd64/link.exe"
+ LIBMGR_X64_BINARY="$with_cl_home/bin/x86_amd64/lib.exe"
+ fi
+ if test "$BUILD_X64" = TRUE; then
+ AC_MSG_RESULT([found])
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_WARN([Installation set will not contain the 64-bit Explorer extension])
+ fi
+ AC_SUBST(BUILD_X64)
+
+ # These are passed to the environment through set_soenv.in as usual, and then
+ # used in set_wntx64.mk
+ AC_SUBST(CC_X64_BINARY)
+ AC_SUBST(CXX_X64_BINARY)
+ AC_SUBST(LINK_X64_BINARY)
+ AC_SUBST(LIBMGR_X64_BINARY)
else
AC_MSG_CHECKING([the MinGW C++ Compiler])
if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then
@@ -6535,6 +6581,16 @@
AC_MSG_RESULT([external])
SYSTEM_POPPLER=YES
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
+ AC_LANG_PUSH([C++])
+ save_CXXFLAGS=$CXXFLAGS
+ save_CPPFLAGS=$CPPFLAGS
+ CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+ AC_CHECK_HEADER([cpp/poppler-version.h], [],
+ [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+ AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=NO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/instsetoo_native/util/openoffice.lst new/libreoffice-bootstrap-3.4.4.3/instsetoo_native/util/openoffice.lst
--- old/libreoffice-bootstrap-3.4.2.6/instsetoo_native/util/openoffice.lst 2011-09-07 17:28:52.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/instsetoo_native/util/openoffice.lst 2011-11-22 18:55:15.000000000 +0100
@@ -5,8 +5,8 @@
variables
{
OOOBASEVERSION 3.4
- OOOPACKAGEVERSION 3.4.2
- UREPACKAGEVERSION 3.4.2
+ OOOPACKAGEVERSION 3.4.4
+ UREPACKAGEVERSION 3.4.4
URELAYERVERSION 1
BASISROOTNAME LibreOffice
UNIXBASISROOTNAME libreoffice3.4
@@ -57,12 +57,12 @@
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
+ ABOUTBOXPRODUCTVERSION 3.4.4
BASEPRODUCTVERSION 3.4
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.4.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -125,12 +125,12 @@
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
+ ABOUTBOXPRODUCTVERSION 3.4.4
BASEPRODUCTVERSION 3.4
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -141,7 +141,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.4.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -189,14 +189,14 @@
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
+ ABOUTBOXPRODUCTVERSION 3.4.4
BASEPRODUCTVERSION 3.4
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
@@ -211,7 +211,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.4.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -266,7 +266,7 @@
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.4
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
LICENSENAME LGPL
SETSTATICPATH 1
NOVERSIONINDIRNAME 1
@@ -305,11 +305,11 @@
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.4.4
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -351,13 +351,13 @@
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.4.4
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
@@ -403,12 +403,12 @@
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
+ ABOUTBOXPRODUCTVERSION 3.4.4
BASEPRODUCTVERSION 3.4
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -420,7 +420,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.4.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -473,12 +473,12 @@
PRODUCTVERSION 3.4
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc3
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.2
+ ABOUTBOXPRODUCTVERSION 3.4.4
BASEPRODUCTVERSION 3.4
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -489,7 +489,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.2
+ PACKAGEVERSION 3.4.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/ooo.lst new/libreoffice-bootstrap-3.4.4.3/ooo.lst
--- old/libreoffice-bootstrap-3.4.2.6/ooo.lst 2011-09-07 19:20:29.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/ooo.lst 2011-11-22 18:57:07.000000000 +0100
@@ -79,9 +79,8 @@
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
-3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
http://dev-www.libreoffice.org/src
-
+3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/ooo.lst.in new/libreoffice-bootstrap-3.4.4.3/ooo.lst.in
--- old/libreoffice-bootstrap-3.4.2.6/ooo.lst.in 2011-09-06 19:50:22.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/ooo.lst.in 2011-11-22 18:55:15.000000000 +0100
@@ -79,9 +79,8 @@
0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
9ed97fce60a9a65852402248a6659492-hunspell-1.3.1.tar.gz
-3115c721f5cb7c464f01c2dddccfaba6-graphite2-1.0.2.tgz
http://dev-www.libreoffice.org/src
-@GOOGLE_DOCS_EXTENSION_PACK@
+3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
http://download.go-oo.org/extern
185d60944ea767075d27247c3162b3bc-unowinreg.dll
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/set_soenv new/libreoffice-bootstrap-3.4.4.3/set_soenv
--- old/libreoffice-bootstrap-3.4.2.6/set_soenv 2011-09-07 19:20:29.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/set_soenv 2011-11-22 18:57:07.000000000 +0100
@@ -1790,6 +1790,17 @@
ToFile( "DISABLE_ACTIVEX", "","e" );
ToFile( "DISABLE_ATL", "","e" );
ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" );
+ # Variables used when building the parts that needs to be available
+ # also as 64-bit versions in a 32-bit LibreOffice build, like
+ # the Explorer extension. If the configure script hasn't
+ # found the 64-bit (cross-)compiler, then will be empty.
+ ToFile( "BUILD_X64", "", "e" );
+ if ( "" eq "TRUE" ) {
+ ToFile( "CC_X64_BINARY", "", "e" );
+ ToFile( "CXX_X64_BINARY","", "e" );
+ ToFile( "LINK_X64_BINARY","","e" );
+ ToFile( "LIBMGR_X64_BINARY","","e" );
+ }
# Hack around dmake's mktmp not generating DOS paths.
my $tmpdir = qx{cygpath -m "/tmp"};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/set_soenv.in new/libreoffice-bootstrap-3.4.4.3/set_soenv.in
--- old/libreoffice-bootstrap-3.4.2.6/set_soenv.in 2011-09-06 19:50:22.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/set_soenv.in 2011-11-22 18:55:15.000000000 +0100
@@ -1790,6 +1790,17 @@
ToFile( "DISABLE_ACTIVEX", "@DISABLE_ACTIVEX@","e" );
ToFile( "DISABLE_ATL", "@DISABLE_ATL@","e" );
ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" );
+ # Variables used when building the parts that needs to be available
+ # also as 64-bit versions in a 32-bit LibreOffice build, like
+ # the Explorer extension. If the configure script hasn't
+ # found the 64-bit (cross-)compiler, then @BUILD_X64@ will be empty.
+ ToFile( "BUILD_X64", "@BUILD_X64@", "e" );
+ if ( "@BUILD_X64@" eq "TRUE" ) {
+ ToFile( "CC_X64_BINARY", "@CC_X64_BINARY@", "e" );
+ ToFile( "CXX_X64_BINARY","@CXX_X64_BINARY@", "e" );
+ ToFile( "LINK_X64_BINARY","@LINK_X64_BINARY@","e" );
+ ToFile( "LIBMGR_X64_BINARY","@LIBMGR_X64_BINARY@","e" );
+ }
# Hack around dmake's mktmp not generating DOS paths.
my $tmpdir = qx{cygpath -m "/tmp"};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/set_soenv.last new/libreoffice-bootstrap-3.4.4.3/set_soenv.last
--- old/libreoffice-bootstrap-3.4.2.6/set_soenv.last 2011-09-02 11:09:03.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/set_soenv.last 2011-11-01 16:39:50.000000000 +0100
@@ -656,7 +656,7 @@
{
$MSPDB_PATH = PathFormat('');
$MIDL_PATH = PathFormat('');
- $CSC_PATH = PathFormat('/usr/bin');
+ $CSC_PATH = PathFormat('');
$SHOWINCLUDES_PREFIX = '';
$PSDK_HOME = PathFormat('');
$DIRECTXSDK_LIB = PathFormat('');
@@ -730,7 +730,7 @@
$COMPATH = PathFormat('/usr');
$MSPDB_PATH = PathFormat('');
$MIDL_PATH = PathFormat('');
- $CSC_PATH = PathFormat('/usr/bin');
+ $CSC_PATH = PathFormat('');
$PSDK_HOME = PathFormat('');
$FRAME_HOME = PathFormat('');
$USE_NEW_SDK = "TRUE";
@@ -1594,16 +1594,7 @@
ToFile( "WITH_LANG", "en-US cs", "e" );
ToFile( "WITH_LANG_LIST", "en-US cs", "e" );
ToFile( "INTRO_BITMAP", "", "e" );
-ToFile( "PROGRESSBARCOLOR", "126,170,23", "e" );
-ToFile( "PROGRESSSIZE", "319,10", "e" );
-ToFile( "PROGRESSPOSITION", "164,225", "e" );
-ToFile( "PROGRESSFRAMECOLOR","207,208,211", "e" );
ToFile( "ABOUT_BITMAP", "", "e" );
-ToFile( "STARTCENTER_LEFT_BITMAP", "", "e" );
-ToFile( "STARTCENTER_RIGHT_BITMAP", "", "e" );
-ToFile( "STARTCENTER_RTL_LEFT_BITMAP", "", "e" );
-ToFile( "STARTCENTER_RTL_RIGHT_BITMAP", "", "e" );
-ToFile( "STARTCENTER_SPACE_BITMAP", "", "e" );
ToFile( "OOO_VENDOR", "", "e" );
ToFile( "OOODMAKEMODE", "YES", "e" );
ToFile( "PRODUCTVERSION", "3.4", "e" );
@@ -1726,17 +1717,6 @@
# (c = comment, e = environment variable, a = alias )
ToFile( "Platform dependent constant values.", $empty, "c" );
ToFile( "SOLAR_JAVA", $SOLAR_JAVA, "e" );
-ToFile( "ENABLE_MONO", "YES", "e" );
-ToFile( "ENABLE_MONO_CLIMAKER", "YES", "e" );
-if ("/usr/bin/mcs" ne "") {
-ToFile( "CSC", "/usr/bin/mcs", "e" );
-}
-ToFile( "AL", "/usr/bin/al", "e" );
-ToFile( "CSC_PATH", "/usr/bin", "e" );
-ToFile( "MONO_CFLAGS", "-D_REENTRANT -pthread -I/usr/lib64/pkgconfig/../../include/mono-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include ", "e" );
-ToFile( "MONO_LIBS", "-pthread -L/usr/lib64/pkgconfig/../../lib64 -lmono -ldl -lpthread -lm -lgthread-2.0 -lrt -lglib-2.0 ", "e" );
-ToFile( "MONO_GAC_ROOT", "", "e" );
-ToFile( "MKBUNDLE", "/usr/bin/mkbundle2", "e" );
ToFile( "BIG_SVX", $BIG_SVX, "e" );
ToFile( "COM", $COM, "e" );
ToFile( "COMPATH", $COMPATH, "e" );
@@ -1790,6 +1770,17 @@
ToFile( "DISABLE_ACTIVEX", "","e" );
ToFile( "DISABLE_ATL", "","e" );
ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" );
+ # Variables used when building the parts that needs to be available
+ # also as 64-bit versions in a 32-bit LibreOffice build, like
+ # the Explorer extension. If the configure script hasn't
+ # found the 64-bit (cross-)compiler, then will be empty.
+ ToFile( "BUILD_X64", "", "e" );
+ if ( "" eq "TRUE" ) {
+ ToFile( "CC_X64_BINARY", "", "e" );
+ ToFile( "CXX_X64_BINARY","", "e" );
+ ToFile( "LINK_X64_BINARY","","e" );
+ ToFile( "LIBMGR_X64_BINARY","","e" );
+ }
# Hack around dmake's mktmp not generating DOS paths.
my $tmpdir = qx{cygpath -m "/tmp"};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/solenv/inc/langlist.mk new/libreoffice-bootstrap-3.4.4.3/solenv/inc/langlist.mk
--- old/libreoffice-bootstrap-3.4.2.6/solenv/inc/langlist.mk 2011-05-20 18:04:45.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/solenv/inc/langlist.mk 2011-11-22 18:55:15.000000000 +0100
@@ -57,6 +57,7 @@
fi \
fr \
ga \
+gd \
gl \
gu \
he \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/solenv/inc/minor.mk new/libreoffice-bootstrap-3.4.4.3/solenv/inc/minor.mk
--- old/libreoffice-bootstrap-3.4.2.6/solenv/inc/minor.mk 2011-09-07 17:28:52.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/solenv/inc/minor.mk 2011-11-22 18:55:15.000000000 +0100
@@ -1,5 +1,5 @@
RSCVERSION=340
-RSCREVISION=340m1(Build:1206)
-BUILD=1206
+RSCREVISION=340m1(Build:1403)
+BUILD=1403
LAST_MINOR=m1
SOURCEVERSION=OOO340
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-bootstrap-3.4.2.6/solenv/inc/set_wntx64.mk new/libreoffice-bootstrap-3.4.4.3/solenv/inc/set_wntx64.mk
--- old/libreoffice-bootstrap-3.4.2.6/solenv/inc/set_wntx64.mk 2011-05-20 18:04:45.000000000 +0200
+++ new/libreoffice-bootstrap-3.4.4.3/solenv/inc/set_wntx64.mk 2011-11-22 18:55:15.000000000 +0100
@@ -46,7 +46,7 @@
# Stack buffer overrun detection.
CFLAGS+=-GS
-USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+USE_CDEFS_X64+= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -DX86_64 -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
.IF "$(debug)"!=""
USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
USE_CDEFS_X64+=-DDEBUG
@@ -114,7 +114,7 @@
IMPLIBFLAGS_X64=-machine:X64
-LIBPATH_X64=$(PSDK)/lib/x64
+LIBPATH_X64=$(PSDK_HOME)/lib/x64
LIBPATH_VC_X64=$(COMPATH)/lib/amd64
ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
++++++ libreoffice-calc-3.4.2.6.tar.bz2 -> libreoffice-calc-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-calc-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-calc-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-components-3.4.2.6.tar.bz2 -> libreoffice-components-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/ChangeLog new/libreoffice-components-3.4.4.3/ChangeLog
--- old/libreoffice-components-3.4.2.6/ChangeLog 2011-09-07 19:37:36.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/ChangeLog 2011-11-22 19:04:03.000000000 +0100
@@ -1,3 +1,71 @@
+2011-11-22 Petr Mladek [3ba03100af14687c420494532de5ffc4f95779d2]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [86050f16b6801ae8378272406ca1b3305892a359]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [f78a78d821e007ca90da090197a1461bdad2be2f]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [e4932719656f64deb97b82a857310c32930acceb]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-11-01 Thorsten Behrens [70f195ae368055dcb87c29de11f784983314ae20]
+
+Fix .dmg background image some more.
+
+Signed-off-by: Alexander Thurgood
+Signed-off-by: Fridrich Strba
+Signed-off-by: Norbert Thiebaud
+
+2011-10-27 Noel Power [679063b930dea2ae4a67641fef0154dd0999509b]
+
+fix handling of SAFEARRAY(s) returned as variant in olebridge (fdo#38441)
+
+Signed-off-by: Michael Stahl
+Signed-off-by: Michael Meeks
+Signed-off-by: Stephan Bergmann
+
+2011-10-25 Petr Mladek [1952f1110771b2148fb3b54a213fb57f35bcf676]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [4e6f5a0fdf498fa932cde42b3a920e34cd666df2]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
+2011-10-05 Caolán McNamara [242f1bee6e0df3c58c257178058d61a1c349c2ed]
+
+get this building with gcc 4.6.1
+
+
+2011-09-21 Noel Power [0b3a80adb4df072be76445aff3d065d489f11db9]
+
+fdo#37164 get testtool working
+
+
2011-09-07 Petr Mladek [07b5a23bf628abd1c264460ed7d4c2fa36145011]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/automation/source/server/cmdbasestream.cxx new/libreoffice-components-3.4.4.3/automation/source/server/cmdbasestream.cxx
--- old/libreoffice-components-3.4.2.6/automation/source/server/cmdbasestream.cxx 2011-05-19 11:11:11.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/automation/source/server/cmdbasestream.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -70,10 +70,7 @@
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
- else
- Write(pUId);
+ Write(pUId);
Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter
Write(nNr);
}
@@ -82,10 +79,7 @@
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
- else
- Write(pUId);
+ Write(pUId);
Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter
Write(pString);
}
@@ -94,10 +88,7 @@
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
- else
- Write(pUId);
+ Write(pUId);
Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(bBool);
}
@@ -106,10 +97,7 @@
{
Write(comm_USHORT(SIReturn));
Write(nRet);
- if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
- Write(comm_ULONG(0));
- else
- Write(pUId);
+ Write(pUId);
Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1)); // Typ der folgenden Parameter
Write(nNr);
Write(pString);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/automation/source/server/statemnt.cxx new/libreoffice-components-3.4.4.3/automation/source/server/statemnt.cxx
--- old/libreoffice-components-3.4.2.6/automation/source/server/statemnt.cxx 2011-05-20 18:05:11.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/automation/source/server/statemnt.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -3373,7 +3373,7 @@
{
comm_ULONG nId;
pCmdIn->Read( nId );
- aUId = rtl::OString( nId );
+ aUId = rtl::OString::valueOf( static_cast< sal_Int32 >( nId ) );
if ( nId == 0 )
aUId = UID_ACTIVE;
else
@@ -3490,7 +3490,7 @@
{
if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) &&
pControl->IsVisible() ) ||
- aUId.equals( UID_ACTIVE ) ) )
+ aUId.equals( rtl::OString( UID_ACTIVE ) ) ) )
return sal_True;
else
{
@@ -4356,7 +4356,7 @@
#endif
- if ( aUId.equals( UID_ACTIVE ) )
+ if ( aUId.equals( rtl::OString( UID_ACTIVE ) ) )
pControl = GetAnyActive();
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/automation/source/testtool/cmdstrm.cxx new/libreoffice-components-3.4.4.3/automation/source/testtool/cmdstrm.cxx
--- old/libreoffice-components-3.4.2.6/automation/source/testtool/cmdstrm.cxx 2011-05-19 11:11:11.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/automation/source/testtool/cmdstrm.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -101,8 +101,7 @@
sal_uInt16 nElement;
if (pKeyCodes->Seek_Entry(&WhatName,&nElement))
{
- // FIXME: HELPID
- sal_uInt16 nCode = 0;//(sal_uInt16) pKeyCodes->GetObject(nElement)->pData->aUId.GetNum();
+ sal_uInt16 nCode = (sal_uInt16) pKeyCodes->GetObject(nElement)->pData->aUId.toInt64();
if ( nCode >= KEY_SHIFT )
nModify ^= nCode;
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/automation/source/testtool/objtest.cxx new/libreoffice-components-3.4.4.3/automation/source/testtool/objtest.cxx
--- old/libreoffice-components-3.4.2.6/automation/source/testtool/objtest.cxx 2011-05-20 18:05:11.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/automation/source/testtool/objtest.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -255,15 +255,11 @@
return GetObject(nPos)->pData->Kurzname;
else
{
- // FIXME: HELPID
- #if 0
- if ( aUId.Matches( UID_ACTIVE ) )
+ if ( aUId.match( UID_ACTIVE ) )
return CUniString("Active");
else
- return GEN_RES_STR1( S_NAME_NOT_THERE, aUId.GetText() );
- #else
+ return GEN_RES_STR1( S_NAME_NOT_THERE, String::CreateFromAscii( aUId.getStr() ) );
return String();
- #endif
}
}
@@ -693,12 +689,7 @@
SbxTransportMethod *pMeth = new SbxTransportMethod( SbxVARIANT );
pMeth->SetName( pRCommands->GetObject( i )->pData->Kurzname );
pMeth->SetUserData( ID_RemoteCommand );
- // FIXME: HELPID
- #if 0
- pMeth->nValue = pRCommands->GetObject( i )->pData->aUId.GetNum();
- #else
- pMeth->nValue = 0;
- #endif
+ pMeth->nValue = static_cast< sal_uLong >( pRCommands->GetObject( i )->pData->aUId.toInt64() );
Insert( pMeth );
StartListening( pMeth->GetBroadcaster(), sal_True );
}
@@ -852,7 +843,7 @@
ReadFlat( aFileName ,pUIds, sal_True );
if ( !pUIds )
return;
- pNewDef = new ControlDef("Active",rtl::OString());
+ pNewDef = new ControlDef("Active",rtl::OString( UID_ACTIVE ));
const ControlItem *pItem = pNewDef;
if (! pUIds->Insert(pItem))
{
@@ -983,12 +974,9 @@
else
{
- // FIXME: HELPID
- #if 0
if (aShortname.CompareIgnoreCaseToAscii("*Active") == COMPARE_EQUAL)
- aUId = rtl::OString( UID_ACTIVE );
+ aUId = UID_ACTIVE;
else
- #endif
if ( !bUnoName && !bMozillaName )
{ // Bestimmen der ID aus der Hid.Lst
ControlDef WhatName(aLongname,rtl::OString());
@@ -1002,17 +990,14 @@
}
else
{
- // FIXME: HELPID
- #if 0
if ( bUnoName )
- aUId = rtl::OString( aLongname );
+ aUId = rtl::OUStringToOString( aLongname, RTL_TEXTENCODING_UTF8 );
else if ( bMozillaName )
- aUId = rtl::OString( aLongname );
+ aUId = rtl::OUStringToOString( aLongname , RTL_TEXTENCODING_UTF8);
else
{
OSL_FAIL("Unknown URL schema");
}
- #endif
}
@@ -1137,7 +1122,6 @@
}
aLongname = aLine.GetToken(0,cMyDelim);
- // FIXME: HELPID
aUId = rtl::OUStringToOString( aLine.GetToken(1,cMyDelim), RTL_TEXTENCODING_UTF8 );
if ( bSortByName )
@@ -1180,8 +1164,7 @@
while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 )
{
- // FIXME: HELPID
- rtl::OString aUId;// (arWas[nIndex].nUId);
+ rtl::OString aUId ( rtl::OString::valueOf( static_cast< sal_Int64 >( arWas[nIndex].nUId ) ) );
const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId);
pNames->C40_PTR_INSERT(ControlItem, pX);
nIndex++;
@@ -1469,16 +1452,13 @@
{
String aStrId;
aStream.ReadByteString( aStrId, RTL_TEXTENCODING_UTF8 );
- // FIXME: HELPID
- #if 0
- aUId = rtl::OString( aStrId );
- #endif
+ aUId = rtl::OUStringToOString( aStrId, RTL_TEXTENCODING_UTF8 );
}
else
{
comm_ULONG nUId;
aStream >> nUId;
- aUId = rtl::OString();// nUId;
+ aUId = rtl::OString::valueOf( static_cast< sal_Int64 >( nUId ) );
}
if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId)
@@ -2095,8 +2075,7 @@
if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN )
{
pImpl->pNextReturn = ((SbxTransportMethod*)pVar);
- // FIXME: HELPID
- aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue );
+ aNextReturnId = rtl::OString::valueOf( static_cast< sal_Int64 >( ((SbxTransportMethod*)pVar)->nValue ) );
}
if ( SingleCommandBlock )
EndBlock();
@@ -2168,17 +2147,13 @@
{
In->GenCmdControl (pMember->GetULong(),
(sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar);
- // FIXME: HELPID
- aNextReturnId = rtl::OString();// pMember->GetULong() );
+ aNextReturnId = rtl::OUStringToOString( pMember->GetString(), RTL_TEXTENCODING_UTF8 );
}
else
{
In->GenCmdControl (pMember->GetString(),
(sal_uInt16)((SbxTransportMethod*)pVar)->nValue, rPar);
- // FIXME: HELPID
- #if 0
- aNextReturnId = rtl::OString( pMember->GetString() );
- #endif
+ aNextReturnId = rtl::OUStringToOString( pMember->GetString(), RTL_TEXTENCODING_UTF8 );
}
}
@@ -2728,12 +2703,9 @@
// Will be set on method-child further down
- // FIXME: HELPID
- #if 0
- if ( pWhatName->pData->aUId.HasNumeric() )
+ if ( pWhatName->pData->aUId.equals( UID_ACTIVE ) )
pImpl->pControlsObj->SetUserData( ID_Control );
else
- #endif
pImpl->pControlsObj->SetUserData( ID_StringControl );
pShortNames->Insert(pWhatName->pData->Kurzname,pWhatName->pData->aUId,nSequence);
@@ -2746,13 +2718,13 @@
pImpl->pControlsObj->SetDfltProperty(pID);
pMember = pID;
}
- // FIXME: HELPID
- #if 0
- if ( pWhatName->pData->aUId.HasNumeric() )
- pMember->PutULong(pWhatName->pData->aUId.GetNum());
+ sal_uLong nId = static_cast< sal_uLong >( pWhatName->pData->aUId.toInt64() );
+ if ( nId )
+ pMember->PutULong(nId);
else
- pMember->PutString(pWhatName->pData->aUId.GetStr());
- #endif
+ {
+ pMember->PutString( String::CreateFromAscii( pWhatName->pData->aUId.getStr() ) );
+ }
pMember = pImpl->pControlsObj->Find(CUniString("name"),SbxCLASS_DONTCARE);
if ( pMember != NULL )
@@ -2772,20 +2744,18 @@
pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
pMyVar->SetName( pWhatName->pData->Kurzname );
- // FIXME: HELPID
- #if 0
- if ( pWhatName->pData->aUId.HasNumeric() )
+ sal_uLong nId = static_cast< sal_uLong >( pWhatName->pData->aUId.toInt64() );
+ if ( nId )
{
pMyVar->SetUserData( ID_Dispatch );
- pMyVar->nValue = pWhatName->pData->aUId.GetNum();
+ pMyVar->nValue = nId;
pShortNames->Insert( aStr, pWhatName->pData->aUId, nSequence );
}
else
{
pMyVar->SetUserData( ID_UNODispatch );
- pMyVar->aUnoSlot = pWhatName->pData->aUId.GetStr();
+ pMyVar->aUnoSlot = String::CreateFromAscii( pWhatName->pData->aUId.getStr() );
}
- #endif
return pMyVar;
}
@@ -2801,13 +2771,11 @@
pWhatName = ( (ControlDef*)m_pSIds->GetObject( nElement ) );
pReturn->SetName( pWhatName->pData->Kurzname );
- // FIXME: HELPID
- #if 0
- if ( pWhatName->pData->aUId.HasNumeric() )
- pReturn->PutULong(pWhatName->pData->aUId.GetNum());
+ sal_uLong nId = static_cast< sal_uLong >( pWhatName->pData->aUId.toInt64() );
+ if ( nId )
+ pReturn->PutULong( nId);
else
- pReturn->PutString(pWhatName->pData->aUId.GetStr());
- #endif
+ pReturn->PutString( String::CreateFromAscii( pWhatName->pData->aUId ) );
return pReturn;
}
}
@@ -3197,8 +3165,7 @@
}
if ( !bIncludeActive )
{
- // FIXME: HELPID
- ControlItem *pZeroItem = new ControlItemUId( UniString(), rtl::OString() );
+ ControlItem *pZeroItem = new ControlItemUId( UniString(), rtl::OString(UID_ACTIVE) );
sal_uInt16 nNr;
if ( m_pReverseControls->Seek_Entry( pZeroItem, &nNr ) )
{
@@ -3235,19 +3202,13 @@
{
String aUStrId; // UniqueStringID Used for Mozilla Integration
pRetStream->Read( aUStrId );
- // FIXME: HELPID
- #if 0
- aUId = rtl::OString( aUStrId );
- #endif
+ aUId = rtl::OUStringToOString( aUStrId, RTL_TEXTENCODING_UTF8 );
}
else
{
comm_ULONG nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
- // FIXME: HELPID
- #if 0
- aUId = rtl::OString( nUId );
- #endif
+ aUId = rtl::OString::valueOf( static_cast< sal_Int64 >( nUId ) );
}
pRetStream->Read(nParams);
@@ -3276,9 +3237,7 @@
{
case RET_Sequence:
{
- // FIXME: HELPID
- #if 0
- sal_uLong nUId = aUId.GetNum();
+ sal_uLong nUId = static_cast< sal_uLong >( aUId.toInt64() );
if ( nSequence != nUId )
{
bSequenceOK = sal_False;
@@ -3288,7 +3247,6 @@
{
nClearSequence = nUId;
}
- #endif
}
break;
case RET_Value:
@@ -3346,10 +3304,7 @@
}
WinInfoRec *pWinInfo = new WinInfoRec;
- // FIXME: HELPID
- #if 0
- pWinInfo->aUId = aUId.GetText();
- #endif
+ pWinInfo->aUId = String::CreateFromAscii( aUId.getStr() );
pWinInfo->nRType = (sal_uInt16)nLNr1; // just sal_uLong for Transport, data is always USHORT
pWinInfo->aRName = aString1;
pWinInfo->bIsReset = bBool1;
@@ -3401,11 +3356,10 @@
}
// Langname feststellen
- // FIXME: HELPID
- #if 0
- if ( aUId.HasString() )
+ sal_uLong nTmpId = aUId.toInt64();
+ if ( !nTmpId )
{ // use the String ID since there is no LongName in hid.lst
- pWinInfo->aLangname = aUId.GetStr();
+ pWinInfo->aLangname = String::CreateFromAscii( aUId.getStr() );
}
else
{
@@ -3418,7 +3372,6 @@
delete pNewItem;
}
}
- #endif
aWinInfoHdl.Call( pWinInfo );
@@ -3427,9 +3380,7 @@
break;
case RET_ProfileInfo:
{
- // FIXME: HELPID
- #if 0
- sal_uLong nUId = aUId.GetNum();
+ sal_uLong nUId = static_cast< sal_uLong >(aUId.toInt64());
if ( nParams & PARAM_STR_1 )
{
DirEntry FilePath = pImpl->aLogFileBase + DirEntry(DirEntry(aLogFileName).GetBase().AppendAscii(".prf"));
@@ -3557,14 +3508,11 @@
break;
}
}
- #endif
}
break;
case RET_DirectLoging:
{
- // FIXME: HELPID
- #if 0
- sal_uLong nUId = aUId.GetNum();
+ sal_uLong nUId = static_cast< sal_uLong>( aUId.toInt64() );
switch ( nUId )
{
case S_AssertError:
@@ -3580,7 +3528,6 @@
default:
;
}
- #endif
}
break;
case RET_MacroRecorder:
@@ -3611,8 +3558,7 @@
if ( m_pReverseControls )
{
sal_uInt16 nNr;
- // FIXME: HELPID
- ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( /*nLNr1*/ ) );
+ ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString::valueOf( static_cast< sal_Int64 >( nLNr1 ) ));
if ( m_pReverseControls->Seek_Entry(pNewItem,&nNr) )
aULongNames = m_pReverseControls->GetObject(nNr)->pData->Kurzname;
delete pNewItem;
@@ -3852,19 +3798,13 @@
{
String aUStrId; // UniqueStringID Used for Mozilla Integration
pRetStream->Read( aUStrId );
- // FIXME: HELPID
- #if 0
- aUId = rtl::OString( aUStrId );
- #endif
+ aUId = rtl::OUStringToOString( aUStrId, RTL_TEXTENCODING_UTF8 );
}
else
{
comm_ULONG nUId;
pRetStream->Read( nUId ); // bei Sequence einfach die Sequence
- // FIXME: HELPID
- #if 0
- aUId = rtl::OString( nUId );
- #endif
+ aUId = rtl::OString::valueOf( static_cast< sal_Int64 >( nUId ) );
}
pRetStream->Read( aString );
ReplaceNumbers (aString);
@@ -3910,15 +3850,11 @@
ReadFlatArray( Controls::arClasses, Controls::pClasses );
if ( Controls::pClasses )
{
- // FIXME: HELPID
- #if 0
for ( nElement = 0 ; nElement < Controls::pClasses->Count() ; nElement++ )
- if ( Controls::pClasses->GetObject(nElement)->pData->aUId.Matches( nMethodId ) )
+ {
+ if ( Controls::pClasses->GetObject(nElement)->pData->aUId.match( rtl::OString::valueOf( static_cast< sal_Int64 >( nMethodId ) ) ) )
return Controls::pClasses->GetObject(nElement)->pData->Kurzname;
- #else
- (void)nElement;
- (void)nMethodId;
- #endif
+ }
}
return String();
}
@@ -3930,15 +3866,9 @@
ReadFlatArray( CmdStream::arKeyCodes, CmdStream::pKeyCodes );
if ( CmdStream::pKeyCodes )
{
- // FIXME: HELPID
- #if 0
for ( nElement = 0 ; nElement < CmdStream::pKeyCodes->Count() ; nElement++ )
- if ( CmdStream::pKeyCodes->GetObject(nElement)->pData->aUId.Matches( nKeyCode ) )
+ if ( CmdStream::pKeyCodes->GetObject(nElement)->pData->aUId.match( rtl::OString::valueOf( static_cast< sal_Int64 >( nKeyCode ) ) ) )
return CmdStream::pKeyCodes->GetObject(nElement)->pData->Kurzname;
- #else
- (void)nElement;
- (void)nKeyCode;
- #endif
}
return CUniString( "UnknownKeyCode" );
}
@@ -3967,8 +3897,7 @@
bFound = sal_False;
if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL )
{
- // FIXME: HELPID
- aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
+ aResult = pShortNames->GetName( rtl::OString::valueOf( static_cast< sal_Int64 >( nNumber )) );
bFound = sal_True;
}
if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL )
@@ -3985,17 +3914,12 @@
sal_uInt16 nElement;
if ( pRCommands )
{
- // FIXME: HELPID
- #if 0
for ( nElement = 0 ; nElement < pRCommands->Count() ; nElement++ )
- if ( pRCommands->GetObject(nElement)->pData->aUId.Matches( nNumber ) )
+ if ( pRCommands->GetObject(nElement)->pData->aUId.match( rtl::OString::valueOf( static_cast< sal_Int64 >( nNumber ) ) ) )
{
aResult = pRCommands->GetObject(nElement)->pData->Kurzname;
nElement = pRCommands->Count();
}
- #else
- (void)nElement;
- #endif
}
}
if ( aType.CompareTo(TypeKenn ) == COMPARE_EQUAL )
@@ -4007,23 +3931,17 @@
sal_uInt16 nElement;
if ( pRTypes )
{
- // FIXME: HELPID
- #if 0
for ( nElement = 0 ; nElement < pRTypes->Count() ; nElement++ )
- if ( pRTypes->GetObject(nElement)->pData->aUId.Matches( nNumber ) )
+ if ( pRTypes->GetObject(nElement)->pData->aUId.match( rtl::OString::valueOf( static_cast< sal_Int64 >( nNumber ) ) ) )
{
aResult = pRTypes->GetObject(nElement)->pData->Kurzname;
nElement = pRTypes->Count();
}
- #else
- (void)nElement;
- #endif
}
}
if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL )
{
- // FIXME: HELPID
- aResult = pShortNames->GetName(rtl::OString(/*nNumber*/));
+ aResult = pShortNames->GetName(rtl::OString::valueOf( static_cast< sal_Int64>( nNumber ) ));
bFound = sal_True;
}
if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL )
@@ -4154,8 +4072,7 @@
if (pClasses && pClasses->Seek_Entry(&WhatName,&nElement))
{
pMethodVar->SetName(aStr);
- // FIXME: HELPID
- sal_uLong nUId = 0;//pClasses->GetObject(nElement)->pData->aUId.GetNum();
+ sal_uLong nUId = static_cast< sal_uLong >( pClasses->GetObject(nElement)->pData->aUId.toInt64() );
pMethodVar->nValue = nUId;
pMethodVar->SetUserData( GetUserData() );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/extensions/source/ole/unoconversionutilities.hxx new/libreoffice-components-3.4.4.3/extensions/source/ole/unoconversionutilities.hxx
--- old/libreoffice-components-3.4.2.6/extensions/source/ole/unoconversionutilities.hxx 2011-05-19 11:11:12.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/extensions/source/ole/unoconversionutilities.hxx 2011-11-22 18:55:17.000000000 +0100
@@ -134,7 +134,7 @@
/** @exception com.sun.star.lang.IllegalArgumentException
If rSeq does not contain a sequence then the exception is thrown.
*/
- SAFEARRAY* createUnoSequenceWrapper(const Any& rSeq);
+ VARTYPE createUnoSequenceWrapper(const Any& rSeq, SAFEARRAY*& pOutArray );
/** @exception com.sun.star.lang.IllegalArgumentException
If rSeq does not contain a sequence or elemtype has no proper value
then the exception is thrown.
@@ -779,11 +779,12 @@
}
case TypeClass_SEQUENCE: // sequence ??? SafeArray descriptor
{
- SAFEARRAY* pArray = createUnoSequenceWrapper(rAny);
- if (pArray)
+ SAFEARRAY* pOutArray = NULL;
+ VARTYPE eArrayType = createUnoSequenceWrapper(rAny, pOutArray );
+ if (pOutArray)
{
- V_VT(pVariant) = VT_ARRAY | VT_VARIANT;
- V_ARRAY(pVariant) = pArray;
+ V_VT(pVariant) = VT_ARRAY | eArrayType;
+ V_ARRAY(pVariant) = pOutArray;
}
else
{
@@ -1295,9 +1296,8 @@
template<class T>
-SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq)
+VARTYPE UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq, SAFEARRAY*& pArray)
{
- SAFEARRAY* pArray = NULL;
sal_uInt32 n = 0;
if( rSeq.getValueTypeClass() != TypeClass_SEQUENCE )
@@ -1361,7 +1361,7 @@
TYPELIB_DANGER_RELEASE( pSeqElementDesc);
- return pArray;
+ return eTargetElementType;
}
/* The argument rObj can contain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/editpropertyhandler.cxx new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/editpropertyhandler.cxx
--- old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/editpropertyhandler.cxx 2011-05-19 11:11:12.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/editpropertyhandler.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -248,13 +248,13 @@
::std::vector< ::rtl::OUString > aSuperseded;
if ( implHaveBothScrollBarProperties() )
{
- aSuperseded.push_back( PROPERTY_HSCROLL );
- aSuperseded.push_back( PROPERTY_VSCROLL );
+ aSuperseded.push_back( static_cast(PROPERTY_HSCROLL) );
+ aSuperseded.push_back( static_cast(PROPERTY_VSCROLL) );
}
if ( implHaveTextTypeProperty() )
{
- aSuperseded.push_back( PROPERTY_RICHTEXT );
- aSuperseded.push_back( PROPERTY_MULTILINE );
+ aSuperseded.push_back( static_cast(PROPERTY_RICHTEXT) );
+ aSuperseded.push_back( static_cast(PROPERTY_MULTILINE) );
}
if ( aSuperseded.empty() )
return Sequence< ::rtl::OUString >();
@@ -267,8 +267,8 @@
::osl::MutexGuard aGuard( m_aMutex );
::std::vector< ::rtl::OUString > aInterestingActuatingProps;
if ( implHaveTextTypeProperty() )
- aInterestingActuatingProps.push_back( PROPERTY_TEXTTYPE );
- aInterestingActuatingProps.push_back( PROPERTY_MULTILINE );
+ aInterestingActuatingProps.push_back( static_cast(PROPERTY_TEXTTYPE) );
+ aInterestingActuatingProps.push_back( static_cast(PROPERTY_MULTILINE) );
return Sequence< ::rtl::OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() );;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/formcomponenthandler.cxx new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/formcomponenthandler.cxx
--- old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/formcomponenthandler.cxx 2011-05-19 11:11:12.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/formcomponenthandler.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -947,28 +947,28 @@
{
::osl::MutexGuard aGuard( m_aMutex );
::std::vector< ::rtl::OUString > aInterestingProperties;
- aInterestingProperties.push_back( PROPERTY_DATASOURCE );
- aInterestingProperties.push_back( PROPERTY_COMMAND );
- aInterestingProperties.push_back( PROPERTY_COMMANDTYPE );
- aInterestingProperties.push_back( PROPERTY_LISTSOURCE );
- aInterestingProperties.push_back( PROPERTY_LISTSOURCETYPE );
- aInterestingProperties.push_back( PROPERTY_SUBMIT_ENCODING );
- aInterestingProperties.push_back( PROPERTY_REPEAT );
- aInterestingProperties.push_back( PROPERTY_TABSTOP );
- aInterestingProperties.push_back( PROPERTY_BORDER );
- aInterestingProperties.push_back( PROPERTY_CONTROLSOURCE );
- aInterestingProperties.push_back( PROPERTY_DROPDOWN );
- aInterestingProperties.push_back( PROPERTY_IMAGE_URL );
- aInterestingProperties.push_back( PROPERTY_TARGET_URL );
- aInterestingProperties.push_back( PROPERTY_STRINGITEMLIST );
- aInterestingProperties.push_back( PROPERTY_BUTTONTYPE );
- aInterestingProperties.push_back( PROPERTY_ESCAPE_PROCESSING );
- aInterestingProperties.push_back( PROPERTY_TRISTATE );
- aInterestingProperties.push_back( PROPERTY_DECIMAL_ACCURACY );
- aInterestingProperties.push_back( PROPERTY_SHOWTHOUSANDSEP );
- aInterestingProperties.push_back( PROPERTY_FORMATKEY );
- aInterestingProperties.push_back( PROPERTY_EMPTY_IS_NULL );
- aInterestingProperties.push_back( PROPERTY_TOGGLE );
+ aInterestingProperties.push_back( static_cast(PROPERTY_DATASOURCE) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_COMMAND) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_COMMANDTYPE) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_LISTSOURCE) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_LISTSOURCETYPE) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_SUBMIT_ENCODING) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_REPEAT) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_TABSTOP) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_BORDER) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_CONTROLSOURCE) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_DROPDOWN) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_IMAGE_URL) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_TARGET_URL) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_STRINGITEMLIST) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_BUTTONTYPE) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_ESCAPE_PROCESSING) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_TRISTATE) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_DECIMAL_ACCURACY) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_SHOWTHOUSANDSEP) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_FORMATKEY) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_EMPTY_IS_NULL) );
+ aInterestingProperties.push_back( static_cast(PROPERTY_TOGGLE) );
return Sequence< ::rtl::OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/xsdvalidationhelper.cxx new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/xsdvalidationhelper.cxx
--- old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/xsdvalidationhelper.cxx 2011-05-19 11:11:12.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/xsdvalidationhelper.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -271,7 +271,7 @@
Reference< XPropertySet > xNewType( getDataType( _rName ), UNO_QUERY );
// fire any changes in the properties which result from this new type
- std::set< ::rtl::OUString > aFilter; aFilter.insert( PROPERTY_NAME );
+ std::set< ::rtl::OUString > aFilter; aFilter.insert( static_cast(PROPERTY_NAME) );
firePropertyChanges( xOldType, xNewType, aFilter );
// fire the change in the Data Type property
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
--- old/libreoffice-components-3.4.2.6/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx 2011-05-19 11:11:12.000000000 +0200
+++ new/libreoffice-components-3.4.4.3/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -247,27 +247,27 @@
::std::vector< ::rtl::OUString > aSuperfluous;
if ( m_pHelper.get() )
{
- aSuperfluous.push_back( PROPERTY_CONTROLSOURCE );
- aSuperfluous.push_back( PROPERTY_EMPTY_IS_NULL );
- aSuperfluous.push_back( PROPERTY_FILTERPROPOSAL );
- aSuperfluous.push_back( PROPERTY_LISTSOURCETYPE );
- aSuperfluous.push_back( PROPERTY_LISTSOURCE );
- aSuperfluous.push_back( PROPERTY_BOUNDCOLUMN );
+ aSuperfluous.push_back( static_cast(PROPERTY_CONTROLSOURCE) );
+ aSuperfluous.push_back( static_cast(PROPERTY_EMPTY_IS_NULL) );
+ aSuperfluous.push_back( static_cast(PROPERTY_FILTERPROPOSAL) );
+ aSuperfluous.push_back( static_cast(PROPERTY_LISTSOURCETYPE) );
+ aSuperfluous.push_back( static_cast(PROPERTY_LISTSOURCE) );
+ aSuperfluous.push_back( static_cast(PROPERTY_BOUNDCOLUMN) );
bool bAllowBinding = m_pHelper->canBindToAnyDataType();
if ( bAllowBinding )
{
- aSuperfluous.push_back( PROPERTY_MAXTEXTLEN );
- aSuperfluous.push_back( PROPERTY_VALUEMIN );
- aSuperfluous.push_back( PROPERTY_VALUEMAX );
- aSuperfluous.push_back( PROPERTY_DECIMAL_ACCURACY );
- aSuperfluous.push_back( PROPERTY_TIMEMIN );
- aSuperfluous.push_back( PROPERTY_TIMEMAX );
- aSuperfluous.push_back( PROPERTY_DATEMIN );
- aSuperfluous.push_back( PROPERTY_DATEMAX );
- aSuperfluous.push_back( PROPERTY_EFFECTIVE_MIN );
- aSuperfluous.push_back( PROPERTY_EFFECTIVE_MAX );
+ aSuperfluous.push_back( static_cast(PROPERTY_MAXTEXTLEN) );
+ aSuperfluous.push_back( static_cast(PROPERTY_VALUEMIN) );
+ aSuperfluous.push_back( static_cast(PROPERTY_VALUEMAX) );
+ aSuperfluous.push_back( static_cast(PROPERTY_DECIMAL_ACCURACY) );
+ aSuperfluous.push_back( static_cast(PROPERTY_TIMEMIN) );
+ aSuperfluous.push_back( static_cast(PROPERTY_TIMEMAX) );
+ aSuperfluous.push_back( static_cast(PROPERTY_DATEMIN) );
+ aSuperfluous.push_back( static_cast(PROPERTY_DATEMAX) );
+ aSuperfluous.push_back( static_cast(PROPERTY_EFFECTIVE_MIN) );
+ aSuperfluous.push_back( static_cast(PROPERTY_EFFECTIVE_MAX) );
}
}
@@ -283,8 +283,8 @@
::std::vector< ::rtl::OUString > aInterestedInActuations( 2 );
if ( m_pHelper.get() )
{
- aInterestedInActuations.push_back( PROPERTY_XSD_DATA_TYPE );
- aInterestedInActuations.push_back( PROPERTY_XML_DATA_MODEL );
+ aInterestedInActuations.push_back( static_cast(PROPERTY_XSD_DATA_TYPE) );
+ aInterestedInActuations.push_back( static_cast(PROPERTY_XML_DATA_MODEL) );
}
if ( aInterestedInActuations.empty() )
return Sequence< ::rtl::OUString >();
Files old/libreoffice-components-3.4.2.6/setup_native/source/mac/ooo/DS_Store and new/libreoffice-components-3.4.4.3/setup_native/source/mac/ooo/DS_Store differ
++++++ libreoffice-extensions-3.4.2.6.tar.bz2 -> libreoffice-extensions-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/ChangeLog new/libreoffice-extensions-3.4.4.3/ChangeLog
--- old/libreoffice-extensions-3.4.2.6/ChangeLog 2011-09-07 19:38:08.000000000 +0200
+++ new/libreoffice-extensions-3.4.4.3/ChangeLog 2011-11-22 19:04:34.000000000 +0100
@@ -1,3 +1,86 @@
+2011-11-22 Petr Mladek [328cf3d6ddc7170bae58c5d2463ace6fc6424167]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [225a2e0c84a39043d48271865a0281b49370433f]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [a60b1835ab1085ce9d3d9130783bf8cece5f4348]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [812335b4f5220c800fded73d2476d138c2e0a458]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-31 Andras Timar [9d9add77f6a08c9511df902e9d34690c6846161f]
+
+Scottish Gaelic (gd) translation
+
+
+2011-10-25 Petr Mladek [c08e491b49096046d06ef2ac722167369aec3810]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [cb97183e6bd55f3fc1976af7ffe1c6e0b239967e]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
+2011-10-23 Andras Timar [03208fbdf808413480b8b7809d703d879bbfe803]
+
+nlpsolver translation update
+
+
+2011-10-21 Andras Timar [28664eecf3b5af8d850f86d392edf7afba0e4779]
+
+fix localization of NLPSolver
+
+Signed-off-by: Caolán McNamara
+
+2011-09-30 Luboš Luňák [a9cc06fa45d4cd9547f40a9869c64c912b821b42]
+
+build without glib poppler bindings
+
+- there's not configure check for it, only for poppler itself
+- and it's not actually used anyway
+
+2011-09-30 Caolán McNamara [9540db43f3f1b11d3407a45aefda235d7e78f76b]
+
+Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3
+
+
+2011-09-30 Tomáš Chvátal [53e66aea4c1b3617363fd138a7903190d964da6b]
+
+This is merge of f6f8f67460bba296c49f794d14621b7313df4f7d.
+
+It is not posible to git-am due to merge to core/ repository.
+It had one minor collision on pdfioutdev_gpl.hxx.
+
+Orginal header:
+From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
+From: Caolán McNamara
+Date: Tue, 19 Jul 2011 07:54:07 +0000
+Subject: poppler 0.17.0 changed its api for no some reason or other
+
2011-09-07 Petr Mladek [e1537bdf89d429004346df94086faa49d7f6a512]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverCommon_gd.properties new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverCommon_gd.properties
--- old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverCommon_gd.properties 1970-01-01 01:00:00.000000000 +0100
+++ new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverCommon_gd.properties 2011-11-22 18:55:17.000000000 +0100
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Cuir mar fhiacham caochladairean neo-\u00E0icheil
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=Meud an sgaotha
+NLPSolverCommon.Properties.LibrarySize=Meud na leabhar-lainn
+NLPSolverCommon.Properties.LearningCycles=Cuairtean ionnsachaidh
+NLPSolverCommon.Properties.GuessVariableRange=Tomhas air cr\u00ECochan nan caochladairean
+NLPSolverCommon.Properties.VariableRangeThreshold=Stairsneach cr\u00ECochan nan caochladairean (nuair a nithear tomhas)
+NLPSolverCommon.Properties.UseACRComparator=Cleachd coimeasaiche ACR (an \u00E0ite BCH)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Cleachd puing t\u00F2iseachaidh air thuaiream
+NLPSolverCommon.Properties.StagnationLimit=Cr\u00ECoch na neo-ghluasadachd
+NLPSolverCommon.Properties.Tolerance=Fulangas na neo-ghluasadachd
+NLPSolverCommon.Properties.EnhancedSolverStatus=Seall staid mheudaichte an fhuasglair
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Reat suidseadh \u00E0idseint (Coltachd DE)
+NLPSolverCommon.Properties.DEFactor=DE: Factar sg\u00E8ilidh (0-1.2)
+NLPSolverCommon.Properties.DECR=DE: Coltachd Crossover (0-1)
+NLPSolverCommon.Properties.PSC1=PS: Cunbhalachan cognatach
+NLPSolverCommon.Properties.PSC2=PS: Cunbhalachan s\u00F2isealta
+NLPSolverCommon.Properties.PSWeight=PS: Co-\u00E8ifeachd cuingealachaidh
+NLPSolverCommon.Properties.PSCL=PS: Coltachd m\u00F9thaidh (0-0.005)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverCommon_nb.properties new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverCommon_nb.properties
--- old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverCommon_nb.properties 2011-05-19 11:14:20.000000000 +0200
+++ new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverCommon_nb.properties 2011-11-22 18:55:17.000000000 +0100
@@ -1,6 +1,6 @@
# x-no-translate
#BaseNLPSolver
-NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables
+NLPSolverCommon.Properties.AssumeNonNegative=Anta positive variabler
#BaseEvolutionarySolver
NLPSolverCommon.Properties.SwarmSize=Size of Swarm
NLPSolverCommon.Properties.LibrarySize=Bibliotekst\u00F8rrelse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverStatusDialog_gd.properties new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverStatusDialog_gd.properties
--- old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverStatusDialog_gd.properties 1970-01-01 01:00:00.000000000 +0100
+++ new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverStatusDialog_gd.properties 2011-11-22 18:55:17.000000000 +0100
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=Staid an fhuasglair
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Am fuasgladh l\u00E0ithreach:
+NLPSolverStatusDialog.Controls.lblIteration=Ath-nochdaidhean:
+NLPSolverStatusDialog.Controls.lblStagnation=Neo-ghluasadachd:
+NLPSolverStatusDialog.Controls.lblRuntime=\u00D9ine ruith:
+NLPSolverStatusDialog.Controls.btnStop=Cuir stad air
+NLPSolverStatusDialog.Controls.btnOK=Ceart ma-th\u00E0
+NLPSolverStatusDialog.Controls.btnContinue=Lean air adhart
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=R\u00E0inig thu na tha ceadaichte de ath-nochdaidhean.
+NLPSolverStatusDialog.Message.StopStagnation=Stad am pr\u00F2iseas air sg\u00E0th neo-ghluasadachd.
+NLPSolverStatusDialog.Message.StopUser=Stad an cleachdaiche am pr\u00F2iseas.
+NLPSolverStatusDialog.Message.CurrentIteration=Stad am pr\u00F2iseas aig ath-nochdadh %d \u00E0 %d.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=Nano-dhiogan
+NLPSolverStatusDialog.Time.Microseconds=Micreo-dhiogan
+NLPSolverStatusDialog.Time.Milliseconds=Mille-dhiogan
+NLPSolverStatusDialog.Time.Second=Diog
+NLPSolverStatusDialog.Time.Seconds=Diogan
+NLPSolverStatusDialog.Time.Minute=Mionaid
+NLPSolverStatusDialog.Time.Minutes=Mionaidean
+NLPSolverStatusDialog.Time.Hour=Uair a th\u00ECde
+NLPSolverStatusDialog.Time.Hours=Uairean a th\u00ECde
+NLPSolverStatusDialog.Time.Day=Latha
+NLPSolverStatusDialog.Time.Days=L\u00E0ithean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverStatusDialog_is.properties new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverStatusDialog_is.properties
--- old/libreoffice-extensions-3.4.2.6/nlpsolver/locale/NLPSolverStatusDialog_is.properties 2011-05-19 11:14:20.000000000 +0200
+++ new/libreoffice-extensions-3.4.4.3/nlpsolver/locale/NLPSolverStatusDialog_is.properties 2011-11-22 18:55:17.000000000 +0100
@@ -25,4 +25,4 @@
NLPSolverStatusDialog.Time.Hour=Klukkustund
NLPSolverStatusDialog.Time.Hours=Klukkustundir
NLPSolverStatusDialog.Time.Day=Dagur
-NLPSolverStatusDialog.Time.Days=Days
+NLPSolverStatusDialog.Time.Days=Dagur
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/nlpsolver/makefile.mk new/libreoffice-extensions-3.4.4.3/nlpsolver/makefile.mk
--- old/libreoffice-extensions-3.4.2.6/nlpsolver/makefile.mk 2011-05-24 14:08:23.000000000 +0200
+++ new/libreoffice-extensions-3.4.4.3/nlpsolver/makefile.mk 2011-11-22 18:55:17.000000000 +0100
@@ -46,7 +46,7 @@
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/ && $(GNUTAR) xf -)
+CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/locale/ && rm *de_DE* && $(GNUTAR) xf -)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx new/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
--- old/libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-05-19 11:14:21.000000000 +0200
+++ new/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2011-11-22 18:55:17.000000000 +0100
@@ -150,7 +150,11 @@
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
{
// dump JPEG file as-is
+#if POPPLER_CHECK_VERSION(0, 17, 3)
+ str = str->getBaseStream();
+#else
str = ((DCTStream *)str)->getRawStream();
+#endif
str->reset();
int c;
@@ -489,7 +493,11 @@
printf("endPage\n");
}
+#if POPPLER_CHECK_VERSION(0, 17, 0)
+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
+#else
void PDFOutDev::processLink(Link* link, Catalog*)
+#endif
{
assert(link);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx new/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
--- old/libreoffice-extensions-3.4.2.6/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-05-19 11:14:21.000000000 +0200
+++ new/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2011-11-22 18:55:17.000000000 +0100
@@ -65,7 +65,14 @@
class GfxFont;
class PDFDoc;
#ifndef SYSTEM_POPPLER
+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
typedef GString GooString;
+#else
+#include
+#define POPPLER_CHECK_VERSION(major,minor,micro) \
+ (POPPLER_VERSION_MAJOR > (major) || \
+ (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
+ (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro)))
#endif
namespace pdfi
@@ -193,9 +200,13 @@
// Convert between device and user coordinates.
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
-
+
+ #if POPPLER_CHECK_VERSION(0, 17, 0)
+ virtual void processLink(AnnotLink *link, Catalog *catalog);
+ #else
//----- link borders
virtual void processLink(Link *link, Catalog *catalog);
+ #endif
//----- save/restore graphics state
virtual void saveState(GfxState *state);
++++++ libreoffice-extras-3.4.2.6.tar.bz2 -> libreoffice-extras-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-extras-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-extras-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-filters-3.4.2.6.tar.bz2 -> libreoffice-filters-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-filters-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-filters-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-help-3.4.2.6.tar.bz2 -> libreoffice-help-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/ChangeLog new/libreoffice-help-3.4.4.3/ChangeLog
--- old/libreoffice-help-3.4.2.6/ChangeLog 2011-09-07 19:39:28.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/ChangeLog 2011-11-22 19:06:03.000000000 +0100
@@ -1,3 +1,51 @@
+2011-11-22 Petr Mladek [72b30a9744245ba3d43d44227007afe5d8a54781]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [08f27557bbf7a0a83bc26cae3a800ad6fc6fda0c]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [093db76be7e1a2eb2d318882b36885297ef828d7]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [1ae20e403483c8c43aa4ab178c3db8d08a1d18d4]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-25 Petr Mladek [f29d9bf25fa726ff3e61d3bcd0e06dfa5d2eb31f]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [841c1969e3b7ff39b1d7123c7350753861e5332f]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
+2011-10-25 Andras Timar [09da52a344af15b9393d5cd3085a1f70a2028502]
+
+remove/change *.services.openoffice.org links
+
+Signed-off-by: Petr Mladek
+
2011-09-07 Petr Mladek [cc6bed068ff2900ca3d3f472c394ea848a6d7760]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/sbasic/shared/main0601.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/sbasic/shared/main0601.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/sbasic/shared/main0601.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/sbasic/shared/main0601.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -45,7 +45,7 @@
<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/main0601.xhp" name="$[officename] Basic Help">%PRODUCTNAME Basic Help</link></paragraph>
<section id="basicalt">
<paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="4">%PRODUCTNAME %PRODUCTVERSION provides an Application Programming Interface (API) that allows controlling the $[officename] components with different programming languages by using the $[officename] Software Development Kit (SDK). For more information about the $[officename] API and the Software Development Kit, visit <link href="http://api.openoffice.org/" name="http://api.openoffice.org">http://api.openoffice.org</link></paragraph>
-<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="10">This help section explains the most common runtime functions of %PRODUCTNAME Basic. For more in-depth information please refer to the <link href="http://wiki.services.openoffice.org/wiki/Documentation/BASIC_Guide">OpenOffice.org BASIC Programming Guide</link> on the OpenOffice.org Wiki.</paragraph>
+<paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="10">This help section explains the most common runtime functions of %PRODUCTNAME Basic. For more in-depth information please refer to the <link href="http://wiki.documentfoundation.org/Documentation/BASIC_Guide">OpenOffice.org BASIC Programming Guide</link> on the OpenOffice.org Wiki.</paragraph>
</section>
<paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="3" l10n="U" oldref="9">Working with %PRODUCTNAME Basic</paragraph>
<embed href="text/sbasic/shared/01000000.xhp#doc_title"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060100.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060100.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060100.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060100.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -45,7 +45,7 @@
<paragraph xml-lang="en-US" id="hd_id3154944" role="heading" level="1" l10n="CHG"
oldref="16">Functions by Category</paragraph>
<paragraph xml-lang="en-US" id="par_id3149378" role="paragraph" l10n="CHG" oldref="2">This section describes the functions of $[officename] Calc. The various functions are divided into categories in the Function Wizard.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0120200910234570" role="tip" l10n="NEW">You can find detailed explanations, illustrations, and examples of Calc functions in the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">OpenOffice.org Wiki</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0120200910234570" role="tip" l10n="NEW">You can find detailed explanations, illustrations, and examples of Calc functions in the <link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_Functions_listed_by_category">OpenOffice.org Wiki</link>.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3146972" role="heading" level="2" l10n="U" oldref="3"><link href="text/scalc/01/04060101.xhp" name="Database">Database</link></paragraph>
<embed href="text/scalc/01/04060101.xhp#datenbanktext"/>
<paragraph xml-lang="en-US" id="hd_id3155443" role="heading" level="2" l10n="U" oldref="4"><link href="text/scalc/01/04060102.xhp" name="Date & Time">Date & Time</link></paragraph>
@@ -75,7 +75,7 @@
<embed href="text/scalc/01/04060111.xhp#addintext"/>
<paragraph xml-lang="en-US" id="par_id3150715" role="paragraph" l10n="U" oldref="14"><link href="text/scalc/01/04060199.xhp" name="Operators">Operators</link> are also available.</paragraph>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id0902200809540918" role="paragraph" l10n="NEW"><variable id="drking"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
+ <paragraph xml-lang="en-US" id="par_id0902200809540918" role="paragraph" l10n="NEW"><variable id="drking"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_Functions_listed_by_category">Calc functions in the OpenOffice.org Wiki</link>
</variable></paragraph>
</section>
</body>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060101.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060101.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060101.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060101.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -501,7 +501,7 @@
<paragraph xml-lang="en-US" id="par_id3147083" role="paragraph" l10n="U" oldref="87">
<emph>SearchCriteria</emph> is the cell range containing search criteria. If you write several criteria in one row they are connected by AND. If you write the criteria in different rows they are connected by OR. Empty cells in the search criteria range will be ignored.</paragraph>
<paragraph xml-lang="en-US" id="par_id3151188" role="paragraph" l10n="U" oldref="188">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060500.xhp" name="Spreadsheet - Calculate">%PRODUCTNAME Calc - Calculate</link> to define how $[officename] Calc acts when searching for identical entries.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3882869" role="paragraph" l10n="NEW">See also the Wiki page about <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3882869" role="paragraph" l10n="NEW">See also the Wiki page about <link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Conditional_Counting_and_Summation">Conditional Counting and Summation</link>.</paragraph>
<sort order="asc">
<section id="Section1">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150882">DCOUNT function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060107.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060107.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060107.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060107.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -657,7 +657,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_RGP" id="bm_id3144716" localize="false"/>
<paragraph role="heading" id="hd_id3109846" xml-lang="en-US" level="2" l10n="U" oldref="64">LINEST</paragraph>
-<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="CHG" oldref="65"><ahelp hid="HID_FUNC_RGP">Returns a table of statistics for a straight line that best fits a data set.</ahelp><comment>changed based on http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_LINEST_... (issue 76142)</comment></paragraph>
+<paragraph role="paragraph" id="par_id3144733" xml-lang="en-US" l10n="CHG" oldref="65"><ahelp hid="HID_FUNC_RGP">Returns a table of statistics for a straight line that best fits a data set.</ahelp><comment>changed based on http://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_LINEST_functi... (issue 76142)</comment></paragraph>
<paragraph role="heading" id="hd_id3152825" xml-lang="en-US" level="3" l10n="U" oldref="66">Syntax</paragraph>
<paragraph role="code" id="par_id3152839" xml-lang="en-US" l10n="U" oldref="67">LINEST(data_Y; data_X; linearType; stats)</paragraph>
<paragraph role="paragraph" id="par_id3152853" xml-lang="en-US" l10n="U" oldref="68">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060110.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060110.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060110.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060110.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -74,7 +74,7 @@
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_ASC" id="bm_id3187353" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id7723929" role="heading" level="2" l10n="NEW">ASC</paragraph>
<paragraph xml-lang="en-US" id="par_id8455153" role="paragraph" l10n="NEW"><ahelp hid=".">The ASC function converts full-width to half-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_...</link> for a conversion table.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9912411" role="paragraph" l10n="NEW">See <link href="http://wiki.documentfoundation.org/Calc/Features/JIS_and_ASC_functions">http://wiki.documentfoundation.org/Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
<paragraph xml-lang="en-US" id="hd_id9204992" role="heading" level="3" l10n="NEW">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id1993774" role="code" l10n="NEW">ASC("Text")</paragraph>
<paragraph xml-lang="en-US" id="par_id2949919" role="paragraph" l10n="NEW">
@@ -306,7 +306,7 @@
<bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_JIS" id="bm_id3818475" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3666188" role="heading" level="2" l10n="NEW">JIS</paragraph>
<paragraph xml-lang="en-US" id="par_id964384" role="paragraph" l10n="NEW"><ahelp hid=".">The JIS function converts half-width to full-width ASCII and katakana characters. Returns a text string.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id1551561" role="paragraph" l10n="NEW">See <link href="http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_and_ASC_functions">http://wiki.services.openoffice.org/mwiki/index.php?title=Calc/Features/JIS_...</link> for a conversion table.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1551561" role="paragraph" l10n="NEW">See <link href="http://wiki.documentfoundation.org/Calc/Features/JIS_and_ASC_functions">http://wiki.documentfoundation.org/Calc/Features/JIS_and_ASC_functions</link> for a conversion table.</paragraph>
<paragraph xml-lang="en-US" id="hd_id2212897" role="heading" level="3" l10n="NEW">Syntax</paragraph>
<paragraph xml-lang="en-US" id="par_id2504654" role="code" l10n="NEW">JIS("Text")</paragraph>
<paragraph xml-lang="en-US" id="par_id5292519" role="paragraph" l10n="NEW">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060116.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060116.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060116.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060116.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -553,7 +553,7 @@
<emph>FromUnit</emph> is the unit from which conversion is taking place.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153790" role="paragraph" l10n="U" oldref="213">
<emph>ToUnit</emph> is the unit to which conversion is taking place. Both units must be of the same type.</paragraph>
-<paragraph xml-lang="en-US" id="par_id09022809540918" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_CONVERT_ADD_function">Current list of CONVERT_ADD units in the OpenOffice.org Wiki.</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id09022809540918" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_CONVERT_ADD_function">Current list of CONVERT_ADD units in the OpenOffice.org Wiki.</link></paragraph>
<paragraph xml-lang="en-US" id="hd_id3156270" role="heading" level="3" l10n="U"
oldref="214">Examples</paragraph>
<paragraph xml-lang="en-US" id="par_id3156336" role="paragraph" l10n="U" oldref="215">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060182.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060182.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060182.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060182.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -283,7 +283,7 @@
<emph>mu</emph> is the known mean of the population.</paragraph>
<paragraph xml-lang="en-US" id="par_id3154740" role="paragraph" l10n="CHG" oldref="109">
<emph>Sigma</emph> (optional) is the known standard deviation of the population. If omitted, the standard deviation of the given sample is used.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0305200911372999" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_ZTEST_function">Wiki page</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372999" role="paragraph" l10n="NEW">See also the <link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_ZTEST_function">Wiki page</link>.</paragraph>
</section>
<section id="harmean">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153623">HARMEAN function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060185.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060185.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/01/04060185.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/01/04060185.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -521,7 +521,7 @@
oldref="183">Example</paragraph>
<paragraph xml-lang="en-US" id="par_id3146077" role="paragraph" l10n="U" oldref="184">
<item type="input">=WEIBULL(2;1;1;1)</item> returns 0.86.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0305200911372899" role="paragraph" l10n="NEW">See also the <link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Calc:_WEIBULL_function">Wiki page</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0305200911372899" role="paragraph" l10n="NEW">See also the <link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_WEIBULL_function">Wiki page</link>.</paragraph>
</section>
</sort>
<section id="relatedtopics">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/guide/database_filter.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/guide/database_filter.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/guide/database_filter.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/guide/database_filter.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -96,7 +96,7 @@
<embed href="text/scalc/guide/database_sort.xhp#database_sort"/>
<embed href="text/scalc/guide/cellcopy.xhp#cellcopy"/>
<embed href="text/scalc/guide/specialfilter.xhp#specialfilter"/>
- <paragraph xml-lang="en-US" id="par_id4525284" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id4525284" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
</section>
</body>
</helpdocument>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/guide/database_sort.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/guide/database_sort.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/scalc/guide/database_sort.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/scalc/guide/database_sort.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -64,7 +64,7 @@
<section id="relatedtopics">
<embed href="text/scalc/guide/database_define.xhp#database_define"/>
<embed href="text/scalc/guide/database_filter.xhp#database_filter"/>
- <paragraph xml-lang="en-US" id="par_id1846980" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1846980" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Defining_a_Data_Range">Wiki page about defining a data range</link></paragraph>
</section>
</body>
</helpdocument>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/02100001.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/02100001.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/02100001.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/02100001.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -356,8 +356,8 @@
<embed href="text/swriter/guide/finding.xhp#finding"/>
</case>
</switch>
-<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id1751457" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Regular_Expressions_in_Writer">Wiki page about regular expressions in Writer</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id5483870" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Regular_Expressions_in_Calc">Wiki page about regular expressions in Calc</link></paragraph>
</section>
</body>
</helpdocument>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/06020000.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/06020000.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/06020000.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/06020000.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -73,7 +73,7 @@
<bookmark xml-lang="en-US" branch="hid/svx:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE" id="bm_id3149763" localize="false"/>
<paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">Select a language for the thesaurus.</ahelp> You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">Select a language for the thesaurus.</ahelp> You can install languages with a thesaurus library from the <link href="http://extensions.libreoffice.org/">Extensions</link> web page.</paragraph>
</body>
</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/06040400.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/06040400.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/06040400.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/06040400.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -55,7 +55,7 @@
<bookmark xml-lang="en-US" branch="hid/CUI_HID_OFAPAGE_QUOTE_SW_CLB" id="bm_id59906552" localize="false"/>
<paragraph xml-lang="en-US" id="par_id31537173" role="paragraph" l10n="NEW"><ahelp hid=".">Select to apply the replacements while you type [T], or when you modify existing text [M].</ahelp></paragraph>
-<comment>new feature, cws cbosdo01. http://wiki.services.openoffice.org/wiki/Non_Breaking_Spaces_Before_Punctuat...)</comment>
+<comment>new feature, cws cbosdo01. http://wiki.documentfoundation.org/Non_Breaking_Spaces_Before_Punctuation_In...)</comment>
<paragraph xml-lang="en-US" id="hd_id3159300" role="heading" level="2" l10n="U" oldref="25">Add non breaking space before specific punctuation marks in French text</paragraph>
<paragraph xml-lang="en-US" id="par_id3153173" role="paragraph" l10n="U" oldref="27">Inserts a non breaking space before ";", "!", "?" and ":" when the character language is set to French (France, Belgium, Luxembourg, Monaco, or Switzerland) and before ":" only when the character language is set to French (Canada).</paragraph>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/packagemanager.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/packagemanager.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/packagemanager.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/packagemanager.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -77,7 +77,7 @@
</list><comment>UFI: Extension Guide needed. Until we have that guide, I'll add some more info in this file.</comment>
<paragraph id="hd_id3895382" role="heading" xml-lang="en-US" level="2">To install an extension</paragraph>
<paragraph id="par_id9143955" role="paragraph" xml-lang="en-US">An extension is available as a file with the file extension .oxt.</paragraph>
-<paragraph id="par_id7857905" role="paragraph" xml-lang="en-US">You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the <link href="http://extensions.services.openoffice.org/">http://extensions.services.openoffice.org/</link> page.<comment># i78606</comment></paragraph>
+<paragraph id="par_id7857905" role="paragraph" xml-lang="en-US">You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the <link href="http://extensions.libreoffice.org/">http://extensions.libreoffice.org/</link> page.<comment># i78606</comment></paragraph>
<paragraph id="hd_id5016937" role="heading" xml-lang="en-US" level="3">To install a user extension</paragraph>
<paragraph id="par_id1856440" role="paragraph" xml-lang="en-US">Do any of the following:</paragraph>
<list type="ordered">
@@ -129,4 +129,4 @@
<paragraph id="par_id1439558" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select an installed extension, then click to open the Options dialog for the extension.</ahelp></paragraph>
<paragraph id="par_id0103201110331832" role="paragraph" xml-lang="en-US">Some additional commands can appear in the context menu of an extension in the Extension Manager window, depending on the selected extension. You can choose to show the license text again. You can choose to exclude the extension from checking for updates or to include an excluded extension.</paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/ref_pdf_export.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/01/ref_pdf_export.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/01/ref_pdf_export.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -134,7 +134,7 @@
<paragraph xml-lang="en-US" id="par_id853434896" role="paragraph" l10n="NEW"><ahelp hid=".">Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document.</ahelp> Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
- <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">This setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id9796441" role="heading" level="2" l10n="NEW">Initial View</paragraph>
<paragraph xml-lang="en-US" id="hd_id1218604" role="heading" level="2" l10n="NEW">Panes</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>
@@ -284,4 +284,4 @@
oldref="50">Export</paragraph>
<paragraph xml-lang="en-US" id="par_id3146975" role="paragraph" l10n="U" oldref="51"><ahelp hid=".">Exports the current file in PDF format.</ahelp></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/dabawiz02access.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -45,7 +45,7 @@
</bookmark><comment>mw added 2 new index entries</comment><paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1" l10n="NEW"><variable id="access"><link href="text/shared/explorer/database/dabawiz02access.xhp">Microsoft Access Connection</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1142772" xml-lang="en-US" l10n="NEW">See also the English Wiki page <link href="http://wiki.services.openoffice.org/wiki/MSA-Base_Faq">http://wiki.services.openoffice.org/wiki/MSA-Base_Faq</link>.</paragraph>
+<paragraph role="paragraph" id="par_id1142772" xml-lang="en-US" l10n="NEW">See also the English Wiki page <link href="http://wiki.documentfoundation.org/MSA-Base_Faq">http://wiki.documentfoundation.org/MSA-Base_Faq</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" id="bm_id627155" localize="false"/><paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2" l10n="NEW">Microsoft Access database file</paragraph>
<paragraph role="paragraph" id="par_idN10548" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the path to the database file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" id="bm_id8335215" localize="false"/><paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="2" l10n="NEW">Browse</paragraph>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/main.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/main.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/main.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/main.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -108,7 +108,7 @@
<embedvar href="text/shared/explorer/database/toolbars.xhp#toolbars"/>
</paragraph>
<embed href="text/shared/04/01020000.xhp#DB_keys"/>
-<paragraph role="paragraph" id="par_id6474806" xml-lang="en-US" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Database">Wiki page about Base</link></paragraph>
+<paragraph role="paragraph" id="par_id6474806" xml-lang="en-US" l10n="NEW"><link href="http://wiki.documentfoundation.org/Database">Wiki page about Base</link></paragraph>
</section>
</body>
</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -62,7 +62,7 @@
<embed href="text/shared/00/00000001.xhp#finish"/>
<embed href="text/shared/00/00000001.xhp#abbrechen"/>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0112200902353554" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Macros_in_Database_Documents">An in depth explanation by the developers (Wiki).</link></paragraph>
</section>
</body>
</helpdocument>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/rep_main.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/rep_main.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/rep_main.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -45,40 +45,6 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id5248573" role="paragraph" l10n="NEW">The Report Builder is a tool to create your own database reports. Unlike with the <link href="text/shared/autopi/01100000.xhp">Report Wizard</link>, using the Report Builder you can take control to design the report the way you want. The generated report is a Writer document that you can edit, too.</paragraph>
<paragraph xml-lang="en-US" id="par_id7128818" role="note" l10n="NEW">To use the Report Builder, the Report Builder extension must be installed. In addition, the Java Runtime Environment (JRE) software must be installed, and this software must be selected in %PRODUCTNAME.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3753776" role="heading" level="2" l10n="NEW">To Install the Report Builder Extension</paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id5284279" role="paragraph" l10n="NEW">Choose Tools - Extension Manager to open the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="CHG">If you see the Report Builder in the Extension Manager list, then you do not need to install the extension. Else click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The extension file will be downloaded to your computer.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the extension file that you downloaded. Click Open.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Report Builder extension.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id6201666" role="paragraph" l10n="NEW">Read the license. If you accept the license, click Accept to continue the installation.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id208136" role="paragraph" l10n="NEW">Click Close to close the Extension Manager.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id20813699" role="paragraph" l10n="NEW">Restart %PRODUCTNAME. If the Quickstarter is running, also close the Quickstarter.</paragraph>
- </listitem>
- </list>
<paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2" l10n="NEW">To install the JRE software</paragraph>
<paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
<list type="ordered">
@@ -251,4 +217,4 @@
</image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
<paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/explorer/database/rep_navigator.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -51,7 +51,7 @@
<paragraph role="heading" id="hd_id2932828" xml-lang="en-US" level="2" l10n="NEW">To enter functions to the report</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:NewFunction" id="bm_id974456" localize="false"/><paragraph role="paragraph" id="par_id5091708" xml-lang="en-US" l10n="NEW"><ahelp hid=".">In the context menu of the Report Navigator, you see the same commands as in the Report Builder view, plus additional commands to create new functions or to delete them.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id9449446" xml-lang="en-US" l10n="NEW">Functions can be entered using a syntax as specified by the <link href="http://en.wikipedia.org/wiki/OpenFormula">OpenFormula</link> proposal.</paragraph>
-<paragraph role="paragraph" id="par_id4095583" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.services.openoffice.org/wiki/Database">Wiki page about Base</link> for some more help regarding the functions in a report.</paragraph>
+<paragraph role="paragraph" id="par_id4095583" xml-lang="en-US" l10n="NEW">See <link href="http://wiki.documentfoundation.org/Database">Wiki page about Base</link> for some more help regarding the functions in a report.</paragraph>
<paragraph role="heading" id="hd_id311593" xml-lang="en-US" level="3" l10n="NEW">To calculate a sum for each client<comment>copied from a mail by Ocke - did not test</comment></paragraph>
<list type="ordered">
<listitem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/assistive.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/assistive.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/assistive.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/assistive.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -49,7 +49,7 @@
<paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="1" l10n="U" oldref="22"><variable id="assistive"><link href="text/shared/guide/assistive.xhp" name="Assistive Tools in $[officename]">Assistive Tools in $[officename]</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="25">$[officename] supports some assistive technology tools like screen magnification software, screen readers, and on-screen keyboards. Most of these tools communicate with $[officename] by means of the Java(TM) Access Bridge software, that uses the Java Accessibility API, a part of the Java runtime environment.</paragraph>
-<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the OpenOffice.org Wiki at <link href="http://wiki.services.openoffice.org/wiki/Accessibility">http://wiki.services.openoffice.org/wiki/Accessibility</link>.</paragraph>
+<paragraph role="tip" id="par_id8847010" xml-lang="en-US" l10n="NEW">A current list of supported assistive tools can be found on the OpenOffice.org Wiki at <link href="http://wiki.documentfoundation.org/Accessibility">http://wiki.documentfoundation.org/Accessibility</link>.</paragraph>
<paragraph role="heading" id="hd_id3145345" xml-lang="en-US" level="2" l10n="U" oldref="12">Requirements to use assistive tools in $[officename]</paragraph>
<list type="unordered">
<listitem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/digital_signatures.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/digital_signatures.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/digital_signatures.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/digital_signatures.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -108,7 +108,7 @@
<paragraph xml-lang="en-US" id="par_id6075624" role="paragraph" l10n="NEW">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph>
<paragraph xml-lang="en-US" id="par_id6819971" role="warning" l10n="NEW">The messages about validation of a signature that you see in %PRODUCTNAME are the messages that the validation files return. The %PRODUCTNAME software has no way to ensure that the messages reflect the true status of any certificate. The %PRODUCTNAME software only displays the messages that other files that are not under control of %PRODUCTNAME report. There is no legal responsibility of %PRODUCTNAME that the displayed messages reflect the true status of a digital signature.</paragraph>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
<paragraph xml-lang="en-US" id="par_id486465" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_send.xhp">Applying digital signatures</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3448591" role="paragraph" l10n="NEW"><link href="text/shared/guide/digitalsign_receive.xhp">Opening a document using WebDAV over HTTPS</link></paragraph>
</section>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/digitalsign_receive.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -96,7 +96,7 @@
<paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If you enable <emph>Remember password till end of session</emph>, your password will be remembered for subsequent WebDAV connections until you exit %PRODUCTNAME.</ahelp></paragraph>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
<paragraph xml-lang="en-US" id="par_id2182378" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
</section>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/digitalsign_send.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/digitalsign_send.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/digitalsign_send.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/digitalsign_send.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -109,7 +109,7 @@
<!-- removed HID 1311736326 -->
<paragraph xml-lang="en-US" id="par_id7705618" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose this setting to cancel the connection.</ahelp></paragraph>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3204443" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/How_to_use_digital_Signatures">English Wiki page on digital signatures</link></paragraph>
<paragraph xml-lang="en-US" id="par_id5166173" role="paragraph" l10n="NEW"><link href="text/shared/guide/digital_signatures.xhp">About digital signatures</link></paragraph>
</section>
</body>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -127,7 +127,7 @@
<paragraph role="paragraph" id="par_id0811200801491972" xml-lang="en-US" l10n="NEW">In Excel, the formula =A1+A2 returns 2, but the formula =SUM(A1,A2) returns 0.<comment>in SUM(A1<limiter>A2), use the Excel limiter comma , in English and semicolon ; in German</comment></paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.services.openoffice.org/wiki/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
+<paragraph role="note" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="30">For a detailed overview about converting documents to and from Microsoft Office format, see the <link href="http://wiki.documentfoundation.org/Documentation/OOoAuthors_User_Manual/Migration_Guide">Migration Guide</link>.</paragraph>
<paragraph role="heading" id="par_idN10A9F" xml-lang="en-US" level="2" l10n="NEW">Opening Microsoft Office Documents That Are Protected With a Password</paragraph>
<paragraph role="paragraph" id="par_id8699606" xml-lang="en-US" l10n="NEW">%PRODUCTNAME can open the following Microsoft Office document types that are protected by a password.</paragraph>
<table id="tbl_id4497512">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/optionen/01010400.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/optionen/01010400.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/shared/optionen/01010400.xhp 2011-05-19 11:53:21.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/shared/optionen/01010400.xhp 2011-11-22 18:55:17.000000000 +0100
@@ -152,8 +152,8 @@
<paragraph role="paragraph" id="par_id3155098" xml-lang="en-US" l10n="CHG" oldref="18">Specifies that hyphenation will also be carried out in footnotes, headers and footers.</paragraph>
</section>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id6434522" xml-lang="en-US" l10n="CHG" localize="false"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
-<paragraph role="paragraph" id="par_id3552964" xml-lang="en-US" l10n="CHG" localize="false"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
+<paragraph role="paragraph" id="par_id6434522" xml-lang="en-US" l10n="CHG" localize="false"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
+<paragraph role="paragraph" id="par_id3552964" xml-lang="en-US" l10n="CHG" localize="false"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
</section>
</body>
</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/numbering_lines.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/numbering_lines.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/numbering_lines.xhp 2011-05-19 11:53:22.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/numbering_lines.xhp 2011-11-22 18:55:18.000000000 +0100
@@ -136,6 +136,6 @@
<paragraph xml-lang="en-US" id="par_id3153934" role="paragraph" l10n="U" oldref="5"><link href="text/swriter/01/06180000.xhp" name="Tools - Line Numbering">Tools - Line Numbering</link></paragraph>
<embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
<paragraph xml-lang="en-US" id="par_id3153960" role="paragraph" l10n="U" oldref="32"><link href="text/swriter/01/05030800.xhp" name="Format - Paragraph - Numbering">Format - Paragraph - Numbering</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id2212591" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id2212591" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
</body>
</helpdocument>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/numbering_paras.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/numbering_paras.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/numbering_paras.xhp 2011-05-19 11:53:22.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/numbering_paras.xhp 2011-11-22 18:55:18.000000000 +0100
@@ -95,6 +95,6 @@
<embed href="text/shared/guide/numbering_stop.xhp#numbering_stop"/>
<embed href="text/swriter/guide/captions.xhp#captions"/>
<embed href="text/swriter/guide/number_sequence.xhp#number_sequence"/>
- <paragraph xml-lang="en-US" id="par_id6943571" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id6943571" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings">Wiki page about numbering paragraphs by styles</link></paragraph>
</body>
</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp 2011-05-19 11:53:22.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/spellcheck_dialog.xhp 2011-11-22 18:55:18.000000000 +0100
@@ -46,7 +46,7 @@
oldref="37"><variable id="spellcheck_dialog"><link href="text/swriter/guide/spellcheck_dialog.xhp" name="Checking Spelling and Grammar">Checking Spelling and Grammar</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="CHG" oldref="9">You can manually check the spelling and grammar of a text selection or the entire document.</paragraph>
- <paragraph xml-lang="en-US" id="par_id0525200902184476" role="note" l10n="NEW">To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the <link href="http://extensions.services.openoffice.org/dictionary">extensions web page</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0525200902184476" role="note" l10n="NEW">To check the spelling and the grammar of a text, the appropriate dictionaries must be installed. For many languages three different dictionaries exist: a spellchecker, a hyphenation dictionary, and a thesaurus. Each dictionary covers one language only. Grammar checkers can be downloaded and installed as extensions. See the <link href="http://extensions.libreoffice.org">extensions web page</link>.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149828" role="paragraph" l10n="U" oldref="10">The spellcheck starts at the current cursor position, or at the beginning of the text selection.</paragraph>
<list type="ordered">
<listitem>
@@ -72,8 +72,8 @@
<paragraph xml-lang="en-US" id="par_id3147107" role="paragraph" l10n="U" oldref="49"><link href="text/shared/01/06010000.xhp" name="Spellcheck dialog">Spelling and Grammar dialog</link></paragraph>
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
<embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
- <paragraph xml-lang="en-US" id="par_id9625843" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id1683706" role="paragraph" l10n="NEW"><link href="http://wiki.services.openoffice.org/wiki/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9625843" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Adding_More_Languages">Wiki page: Adding more languages</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1683706" role="paragraph" l10n="NEW"><link href="http://wiki.documentfoundation.org/Documentation/How_Tos/Spellchecking_in_More_Languages">Wiki page: Multiple language spellchecking</link></paragraph>
</section>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
--- old/libreoffice-help-3.4.2.6/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp 2011-05-19 11:53:22.000000000 +0200
+++ new/libreoffice-help-3.4.4.3/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp 2011-11-22 18:55:18.000000000 +0100
@@ -72,11 +72,11 @@
<paragraph xml-lang="en-US" id="par_id3156263" role="paragraph" l10n="U" oldref="19">Initially, the thesaurus uses the language of the selected word in the document, if a thesaurus library for that language is installed. The title bar of the Thesaurus dialog displays the language in use.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145113" role="note" l10n="U" oldref="18">To look up the word in a different language, click the Language button, and select one of the installed thesaurus languages. A thesaurus library may not be available for all installed languages. You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145113" role="note" l10n="U" oldref="18">To look up the word in a different language, click the Language button, and select one of the installed thesaurus languages. A thesaurus library may not be available for all installed languages. You can install languages with a thesaurus library from the <link href="http://extensions.libreoffice.org/">Extensions</link> web page.</paragraph>
<paragraph xml-lang="en-US" id="par_id3196263" role="paragraph" l10n="U" oldref="19">If a thesaurus library is installed for the language of a word, the context menu of the word shows a Synonyms submenu. Select any of the terms from the submenu to replace the word.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
<paragraph xml-lang="en-US" id="par_id3154392" role="paragraph" l10n="U" oldref="41"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
++++++ libreoffice-help-en-US.spec.in ++++++
--- /var/tmp/diff_new_pack.NdUB0o/_old 2011-12-25 17:36:35.000000000 +0100
+++ /var/tmp/diff_new_pack.NdUB0o/_new 2011-12-25 17:36:35.000000000 +0100
@@ -19,11 +19,11 @@
Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@
-Version: 3.4.2.6
+Version: 3.4.4.3
Release: 1
%define piece help
-%define lo_build_version 3.4.2.6
-%define lo_piece_version 3.4.2.6
+%define lo_build_version 3.4.4.3
+%define lo_piece_version 3.4.4.3
%define lo_langs ""
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
++++++ libreoffice-help-groupX.spec.in ++++++
--- /var/tmp/diff_new_pack.NdUB0o/_old 2011-12-25 17:36:35.000000000 +0100
+++ /var/tmp/diff_new_pack.NdUB0o/_new 2011-12-25 17:36:35.000000000 +0100
@@ -19,11 +19,11 @@
Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@
-Version: 3.4.2.6
+Version: 3.4.4.3
Release: 1
%define piece help
-%define lo_build_version 3.4.2.6
-%define lo_piece_version 3.4.2.6
+%define lo_build_version 3.4.4.3
+%define lo_piece_version 3.4.4.3
%define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice
%define lo_basis_dir basis3.4
++++++ libreoffice-impress-3.4.2.6.tar.bz2 -> libreoffice-impress-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.4.2.6/ChangeLog new/libreoffice-impress-3.4.4.3/ChangeLog
--- old/libreoffice-impress-3.4.2.6/ChangeLog 2011-09-07 19:38:48.000000000 +0200
+++ new/libreoffice-impress-3.4.4.3/ChangeLog 2011-11-22 19:05:15.000000000 +0100
@@ -1,3 +1,61 @@
+2011-11-22 Petr Mladek [59dea4ed7a952c16c68ec0abc2f3451b72535404]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [23e6925e8cbbd17b55db907fc1803eb053c4c7c6]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [a8b4965d6c0f180aaabfc27ba26b3bfd80631b0c]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [a2aab04ac7693dd035c6a34b7cf38756447cb97f]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-25 Petr Mladek [b148791bcf86c175f2b042d95f71f99a3e38add9]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [71781e0c42ceb3c3985a36f5acb1987ea213253e]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
+2011-09-19 Ivan Timofeev [20140491c901db50783e4f515fae38af7215af7f]
+
+fdo#38391: don't crash while dropping texture
+
+Signed-off-by: Michael Meeks
+
+2011-09-08 Thorsten Behrens [66d627beac2d018b7bb0c9eefd863cae6bca2e64]
+
+Fix hang in slideshow.
+
+This fixes fdo#32861, by processing all remaining events after the
+post-yield callback comes around (that's supposed to be the time
+when the app can spend time on event processing).
+
+Signed-off-by: Caolán McNamara
+
2011-09-07 Petr Mladek [bd240572312f90347d38382932a50a2cf0482561]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.4.2.6/sd/source/ui/slideshow/slideshowimpl.cxx new/libreoffice-impress-3.4.4.3/sd/source/ui/slideshow/slideshowimpl.cxx
--- old/libreoffice-impress-3.4.2.6/sd/source/ui/slideshow/slideshowimpl.cxx 2011-05-20 18:05:40.000000000 +0200
+++ new/libreoffice-impress-3.4.4.3/sd/source/ui/slideshow/slideshowimpl.cxx 2011-11-22 18:55:18.000000000 +0100
@@ -1883,6 +1883,9 @@
{
Application::EnableNoYieldMode(false);
Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener));
+ Application::Reschedule(true); // fix for fdo#32861 - process
+ // *all* outstanding events after
+ // yield is done.
if (mbDisposed)
return 0;
return updateSlideShow();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-impress-3.4.2.6/sd/source/ui/view/sdview4.cxx new/libreoffice-impress-3.4.4.3/sd/source/ui/view/sdview4.cxx
--- old/libreoffice-impress-3.4.2.6/sd/source/ui/view/sdview4.cxx 2011-05-20 18:05:40.000000000 +0200
+++ new/libreoffice-impress-3.4.4.3/sd/source/ui/view/sdview4.cxx 2011-11-22 18:55:18.000000000 +0100
@@ -117,7 +117,7 @@
if( mnAction == DND_ACTION_LINK && pPickObj && pPV )
{
const bool bIsGraphic = pPickObj->ISA( SdrGrafObj );
- if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) )
+ if( bIsGraphic || (pObj && pObj->IsEmptyPresObj() && !bOnMaster) )
{
if( IsUndoEnabled() )
BegUndo(String(SdResId(STR_INSERTGRAPHIC)));
++++++ libreoffice-libs-core-3.4.2.6.tar.bz2 -> libreoffice-libs-core-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-libs-core-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-libs-core-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-libs-extern-3.4.2.6.tar.bz2 -> libreoffice-libs-extern-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-libs-extern-3.4.2.6/ChangeLog new/libreoffice-libs-extern-3.4.4.3/ChangeLog
--- old/libreoffice-libs-extern-3.4.2.6/ChangeLog 2011-09-07 19:39:49.000000000 +0200
+++ new/libreoffice-libs-extern-3.4.4.3/ChangeLog 2011-11-22 19:06:23.000000000 +0100
@@ -1,3 +1,45 @@
+2011-11-22 Petr Mladek [1a6810faf97148206c19682d3354216615b82a1f]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [b123e9b701c511fc31293fc62f8fac638c31def9]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [329306190c758b1463ab2401719760f20d589b66]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [93f165c6f41a52398c6d489ced7c07ae6b32dceb]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-25 Petr Mladek [2c5e8e1a68cd4427b1ab0b54f7822aac3403425b]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [af9bc68e62191f4a6ccefaef8393ae80593f3cb1]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
2011-09-07 Petr Mladek [8fefc050006dbfd2091ddb964ea5067fe382d8f5]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
@@ -7,6 +49,11 @@
fdo#39355: reenable "use typedefs and endianess from sal" patch hunk
+
+2011-09-02 Lionel Elie Mamane [2d25fee9ed2fc381ef51dae36c892fa2ebc9d0a5]
+
+fdo#39355: reenable "use typedefs and endianess from sal" patch hunk
+
2011-09-02 Petr Mladek [469ca9ab6d55be92ce2561496b5520c77f82854d]
++++++ libreoffice-libs-extern-sys-3.4.2.6.tar.bz2 -> libreoffice-libs-extern-sys-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-libs-extern-sys-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-libs-extern-sys-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-libs-gui-3.4.2.6.tar.bz2 -> libreoffice-libs-gui-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-libs-gui-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-libs-gui-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-poppler-0.17.0-reject-fix.diff ++++++
--- configure.in
+++ configure.in
@@ -6598,16 +6598,6 @@
AC_MSG_RESULT([external])
SYSTEM_POPPLER=YES
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- save_CPPFLAGS=$CPPFLAGS
- CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
- CXXFLAGS=$save_CXXFLAGS
- CPPFLAGS=$save_CPPFLAGS
- AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=NO
--- src/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ src/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -150,11 +150,7 @@
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
{
// dump JPEG file as-is
-#if POPPLER_CHECK_VERSION(0, 17, 3)
- str = str->getBaseStream();
-#else
str = ((DCTStream *)str)->getRawStream();
-#endif
str->reset();
int c;
@@ -493,11 +489,7 @@
printf("endPage\n");
}
-#if POPPLER_CHECK_VERSION(0, 17, 0)
-void PDFOutDev::processLink(AnnotLink *link, Catalog *)
-#else
void PDFOutDev::processLink(Link* link, Catalog*)
-#endif
{
assert(link);
--- src/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ src/libreoffice-extensions-3.4.4.3/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -65,14 +65,7 @@
class GfxFont;
class PDFDoc;
#ifndef SYSTEM_POPPLER
-#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
typedef GString GooString;
-#else
-#include
-#define POPPLER_CHECK_VERSION(major,minor,micro) \
- (POPPLER_VERSION_MAJOR > (major) || \
- (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
- (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro)))
#endif
namespace pdfi
@@ -201,12 +194,8 @@
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
- #if POPPLER_CHECK_VERSION(0, 17, 0)
- virtual void processLink(AnnotLink *link, Catalog *catalog);
- #else
//----- link borders
virtual void processLink(Link *link, Catalog *catalog);
- #endif
//----- save/restore graphics state
virtual void saveState(GfxState *state);
++++++ libreoffice-postprocess-3.4.2.6.tar.bz2 -> libreoffice-postprocess-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-postprocess-3.4.2.6/ChangeLog new/libreoffice-postprocess-3.4.4.3/ChangeLog
--- old/libreoffice-postprocess-3.4.2.6/ChangeLog 2011-09-07 19:45:42.000000000 +0200
+++ new/libreoffice-postprocess-3.4.4.3/ChangeLog 2011-11-22 19:12:34.000000000 +0100
@@ -1,3 +1,45 @@
+2011-11-22 Petr Mladek [8f3d55f9be27ee1d7b5340dd72d464e743baafb8]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [8e47c3530de6cfa71202221dc07bb421e2a54cd5]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [e627b5719d218da31fbb3181adbbb9e361d829be]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [fab5d49f7014d2974e0dcc2ee2af8169aae8d5a4]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-25 Petr Mladek [913ebc6cb7a84145f0fafd8a22928a598d8f864f]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [fc108e4d647f53ccb22b7f1f0511a5c4b5585708]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
2011-09-07 Petr Mladek [354c89257d92f6114fb428a37f51bce307269c8e]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
++++++ libreoffice-sdk-3.4.2.6.tar.bz2 -> libreoffice-sdk-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-sdk-3.4.2.6/ChangeLog new/libreoffice-sdk-3.4.4.3/ChangeLog
--- old/libreoffice-sdk-3.4.2.6/ChangeLog 2011-09-07 19:38:45.000000000 +0200
+++ new/libreoffice-sdk-3.4.4.3/ChangeLog 2011-11-22 19:05:10.000000000 +0100
@@ -1,3 +1,45 @@
+2011-11-22 Petr Mladek [ca1f6f10226bcce4e22003c8f4f80a22ad4555d4]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [35a41c8338e578e496676a57000b38eb09547046]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [8657bf293f48b9a8ec05758dd5edea6f0b1c94df]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [f10bb7c859f2e33720d22425137e6dac982f513e]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-25 Petr Mladek [a50c65a7a82d3f5ca3d5f7b68de2ad3a6dfdd3a7]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [e0e013afbb6b5862bc9fb556493aa1c8c27ee177]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
2011-09-07 Petr Mladek [eccef8eb5bf6f9677377d3f604e08f87b30ae59e]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
++++++ libreoffice-testing-3.4.2.6.tar.bz2 -> libreoffice-testing-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-testing-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-testing-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-translations-3.4.2.6.tar.bz2 -> libreoffice-translations-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ libreoffice-ure-3.4.2.6.tar.bz2 -> libreoffice-ure-3.4.4.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.4.2.6/ChangeLog new/libreoffice-ure-3.4.4.3/ChangeLog
--- old/libreoffice-ure-3.4.2.6/ChangeLog 2011-09-07 19:39:39.000000000 +0200
+++ new/libreoffice-ure-3.4.4.3/ChangeLog 2011-11-22 19:06:14.000000000 +0100
@@ -1,3 +1,45 @@
+2011-11-22 Petr Mladek [e4e239ad7d2b557c3524e0bff5c1b1369c6bbee3]
+
+Version 3.4.4.3, tag suse-3.4.4.3 (SUSE LO 3.4.4-rc1)
+
+
+2011-11-22 Petr Mladek [1bb166f9dc0861d9aeb93332e9a8ee22bd25920e]
+
+Merge commit 'libreoffice-3.4.4.2' into suse-3.4.4
+
+
+2011-11-22 Petr Mladek [dadf0ad845e955bc69e6777bc714e6359f1e25d4]
+
+Branch suse-3.4.4
+
+This is 'suse-3.4.4' - the stable branch for the SUSE 3.4.4 release.
+Only very safe changes are allowed.
+
+Note that we do not plan any official maintenance update. We will
+just provide packages for the LibreOffice:Stable project in BS.
+
+2011-11-01 Petr Mladek [0a73a471e81bfe7a7383db4a1838182381eb3f06]
+
+Version 3.4.4.2, tag libreoffice-3.4.4.2 (3.4.4-rc2)
+
+
+2011-10-25 Petr Mladek [3b4b92a1f7b9ecbe38982c9dec8ac538ef3e20fd]
+
+Branch libreoffice-3-4-4
+
+This is 'libreoffice-3-4-4' - the stable branch for the 3.4.4 release.
+Only very safe changes, reviewed by three people are allowed.
+
+If you want to commit more complicated fix for the next 3.4.x release,
+please use the 'libreoffice-3-4' branch.
+
+If you want to build something cool, unstable, and risky, use master.
+
+2011-10-25 Petr Mladek [ab8a9944c70baf122e97ae4a98d25175785c9043]
+
+Version 3.4.4.1, tag libreoffice-3.4.4.1 (3.4.4-rc1)
+
+
2011-09-07 Petr Mladek [482880bac432acd19363f24e7d326bb67bd50b88]
Version 3.4.2.6, tag suse-3.4.2.6 (SUSE LO 3.4.2-rc3)
++++++ libreoffice-writer-3.4.2.6.tar.bz2 -> libreoffice-writer-3.4.4.3.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-writer-3.4.2.6.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-writer-3.4.4.3.tar.bz2 differ: char 11, line 1
++++++ pyuno-path.diff ++++++
--- pyuno/source/module/uno.py 2011-11-30 18:39:37 -0500
+++ pyuno/source/module/uno.py 2011-11-30 19:38:14 -0500
@@ -26,6 +26,12 @@
#*************************************************************************
import os
import sys
+import platform
+
+if platform.machine() == 'x86_64':
+ sys.path.append('/usr/lib64/libreoffice/basis-link/program')
+else:
+ sys.path.append('/usr/lib/libreoffice/basis-link/program')
if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:@INSTALLDIR@/program/fundamentalrc"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org