[Libreoffice-commits] .: python/Python-aix.patch

2012-01-02 Thread Stephan Bergmann 
 python/Python-aix.patch |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7d8f3b19c69e741175bed035681cfacd3a30713d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 2 10:04:57 2012 +0100

Linux LD_LIBRARY_PATH is missing as well.

diff --git a/python/Python-aix.patch b/python/Python-aix.patch
index 8dae6d1..9c8f601 100644
--- a/python/Python-aix.patch
+++ b/python/Python-aix.patch
@@ -12,10 +12,11 @@
$(LN) -f $(INSTSONAME) $@; \
else\
$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) 
$(LIBM) $(LDLAST); \
-@@ -907,6 +907,7 @@
+@@ -907,6 +907,8 @@
export PATH; PATH=`pwd`:$$PATH; \
export PYTHONPATH; PYTHONPATH=`pwd`/Lib; \
export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH=`pwd`; \
++  export LD_LIBRARY_PATH; 
LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}; \
 +  export LIBPATH; LIBPATH=`pwd`${LIBPATH:+:$LIBPATH}; \
export EXE; EXE=$(BUILDEXE); \
cd $(srcdir)/Lib/$(PLATDIR); ./regen
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - l10ntools/scripts

2012-01-02 Thread Andras Timar 
 l10ntools/scripts/keyidGen.pl |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit e1430a66abdbcd6cfeaa99c33fb6a97e95c118f0
Author: Andras Timar ati...@suse.com
Date:   Mon Jan 2 12:35:52 2012 +0100

fix KeyID generation for a corner case

diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl
index bb9eae9..cf95b29 100644
--- a/l10ntools/scripts/keyidGen.pl
+++ b/l10ntools/scripts/keyidGen.pl
@@ -67,16 +67,23 @@ while ( INFILE )
 my $title  = defined $14 ? $14 : '';
 my $timestamp  = defined $15 ? $15 : '';
 @path = split (  , $file );
-$key = $path[-3] . _ . $path[-2] . _ . $path[-1] . # . $gid . 
.;
+if (defined $path[-3])
+{
+$key = $path[-3] . _ . $path[-2] . _ . $path[-1] . # . $gid 
. .;
+}
+else
+{
+$key = $prj . _ . $path[-2] . _ . $path[-1] . # . $gid . .;
+}
 if (length($lid)) {$key .= $lid . .;}
 if (length($type)) {$key .= $type . .;}
 # replace non-word characters to _ just as in po files in source keys
 $key =~ s|[^\w#\./]|_|g;
 # ISO 639 private use code
-   $lang = qtz;
-   if ( $text ne ) {$text = makekeyidstr(keyidgen($key . text),$text);}
-   if ( $quickhelptext ne ) {$quickhelptext = makekeyidstr(keyidgen($key 
. quickhelptext),$quickhelptext);}
-   if ( $title ne ) {$title = makekeyidstr(keyidgen($key . 
title),$title);}
+$lang = qtz;
+if ( $text ne ) {$text = makekeyidstr(keyidgen($key . 
text),$text);}
+if ( $quickhelptext ne ) {$quickhelptext = 
makekeyidstr(keyidgen($key . quickhelptext),$quickhelptext);}
+if ( $title ne ) {$title = makekeyidstr(keyidgen($key . 
title),$title);}
 print OUTFILE 
$prj\t$file\t$dummy\t$type\t$gid\t$lid\t$helpid\t$platform\t$width\t$lang\t$text\t$helptext\t$quickhelptext\t$title\t$timestamp\n;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

2012-01-02 Thread Petr Mladek 
 sw/source/ui/app/applab.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 502ef71db74c3cdb1433c3402a0d93971dc47f1b
Author: Winfried Donkers w.donk...@dci-electronics.nl
Date:   Fri Dec 9 17:44:20 2011 +0100

fdo#36874: Label PRINTING misplaced on paper sheet

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 00809fe..f1f8536 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -266,10 +266,14 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool 
bLabel)
 
 aDesc.SetUseOn(nsUseOnPage::PD_ALL);   
// Site numbering
 
+// fix (fdo36874) revised page size calculation
 // Set page size
-rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-rItem.lLeft  + rItem.nCols * 
rItem.lHDist + MINLAY,
-rItem.lUpper + rItem.nRows * 
rItem.lVDist + MINLAY));
+long lPgWidth, lPgHeight;
+lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft)  MINLAY) ?
+(rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) : MINLAY);
+lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper)  MINLAY) ?
+(rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) : MINLAY);
+rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight 
));
 
 // Numbering type
 SvxNumberType aType;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4-5' - 2 commits - xmloff/inc xmloff/source

2012-01-02 Thread Lubos Lunak 
 xmloff/inc/xmloff/PageMasterStyleMap.hxx   |1 +
 xmloff/source/style/PageMasterExportPropMapper.cxx |7 +++
 xmloff/source/style/PageMasterStyleMap.cxx |   21 ++---
 xmloff/source/text/txtprmap.cxx|4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)

New commits:
commit 63ecdc34d14e7c543dd2a435e54d084f8c2325d8
Author: Michael Stahl mst...@redhat.com
Date:   Thu Dec 22 23:51:33 2011 +0100

fdo#44082: fix hyphenation attributes:

These have type positiveInteger, so don't write 0 values:

20.191 fo:hyphenation-push-char-count
20.192 fo:hyphenation-remain-char-count

Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Luboš Luňák l.lu...@suse.cz

diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 8cf954a..df7a9f4 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -256,8 +256,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
 MP_ED( ParaTabStops, STYLE,  TAB_STOPS,  
MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_TABSTOP, CTF_TABSTOP ), // this is not 
realy a string!
 // RES_PARATR_HYPHENZONE
 MT_E( ParaIsHyphenation, FO, HYPHENATE,  
XML_TYPE_BOOL, 0 ),
-MT_E( ParaHyphenationMaxLeadingChars, FO, HYPHENATION_REMAIN_CHAR_COUNT, 
XML_TYPE_NUMBER16, 0 ),
-MT_E( ParaHyphenationMaxTrailingChars,FO, HYPHENATION_PUSH_CHAR_COUNT, 
XML_TYPE_NUMBER16, 0 ),
+MT_E( ParaHyphenationMaxLeadingChars, FO, HYPHENATION_REMAIN_CHAR_COUNT, 
XML_TYPE_NUMBER16_NO_ZERO, 0 ),
+MT_E( ParaHyphenationMaxTrailingChars,FO, HYPHENATION_PUSH_CHAR_COUNT, 
XML_TYPE_NUMBER16_NO_ZERO, 0 ),
 MP_E( ParaHyphenationMaxHyphens, FO, HYPHENATION_LADDER_COUNT, 
XML_TYPE_NUMBER16_NONE, 0 ),
 // RES_PARATR_DROP
 MP_E( DropCapWholeWord,  STYLE,  LENGTH, 
MID_FLAG_SPECIAL_ITEM|XML_TYPE_BOOL, CTF_DROPCAPWHOLEWORD ),
commit 0bf04da04fcb100bbfd4470e8708a1555ac1461d
Author: Michael Stahl mst...@redhat.com
Date:   Thu Dec 22 23:10:14 2011 +0100

fdo#44073: ODF export: fix layout grid invalid ODF

The following 3 attributes have been added in ODF 1.2, so don't write
them into ODF 1.1 files:

style:layout-grid-base-width 20.297
style:layout-grid-snap-to 20.305
style:layout-grid-standard-mode 20.306

Additionally, style:layout-grid-snap-to was written wrongly as
style:layout-grid-snap-to-characters, which does not exist in any ODF
spec.
For backward compatibility with previous OOo/LO versions, write the
wrong attribute in addition to the correct one in ODF extended mode,
even though validators complain about it (consider removing that
some years from now).

Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Luboš Luňák l.lu...@suse.cz

diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx 
b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
index d81bd80..91c59e9 100644
--- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx
+++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
@@ -97,6 +97,7 @@
 #define CTF_PM_STANDARD_MODE(XML_PM_CTF_START + 0x0055)
 #define CTP_PM_GRID_BASE_WIDTH  (XML_PM_CTF_START + 0x0056)
 #define CTP_PM_GRID_SNAP_TO_CHARS   (XML_PM_CTF_START + 0x0057)
+#define CTP_PM_GRID_SNAP_TO (XML_PM_CTF_START + 0x0058)
 // header
 #define CTF_PM_HEADERBORDERALL 
(CTF_PM_HEADERFLAG|CTF_PM_BORDERALL)
 #define CTF_PM_HEADERBORDERTOP 
(CTF_PM_HEADERFLAG|CTF_PM_BORDERTOP)
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index c59d61c..9289712 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -325,7 +325,9 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 XMLPropertyState*  pPMScaleToY = NULL;
 XMLPropertyState*  pPMStandardMode = NULL;
 XMLPropertyState*  pPMGridBaseWidth= NULL;
+// same as pPMGridSnapTo but for backward compatibility only
 XMLPropertyState*  pPMGridSnapToChars  = NULL;
+XMLPropertyState*   pPMGridSnapTo   = NULL;
 
 XMLPropertyState*   pPrint  = NULL;
 
@@ -381,6 +383,7 @@ void XMLPageMasterExportPropMapper::ContextFilter(
 case CTF_PM_STANDARD_MODE: pPMStandardMode = 
pProp;break;
 case CTP_PM_GRID_BASE_WIDTH:   pPMGridBaseWidth
= pProp;break;
 case CTP_PM_GRID_SNAP_TO_CHARS:pPMGridSnapToChars  
= pProp;break;
+case CTP_PM_GRID_SNAP_TO:   pPMGridSnapTo = pProp;break;
 }
 if (nPrintId == CTF_PM_PRINTMASK)
 {

[Libreoffice-commits] .: 3 commits - configure.in solenv/inc

2012-01-02 Thread Tor Lillqvist 
 configure.in  |2 +-
 solenv/inc/startup/startup.mk |2 +-
 solenv/inc/unitools.mk|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4f769af98a340a47a01009465bf8ba8eb93509e0
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Jan 2 17:30:59 2012 +0200

Fix thinko: ==, not =

diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 3f8fc9e..6d7ef05 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -35,7 +35,7 @@ AUTODOC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/autodoc
 LOCALIZE_SL*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/localize_sl
 GSICHECK*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/gsicheck
 
-.IF $(XSLTPROC)=
+.IF $(XSLTPROC)==
 .IF $(SYSTEM_LIBXSLT)!=YES
 XSLTPROC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xsltproc
 .ELSE  # $(SYSTEM_LIBXSLT)!=YES
commit 004f9bd21f06288df976ff2d124959c2d7546dfa
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Jan 2 17:25:39 2012 +0200

We have no MAKEFILE.MK or makefile.rc files

diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk
index 0fa378c..565ab8c 100644
--- a/solenv/inc/startup/startup.mk
+++ b/solenv/inc/startup/startup.mk
@@ -101,7 +101,7 @@ $(NULLPRQ) .PHONY :;
 # Check for a Local project file, gets parsed before user makefile.
 .INCLUDE .IGNORE .NOINFER: project.mk
 
-.MAKEFILES :- makefile.mk MAKEFILE.MK $(CONFIG_PROJECT)$/makefile.rc 
$(SOLARENV)$/inc$/found_no.mk
+.MAKEFILES :- makefile.mk $(SOLARENV)$/inc$/found_no.mk
 
 LANG=C
 .EXPORT : LANG
commit 08c7038f424a93746c867898769c9f8714247ec2
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Jan 2 13:57:56 2012 +0200

The Android NDK calls the CPU just arm, not armel

diff --git a/configure.in b/configure.in
index ba05eae..efb7ca0 100644
--- a/configure.in
+++ b/configure.in
@@ -2750,7 +2750,7 @@ linux-androideabi*)
 
 case $host_cpu in
 
-armel)
+arm|armel)
 CPU=R
 CPUNAME=ARM
 OUTPATH=unxandr
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: config_host.mk.in configure.in icu/icuversion.mk set_soenv.in

2012-01-02 Thread Norbert Thiebaud 
 config_host.mk.in |   19 ++--
 configure.in  |  239 +++---
 icu/icuversion.mk |6 -
 set_soenv.in  |   70 ---
 4 files changed, 155 insertions(+), 179 deletions(-)

New commits:
commit 9bbb628e1b1b8b3fa97b37679157ce4267089172
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Jan 2 09:42:44 2012 -0600

oops use == not = in dmake conditional

diff --git a/config_host.mk.in b/config_host.mk.in
index 061a07d..b53794f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -17,7 +17,7 @@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_EPM=@BUILD_EPM@
-export BUILD_MOZAB=@BUILD_MOZAB@
+@x_MOZ@ export BUILD_MOZAB=@BUILD_MOZAB@
 export BUILD_NCPUS=@BUILD_NCPUS@
 export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
 export BUILD_STAX=@BUILD_STAX@
@@ -51,6 +51,7 @@ export DBUS_CFLAGS=@DBUS_CFLAGS@
 export DBUS_LIBS=@DBUS_LIBS@
 export DB_CPPLIB=@DB_CPPLIB@
 export DB_LIB=@DB_LIB@
+@x_MOZ@ export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
@@ -205,13 +206,14 @@ export MKDEPENDSOLVER=TRUE
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
 export MOC=@MOC@
-export MOZILLABUILD=@MOZILLABUILD@
-export MOZILLA_HEADERS_CFLAGS=@MOZILLA_HEADERS_CFLAGS@
-export MOZ_FLAVOUR=@MOZ_FLAVOUR@
-export MOZ_INC=@MOZ_INC@
-export MOZ_LDAP_CFLAGS=@MOZ_LDAP_CFLAGS@
-export MOZ_LIB=@MOZ_LIB@
-export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
+@x_MOZ@ export MOZILLABUILD=@MOZILLABUILD@
+@x_MOZ@ export MOZILLA_HEADERS_CFLAGS=@MOZILLA_HEADERS_CFLAGS@
+@x_MOZ@ export MOZILLA_VERSION=@MOZILLA_VERSION@
+@x_MOZ@ export MOZ_FLAVOUR=@MOZ_FLAVOUR@
+@x_MOZ@ export MOZ_INC=@MOZ_INC@
+@x_MOZ@ export MOZ_LDAP_CFLAGS=@MOZ_LDAP_CFLAGS@
+@x_MOZ@ export MOZ_LIB=@MOZ_LIB@
+@x_MOZ@ export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
@@ -248,6 +250,7 @@ export POPPLER_CFLAGS=@POPPLER_CFLAGS@
 export POPPLER_LIBS=@POPPLER_LIBS@
 export POSTGRESQL_INC=@POSTGRESQL_INC@
 export POSTGRESQL_LIB=@POSTGRESQL_LIB@
+@x_MOZ@ export PREBUILD_MOZAB=@PREBUILD_MOZAB@
 export PREFIXDIR=@PREFIXDIR@
 export PRODUCT=@PRODUCT@
 export PRODUCTNAME=@PRODUCTNAME@
diff --git a/configure.in b/configure.in
index efb7ca0..fab7cfc 100644
--- a/configure.in
+++ b/configure.in
@@ -6308,6 +6308,7 @@ AC_SUBST(WITH_OPENLDAP)
 dnl ===
 dnl Check for system mozilla
 dnl ===
+
 AC_MSG_CHECKING([which Mozilla to use])
 if test -n $with_system_mozilla  test $with_system_mozilla != no; then
 AC_MSG_RESULT([external])
@@ -6370,138 +6371,174 @@ Please recompile $tmp with --enable-ldap or use 
--with-openldap.])
 
 elif test $enable_mozilla = no; then
 AC_MSG_RESULT([none])
+x_MOZ=[\#]
 WITH_MOZILLA=NO
 else
 AC_MSG_RESULT([internal])
 SYSTEM_MOZILLA=NO
 BUILD_TYPE=$BUILD_TYPE MOZ
-if test -z $with_mozilla_version; then
-MOZILLA_VERSION=
-else
-AC_MSG_CHECKING([which Mozilla version to build])
-MOZILLA_VERSION=$with_mozilla_version
-enable_build_mozilla=1
-AC_MSG_RESULT([$MOZILLA_VERSION])
-fi
+if test -z $with_mozilla_version; then
+MOZILLA_VERSION=
+else
+AC_MSG_CHECKING([which Mozilla version to build])
+MOZILLA_VERSION=$with_mozilla_version
+enable_build_mozilla=1
+AC_MSG_RESULT([$MOZILLA_VERSION])
+fi
 
-AC_SUBST(MOZILLA_VERSION)
+AC_SUBST(MOZILLA_VERSION)
 
-AC_MSG_CHECKING([for toolkit Mozilla should use])
-if test -z $with_mozilla_toolkit; then
-if test $_os != WINNT ; then
-if test $_os = Darwin ; then
-MOZILLA_TOOLKIT=mac
-AC_MSG_RESULT([mac])
-else
-MOZILLA_TOOLKIT=gtk2
-AC_MSG_RESULT([gtk2])
+AC_MSG_CHECKING([for toolkit Mozilla should use])
+if test -z $with_mozilla_toolkit; then
+if test $_os != WINNT ; then
+if test $_os = Darwin ; then
+MOZILLA_TOOLKIT=mac
+AC_MSG_RESULT([mac])
+else
+MOZILLA_TOOLKIT=gtk2
+AC_MSG_RESULT([gtk2])
+fi
 fi
+else
+MOZILLA_TOOLKIT=$with_mozilla_toolkit
+enable_build_mozilla=1
+AC_MSG_RESULT([$MOZILLA_TOOLKIT])
 fi
-else
-MOZILLA_TOOLKIT=$with_mozilla_toolkit
-enable_build_mozilla=1
-AC_MSG_RESULT([$MOZILLA_TOOLKIT])
-fi
 
-AC_SUBST(MOZILLA_TOOLKIT)
+AC_SUBST(MOZILLA_TOOLKIT)
 
-# default to enabling build mozilla
-if test $enable_build_mozilla != no; then
-enable_build_mozilla=yes
-else
-enable_build_mozilla=
-fi
+# default to enabling build mozilla
+if test $enable_build_mozilla != no; then
+

[Libreoffice-commits] .: Branch 'libreoffice-3-4-5' - sw/inc sw/source

2012-01-02 Thread Petr Mladek 
 sw/inc/printdata.hxx  |   11 +--
 sw/inc/unotxdoc.hxx   |3 +--
 sw/source/core/view/printdata.cxx |   13 +++--
 sw/source/ui/inc/view.hxx |3 +--
 sw/source/ui/uiview/view.cxx  |   18 --
 sw/source/ui/uno/unotxdoc.cxx |   33 +
 sw/source/ui/uno/unotxvw.cxx  |8 
 7 files changed, 47 insertions(+), 42 deletions(-)

New commits:
commit 2e183bde347bff8f617a275beff12eb257aac719
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 21 16:39:22 2011 +0100

sw: fdo#39159 fdo#40482: temp selection print doc:

Ensure that the printing temp selection document is not destroyed
prematurely by SwXTextView::NotifySelChanged, called via
ViewOptionAdjustStop, by retaining the temp doc object shell not
at the View but in SwRenderData.

Not restoring the view options for selections does not actually work,
because having a selection surprisingly does not imply printing a
temp document: the preview also uses a selection.
(view option regression from cd690d2e72be410058376c416a40ff5d918fb0f7)

backport of 89d2733e16ae6233deea6bef3193bd45c89b854c

Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Cedric Bosdonnat cbosdon...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 99c5cb4..e90508f 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -28,10 +28,10 @@
 #ifndef SW_PRINTDATA_HXX
 #define SW_PRINTDATA_HXX
 
-
 #include sal/types.h
 #include rtl/ustring.hxx
 #include vcl/print.hxx
+#include sfx2/objsh.hxx
 
 #include set
 #include map
@@ -246,6 +246,10 @@ class SwRenderData
 
 rtl::OUString   m_aPageRange;
 
+// temp print document -- must live longer than m_pViewOptionAdjust!
+// also this is a Lock and not a Ref because Ref does not delete the doc
+SfxObjectShellLock m_xTempDocShell;
+
 // the view options to be applied for printing 
 SwViewOptionAdjust_Impl *   m_pViewOptionAdjust;
 
@@ -267,9 +271,12 @@ public:
 void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, 
OutputDevice *pOutDev );
 void DeletePostItData();
 
+SfxObjectShellLock const GetTempDocShell() const;
+void SetTempDocShell(SfxObjectShellLock const);
+
 bool IsViewOptionAdjust() const  { return m_pViewOptionAdjust != 0; }
 bool NeedNewViewOptionAdjust( const ViewShell ) const;
-void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption 
rViewOptions, bool bIsTmpSelection );
+void ViewOptionAdjustStart( ViewShell rSh, const SwViewOption 
rViewOptions);
 void ViewOptionAdjust( SwPrintData const* const pPrtOptions );
 void ViewOptionAdjustStop();
 
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index ab8ae52..ca8ee42 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -588,10 +588,9 @@ class SwViewOptionAdjust_Impl
 {
 ViewShell m_rShell;
 SwViewOptionm_aOldViewOptions;
-bool m_bIsTmpSelection;
 
 public:
-SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions, 
bool bIsTmpSelection );
+SwViewOptionAdjust_Impl( ViewShell rSh, const SwViewOption rViewOptions 
);
 ~SwViewOptionAdjust_Impl();
 void AdjustViewOptions( SwPrintData const* const pPrtOptions );  
 bool checkShell( const ViewShell rCompare ) const
diff --git a/sw/source/core/view/printdata.cxx 
b/sw/source/core/view/printdata.cxx
index a60bd67..c904738 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -108,19 +108,28 @@ void SwRenderData::DeletePostItData()
 }
 }
 
+SfxObjectShellLock const SwRenderData::GetTempDocShell() const
+{
+return m_xTempDocShell;
+}
+void SwRenderData::SetTempDocShell(SfxObjectShellLock const xShell)
+{
+m_xTempDocShell = xShell;
+}
+
 bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell rCompare ) const
 {
 return m_pViewOptionAdjust ? ! m_pViewOptionAdjust-checkShell( rCompare ) 
: true;
 }
 
 
-void SwRenderData::ViewOptionAdjustStart( ViewShell rSh, const SwViewOption 
rViewOptions,  bool bIsTmpSelection )
+void SwRenderData::ViewOptionAdjustStart( ViewShell rSh, const SwViewOption 
rViewOptions )
 {
 if (m_pViewOptionAdjust)
 {
 DBG_ASSERT( 0, error: there should be no ViewOptionAdjust active when 
calling this function );
 }
-m_pViewOptionAdjust = new SwViewOptionAdjust_Impl( rSh, rViewOptions,  
bIsTmpSelection );
+m_pViewOptionAdjust = new SwViewOptionAdjust_Impl( rSh, rViewOptions );
 }
 
 
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 57ca1c9..cf39873 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -647,8 +647,7 @@ public:
 
 void NotifyDBChanged();
 
-SfxObjectShellLock  GetTmpSelectionDoc();
-SfxObjectShellLock  GetOrCreateTmpSelectionDoc();
+

[Libreoffice-commits] .: 3 commits - cppu/source stoc/source

2012-01-02 Thread Stephan Bergmann 
 cppu/source/typelib/typelib.cxx   |   15 +-
 stoc/source/inspect/introspection.cxx |  172 +-
 stoc/source/inspect/makefile.mk   |3 
 3 files changed, 37 insertions(+), 153 deletions(-)

New commits:
commit 9d54084d61afc45beeff76e84277e3b814b32a73
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 2 18:00:40 2012 +0100

Replace dynamic array with std::vector.

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c197f73..436781e 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -287,20 +287,21 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() 
SAL_THROW( () )
 
 if( pWeakMap )
 {
-sal_Int32 nSize = pWeakMap-size();
-typelib_TypeDescriptionReference ** ppTDR = new 
typelib_TypeDescriptionReference *[ nSize ];
+std::vector typelib_TypeDescriptionReference *  ppTDR;
 // save al weak references
 WeakMap_Impl::const_iterator aIt = pWeakMap-begin();
-sal_Int32 i = 0;
 while( aIt != pWeakMap-end() )
 {
-typelib_typedescriptionreference_acquire( ppTDR[i++] = 
(*aIt).second );
+ppTDR.push_back( (*aIt).second );
+typelib_typedescriptionreference_acquire( ppTDR.back() );
 ++aIt;
 }
 
-for( i = 0; i  nSize; i++ )
+for( std::vector typelib_TypeDescriptionReference * ::iterator i(
+ ppTDR.begin() );
+ i != ppTDR.end(); ++i )
 {
-typelib_TypeDescriptionReference * pTDR = ppTDR[i];
+typelib_TypeDescriptionReference * pTDR = *i;
 OSL_ASSERT( pTDR-nRefCount  pTDR-nStaticRefCount );
 pTDR-nRefCount -= pTDR-nStaticRefCount;
 
@@ -312,8 +313,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() 
SAL_THROW( () )
 typelib_typedescriptionreference_release( pTDR );
 }
 
-delete [] ppTDR;
-
 #if OSL_DEBUG_LEVEL  1
 aIt = pWeakMap-begin();
 while( aIt != pWeakMap-end() )
commit 13a40f304112a6c9ad232ea1de547e019b045e61
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 2 18:00:01 2012 +0100

Get rid of manual ref counting.

diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index c2aeb49..1cb278d 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -40,6 +40,7 @@
 #include cppuhelper/factory.hxx
 #include cppuhelper/implbase3.hxx
 #include cppuhelper/typeprovider.hxx
+#include salhelper/simplereferenceobject.hxx
 
 #include com/sun/star/uno/DeploymentException.hpp
 #include com/sun/star/lang/XSingleServiceFactory.hpp
@@ -64,6 +65,7 @@
 #include com/sun/star/container/XIndexContainer.hpp
 #include com/sun/star/container/XEnumerationAccess.hpp
 
+#include rtl/ref.hxx
 #include rtl/ustrbuf.hxx
 #include rtl/strbuf.hxx
 #include boost/unordered_map.hpp
@@ -143,9 +145,6 @@ sal_Bool isDerivedFrom( ReferenceXIdlClass xToTestClass, 
ReferenceXIdlClass
 // Entspricht dem alten IntrospectionAccessImpl, bildet jetzt den statischen
 // Anteil des neuen Instanz-bezogenen ImplIntrospectionAccess
 
-// ACHTUNG !!! Von Hand refcounten !!!
-
-
 // Hashtable fuer die Suche nach Namen
 struct hashName_Impl
 {
@@ -186,7 +185,7 @@ LowerToExactNameMap;
 
 
 class ImplIntrospectionAccess;
-class IntrospectionAccessStatic_Impl
+class IntrospectionAccessStatic_Impl: public salhelper::SimpleReferenceObject
 {
 friend class ImplIntrospection;
 friend class ImplIntrospectionAccess;
@@ -254,10 +253,6 @@ class IntrospectionAccessStatic_Impl
 void checkInterfaceArraySize( Sequence ReferenceXInterface  rSeq, 
ReferenceXInterface* rpInterfaceArray,
 sal_Int32 iNextIndex );
 
-// RefCount
-sal_Int32 nRefCount;
-
-
 public:
 IntrospectionAccessStatic_Impl( Reference XIdlReflection  
xCoreReflection_ );
 ~IntrospectionAccessStatic_Impl()
@@ -267,14 +262,6 @@ public:
 sal_Int32 getPropertyIndex( const OUString aPropertyName ) const;
 sal_Int32 getMethodIndex( const OUString aMethodName ) const;
 
-void acquire() { nRefCount++; }
-void release()
-{
-nRefCount--;
-if( nRefCount = 0 )
-delete this;
-}
-
 // Methoden von XIntrospectionAccess (ALT, jetzt nur Impl)
 void setPropertyValue(const Any obj, const OUString aPropertyName, const 
Any aValue) const;
 //  void setPropertyValue(Any obj, const OUString aPropertyName, const Any 
aValue) const;
@@ -314,14 +301,8 @@ 
IntrospectionAccessStatic_Impl::IntrospectionAccessStatic_Impl( Reference XIdlR
 
 // Method-Daten
 mnMethCount = 0;
-
-// Eigenens RefCounting
-nRefCount = 0;
 }
 
-// Von Hand refcounten !!!
-
-
 sal_Int32 IntrospectionAccessStatic_Impl::getPropertyIndex( const OUString 
aPropertyName ) const
 {
 sal_Int32 iHashResult = -1;
@@ -738,7 +719,7 @@ class ImplIntrospectionAdapter :
 const Any

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - svx/source

2012-01-02 Thread Petr Mladek 
 svx/source/table/svdotable.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 395c05c288116683ffb3bceb658f61694c042b28
Author: Christian Lippka ORACLE christian.lip...@oracle.com
Date:   Tue Dec 6 03:28:41 2011 +0100

impress210: #i117319# disconnect and reconnect to table style on change 
model in SdrTableObjImpl

# HG changeset patch
# User Christian Lippka ORACLE christian.lip...@oracle.com
# Date 1299770834 -3600
# Node ID 8177bdbe49941e3c2a8b62c7c5cf166dcadb7a54
# Parent  6b1140cdac81a77836e5be80033f328a0956c94a

impress210: #i117319# disconnect and reconnect to table style on change 
model in SdrTableObjImpl

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index b2c39fc..ef4b1a6 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -332,6 +332,7 @@ void SdrTableObjImpl::operator=( const SdrTableObjImpl 
rSource )
 void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel)
 {
 // try to find new table style
+disconnectTableStyle();
 
 Reference XIndexAccess  xNewTableStyle;
 if( mxTableStyle.is() ) try
@@ -362,6 +363,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, 
SdrModel* pNewModel)
 
 mxTableStyle = xNewTableStyle;
 
+connectTableStyle();
 update();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - svtools/source

2012-01-02 Thread Matteo Casalin 
 svtools/source/control/valueset.cxx |   49 +++-
 1 file changed, 21 insertions(+), 28 deletions(-)

New commits:
commit ca343939c03551957433708836517eb37b62e523
Author: Matteo Casalin matteo.casa...@poste.it
Date:   Mon Jan 2 19:46:49 2012 +0100

Group a common test to avoid unnecessary calculations

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 97ecc03..84f472f 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1033,35 +1033,34 @@ sal_Bool ValueSet::ImplScroll( const Point rPos )
 
 size_t ValueSet::ImplGetItem( const Point rPos, sal_Bool bMove ) const
 {
-if ( mpNoneItem )
+if ( mpNoneItem  mpNoneItem-maRect.IsInside( rPos ) )
 {
-if ( mpNoneItem-maRect.IsInside( rPos ) )
-return VALUESET_ITEM_NONEITEM;
+return VALUESET_ITEM_NONEITEM;
 }
 
-Point aDefPos;
-Rectangle aWinRect( aDefPos, maVirDev.GetOutputSizePixel() );
+const Rectangle aWinRect( Point(), maVirDev.GetOutputSizePixel() );
 
-size_t nItemCount = mpImpl-mpItemList-size();
-for ( size_t i = 0; i  nItemCount; i++ )
+if ( aWinRect.IsInside( rPos ) )
 {
-ValueSetItem* pItem = (*mpImpl-mpItemList)[ i ];
-if ( pItem-maRect.IsInside( rPos ) )
+// The point is inside the ValueSet window,
+// let's find the containing item.
+const size_t nItemCount = mpImpl-mpItemList-size();
+for ( size_t i = 0; i  nItemCount; ++i )
 {
-if ( aWinRect.IsInside( rPos ) )
+ValueSetItem *const pItem = (*mpImpl-mpItemList)[ i ];
+if ( pItem-maRect.IsInside( rPos ) )
+{
 return i;
-else
-return VALUESET_ITEM_NOTFOUND;
+}
 }
-}
 
-// Wenn Spacing gesetzt ist, wird der vorher selektierte
-// Eintrag zurueckgegeben, wenn die Maus noch nicht das Fenster
-// verlassen hat
-if ( bMove  mnSpacing  mnHighItemId )
-{
-if ( aWinRect.IsInside( rPos ) )
+// Wenn Spacing gesetzt ist, wird der vorher selektierte
+// Eintrag zurueckgegeben, wenn die Maus noch nicht das Fenster
+// verlassen hat
+if ( bMove  mnSpacing  mnHighItemId )
+{
 return GetItemPos( mnHighItemId );
+}
 }
 
 return VALUESET_ITEM_NOTFOUND;
commit fe36838f9db5fef3c281b677c64b4db0519c9d4d
Author: Matteo Casalin matteo.casa...@poste.it
Date:   Mon Dec 26 10:38:25 2011 +0100

Do not repeat the same test twice

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 576a091..97ecc03 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -700,16 +700,10 @@ void ValueSet::ImplDrawSelect()
 if ( !IsReallyVisible() )
 return;
 
-sal_Bool bFocus = HasFocus();
-sal_Bool bDrawSel;
+const bool bFocus = HasFocus();
+const bool bDrawSel = !( (mbNoSelection  !mbHighlight) || 
(!mbDrawSelection  mbHighlight) );
 
-if ( (mbNoSelection  !mbHighlight) || (!mbDrawSelection  mbHighlight) )
-bDrawSel = sal_False;
-else
-bDrawSel = sal_True;
-
-if ( !bFocus 
- ((mbNoSelection  !mbHighlight) || (!mbDrawSelection  
mbHighlight)) )
+if ( !bFocus  !bDrawSel )
 {
 XubString aEmptyStr;
 ImplDrawItemText( aEmptyStr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

2012-01-02 Thread Stephan Bergmann 
 extensions/source/update/check/updatecheckconfig.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b052839d7bfa6632e9e6479a871ba417189973a8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 2 20:56:04 2012 +0100

-Wunused-but-set-variable

diff --git a/extensions/source/update/check/updatecheckconfig.cxx 
b/extensions/source/update/check/updatecheckconfig.cxx
index 256199e..932f302 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -236,8 +236,7 @@ rtl::OUString UpdateCheckConfig::getAllUsersDirectory()
 if( ! FAILED( SHGetSpecialFolderPathW( NULL, szPath, 
CSIDL_COMMON_DOCUMENTS, true ) ) )
 {
 aRet = rtl::OUString( reinterpret_cast sal_Unicode * (szPath) );
-osl::FileBase::RC rc;
-rc = osl::FileBase::getFileURLFromSystemPath( aRet, aRet );
+osl::FileBase::getFileURLFromSystemPath( aRet, aRet );
 }
 #else
 osl::FileBase::getTempDirURL(aRet);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf extensions/qa extensions/source

2012-01-02 Thread Jan Holesovsky 
 distro-configs/LibreOfficeLinux.conf  |1 +
 distro-configs/LibreOfficeMacOSX.conf |1 +
 distro-configs/LibreOfficeWin32.conf  |1 +
 extensions/qa/update/test_update.cxx  |1 -
 extensions/source/update/check/updateprotocol.cxx |   16 +++-
 extensions/source/update/check/updateprotocol.hxx |1 -
 6 files changed, 6 insertions(+), 15 deletions(-)

New commits:
commit 9cb07807ca3a8c3c53a7d5241258aab2b4e4305b
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Jan 2 19:14:06 2012 +0100

Online update: Enable online update even for the Linux release builds.

[and mention it explicitly in the Windows and Mac distro configs, to be
safe :-)]

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index 1a4ab2e..f498df0 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -41,6 +41,7 @@
 --enable-cairo
 --enable-binfilter
 --enable-python=internal
+--enable-online-update
 --disable-unix-qstart-libpng
 --disable-randr-link
 --disable-kde4
diff --git a/distro-configs/LibreOfficeMacOSX.conf 
b/distro-configs/LibreOfficeMacOSX.conf
index 59ea95b..7e7af46 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -12,4 +12,5 @@
 --enable-ext-nlpsolver
 --enable-ext-postgresql-sdbc
 --enable-extension-integration
+--enable-online-update
 --without-system-postgresql
diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index 10d7f12..fc267e2 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -17,3 +17,4 @@
 --enable-ext-pdfimport
 --enable-ext-nlpsolver
 --enable-ext-postgresql-sdbc
+--enable-online-update
commit adad42f4401dec83ad78218b40fdfc71731ce214
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Jan 2 19:02:46 2012 +0100

Online update: Don't check for buildid at the user's end.

We want more freedom in what to offer to the user; at some stage we would 
like
to offer 3.6 to the users using 3.5 which would be harder with this buildid
check.

This makes the server side responsible for offering the correct version; but
that should be fine because all the versions that we are able to update must
be listed on the server: what is not listed is considered up-to-date.

diff --git a/extensions/qa/update/test_update.cxx 
b/extensions/qa/update/test_update.cxx
index 84cbc4f..bed67d3 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -131,7 +131,6 @@ protected:
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
 m_aRepositoryList,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 100 ) ),
 rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID 
) ) ) )
 {
 CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
diff --git a/extensions/source/update/check/updateprotocol.cxx 
b/extensions/source/update/check/updateprotocol.cxx
index bc268e8..187a665 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -59,14 +59,8 @@ namespace xml = css::xml ;
 static bool
 getBootstrapData(
 uno::Sequence ::rtl::OUString   rRepositoryList,
-::rtl::OUString  rBuildID,
 ::rtl::OUString  rInstallSetID)
 {
-rBuildID = UNISTRING( ${$BRAND_BASE_DIR/program/ 
SAL_CONFIGFILE(version) :ProductBuildid} );
-rtl::Bootstrap::expandMacros( rBuildID );
-if ( rBuildID.isEmpty() )
-return false;
-
 rInstallSetID = UNISTRING( ${$BRAND_BASE_DIR/program/ 
SAL_CONFIGFILE(version) :UpdateID} );
 rtl::Bootstrap::expandMacros( rInstallSetID );
 if ( rInstallSetID.isEmpty() )
@@ -103,15 +97,14 @@ checkForUpdates(
 rtl::Bootstrap::get(UNISTRING(_ARCH), myArch);
 
 uno::Sequence ::rtl::OUString  aRepositoryList;
-::rtl::OUString aBuildID;
 ::rtl::OUString aInstallSetID;
 
-if( ! ( getBootstrapData(aRepositoryList, aBuildID, aInstallSetID)  
(aRepositoryList.getLength()  0) ) )
+if( ! ( getBootstrapData(aRepositoryList, aInstallSetID)  
(aRepositoryList.getLength()  0) ) )
 return false;
 
 return checkForUpdates( o_rUpdateInfo, rxContext, rxInteractionHandler, 
rUpdateInfoProvider,
 myOS, myArch,
-aRepositoryList, aBuildID, aInstallSetID );
+aRepositoryList, aInstallSetID );
 }
 
 bool
@@ -123,7 +116,6 @@ checkForUpdates(
 const rtl::OUString rOS,
 const rtl::OUString rArch,
 const uno::Sequence rtl::OUString  rRepositoryList,
-const rtl::OUString rBuildID,
 const rtl::OUString rInstallSetID )
 {
 if( !rxContext.is() )
@@ -155,9 +147,7 @@ checkForUpdates(
 aBuffer.append( rOS );
 aBuffer.appendAscii(\' and inst:arch=\');

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - nlpsolver/Extension_nlpsolver.mk

2012-01-02 Thread Andras Timar 
 nlpsolver/Extension_nlpsolver.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d80b56d94e00df4c509b5171ac5180246d81aa64
Author: Andras Timar ati...@suse.com
Date:   Mon Jan 2 21:01:14 2012 +0100

pack *.default files, too fdo#43923

diff --git a/nlpsolver/Extension_nlpsolver.mk b/nlpsolver/Extension_nlpsolver.mk
index f39fcb5..501eb6b 100644
--- a/nlpsolver/Extension_nlpsolver.mk
+++ b/nlpsolver/Extension_nlpsolver.mk
@@ -33,7 +33,7 @@ $(eval $(call 
gb_Extension_add_file,nlpsolver,components.rdb,$(SRCDIR)/nlpsolver
 $(eval $(call 
gb_Extension_add_file,nlpsolver,nlpsolver.jar,$(OUTDIR)/bin/nlpsolver.jar))
 $(eval $(call 
gb_Extension_add_file,nlpsolver,EvolutionarySolver.jar,$(OUTDIR)/bin/EvolutionarySolver.jar))
 
-$(eval $(foreach trans, $(wildcard 
$(SRCDIR)/nlpsolver/src/locale/*.properties), \
+$(eval $(foreach trans, $(wildcard $(SRCDIR)/nlpsolver/src/locale/*), \
$(eval $(call gb_Extension_add_file,nlpsolver,locale/$(notdir 
$(trans)),$(trans)
 $(eval $(call 
gb_Extension_add_file,nlpsolver,help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp,
 \

$(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source dbaccess/source extensions/source sc/source sd/source svx/source sw/source

2012-01-02 Thread Lior Kaplan 
 cui/source/customize/cfg.src   |   61 -
 cui/source/dialogs/sdrcelldlg.src  |6 --
 cui/source/options/optgdlg.src |1 
 cui/source/tabpages/autocdlg.src   |2 
 dbaccess/source/ui/app/app.src |1 
 extensions/source/bibliography/toolbar.src |1 
 sc/source/ui/src/sortdlg.src   |3 -
 sd/source/ui/dlg/celltempl.src |4 -
 svx/source/dialog/linkwarn.src |4 -
 sw/source/ui/config/optload.src|1 
 sw/source/ui/misc/pggrid.src   |2 
 11 files changed, 86 deletions(-)

New commits:
commit 2650c803fa62bbf9d4138ead30de5ba3a2896856
Author: Lior Kaplan kaplanl...@gmail.com
Date:   Mon Jan 2 22:35:33 2012 +0200

Clean non English strings in the code
we do translation differently.
(cherry picked from commit 14c0e038c9c33dc59cbf6e5ec81d36779f28b004)

diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 66ac237..4fe3b13 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -31,7 +31,6 @@
 TabDialog RID_SVXDLG_CUSTOMIZE
 {
 OutputSize = TRUE ;
-Text [ de ] = Anpassen ;
 Text [ en-US ] = Customize ;
 Moveable = TRUE ;
 SvLook = TRUE ;
@@ -43,28 +42,24 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 PageItem
 {
 Identifier = RID_SVXPAGE_MENUS ;
-Text [ de ] = Menüs ;
 Text [ en-US ] = Menus ;
 PageResID = 300 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_KEYBOARD ;
-Text [ de ] = Tastatur ;
 Text [ en-US ] = Keyboard ;
 PageResID = 301 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_TOOLBARS ;
-Text [ de ] = Symbolleisten ;
 Text [ en-US ] = Toolbars ;
 PageResID = 302 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_EVENTS ;
-Text [ de ] = Ereignisse ;
 Text [ en-US ] = Events ;
 PageResID = 303 ;
 };
@@ -73,47 +68,36 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 };
 
 #define TEXT_MENU \
-Text [ de ] = Menü ; \
 Text [ en-US ] = Menu ;\
 
 #define TEXT_BEGIN_GROUP \
-Text [ de ] = Gruppe beginnen ; \
 Text [ en-US ] = Begin a Group ;\
 
 #define TEXT_RENAME \
-Text [ de ] = Umbenennen... ; \
 Text [ en-US ] = Rename... ;\
 
 #define TEXT_DELETE \
-Text [ de ] = Entfernen... ; \
 Text [ en-US ] = Delete... ;\
 
 #define TEXT_DELETE_NODOTS \
-Text [ de ] = Entfernen ; \
 Text [ en-US ] = Delete ;\
 
 #define TEXT_MOVE \
-Text [ de ] = Verschieben... ; \
 Text [ en-US ] = Move... ;\
 
 #define TEXT_DEFAULT_STYLE \
-Text [ de ] = Standard Einstellungen herstellen ; \
 Text [ en-US ] = Restore Default Settings ;\
 
 #define TEXT_DEFAULT_COMMAND \
-Text [ de ] = Standardbefehl ~wiederherstellen ; \
 Text [ en-US ] = Restore Default Command ;\
 
 #define TEXT_TEXT_ONLY \
-Text [ de ] = Nur Text ; \
 Text [ en-US ] = Text only ;\
 
 #define TEXT_TOOLBAR_NAME \
-Text [ de ] = Name der Symbolleiste ; \
 Text [ en-US ] = Toolbar Name ;\
 
 #define TEXT_SAVE_IN \
-Text [ de ] = Speichern in ; \
 Text [ en-US ] = Save In ;\
 
 TabPage RID_SVXPAGE_MENUS
@@ -125,7 +109,6 @@ TabPage RID_SVXPAGE_MENUS
 {
 Pos = MAP_APPFONT ( 6 , 11 ) ;
 Size = MAP_APPFONT ( 261 , 8 ) ;
-Text [ de ] = %PRODUCTNAME %MODULENAME Menüs ;
 Text [ en-US ] = %PRODUCTNAME %MODULENAME Menus ;
 };
 FixedText FT_MENUS
@@ -148,7 +131,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 22 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = Neu... ;
 Text [ en-US ] = New... ;
 };
 MenuButton BTN_CHANGE
@@ -163,7 +145,6 @@ TabPage RID_SVXPAGE_MENUS
 {
 Pos = MAP_APPFONT ( 6 , 56 ) ;
 Size = MAP_APPFONT ( 261 , 8 ) ;
-Text [ de ] = Menüinhalt ;
 Text [ en-US ] = Menu Content ;
 };
 FixedText GRP_MENU_ENTRIES
@@ -171,7 +152,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 9 , 67 ) ;
 Size = MAP_APPFONT ( 55 , 8 ) ;
 Group = TRUE ;
-Text [ de ] = Einträge ;
 Text [ en-US ] = Entries ;
 };
 Control BOX_ENTRIES
@@ -188,7 +168,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 67 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = Hinzufügen... ;
 Text [ en-US ] = Add... ;
 };
 MenuButton BTN_CHANGE_ENTRY
@@ -197,7 +176,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 84 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = Ändern

[Libreoffice-commits] .: cui/source dbaccess/source extensions/source sc/source sd/source svx/source sw/source

2012-01-02 Thread Lior Kaplan 
 cui/source/customize/cfg.src   |   61 -
 cui/source/dialogs/sdrcelldlg.src  |6 --
 cui/source/options/optgdlg.src |1 
 cui/source/tabpages/autocdlg.src   |2 
 dbaccess/source/ui/app/app.src |1 
 extensions/source/bibliography/toolbar.src |1 
 sc/source/ui/src/sortdlg.src   |3 -
 sd/source/ui/dlg/celltempl.src |4 -
 svx/source/dialog/linkwarn.src |4 -
 sw/source/ui/config/optload.src|1 
 sw/source/ui/misc/pggrid.src   |2 
 11 files changed, 86 deletions(-)

New commits:
commit 14c0e038c9c33dc59cbf6e5ec81d36779f28b004
Author: Lior Kaplan kaplanl...@gmail.com
Date:   Mon Jan 2 22:35:33 2012 +0200

Clean non English strings in the code
we do translation differently.

diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 66ac237..4fe3b13 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -31,7 +31,6 @@
 TabDialog RID_SVXDLG_CUSTOMIZE
 {
 OutputSize = TRUE ;
-Text [ de ] = Anpassen ;
 Text [ en-US ] = Customize ;
 Moveable = TRUE ;
 SvLook = TRUE ;
@@ -43,28 +42,24 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 PageItem
 {
 Identifier = RID_SVXPAGE_MENUS ;
-Text [ de ] = Menüs ;
 Text [ en-US ] = Menus ;
 PageResID = 300 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_KEYBOARD ;
-Text [ de ] = Tastatur ;
 Text [ en-US ] = Keyboard ;
 PageResID = 301 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_TOOLBARS ;
-Text [ de ] = Symbolleisten ;
 Text [ en-US ] = Toolbars ;
 PageResID = 302 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_EVENTS ;
-Text [ de ] = Ereignisse ;
 Text [ en-US ] = Events ;
 PageResID = 303 ;
 };
@@ -73,47 +68,36 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 };
 
 #define TEXT_MENU \
-Text [ de ] = Menü ; \
 Text [ en-US ] = Menu ;\
 
 #define TEXT_BEGIN_GROUP \
-Text [ de ] = Gruppe beginnen ; \
 Text [ en-US ] = Begin a Group ;\
 
 #define TEXT_RENAME \
-Text [ de ] = Umbenennen... ; \
 Text [ en-US ] = Rename... ;\
 
 #define TEXT_DELETE \
-Text [ de ] = Entfernen... ; \
 Text [ en-US ] = Delete... ;\
 
 #define TEXT_DELETE_NODOTS \
-Text [ de ] = Entfernen ; \
 Text [ en-US ] = Delete ;\
 
 #define TEXT_MOVE \
-Text [ de ] = Verschieben... ; \
 Text [ en-US ] = Move... ;\
 
 #define TEXT_DEFAULT_STYLE \
-Text [ de ] = Standard Einstellungen herstellen ; \
 Text [ en-US ] = Restore Default Settings ;\
 
 #define TEXT_DEFAULT_COMMAND \
-Text [ de ] = Standardbefehl ~wiederherstellen ; \
 Text [ en-US ] = Restore Default Command ;\
 
 #define TEXT_TEXT_ONLY \
-Text [ de ] = Nur Text ; \
 Text [ en-US ] = Text only ;\
 
 #define TEXT_TOOLBAR_NAME \
-Text [ de ] = Name der Symbolleiste ; \
 Text [ en-US ] = Toolbar Name ;\
 
 #define TEXT_SAVE_IN \
-Text [ de ] = Speichern in ; \
 Text [ en-US ] = Save In ;\
 
 TabPage RID_SVXPAGE_MENUS
@@ -125,7 +109,6 @@ TabPage RID_SVXPAGE_MENUS
 {
 Pos = MAP_APPFONT ( 6 , 11 ) ;
 Size = MAP_APPFONT ( 261 , 8 ) ;
-Text [ de ] = %PRODUCTNAME %MODULENAME Menüs ;
 Text [ en-US ] = %PRODUCTNAME %MODULENAME Menus ;
 };
 FixedText FT_MENUS
@@ -148,7 +131,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 22 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = Neu... ;
 Text [ en-US ] = New... ;
 };
 MenuButton BTN_CHANGE
@@ -163,7 +145,6 @@ TabPage RID_SVXPAGE_MENUS
 {
 Pos = MAP_APPFONT ( 6 , 56 ) ;
 Size = MAP_APPFONT ( 261 , 8 ) ;
-Text [ de ] = Menüinhalt ;
 Text [ en-US ] = Menu Content ;
 };
 FixedText GRP_MENU_ENTRIES
@@ -171,7 +152,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 9 , 67 ) ;
 Size = MAP_APPFONT ( 55 , 8 ) ;
 Group = TRUE ;
-Text [ de ] = Einträge ;
 Text [ en-US ] = Entries ;
 };
 Control BOX_ENTRIES
@@ -188,7 +168,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 67 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = Hinzufügen... ;
 Text [ en-US ] = Add... ;
 };
 MenuButton BTN_CHANGE_ENTRY
@@ -197,7 +176,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 84 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = Ändern ;
 Text [ en-US ] = Modify ;
 };
 ImageButton BTN_UP
@@

[Libreoffice-commits] .: solenv/gbuild

2012-01-02 Thread Matus Kukan 
 solenv/gbuild/Rdb.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5436f578ee7c7e4fe840cb243c2797f52b8b461d
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Jan 2 23:19:49 2012 +0100

gbuild: Rdb: blind fix for Windows, use gb_Helper_abbreviate_dirs_native

diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index c7f9d0d..bea289f 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -38,7 +38,7 @@ $(strip $(if $(call 
gb_Rdb__is_old_component_target,$(component))\
 endef
 
 define gb_Rdb__command
-$(call gb_Helper_abbreviate_dirs,\
+$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $@)  \
(\
echo 'list'  \
@@ -56,7 +56,7 @@ $(call gb_Rdb_get_target,%) :
 .PHONY : $(call gb_Rdb_get_clean_target,%)
 $(call gb_Rdb_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RDB,1)
-   $(call gb_Helper_abbreviate_dirs,\
+   $(call gb_Helper_abbreviate_dirs_native,\
rm -f $(call gb_Rdb_get_outdir_target,$*) $(call 
gb_Rdb_get_target,$*))
 
 $(call gb_Rdb_get_outdir_target,%) :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in set_soenv.in

2012-01-02 Thread Norbert Thiebaud 
 config_host.mk.in |   23 ++--
 configure.in  |  240 +++-
 set_soenv.in  |  294 --
 3 files changed, 252 insertions(+), 305 deletions(-)

New commits:
commit 7eea90d66dd1bd570723ab4d981880ecfbad265c
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Jan 2 19:07:36 2012 -0600

migrate JAVALIB out of set_soenv.in

diff --git a/config_host.mk.in b/config_host.mk.in
index 75cce05..a6d7c84 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,6 +165,7 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export INTRO_BIPMAP=@INTRO_BITMAP@
+@x_JAVALIB@ export JAVALIB=@JAVALIB@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
 export KDE4_CFLAGS=@KDE4_CFLAGS@
 export KDE4_LIBS=@KDE4_LIBS@
diff --git a/configure.in b/configure.in
index cc40ed9..b7b255a 100644
--- a/configure.in
+++ b/configure.in
@@ -2537,8 +2537,10 @@ AC_SUBST(MSPDB_PATH)
 AC_SUBST(SHOWINCLUDES_PREFIX)
 
 #
-# determine CPI, CPUNAME, GUI, GUIBASE, ...
+# determine CPU, CPUNAME, GUI, GUIBASE, ...
 #
+LIB64=lib
+
 case $host_os in
 
 aix*)
@@ -2564,6 +2566,7 @@ cygwin*)
 if test $CL_X64 != ; then
 CPU=X
 CPUNAME=X86_64
+LIB64=lib/x64
 OUTPATH=wntmscx$COMEX
 else
 CPU=I
@@ -2713,6 +2716,7 @@ linux-gnu*)
 powerpc64)
 CPU=P
 CPUNAME=POWERPC64
+LIB64=lib64
 OUTPATH=unxlngppc64
 ;;
 sparc)
@@ -2728,11 +2732,13 @@ linux-gnu*)
 s390x)
 CPU=3
 CPUNAME=S390x
+LIB64=lib64
 OUTPATH=unxlngs390x
 ;;
 x86_64)
 CPU=X
 CPUNAME=X86_64
+LIB64=lib64
 OUTPATH=unxlngx6
 ;;
 *)
@@ -4726,6 +4732,236 @@ if test $SOLAR_JAVA != ; then
 AC_SUBST(AWTLIB)
 fi
 
+#
+# Determine JAVALIB
+# If your platform follow the common pattern
+# just define JAVA_ARCH and JAVA_TOOLKIT for it
+# if not, leave JAVA_ARCH empty and define JAVALIB manually
+# if you don't want JAVALIB to be exported at all
+# define x_JAVALIB=[\#]
+#
+JAVA_ARCH=
+JAVA_TOOLKIT=
+x_JAVALIB=
+
+case $host_os in
+
+aix*)
+JAVA_ARCH=ppc
+JAVA_TOOLKIT=classic
+;;
+
+cygwin*|darwin*)
+x_JAVALIB=[\#]
+;;
+
+dragonfly*)
+case $host_cpu in
+i*86)
+JAVA_ARCH=i386
+JAVA_TOOLKIT=client
+;;
+x86_64)
+JAVA_ARCH=amd64
+JAVA_TOOLKIT=server
+;;
+esac
+;;
+
+freebsd*)
+case $host_cpu in
+i*86)
+JAVA_ARCH=i386
+JAVA_TOOLKIT=client
+;;
+x86_64)
+if test `echo $JAVA_HOME | sed -e 's,.*/,,'` = linux ; then
+JAVA_ARCH=i386
+JAVA_TOOLKIT=client
+else
+JAVA_ARCH=amd64
+JAVA_TOOLKIT=server
+fi
+;;
+esac
+;;
+
+k*bsd*-gnu*)
+case $host_cpu in
+i*86)
+JAVA_ARCH=i386
+JAVA_TOOLKIT=client
+;;
+x86_64)
+JAVA_ARCH=amd64
+JAVA_TOOLKIT=server
+;;
+esac
+;;
+
+linux-gnu*)
+
+case $host_cpu in
+
+alpha)
+JAVA_ARCH=alpha
+JAVA_TOOLKIT=server
+;;
+arm)
+JAVA_ARCH=arm
+JAVA_TOOLKIT=server
+;;
+hppa)
+JAVA_ARCH=hppa
+JAVA_TOOLKIT=server
+;;
+i*86)
+JAVA_ARCH=i386
+case $JDK in
+[Ii][Bb][Mm]*)
+JAVA_ARCH=
+JRE_BASE_DIR=$JAVA_HOME/jre/bin
+JAVALIB=-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L 
$JRE_BASE_DIR/classic -L $JRE_BASE_DIR/native_thread
+;;
+[Bb][Ee][Aa]*)
+JAVA_TOOLKIT=jrockit;
+;;
+*)
+JAVA_TOOLKIT=client;
+;;
+esac
+;;
+ia64)
+JAVA_ARCH=ia64
+JAVA_TOOLKIT=server
+;;
+m68k)
+JAVA_ARCH=mk68
+JAVA_TOOLKIT=server
+;;
+mips|mips64|mipsel|mips64el)
+JAVA_ARCH=$host_cpu
+JAVA_TOOLKIT=server
+;;
+mips32)
+JAVA_ARCH=$host_cpu
+JAVA_TOOLKIT=client
+;;
+powerpc)
+JAVA_ARCH=ppc
+case $JDK in
+[Ii][Bb][Mm]*)
+JAVA_TOOLKIT=classic
+;;
+gcj)
+JAVA_TOOLKIT=client
+;;
+*)
+JAVA_TOOLKIT=server
+;;
+esac
+;;
+powerpc64)
+JAVA_ARCH=ppc64
+if test $JDK = gcj ; then
+JAVA_TOOLKIT=client
+else
+JAVA_TOOLKIT=server
+fi
+;;
+sparc)
+JAVA_ARCH=sparc
+JAVA_TOOLKIT=server
+;;
+s390)
+JAVA_ARCH=s390
+JAVA_TOOLKIT=server
+;;
+s390x)
+JAVA_ARCH=s390x
+JAVA_TOOLKIT=server
+;;
+x86_64)
+JAVA_ARCH=amd64
+JAVA_TOOLKIT=server
+;;
+*)
+AC_MSG_ERROR([No