[Libreoffice-commits] .: Branch 'feature/kill-set_soenv' - 45 commits - basic/source bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk comphelper/inc configure.in connectivity/source default_images/starmath desktop/unx Env.Host.sh.in extras/source framework/qa i18npool/inc i18npool/source instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/util jvmfwk/plugins l10ntools/prj l10ntools/scripts l10ntools/source Makefile.in ooo_custom_images/hicontrast scp2/source sdext/source sd/source setup_native/source sfx2/source shell/source solenv/gbuild solenv/gdb solenv/inc starmath/inc starmath/qa starmath/source svtools/inc svtools/source sw/source testautomation/framework testautomation/global testautomation/math tools/inc tools/source vbahelper/util vcl/source xml2cmp/Executable_xml2cmp.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Sep 19 05:51:05 PDT 2011
Env.Host.sh.in | 5
Makefile.in | 1
basic/source/runtime/iosys.cxx | 9
bin/distro-install-clean-up | 2
bin/distro-install-desktop-integration | 2
bin/distro-install-file-lists | 2
bin/distro-install-sdk | 2
comphelper/inc/comphelper/string.hxx | 84 ++
configure.in | 105 ++-
connectivity/source/drivers/dbase/DTable.cxx | 38 -
default_images/starmath/res/mi21618.png |binary
desktop/unx/source/start.c | 3
extras/source/truetype/symbol/OpenSymbol.sfd | 314 +++++++++-
extras/source/truetype/symbol/opens___.ttf |binary
framework/qa/complex/framework/recovery/RecoveryTest.java | 1
i18npool/inc/i18npool/lang.h | 1
i18npool/source/isolang/isolang.cxx | 1
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt | 2
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt | 67 --
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt | 67 --
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt | 2
instsetoo_native/util/makefile.mk | 17
jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 5
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 39 -
l10ntools/prj/d.lst | 1
l10ntools/scripts/addkeyid2pot.pl | 106 +++
l10ntools/scripts/keyidGen.pl | 169 ++---
l10ntools/source/export.cxx | 6
l10ntools/source/helpex.cxx | 7
l10ntools/source/helpmerge.cxx | 11
l10ntools/source/lngmerge.cxx | 2
l10ntools/source/xrmmerge.cxx | 2
ooo_custom_images/hicontrast/starmath/res/mi21618.png |binary
scp2/source/ooo/module_helppack.ulf | 6
scp2/source/ooo/module_langpack.ulf | 6
sd/source/ui/view/sdview4.cxx | 2
sdext/source/presenter/makefile.mk | 2
setup_native/source/win32/msi-encodinglist.txt | 2
sfx2/source/appl/workwin.cxx | 2
sfx2/source/bastyp/mieclip.cxx | 35 -
shell/source/cmdmail/cmdmailsuppl.cxx | 4
solenv/gbuild/Jar.mk | 2
solenv/gdb/makefile.mk | 2
solenv/inc/langlist.mk | 1
starmath/inc/helpids.h | 1
starmath/inc/parse.hxx | 34 -
starmath/inc/starmath.hrc | 1
starmath/inc/types.hxx | 1
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 1
starmath/source/commands.src | 53 -
starmath/source/mathtype.cxx | 3
starmath/source/parse.cxx | 2
starmath/source/toolbox.src | 19
svtools/inc/svtools/htmlkywd.hxx | 1
svtools/source/misc/langtab.src | 1
sw/source/core/fields/authfld.cxx | 2
testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt | 1
testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt | 1
testautomation/global/win/e_mathop.win | 1
testautomation/global/win/mathop.win | 1
testautomation/math/required/includes/m_010_.inc | 4
tools/inc/tools/string.hxx | 3
tools/source/string/strimp.cxx | 31
tools/source/string/tustring.cxx | 31
vbahelper/util/makefile.mk | 100 ---
vcl/source/gdi/sallayout.cxx | 2
xml2cmp/Executable_xml2cmp.mk | 10
69 files changed, 861 insertions(+), 584 deletions(-)
New commits:
commit 2efbb35542cfd7afd6867c71a0eabaf96adf24f8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Sep 19 14:50:30 2011 +0200
make internal icu work again
diff --git a/configure.in b/configure.in
index 03e6bb7..f0d3018 100755
--- a/configure.in
+++ b/configure.in
@@ -5977,6 +5977,9 @@ if test -n "$with_system_icu" -o -n "$with_system_libs" && \
else
AC_MSG_RESULT([internal])
SYSTEM_ICU=NO
+ ICU_MAJOR=4
+ ICU_MINOR=4
+ ICU_MICRO=2
BUILD_TYPE="$BUILD_TYPE ICU"
fi
AC_SUBST(SYSTEM_ICU)
commit 8a865b72489ffac61c77213975d18ecad0775a79
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Sep 19 13:48:51 2011 +0200
first light without set_soenv
* builds on unxlngx6.pro with:
- --disable-binfilter
- --disable-mozilla
- --without-help
- --without-myspell-dicts
- --with-system-icu
- --with-num-cpus=8
- --with-max-jobs=8
- --without-java
diff --git a/Env.Host.sh.in b/Env.Host.sh.in
index 6f24e56..4351c57 100755
--- a/Env.Host.sh.in
+++ b/Env.Host.sh.in
@@ -190,7 +190,6 @@ export RPM="@RPM@"
export DPKG="@DPKG@"
export PKGMK="@PKGMK@"
export GNUMAKE="@GNUMAKE@"
-export MAKE="@MAKE@"
export GNUTAR="@GNUTAR@"
export UPD="@UPD@"
export WORK_STAMP="@WORK_STAMP@"
diff --git a/configure.in b/configure.in
index 1a1f918..03e6bb7 100755
--- a/configure.in
+++ b/configure.in
@@ -4722,7 +4722,6 @@ fi
AC_SUBST(SYSTEM_LIBXSLT)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
-AC_SUBST(XSLTPROC)
# ===================================================================
# Check for system libxml
@@ -9386,7 +9385,6 @@ if [[ "$TARFILE_LOCATION" == "DEFAULT" ]]
then
TARFILE_LOCATION="$SRC_ROOT/src"
fi
-AC_SUBST(SRC_ROOT)
AC_MSG_CHECKING([platformspecific configuration])
case "$host_os" in
linux-gnu)
@@ -9582,7 +9580,6 @@ GXX_INCLUDE_PATH_FOR_BUILD="$GXX_INCLUDE_PATH"
HOST_PLATFORM="$host"
INPATH_FOR_BUILD="$INPATH"
JDKLIB="$JAVALIB"
-MAKE="$GNUMAKE"
OUTDIR="$SRC_ROOT/solver/$INPATH"
OUTDIR_FOR_BUILD="$OUTDIR"
OUTPATH_FOR_BUILD="$OUTPATH"
@@ -9600,6 +9597,10 @@ WORKDIR_FOR_BUILD="$WORKDIR"
gb_REPOS="$SRC_ROOT"
WORK_STAMP="$SOURCEVERSION"
DEFAULT_MOZILLA_TOOLKIT="$MOZILLA_TOOLKIT"
+if [[ "$SYSTEM_LIBXSLT" != "YES" ]]
+then
+ XSLTPROC="$SOLARVER/$INPATH/bin/xsltproc"
+fi
AC_SUBST(BUILD_PLATFORM)
AC_SUBST(CLASSPATH)
@@ -9625,7 +9626,6 @@ AC_SUBST(INPATH)
AC_SUBST(INPATH_FOR_BUILD)
AC_SUBST(JAVALIB)
AC_SUBST(JDKLIB)
-AC_SUBST(MAKE)
AC_SUBST(OS)
AC_SUBST(OS_FOR_BUILD)
AC_SUBST(OUTDIR)
@@ -9644,11 +9644,13 @@ AC_SUBST(SOLARLIB)
AC_SUBST(SOLARSRC)
AC_SUBST(SOLARVER)
AC_SUBST(SOLARVERSION)
+AC_SUBST(SRC_ROOT)
AC_SUBST(WORKDIR)
AC_SUBST(WORKDIR_FOR_BUILD)
AC_SUBST(WORK_STAMP)
AC_SUBST(TMPDIR)
AC_SUBST(XCLASSPATH)
+AC_SUBST(XSLTPROC)
AC_SUBST(gb_REPOS)
commit ced76322f8dd41368fe772419617d23391549fc8
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Sep 19 00:53:29 2011 +0200
some more work on set_soenv
diff --git a/Env.Host.sh.in b/Env.Host.sh.in
index d644494..6f24e56 100755
--- a/Env.Host.sh.in
+++ b/Env.Host.sh.in
@@ -190,6 +190,7 @@ export RPM="@RPM@"
export DPKG="@DPKG@"
export PKGMK="@PKGMK@"
export GNUMAKE="@GNUMAKE@"
+export MAKE="@MAKE@"
export GNUTAR="@GNUTAR@"
export UPD="@UPD@"
export WORK_STAMP="@WORK_STAMP@"
@@ -549,8 +550,9 @@ export MKOUT="mkout.pl"
export ZIPDEP="zipdep.pl"
export OOODMAKEMODE="YES"
export PSPRINT="TRUE"
+export DEFAULT_MOZILLA_TOOLKIT="gtk2"
alias mkout=$SOLARENV/bin/mkout.pl
-alias deliver=$SOLENV/bin/deliver.pl
-alias build=$SOLENV/bin/build.pl
+alias deliver=$SOLARENV/bin/deliver.pl
+alias build=$SOLARENV/bin/build.pl
alias zipdep=$ZIPDEP
diff --git a/configure.in b/configure.in
index d34d6b4..1a1f918 100755
--- a/configure.in
+++ b/configure.in
@@ -6646,13 +6646,14 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then
AC_MSG_ERROR([--with-gnu-patch did not point to an executable])
fi
fi
-
- AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
- if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
- fi
+else
+ AC_PATH_PROGS(GNUPATCH, patch)
+fi
+AC_MSG_CHECKING([whether $GNUPATCH is GNU patch])
+if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_ERROR([no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it])
fi
dnl We also need to check for --with-gnu-cp
@@ -6692,8 +6693,6 @@ else
esac
fi
-AC_SUBST(GNUPATCH)
-AC_SUBST(GNUCP)
dnl ***************************************
dnl testing assembler path
@@ -9559,7 +9558,7 @@ case "$host_os" in
fi
CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:."
XCLASSPATH="$CLASSPATH"
- PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR$PATH"
+ PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr"
SOLAREXTRALIB=" -L..$LIB64"
TMPDIR=/tmp
;;
@@ -9583,6 +9582,7 @@ GXX_INCLUDE_PATH_FOR_BUILD="$GXX_INCLUDE_PATH"
HOST_PLATFORM="$host"
INPATH_FOR_BUILD="$INPATH"
JDKLIB="$JAVALIB"
+MAKE="$GNUMAKE"
OUTDIR="$SRC_ROOT/solver/$INPATH"
OUTDIR_FOR_BUILD="$OUTDIR"
OUTPATH_FOR_BUILD="$OUTPATH"
@@ -9599,6 +9599,7 @@ WORKDIR="$SRC_ROOT/workdir/$INPATH"
WORKDIR_FOR_BUILD="$WORKDIR"
gb_REPOS="$SRC_ROOT"
WORK_STAMP="$SOURCEVERSION"
+DEFAULT_MOZILLA_TOOLKIT="$MOZILLA_TOOLKIT"
AC_SUBST(BUILD_PLATFORM)
AC_SUBST(CLASSPATH)
@@ -9614,14 +9615,17 @@ AC_SUBST(DMAKEROOT)
AC_SUBST(GUI)
AC_SUBST(GUI_FOR_BUILD)
AC_SUBST(GUIBASE)
-AC_SUBST(GUIBASE_FOR_BUILD)
AC_SUBST(GNUCOPY)
+AC_SUBST(GNUCP)
+AC_SUBST(GNUPATCH)
+AC_SUBST(GUIBASE_FOR_BUILD)
AC_SUBST(GVER)
AC_SUBST(HOST_PLATFORM)
AC_SUBST(INPATH)
AC_SUBST(INPATH_FOR_BUILD)
AC_SUBST(JAVALIB)
AC_SUBST(JDKLIB)
+AC_SUBST(MAKE)
AC_SUBST(OS)
AC_SUBST(OS_FOR_BUILD)
AC_SUBST(OUTDIR)
commit ac2bc31cd08b027b6e9e11c0ac55913c42451529
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Sep 18 03:39:44 2011 +0200
append path at the end
diff --git a/configure.in b/configure.in
index 353980e..d34d6b4 100755
--- a/configure.in
+++ b/configure.in
@@ -9559,7 +9559,7 @@ case "$host_os" in
fi
CLASSPATH="$JAVA_HOME/jre/lib/rt.jar:."
XCLASSPATH="$CLASSPATH"
- PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr"
+ PATH_="$JAVA_HOME/bin$PATH_SEPARATOR.$PATH_SEPARATOR$SRC_ROOT/solenv/$OUTPATH/bin$PATH_SEPARATOR$SRC_ROOT/solenv/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR$PATH"
SOLAREXTRALIB=" -L..$LIB64"
TMPDIR=/tmp
;;
commit faeab5b74f586ff6b9bf60caaf56d1e1444be921
Merge: c9be754... 1e928fd...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Sep 18 03:21:34 2011 +0200
Merge branch 'master' into feature/kill-set_soenv
commit 1e928fd948005664dbb32bc945808273e56b2ee6
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sat Sep 17 18:54:32 2011 -0400
don't try to cat a non existent Jar manifest
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 652331a..b30bd3a 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -50,7 +50,7 @@ define gb_Jar__command
echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
echo "Class-Path: $(JARCLASSPATH)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
- cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) && \
+ cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) >> $(call gb_Jar_get_manifest_target,$(1)) && \
mkdir -p $(dir $(2)) && \
cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1))) && \
$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \
commit 27ba6af823a3c174326d1e9c19aa114abd71f03e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 23:14:44 2011 +0100
m4 is a real pain with [], fixes missing themes/icons
diff --git a/configure.in b/configure.in
index 75c0385..43c34a5 100755
--- a/configure.in
+++ b/configure.in
@@ -7792,7 +7792,7 @@ for theme in $with_theme; do
[AC_MSG_ERROR([Unknown value for --with-themes: $theme])]
)
WITH_THEMES="$WITH_THEMES $theme"
- SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[:lower:]' '[:upper:]'`"
+ SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`"
done
AC_MSG_RESULT([$WITH_THEMES])
AC_SUBST([WITH_THEMES])
commit ec303dfe52f7ba78ffba2a5327fda38abfef5d6f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 22:59:00 2011 +0100
charset arg doesn't exist anymore, fixes helpex
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 86b94d3..49d9a0f 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -527,7 +527,7 @@ Export::~Export()
if ( bMergeMode && !bUnmerge ) {
if ( !pMergeDataFile )
- pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog);//, bUTF8 );
+ pMergeDataFile = new MergeDataFile(sMergeSrc, sFile, bErrorLog);
delete pMergeDataFile;
}
@@ -1881,7 +1881,7 @@ sal_Bool Export::PrepareTextToMerge(ByteString &rText, sal_uInt16 nTyp,
// search for merge data
if ( !pMergeDataFile ){
- pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog );//, bUTF8 );
+ pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog );
// Init Languages
ByteString sTmp = Export::sLanguages;
@@ -1931,7 +1931,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
/*****************************************************************************/
{
if ( !pMergeDataFile ){
- pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog );//, bUTF8 );
+ pMergeDataFile = new MergeDataFile( sMergeSrc, sFile, bErrorLog );
// Init Languages
ByteString sTmp = Export::sLanguages;
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index e67f979..b6a0199 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -225,10 +225,8 @@ int _cdecl main( int argc, char *argv[] )
if ( bMergeMode )
{
-
//sal_uInt64 startreadloc = Export::startMessure();
- MergeDataFile aMergeDataFile( sSDFFile, sInputFile , sal_False, RTL_TEXTENCODING_MS_1252 );
- //MergeDataFile aMergeDataFile( sSDFFile, sInputFile , sal_False, RTL_TEXTENCODING_MS_1252, false );
+ MergeDataFile aMergeDataFile(sSDFFile, sInputFile, sal_False);
//Export::stopMessure( ByteString("read localize.sdf") , startreadloc );
hasNoError = aParser.Merge( sSDFFile, sOutputFile , Export::sLanguages , aMergeDataFile );
@@ -260,8 +258,7 @@ int _cdecl main( int argc, char *argv[] )
aFStream.close();
ByteString sHelpFile(""); // dummy
- //MergeDataFile aMergeDataFile( sSDFFile, sHelpFile , sal_False, RTL_TEXTENCODING_MS_1252, false );
- MergeDataFile aMergeDataFile( sSDFFile, sHelpFile , sal_False, RTL_TEXTENCODING_MS_1252 );
+ MergeDataFile aMergeDataFile( sSDFFile, sHelpFile, sal_False );
//aMergeDataFile.Dump();
std::vector<ByteString> aLanguages;
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 066fb01..8281073 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -219,7 +219,7 @@ sal_Bool LngParser::Merge(
}
nError = LNG_OK;
- MergeDataFile aMergeDataFile( rSDFFile, sSource , sal_False, RTL_TEXTENCODING_MS_1252);//, bDBIsUTF8 );
+ MergeDataFile aMergeDataFile( rSDFFile, sSource, sal_False );
ByteString sTmp( Export::sLanguages );
if( sTmp.ToUpperAscii().Equals("ALL") )
Export::SetLanguages( aMergeDataFile.GetLanguages() );
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 4043e6f..a2a701e 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -605,7 +605,7 @@ XRMResMerge::XRMResMerge(
{
if ( rMergeSource.Len())
pMergeDataFile = new MergeDataFile(
- rMergeSource, sInputFileName, bErrorLog);//, bUTF8 );
+ rMergeSource, sInputFileName, bErrorLog);
if( Export::sLanguages.EqualsIgnoreCaseAscii("ALL") ){
Export::SetLanguages( pMergeDataFile->GetLanguages() );
aLanguages = pMergeDataFile->GetLanguages();
commit 6c033b649dac28b2cd1ea9d0bc3e2ccf5aaf6e6e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 22:21:28 2011 +0100
drop makefile.mk
diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk
deleted file mode 100755
index 48f4f93..0000000
--- a/vbahelper/util/makefile.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=vbahelper
-TARGET=vbahelper
-
-# --- Settings ---------------------------------------------------
-
-.INCLUDE : settings.mk
-
-TARGET_HELPER=vbahelper
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=$(SLB)$/$(TARGET)bits.lib
-
-SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX)
-
-
-# dynamic libraries
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(BASICLIB) \
- $(TOOLSLIB) \
- $(SALLIB)\
- $(SFXLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(SVTOOLLIB) \
- $(MSFILTERLIB) \
- $(TKLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET_HELPER)
-SHL1USE_EXPORTS=name
-SHL1LIBS=$(LIB1TARGET)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-TARGET_MSFORMS=msforms
-SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno
-SHL2IMPLIB= i$(TARGET_MSFORMS)
-
-SHL2VERSIONMAP=$(SOLARENV)/src/component.map
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=$(SHL2TARGET)
-SHL2STDLIBS= \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(COMPHELPERLIB) \
- $(SVLIB) \
- $(TOOLSLIB) \
- $(SALLIB)\
- $(VBAHELPERLIB) \
- $(SFXLIB) \
- $(SVXLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(TKLIB) \
- $(BASICLIB) \
- $(SVXMSFILTERLIB) \
-
-SHL2DEPN=$(SHL1TARGETN)
-SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib
-
-# --- Targets -----------------------------------------------------------
-
-.INCLUDE : target.mk
commit bca6b33e570888dca4f500ec76d2eefeb25452ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 21:43:49 2011 +0100
reformat so that numbers are correct
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index e4fb34f..f4a4973 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -97,23 +97,23 @@ enum SmTokenType
/*125*/ TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
/*130*/ TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
/*135*/ TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
-/*140*/ TFORALL, TEXISTS, TNOTEXISTS, TLIM, TNABLA, TTOWARD,
-/*145*/ TSINH, TCOSH, TTANH, TCOTH, TASIN,
-/*150*/ TACOS, TATAN, TLN, TLOG, TUOPER,
-/*155*/ TBOPER, TBLACK, TWHITE, TRED, TGREEN,
-/*160*/ TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED,
-/*165*/ TSANS, TSERIF, TPOINT, TASINH, TACOSH,
-/*170*/ TATANH, TACOTH, TACOT, TEXP, TCDOT,
-/*175*/ TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,
-/*180*/ TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG, TNI,
-/*185*/ TBACKEPSILON, TALEPH, TIM, TRE, TWP,
-/*190*/ TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP, TLIMINF,
-/*195*/ TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW, TUNDERBRACE,
-/*200*/ TOVERBRACE, TCIRC, TTOP, THBAR, TLAMBDABAR,
-/*205*/ TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES,
-/*210*/ TNDIBVIDES, TSETN, TSETZ, TSETQ, TSETR,
-/*215*/ TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, TWIDESLASH,
-/*220*/ TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE,
+/*140*/ TFORALL, TEXISTS, TNOTEXISTS, TLIM, TNABLA,
+/*145*/ TTOWARD, TSINH, TCOSH, TTANH, TCOTH,
+/*150*/ TASIN, TACOS, TATAN, TLN, TLOG,
+/*155*/ TUOPER, TBOPER, TBLACK, TWHITE, TRED,
+/*160*/ TGREEN, TBLUE, TCYAN, TMAGENTA, TYELLOW,
+/*165*/ TFIXED, TSANS, TSERIF, TPOINT, TASINH,
+/*170*/ TACOSH, TATANH, TACOTH, TACOT, TEXP,
+/*175*/ TCDOT, TODOT, TLESLANT, TGESLANT, TNSUBSET,
+/*180*/ TNSUPSET, TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG,
+/*185*/ TNI, TBACKEPSILON, TALEPH, TIM, TRE,
+/*190*/ TWP, TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP,
+/*195*/ TLIMINF, TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW,
+/*200*/ TUNDERBRACE, TOVERBRACE, TCIRC, TTOP, THBAR,
+/*205*/ TLAMBDABAR, TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW,
+/*210*/ TDIVIDES, TNDIBVIDES, TSETN, TSETZ, TSETQ,
+/*215*/ TSETR, TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT,
+/*220*/ TWIDESLASH, TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE,
/*225*/ TUNKNOWN, TDEBUG
};
commit f20bafad82340f1f735c1804a34ddd3a34c00e74
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 14:09:38 2011 +0100
ditch ByteString::Expand
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 9a70a66..b2bbfe7 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -177,7 +177,6 @@ private:
// Append(char)
void operator +=(int); // not implemented; to detect misuses
// of operator +=(sal_Char)
-
public:
ByteString();
ByteString( const ByteString& rStr );
@@ -234,8 +233,6 @@ public:
ByteString& Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN );
ByteString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const;
- ByteString& Expand( xub_StrLen nCount, sal_Char cExpandChar = ' ' );
-
ByteString& EraseLeadingChars( sal_Char c = ' ' );
ByteString& EraseTrailingChars( sal_Char c = ' ' );
ByteString& EraseLeadingAndTrailingChars( sal_Char c = ' ' );
diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index 3d15cb2..d842875 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.cxx
@@ -769,37 +769,6 @@ STRING& STRING::Erase( xub_StrLen nIndex, xub_StrLen nCount )
// -----------------------------------------------------------------------
-STRING& STRING::Expand( xub_StrLen nCount, STRCODE cExpandChar )
-{
- DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
- // Muss der String erweitert werden
- sal_Int32 nLen = mpData->mnLen;
- if ( nCount <= nLen )
- return *this;
-
- // Neuen String anlegen
- STRINGDATA* pNewData = ImplAllocData( nCount );
-
- // Alten String kopieren
- memcpy( pNewData->maStr, mpData->maStr, nLen*sizeof( STRCODE ) );
-
- // und initialisieren
- STRCODE* pStr = pNewData->maStr;
- pStr += nLen;
- for (sal_Int32 i = nCount - nLen; i > 0; --i) {
- *pStr++ = cExpandChar;
- }
-
- // Alte Daten loeschen und Neue zuweisen
- STRING_RELEASE((STRING_TYPE *)mpData);
- mpData = pNewData;
-
- return *this;
-}
-
-// -----------------------------------------------------------------------
-
STRING& STRING::EraseLeadingChars( STRCODE c )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 720d5a2..0f98741 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -474,4 +474,35 @@ STRING& STRING::Fill( xub_StrLen nCount, STRCODE cFillChar )
return *this;
}
+// -----------------------------------------------------------------------
+
+STRING& STRING::Expand( xub_StrLen nCount, STRCODE cExpandChar )
+{
+ DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+
+ // Muss der String erweitert werden
+ sal_Int32 nLen = mpData->mnLen;
+ if ( nCount <= nLen )
+ return *this;
+
+ // Neuen String anlegen
+ STRINGDATA* pNewData = ImplAllocData( nCount );
+
+ // Alten String kopieren
+ memcpy( pNewData->maStr, mpData->maStr, nLen*sizeof( STRCODE ) );
+
+ // und initialisieren
+ STRCODE* pStr = pNewData->maStr;
+ pStr += nLen;
+ for (sal_Int32 i = nCount - nLen; i > 0; --i) {
+ *pStr++ = cExpandChar;
+ }
+
+ // Alte Daten loeschen und Neue zuweisen
+ STRING_RELEASE((STRING_TYPE *)mpData);
+ mpData = pNewData;
+
+ return *this;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 98f84dfaeff753f6bf7c8b841466dbb0319e9037
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 14:09:23 2011 +0100
simplify this
diff --git a/xml2cmp/Executable_xml2cmp.mk b/xml2cmp/Executable_xml2cmp.mk
index 40e8428..156199f 100644
--- a/xml2cmp/Executable_xml2cmp.mk
+++ b/xml2cmp/Executable_xml2cmp.mk
@@ -47,14 +47,8 @@ $(eval $(call gb_Executable_add_exception_objects,xml2cmp,\
xml2cmp/source/xcd/dependy \
))
-#uwinapi is part of STDLIBS on windows, but is created in sal,
-#which depends on this module.
-ifeq ($(OS),WNT)
+#uwinapi is part of STDLIBS on windows, but it is created in sal, which
+#depends on this module.
$(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
$(filter-out uwinapi,$(gb_STDLIBS)) \
))
-else
-$(eval $(call gb_Executable_add_linked_libs,xml2cmp,\
- $(gb_STDLIBS) \
-))
-endif
commit 32b2e810ad2a6084d8a0e027aea414b65e2e8c4f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 00:15:49 2011 +0100
use read_uInt8s_AsOString and comphelper::string::padToLength
which allows us to simplify the read in DTable.cxx quite a bit
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 5b57527..fe08f66 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -51,6 +51,7 @@
#include <rtl/ustrbuf.hxx>
#include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -659,14 +660,8 @@ SbError SbiStream::Read( ByteString& rBuf, sal_uInt16 n, bool bForceReadingPerBy
return nError = SbERR_BAD_RECORD_LENGTH;
rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*pStrm, n));
//Pad it out with ' ' to the requested length on short read
- sal_Int32 nRead = aBuffer.getLength();
sal_Int32 nRequested = sal::static_int_cast<sal_Int32>(n);
- if (nRead < nRequested)
- {
- aBuffer.setLength(nRequested);
- for (sal_Int32 i = nRead; i < nRequested; ++i)
- aBuffer.setCharAt(i, ' ');
- }
+ comphelper::string::padToLength(aBuffer, nRequested, ' ');
rBuf = aBuffer.makeStringAndClear();
}
MapError();
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index b0304fa..ccee3af 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -51,6 +51,7 @@
#include <connectivity/dbconversion.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/property.hxx>
+#include <comphelper/string.hxx>
#include <unotools/tempfile.hxx>
#include <unotools/ucbhelper.hxx>
#include <comphelper/types.hxx>
@@ -61,6 +62,7 @@
#include "connectivity/dbconversion.hxx"
#include "resource/dbase_res.hrc"
#include <rtl/logfile.hxx>
+#include <rtl/strbuf.hxx>
#include <algorithm>
@@ -1951,12 +1953,14 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,c
if (!m_pMemoStream || !WriteMemo(rRow.get()[nPos]->get(), nBlockNo))
break;
- ByteString aStr;
- ByteString aBlock(rtl::OString::valueOf(static_cast<sal_Int32>(nBlockNo)));
- aStr.Expand(static_cast<sal_uInt16>(nLen - aBlock.Len()), '0' );
- aStr += aBlock;
+ rtl::OString aBlock(rtl::OString::valueOf(static_cast<sal_Int32>(nBlockNo)));
+ //align aBlock at the right of a nLen sequence, fill to the left with '0'
+ rtl::OStringBuffer aStr;
+ comphelper::string::padToLength(aStr, nLen - aBlock.getLength(), '0');
+ aStr.append(aBlock);
+
// Copy characters:
- memcpy(pData, aStr.GetBuffer(), nLen);
+ memcpy(pData, aStr.getStr(), nLen);
} break;
default:
{
@@ -2726,24 +2730,11 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
{
if ( bIsText )
{
- ::rtl::OUStringBuffer aStr;
- while ( nLength > STRING_MAXLEN )
- {
- ByteString aBStr;
- aBStr.Expand(STRING_MAXLEN);
- m_pMemoStream->Read(aBStr.AllocBuffer(STRING_MAXLEN),STRING_MAXLEN);
- aStr.append(::rtl::OUString(aBStr.GetBuffer(),aBStr.Len(), m_eEncoding));
- nLength -= STRING_MAXLEN;
- }
- if ( nLength > 0 )
- {
- ByteString aBStr;
- aBStr.Expand(static_cast<xub_StrLen>(nLength));
- m_pMemoStream->Read(aBStr.AllocBuffer(static_cast<xub_StrLen>(nLength)),nLength);
- aStr.append(::rtl::OUString(aBStr.GetBuffer(),aBStr.Len(), m_eEncoding));
- }
- if ( aStr.getLength() )
- aVariable = aStr.makeStringAndClear();
+ rtl::OStringBuffer aBuffer(read_uInt8s_AsOString(*m_pMemoStream, nLength));
+ //pad it out with ' ' to expected length on short read
+ sal_Int32 nRequested = sal::static_int_cast<sal_Int32>(nLength);
+ comphelper::string::padToLength(aBuffer, nRequested, ' ');
+ aVariable = rtl::OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding);
} // if ( bIsText )
else
{
commit 76092149d0bd7c5432441972ddfb622cad26af86
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Sep 17 00:10:45 2011 +0100
add a pad and truncate
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx
index c7f29f6..aeec120 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -33,15 +33,15 @@
#include <cstddef>
#include "comphelper/comphelperdllapi.h"
-#include "sal/types.h"
+#include <sal/types.h>
+#include <rtl/strbuf.hxx>
+#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/i18n/XCollator.hpp>
#include <com/sun/star/i18n/XBreakIterator.hpp>
-namespace rtl { class OUString; }
-
// rtl::OUString helper functions that are not widespread or mature enough to
// go into the stable URE API:
namespace comphelper { namespace string {
@@ -251,6 +251,84 @@ COMPHELPER_DLLPUBLIC inline sal_Bool matchL(const rtl::OString& rStr, const char
rStr.pData->length-fromIndex, pMatch, nMatchLen, nMatchLen ) == 0;
}
+
+namespace detail
+{
+ template<typename B> B& truncateToLength(B& rBuffer, sal_Int32 nLen)
+ {
+ if (nLen < rBuffer.getLength())
+ rBuffer.remove(nLen, rBuffer.getLength()-nLen);
+ return rBuffer;
+ }
+}
+
+/** Truncate a buffer to a given length.
+
+ If the StringBuffer has more characters than nLength it will be truncated
+ on the right to nLength characters.
+
+ Has no effect if the StringBuffer is <= nLength
+
+ @param rBuf StringBuffer to operate on
+ @param nLength Length to truncate the buffer to
+
+ @return rBuf;
+ */
+COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& truncateToLength(
+ rtl::OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+{
+ return detail::truncateToLength(rBuffer, nLength);
+}
+
+COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& truncateToLength(
+ rtl::OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+{
+ return detail::truncateToLength(rBuffer, nLength);
+}
+
+namespace detail
+{
+ template<typename B, typename U> B& padToLength(B& rBuffer, sal_Int32 nLen,
+ U cFill = '\0')
+ {
+ sal_Int32 nOrigLen = rBuffer.getLength();
+ if (nLen > nOrigLen)
+ {
+ rBuffer.setLength(nLen);
+ for (sal_Int32 i = nOrigLen; i < nLen; ++i)
+ rBuffer.setCharAt(i, cFill);
+ }
+ return rBuffer;
+ }
+}
+
+/** Pad a buffer to a given length using a given char.
+
+ If the StringBuffer has less characters than nLength it will be expanded on
+ the right to nLength characters, with the expansion filled using cFill.
+
+ Has no effect if the StringBuffer is >= nLength
+
+ @param rBuf StringBuffer to operate on
+ @param nLength Length to pad the buffer to
+ @param cFill character to fill expansion with
+
+ @return rBuf;
+ */
+COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& padToLength(
+ rtl::OStringBuffer& rBuffer, sal_Int32 nLength,
+ sal_Char cFill = '\0') SAL_THROW(())
+{
+ return detail::padToLength(rBuffer, nLength, cFill);
+}
+
+COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& padToLength(
+ rtl::OUStringBuffer& rBuffer, sal_Int32 nLength,
+ sal_Unicode cFill = '\0') SAL_THROW(())
+{
+ return detail::padToLength(rBuffer, nLength, cFill);
+}
+
/** Convert a sequence of strings to a single comma separated string.
Note that no escaping of commas or anything fancy is done.
commit ba3ac5771366c0cecf0a6c39728f87dbf691fef6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 16 16:07:24 2011 +0100
memcpy is of the same length as preceding memset
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 6e1c5d8..b0304fa 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1956,7 +1956,6 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,c
aStr.Expand(static_cast<sal_uInt16>(nLen - aBlock.Len()), '0' );
aStr += aBlock;
// Copy characters:
- memset(pData,' ',nLen); // Clear to NULL
memcpy(pData, aStr.GetBuffer(), nLen);
} break;
default:
commit 7fff462959e50ee36b5410f3bf859af9f3e63c0d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Sep 17 22:27:06 2011 +0200
check make 3.81 for bug 20033 and only disable parallelism if needed
diff --git a/configure.in b/configure.in
index 6ea36b4..75c0385 100755
--- a/configure.in
+++ b/configure.in
@@ -2540,7 +2540,41 @@ if test "$_make_longver" -ge "038200" ; then
elif test "$_make_longver" -ge "038100" ; then
AC_MSG_RESULT([$GNUMAKE $_make_version])
- no_parallelism_make="YES"
+ AC_MSG_CHECKING([for GNU make bug 20033])
+ TESTGMAKEBUG20033=`mktemp -d`
+ cat > $TESTGMAKEBUG20033/Makefile << EOF
+A := \$(wildcard *.a)
+
+.PHONY: all
+all: \$(A:.a=.b)
+ @echo survived bug20033.
+
+.PHONY: setup
+setup:
+ @touch 1.a 2.a 3.a 4.a 5.a 6.a
+
+define d1
+ at echo lala \$(1)
+ at sleep 1
+endef
+
+define d2
+ at echo tyty \$(1)
+ at sleep 1
+endef
+
+%.b : %.a
+ \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if \$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+ \$(call d1,\$(CHECKSUM)),\
+ \$(call d2,\$(CHECKSUM)))
+EOF
+ if test -z "`(cd $TESTGMAKEBUG20033 && $GNUMAKE setup && $GNUMAKE -j)|grep survived`"; then
+ no_parallelism_make="YES"
+ AC_MSG_RESULT([yes, disable parallelism])
+ else
+ AC_MSG_RESULT([no, keep parallelism enabled])
+ fi
+ rm -rf $TESTGMAKEBUG20033
else
AC_MSG_ERROR([failed ($GNUMAKE version >= 3.81 needed])
fi
commit 02d811071cf65aefddac5c3c2a0759d3b673e9a7
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Sep 17 20:36:55 2011 +0200
fdo #37007 Add Math symbol "There does not exist".
diff --git a/default_images/starmath/res/mi21618.png b/default_images/starmath/res/mi21618.png
new file mode 100644
index 0000000..f93a529
Binary files /dev/null and b/default_images/starmath/res/mi21618.png differ
diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd
index d7101ea..97905d1 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -20,7 +20,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1144938807
-ModificationTime: 1257779664
+ModificationTime: 1316279011
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@@ -714,7 +714,7 @@ MUL
SWAP
ENDF
EndTTInstrs
-ShortTable: cvt 38
+ShortTable: cvt 39
0
148
145
@@ -753,6 +753,7 @@ ShortTable: cvt 38
982
1343
1449
+ 91
EndShort
ShortTable: maxp 16
1
@@ -780,8 +781,8 @@ NameList: Adobe Glyph List
DisplaySize: -24
AntiAlias: 1
FitToEm: 1
-WinInfo: 135 45 20
-BeginChars: 992 992
+WinInfo: 360 45 15
+BeginChars: 993 993
StartChar: Alpha
Encoding: 909 913 0
@@ -14941,9 +14942,11 @@ HStem: 2 129<117 1034> 670 135<217 1034> 1274 135<117 1034>
VStem: 1034 156<131 670 805 1274>
TtInstrs:
SVTCA[y-axis]
-PUSHB_1
+PUSHB_3
0
-MDAP[rnd]
+ 34
+ 0
+CALL
PUSHB_1
1
MDRP[min,rnd,black]
@@ -15017,7 +15020,7 @@ SplineSet
1190 2 l 1,11,-1
117 2 l 1,0,-1
EndSplineSet
-Validated: 1
+Validated: 16385
EndChar
StartChar: emptyset
@@ -15389,7 +15392,7 @@ SplineSet
387 129 l 1,20,21
145 327 145 327 145 586 c 0,22,23
145 916 145 916 403 1042 c 0,24,25
- 585 1133 585 1133 954 1133 c 1,26,-1
+ 585 1133 585 1133 954 1133 c 5,26,-1
1065 1325 l 1,27,-1
1198 1325 l 1,28,-1
1090 1133 l 1,29,-1
@@ -107019,6 +107022,7 @@ SplineSet
631 1483 l 1,5,-1
666 1481 l 1,0,-1
EndSplineSet
+Validated: 1
EndChar
StartChar: breve
@@ -107041,6 +107045,7 @@ SplineSet
220 1346 220 1346 268 1284 c 0,16,17
338 1200 338 1200 467 1200 c 0,0,1
EndSplineSet
+Validated: 1
EndChar
StartChar: ACUTE
@@ -107058,6 +107063,7 @@ SplineSet
342 1456 l 1,3,-1
565 1456 l 1,0,-1
EndSplineSet
+Validated: 1
EndChar
StartChar: GRAVE
@@ -107075,6 +107081,298 @@ SplineSet
412 1130 l 1,3,-1
117 1477 l 1,0,-1
EndSplineSet
+Validated: 1
+EndChar
+
+StartChar: nonexistential
+Encoding: 992 8708 992
+Width: 1345
+Flags: HWO
+HStem: 2 129<117 478.5 604.389 1034> 670 135<217 635.5 758.5 1034> 1274 135<117 768.5 892.5 1034>
+VStem: 1034 156<131 670 805 1274>
+TtInstrs:
+SVTCA[y-axis]
+PUSHB_3
+ 1
+ 34
+ 0
+CALL
+PUSHB_2
+ 0
+ 17
+SHP[rp1]
+SHP[rp1]
+PUSHB_1
+ 2
+MDRP[min,rnd,black]
+PUSHB_2
+ 3
+ 20
+SHP[rp2]
+SHP[rp2]
+PUSHB_3
+ 1
+ 2
+ 10
+CALL
+PUSHB_4
+ 64
+ 1
+ 18
+ 9
+CALL
+PUSHB_1
+ 19
+SHP[rp2]
+PUSHB_1
+ 5
+MDAP[rnd]
+PUSHB_2
+ 4
+ 23
+SHP[rp1]
+SHP[rp1]
+PUSHB_1
+ 6
+MDRP[min,rnd,black]
+PUSHB_2
+ 7
+ 24
+SHP[rp2]
+SHP[rp2]
+PUSHB_1
+ 9
+MDAP[rnd]
+PUSHB_2
+ 8
+ 27
+SHP[rp1]
+SHP[rp1]
+PUSHB_1
+ 10
+MDRP[min,rnd,black]
+PUSHB_2
+ 11
+ 14
+SHP[rp2]
+SHP[rp2]
+SVTCA[x-axis]
+PUSHB_1
+ 28
+MDAP[rnd]
+PUSHB_1
+ 21
+MDRP[rp0,rnd,white]
+PUSHB_1
+ 25
+SHP[rp2]
+PUSHB_1
+ 16
+MDRP[min,rnd,black]
+PUSHB_3
+ 21
+ 16
+ 10
+CALL
+PUSHB_4
+ 64
+ 21
+ 10
+ 9
+CALL
+PUSHB_1
+ 1
+SHP[rp2]
+PUSHB_2
+ 29
+ 1
+CALL
+PUSHB_1
+ 54
+SMD
+PUSHW_2
+ 15997
+ -3541
+SPVFS
+PUSHB_1
+ 19
+MDAP[no-rnd]
+SFVTPV
+PUSHB_1
+ 12
+MDRP[grey]
+SFVTCA[x-axis]
+PUSHB_2
+ 18
+ 38
+MIRP[rp0,min,black]
+SFVTPV
+PUSHB_1
+ 13
+MDRP[grey]
+SFVTCA[x-axis]
+PUSHB_1
+ 19
+SRP0
+PUSHB_4
+ 0
+ 19
+ 12
+ 19
+CALL
+PUSHB_4
+ 3
+ 19
+ 12
+ 19
+CALL
+PUSHB_4
+ 4
+ 19
+ 12
+ 19
+CALL
+PUSHB_4
+ 7
+ 19
+ 12
+ 19
+CALL
+PUSHB_4
+ 8
+ 19
+ 12
+ 19
+CALL
+PUSHB_4
+ 11
+ 19
+ 12
+ 19
+CALL
+PUSHB_1
+ 18
+SRP0
+PUSHB_4
+ 14
+ 18
+ 13
+ 19
+CALL
+PUSHB_4
+ 17
+ 18
+ 13
+ 19
+CALL
+PUSHB_4
+ 20
+ 18
+ 13
+ 19
+CALL
+PUSHB_4
+ 23
+ 18
+ 13
+ 19
+CALL
+PUSHB_4
+ 24
+ 18
+ 13
+ 19
+CALL
+PUSHB_4
+ 27
+ 18
+ 13
+ 19
+CALL
+SPVTCA[x-axis]
+SVTCA[y-axis]
+PUSHB_2
+ 12
+ 13
+MDAP[no-rnd]
+MDAP[no-rnd]
+SVTCA[x-axis]
+NPUSHB
+ 16
+ 0
+ 3
+ 4
+ 7
+ 8
+ 11
+ 12
+ 13
+ 14
+ 17
+ 18
+ 19
+ 20
+ 23
+ 24
+ 27
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+MDAP[no-rnd]
+PUSHB_1
+ 64
+SMD
+SVTCA[y-axis]
+IUP[y]
+IUP[x]
+EndTTInstrs
+LayerCount: 2
+Fore
+SplineSet
+436.5 0 m 17,0,-1
+ 117 2 l 1,1,-1
+ 117 131 l 1,2,-1
+ 468.5 133.99 l 9,3,-1
+ 593.5 670.99 l 17,4,-1
+ 217 670 l 1,5,-1
+ 217 805 l 1,6,-1
+ 622.5 805.99 l 9,7,-1
+ 726.5 1274.99 l 17,8,-1
+ 117 1274 l 1,9,-1
+ 117 1409 l 1,10,-1
+ 756.286 1409 l 9,11,-1
+ 787.5 1572.1 l 25,12,-1
+ 923.5 1572.1 l 25,13,-1
+ 892.5 1410.1 l 17,14,-1
+ 1190 1409 l 1,15,-1
+ 1190 2 l 1,16,-1
+ 572.68 2 l 9,17,-1
+ 543.5 -134.01 l 25,18,-1
+ 407.5 -134.01 l 29,19,-1
+ 436.5 0 l 17,0,-1
+604.389 131 m 17,20,-1
+ 1034 131 l 1,21,-1
+ 1034 670 l 1,22,-1
+ 729.5 670.99 l 9,23,-1
+ 604.389 131 l 17,20,-1
+758.5 802.99 m 17,24,-1
+ 1034 805 l 1,25,-1
+ 1034 1274 l 1,26,-1
+ 862.5 1274.99 l 9,27,-1
+ 758.5 802.99 l 17,24,-1
+EndSplineSet
EndChar
EndChars
EndSplineFont
diff --git a/extras/source/truetype/symbol/opens___.ttf b/extras/source/truetype/symbol/opens___.ttf
index 96707f2..589769c 100644
Binary files a/extras/source/truetype/symbol/opens___.ttf and b/extras/source/truetype/symbol/opens___.ttf differ
diff --git a/ooo_custom_images/hicontrast/starmath/res/mi21618.png b/ooo_custom_images/hicontrast/starmath/res/mi21618.png
new file mode 100644
index 0000000..1289aaf
Binary files /dev/null and b/ooo_custom_images/hicontrast/starmath/res/mi21618.png differ
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index f27b47e..1da4029 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -160,6 +160,7 @@
#define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX"
#define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX"
#define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS"
+#define HID_SMA_NOTEXISTS "STARMATH_HID_SMA_NOTEXISTS"
#define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL"
#define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA"
#define HID_SMA_INTX "STARMATH_HID_SMA_INTX"
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 3ad04d1..e4fb34f 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -97,7 +97,7 @@ enum SmTokenType
/*125*/ TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
/*130*/ TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
/*135*/ TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
-/*140*/ TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD,
+/*140*/ TFORALL, TEXISTS, TNOTEXISTS, TLIM, TNABLA, TTOWARD,
/*145*/ TSINH, TCOSH, TTANH, TCOTH, TASIN,
/*150*/ TACOS, TATAN, TLN, TLOG, TUOPER,
/*155*/ TBOPER, TBLACK, TWHITE, TRED, TGREEN,
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f7aa0f2..4d7509b 100755
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -390,6 +390,7 @@
#define RID_UPARROW (RID_APP_START + 2018)
#define RID_DOWNARROW (RID_APP_START + 2019)
#define RID_EXISTS (RID_APP_START + 1608)
+#define RID_NOTEXISTS (RID_APP_START + 1618)
#define RID_FORALL (RID_APP_START + 1612)
// new menue resource ID's
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 8353f6e..d3f30d5 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -120,6 +120,7 @@ enum MathSymbol
MS_IN = (sal_Unicode) 0x2208,
MS_NOTIN = (sal_Unicode) 0x2209,
MS_EXISTS = (sal_Unicode) 0x2203,
+ MS_NOTEXISTS = (sal_Unicode) 0x2204,
MS_BACKEPSILON = (sal_Unicode) 0x220D,
MS_ALEPH = (sal_Unicode) 0x2135,
MS_IM = (sal_Unicode) 0x2111,
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 47f26b8..c77b893 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -355,6 +355,7 @@ void Test::SimpleMisc()
parseandparseagain("partial", "Partial");
parseandparseagain("nabla", "Nabla");
parseandparseagain("exists", "There exists");
+ parseandparseagain("notexists", "There not exists");
parseandparseagain("forall", "For all");
parseandparseagain("hbar", "H bar");
parseandparseagain("lambdabar", "Lambda bar");
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 9d618bb..150f0df 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -119,6 +119,7 @@ String RID_LIMX { Text = "lim <?> " ; };
String RID_LIMINFX { Text = "liminf <?> " ; };
String RID_LIMSUPX { Text = "limsup <?> " ; };
String RID_EXISTS { Text = "exists " ; };
+String RID_NOTEXISTS { Text = "notexists " ; };
String RID_FORALL { Text = "forall " ; };
String RID_INTX { Text = "int <?> " ; };
String RID_IINTX { Text = "iint <?> " ; };
@@ -1410,6 +1411,12 @@ Menu RID_COMMANDMENU
};
MenuItem
{
+ Identifier = RID_NOTEXISTS;
+ HelpId = HID_SMA_NOTEXISTS;
+ Text = "not exists";
+ };
+ MenuItem
+ {
Identifier = RID_FORALL;
HelpId = HID_SMA_FORALL;
Text = "forall";
@@ -1513,49 +1520,3 @@ Menu RID_COMMANDMENU
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index c332bbe..69d1b06 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -342,6 +342,9 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
case 0x2203:
pC = " exists ";
break;
+ case 0x2204:
+ pC = " notexists ";
+ break;
case 0x2205:
pC = " emptyset ";
break;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 06859ce..a2f36bf 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -163,6 +163,7 @@ static const SmTokenTableEntry aTokenTable[] =
{ "emptyset" , TEMPTYSET, MS_EMPTYSET, TGSTANDALONE, 5},
{ "equiv", TEQUIV, MS_EQUIV, TGRELATION, 0},
{ "exists", TEXISTS, MS_EXISTS, TGSTANDALONE, 5},
+ { "notexists", TNOTEXISTS, MS_NOTEXISTS, TGSTANDALONE, 5},
{ "exp", TEXP, '\0', TGFUNCTION, 5},
{ "fact", TFACT, MS_FACT, TGUNOPER, 5},
{ "fixed", TFIXED, '\0', TGFONT, 0},
@@ -1449,6 +1450,7 @@ void SmParser::Term()
case TEMPTYSET :
case TINFINITY :
case TEXISTS :
+ case TNOTEXISTS :
case TFORALL :
case TPARTIAL :
case TNABLA :
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index 07e728f..f493e10 100644
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@@ -1339,18 +1339,18 @@ FloatingWindow RID_TOOLBOXWINDOW
};
ToolBoxItem
{
- Identifier = RID_NABLA ;
- HelpId = HID_SMA_NABLA ;
- Text [ en-US ] = "Nabla";
- };
- ToolBoxItem
- {
Identifier = RID_EXISTS ;
HelpId = HID_SMA_EXISTS ;
Text [ en-US ] = "There Exists";
};
ToolBoxItem
{
+ Identifier = RID_NOTEXISTS ;
+ HelpId = HID_SMA_NOTEXISTS ;
+ Text [ en-US ] = "There Not Exists";
+ };
+ ToolBoxItem
+ {
Identifier = RID_FORALL ;
HelpId = HID_SMA_FORALL ;
Text [ en-US ] = "For All";
@@ -1419,7 +1419,9 @@ FloatingWindow RID_TOOLBOXWINDOW
};
ToolBoxItem
{
- Type = TOOLBOXITEM_SPACE ;
+ Identifier = RID_NABLA ;
+ HelpId = HID_SMA_NABLA ;
+ Text [ en-US ] = "Nabla";
};
ToolBoxItem
{
@@ -1726,6 +1728,7 @@ FloatingWindow RID_TOOLBOXWINDOW
RID_PARTIAL ; \
RID_NABLA ; \
RID_EXISTS ; \
+ RID_NOTEXISTS ; \
RID_FORALL ; \
RID_HBAR; \
RID_LAMBDABAR ; \
@@ -1742,7 +1745,7 @@ FloatingWindow RID_TOOLBOXWINDOW
RID_DOTSUP ; \
RID_DOTSDOWN ; \
}; \
- IdCount = { 19 ; };
+ IdCount = { 20 ; };
ImageList RID_IL_MISC
{
diff --git a/svtools/inc/svtools/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx
index 999ee21..37de7da 100644
--- a/svtools/inc/svtools/htmlkywd.hxx
+++ b/svtools/inc/svtools/htmlkywd.hxx
@@ -329,6 +329,7 @@
#define OOO_STRING_SVTOOLS_HTML_S_eta "eta"
#define OOO_STRING_SVTOOLS_HTML_S_euro "euro"
#define OOO_STRING_SVTOOLS_HTML_S_exist "exist"
+#define OOO_STRING_SVTOOLS_HTML_S_notexist "not exist"
#define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof"
#define OOO_STRING_SVTOOLS_HTML_S_forall "forall"
#define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl"
diff --git a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
index d523c5e..e3d842d 100755
--- a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt
@@ -18987,6 +18987,7 @@ OpenOffice.org Math : Thai
OpenOffice.org Math : Thai;entering text
OpenOffice.org Math : Thai;language settings
OpenOffice.org Math : there exists symbol
+OpenOffice.org Math : there not exists symbol
OpenOffice.org Math : thesaurus
OpenOffice.org Math : thesaurus;activating for a language
OpenOffice.org Math : ticker text
diff --git a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
index 0db04d4..30276ce 100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
@@ -15964,6 +15964,7 @@ Oracle Open Office Math : Thai
Oracle Open Office Math : Thai;entering text
Oracle Open Office Math : Thai;language settings
Oracle Open Office Math : there exists symbol
+Oracle Open Office Math : there not exists symbol
Oracle Open Office Math : thesaurus
Oracle Open Office Math : thesaurus;activating for a language
Oracle Open Office Math : ticker text
diff --git a/testautomation/global/win/e_mathop.win b/testautomation/global/win/e_mathop.win
index 9beb74b..4fb1ed4 100644
--- a/testautomation/global/win/e_mathop.win
+++ b/testautomation/global/win/e_mathop.win
@@ -147,6 +147,7 @@ Infinity sym:STARMATH_HID_SMA_INFINITY
Partial sym:STARMATH_HID_SMA_PARTIAL
Nabla sym:STARMATH_HID_SMA_NABLA
ThereExists sym:STARMATH_HID_SMA_EXISTS
+ThereNotExists sym:STARMATH_HID_SMA_NOTEXISTS
ForAll sym:STARMATH_HID_SMA_FORALL
HBar sym:STARMATH_HID_SMA_HBAR
LambdaBar sym:STARMATH_HID_SMA_LAMBDABAR
diff --git a/testautomation/global/win/mathop.win b/testautomation/global/win/mathop.win
index e4f7d3c..e1bdac3 100644
--- a/testautomation/global/win/mathop.win
+++ b/testautomation/global/win/mathop.win
@@ -147,6 +147,7 @@ Unendlich sym:STARMATH_HID_SMA_INFINITY
Partial sym:STARMATH_HID_SMA_PARTIAL
Nabla sym:STARMATH_HID_SMA_NABLA
EsExistiert sym:STARMATH_HID_SMA_EXISTS
+EsNichtExistiert sym:STARMATH_HID_SMA_NOTEXISTS
FuerAlle sym:STARMATH_HID_SMA_FORALL
HQuer sym:STARMATH_HID_SMA_HBAR
LambdaQuer sym:STARMATH_HID_SMA_LAMBDABAR
diff --git a/testautomation/math/required/includes/m_010_.inc b/testautomation/math/required/includes/m_010_.inc
index 7f3cd89..71e6501 100644
--- a/testautomation/math/required/includes/m_010_.inc
+++ b/testautomation/math/required/includes/m_010_.inc
@@ -579,6 +579,10 @@ try
inc i
Printlog " i: "+i
Call Bereinigen
+ ThereNotExists.Click
+ inc i
+ Printlog " i: "+i
+ Call Bereinigen
ForAll.Click
inc i
Printlog " i: "+i
commit c62fc469aa0539929a5c7f9850fb9ee954fe7198
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Fri Sep 16 17:48:47 2011 +0400
fdo#38391: don't crash while dropping texture
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index e3ea718..0874071 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -117,7 +117,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
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)));
commit 1dfe0e7c8d1a8c4d67a14c2c79362af09c0a56cf
Author: Tomas Chvatal <tchvatal at suse.cz>
Date: Sat Sep 17 18:57:43 2011 +0200
Env.Set.sh -> Env.Host.sh
diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index 229b7e8..c18a2c4 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -1,6 +1,6 @@
#!/bin/sh
-. ./*[Ee]nv.[Ss]et.sh
+. ./*[Ee]nv.[Hh]ost.sh
echo "Cleaning up ...";
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 1cb2c42..80e5c4a 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -1,6 +1,6 @@
#!/bin/sh
-. ./*[Ee]nv.[Ss]et.sh
+. ./*[Ee]nv.[Hh]ost.sh
PRODUCTVERSION_NODOT=`echo $PRODUCTVERSION | sed -e "s/\.//"`
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index f3a8bbf..b233030 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -1,6 +1,6 @@
#!/bin/sh
-. ./*[Ee]nv.[Ss]et.sh
+. ./*[Ee]nv.[Hh]ost.sh
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 3dca2af..05175f6 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -1,6 +1,6 @@
#!/bin/sh
-. ./*[Ee]nv.[Ss]et.sh
+. ./*[Ee]nv.[Hh]ost.sh
if test -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk ; then
commit 71047958119334d30cd4389ad4b05553201217b3
Author: David Tardon <dtardon at redhat.com>
Date: Sat Sep 17 14:58:09 2011 +0200
actually create the flag after run
diff --git a/solenv/gdb/makefile.mk b/solenv/gdb/makefile.mk
index da1afb7..4078428 100644
--- a/solenv/gdb/makefile.mk
+++ b/solenv/gdb/makefile.mk
@@ -36,6 +36,6 @@ TARGET=gdb
ALLTAR : $(MISC)/autoloaders.flag
$(MISC)/autoloaders.flag : autoload.template
- install-gdb-printers -a $(MISC) -f
+ install-gdb-printers -a $(MISC) -f && touch $@
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 6a1e292d1684d8e7ac4e26cd15abff19841165a8
Author: Tomas Chvatal <tchvatal at suse.cz>
Date: Sat Sep 17 12:57:29 2011 +0200
Whitespace once again.
Vim tends to replace 8 spaces with 1 tab, must reconfigure...
diff --git a/configure.in b/configure.in
index c3cff3e..6ea36b4 100755
--- a/configure.in
+++ b/configure.in
@@ -7755,7 +7755,7 @@ WITH_THEMES=""
for theme in $with_theme; do
AS_CASE([$theme],
[default|crystal|hicontrast|oxygen|tango], [],
- [AC_MSG_ERROR([Unknown value for --with-themes: $theme])]
+ [AC_MSG_ERROR([Unknown value for --with-themes: $theme])]
)
WITH_THEMES="$WITH_THEMES $theme"
SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[:lower:]' '[:upper:]'`"
commit d0c339682a9c1e3df5d80e899ff2248bfe594b52
Author: Tomas Chvatal <tchvatal at suse.cz>
Date: Sat Sep 17 12:56:18 2011 +0200
Fix whitespace in last commit, add safeguards for the with-theme values.
diff --git a/configure.in b/configure.in
index a99ddb0..c3cff3e 100755
--- a/configure.in
+++ b/configure.in
@@ -7748,16 +7748,20 @@ dnl ===================================================================
AC_MSG_CHECKING([which themes to include])
# if none given, use all available themes
AS_IF([test "x$with_theme" = "x" -o "x$with_theme" = "xyes"], [
- with_theme="default crystal hicontrast oxygen tango"
+ with_theme="default crystal hicontrast oxygen tango"
])
WITH_THEMES=""
for theme in $with_theme; do
+ AS_CASE([$theme],
+ [default|crystal|hicontrast|oxygen|tango], [],
+ [AC_MSG_ERROR([Unknown value for --with-themes: $theme])]
+ )
WITH_THEMES="$WITH_THEMES $theme"
SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[:lower:]' '[:upper:]'`"
done
AC_MSG_RESULT([$WITH_THEMES])
-AC_SUBST(WITH_THEMES)
+AC_SUBST([WITH_THEMES])
dnl ===================================================================
dnl Test whether to integrate helppacks into the product's installer
commit 7b502808dba8a4790a94182bf9835ba702f6f81b
Author: Tomas Chvatal <tchvatal at suse.cz>
Date: Sat Sep 17 12:46:21 2011 +0200
Make --with-theme actually work.
diff --git a/configure.in b/configure.in
index 6fd2d00..a99ddb0 100755
--- a/configure.in
+++ b/configure.in
@@ -7747,15 +7747,14 @@ dnl Test which themes to include
dnl ===================================================================
AC_MSG_CHECKING([which themes to include])
# if none given, use all available themes
-if test "z$enable_theme" = "z" -o "z$enable_theme" = "zyes"; then
- enable_theme="default crystal hicontrast oxygen tango"
-fi
+AS_IF([test "x$with_theme" = "x" -o "x$with_theme" = "xyes"], [
+ with_theme="default crystal hicontrast oxygen tango"
+])
WITH_THEMES=""
-for theme in $enable_theme
-do
+for theme in $with_theme; do
WITH_THEMES="$WITH_THEMES $theme"
- SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[a-z]' '[A-Z]'`"
+ SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[:lower:]' '[:upper:]'`"
done
AC_MSG_RESULT([$WITH_THEMES])
AC_SUBST(WITH_THEMES)
commit b03f2200610f6788f64302891a2942b8a7bb69f2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Sep 17 10:51:39 2011 +0200
Force JVM into interpreted mode when running under Valgrind, to avoid false error reports.
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 5b09a67..27dc8da 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -37,6 +37,11 @@ UNOCOMPONENT1=sunjavaplugin
.INCLUDE : settings.mk
DLLPRE =
+.IF "$(VALGRIND_CFLAGS)" != ""
+CDEFS += -DHAVE_VALGRIND_H
+CFLAGS += $(VALGRIND_CFLAGS)
+.END
+
# ------------------------------------------------------------------
.IF "$(SOLAR_JAVA)"!=""
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index eaaaf3a..7b5b262 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -62,6 +62,12 @@
#include "vendorlist.hxx"
#include "diagnostics.h"
+#if defined HAVE_VALGRIND_H
+#include <valgrind.h>
+#else
+#define RUNNING_ON_VALGRIND 0
+#endif
+
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
#define SUN_MICRO "Sun Microsystems Inc."
@@ -629,20 +635,27 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
return JFW_PLUGIN_E_VM_CREATION_FAILED;
}
+ // Valgrind typically emits many false errors when executing JIT'ed JVM
+ // code, so force the JVM into interpreted mode:
+ bool forceInterpreted = RUNNING_ON_VALGRIND > 0;
+
// Some testing with Java 1.4 showed that JavaVMOption.optionString has to
// be encoded with the system encoding (i.e., osl_getThreadTextEncoding):
JavaVMInitArgs vm_args;
- boost::scoped_array<JavaVMOption> sarOptions(
- new JavaVMOption[cOptions + 1]);
+ sal_Int32 nOptions = 1 + cOptions + (forceInterpreted ? 1 : 0);
+ //TODO: check for overflow
+ boost::scoped_array<JavaVMOption> sarOptions(new JavaVMOption[nOptions]);
JavaVMOption * options = sarOptions.get();
// We set an abort handler which is called when the VM calls _exit during
// JNI_CreateJavaVM. This happens when the LD_LIBRARY_PATH does not contain
// all some directories of the Java installation. This is necessary for
// all versions below 1.5.1
- options[0].optionString= (char *) "abort";
- options[0].extraInfo= (void* )(sal_IntPtr)abort_handler;
+ int n = 0;
+ options[n].optionString= (char *) "abort";
+ options[n].extraInfo= (void* )(sal_IntPtr)abort_handler;
+ ++n;
rtl::OString sClassPathProp("-Djava.class.path=");
rtl::OString sClassPathOption;
for (int i = 0; i < cOptions; i++)
@@ -659,21 +672,27 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
sClassPathOption = sClassPath + rtl::OString(sep) + sAddPath;
else
sClassPathOption = sClassPath;
- options[i+1].optionString = (char *) sClassPathOption.getStr();
- options[i+1].extraInfo = arOptions[i].extraInfo;
+ options[n].optionString = (char *) sClassPathOption.getStr();
+ options[n].extraInfo = arOptions[i].extraInfo;
}
else
{
#endif
- options[i+1].optionString = arOptions[i].optionString;
- options[i+1].extraInfo = arOptions[i].extraInfo;
+ options[n].optionString = arOptions[i].optionString;
+ options[n].extraInfo = arOptions[i].extraInfo;
#ifdef UNX
}
#endif
#if OSL_DEBUG_LEVEL >= 2
- JFW_TRACE2(OString("VM option: ") + OString(options[i+1].optionString) +
+ JFW_TRACE2(OString("VM option: ") + OString(options[n].optionString) +
OString("\n"));
#endif
+ ++n;
+ }
+ if (forceInterpreted) {
+ options[n].optionString = const_cast<char *>("-Xint");
+ options[n].extraInfo = 0;
+ ++n;
}
#ifdef MACOSX
@@ -682,7 +701,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
vm_args.version= JNI_VERSION_1_2;
#endif
vm_args.options= options;
- vm_args.nOptions= cOptions + 1;
+ vm_args.nOptions= nOptions;
vm_args.ignoreUnrecognized= JNI_TRUE;
/* We set a global flag which is used by the abort handler in order to
commit fefbf4014c9b8ec5f1832c3c4a62911a55472658
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Sep 16 16:52:01 2011 +0200
Removed non-ASCII commentary noise.
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index d2e3f04..df75f73 100755
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -130,7 +130,6 @@ public class RecoveryTest extends ComplexTestCase {
* @todo: remove recovery data before start test
* @todo: after a second start after the crash there should no documents recovered anymore
* @todo: enable remove of recovery files
- * @todo: makefile anpassen auf Parameter überprüfen
*/
public String[] getTestMethodNames() {
return new String[]{"testCrash"};
commit c7c120d3603427455120cfbc4e7ceb7a16044129
Author: Andras Timar <atimar at suse.com>
Date: Sat Sep 17 10:16:50 2011 +0200
add name and description of KeyID langpack/helppack
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
index b9bb361..4737584 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -846,3 +846,9 @@ en-US = "Tigrinya"
[STR_DESC_MODULE_HELPPACK_TI]
en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_QTZ]
+en-US = "KeyID"
+
+[STR_DESC_MODULE_HELPPACK_QTZ]
+en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION with a key ID before each paragraph"
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 01f2140..c26b7e9 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -852,3 +852,9 @@ en-US = "Luxembourgish"
[STR_DESC_MODULE_LANGPACK_LB]
en-US = "Installs the Luxembourgish user interface"
+
+[STR_NAME_MODULE_LANGPACK_QTZ]
+en-US = "KeyID"
+
+[STR_DESC_MODULE_LANGPACK_QTZ]
+en-US = "Installs the English user interface with a key ID before each UI element"
commit 27c5d661ff8b00e0f8d2f697a83d6dfe13b540c7
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 22:34:19 2011 +0200
do not build key id pseudolanguage for release builds
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 19868f8..b5291ce 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -77,7 +77,12 @@ LOCALPYFILES= \
$(BIN)$/msgbox.py
.ENDIF
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
+
+# do not build key is pseudolanguage for release builds
+.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
+alllangiso:=$(alllangiso:s/qtz//)
+.ENDIF
allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))
commit c907a667c2dfab0a59ad182883a44bc751a22d53
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 22:35:11 2011 +0200
build multi language dev-installer on windows
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 6880750..19868f8 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -102,12 +102,20 @@ ALLTAR : openofficeall ooohelppack sdkooall
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
.ENDIF
.ENDIF
-.ELSE
+.ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+.IF "$(GUI)"=="WNT"
+ALLTAR : openofficedevall ooodevhelppack
+.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack)
+.ENDIF
+.ELSE
+.IF "$(GUI)"=="WNT"
+ALLTAR : openofficeidevall ooodevhelppack sdkoodevall
.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
.ENDIF
+.ENDIF
.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
commit 5b465d87703e4843be36d7175aa3d5a969f86282
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 19:22:38 2011 +0200
cleanup: don't use German as fallback language
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 8b2eee4..ba6cda8 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -52,7 +52,6 @@
void HelpParser::FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in ){
/*****************************************************************************/
static const ByteString ENGLISH_LANGUAGECODE( "en-US" );
- static const ByteString GERMAN_LANGUAGECODE ( "de" );
ByteString sCur;
XMLElement* pTmp = NULL;
XMLElement* pTmp2 = NULL;
@@ -75,14 +74,6 @@ void HelpParser::FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in
pTmp->ChangeLanguageTag( String( sLangIdx_in , RTL_TEXTENCODING_ASCII_US) );
rElem_out[ sCur ] = pTmp;
pTmp2 = NULL;
- }
- else if( (rElem_out.find( GERMAN_LANGUAGECODE ) != rElem_out.end() ) && rElem_out[ GERMAN_LANGUAGECODE ] != NULL ){// No English
- pTmp2 = rElem_out[ GERMAN_LANGUAGECODE ];
- pTmp = new XMLElement( *pTmp2 ); // Copy
- pTmp->SetPos( pTmp2->GetPos()+1 );
- pTmp->ChangeLanguageTag( String( sLangIdx_in , RTL_TEXTENCODING_ASCII_US ) );
- rElem_out[ sCur ] = pTmp;
- pTmp2 = NULL;
}else{
fprintf(stdout,"ERROR: No Fallback found for language %s:\n",sCur.GetBuffer());
rElem_out[ sCur ]=new XMLElement(); // Use dummy element
@@ -322,7 +313,6 @@ bool ByteStringLess( const ByteString& rKey1, const ByteString& rKey2 ) {
void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile ){
std::vector<ByteString> aTmp;
- const ByteString DE ("de");
const ByteString ENUS ("en-US");
static const ByteString ALL( "ALL" );
@@ -331,7 +321,6 @@ void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDat
if( Export::sLanguages.EqualsIgnoreCaseAscii( ALL ) )
{
aLanguages = aMergeDataFile.GetLanguages();
- aLanguages.push_back( DE );
aLanguages.push_back( ENUS );
if( !Export::sForcedLanguages.Equals("") )
commit a705aec5117fe9123236ebdeb0d6f271b83f8af4
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 16:20:09 2011 +0200
add KeyID option to Language dropdown box
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index f03b2bb..0582765 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -535,6 +535,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_MANX 0x0663
#define LANGUAGE_USER_TEKE_EBOO 0x0664
#define LANGUAGE_USER_ARAGONESE 0x0665
+#define LANGUAGE_USER_KEYID 0x0666 /* key id pseudolanguage */
#endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 5fd8cb4..94f18cc 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -482,6 +482,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_PORTUGUESE_ANGOLA, "pt", "AO" },
{ LANGUAGE_USER_MANX, "gv", "GB" },
{ LANGUAGE_USER_ARAGONESE, "an", "ES" },
+ { LANGUAGE_USER_KEYID, "qtz", "" }, // key id pseudolanguage used for UI testing
{ LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
{ LANGUAGE_DONTKNOW, "", "" } // marks end of table
};
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f84a46e..03469d2 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -340,6 +340,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Teke-Ibali" ; LANGUAGE_USER_TEKE_IBALI ; > ;
< "Teke-Tyee" ; LANGUAGE_USER_TEKE_TYEE ; > ;
< "Vili" ; LANGUAGE_USER_VILI ; > ;
+ < "KeyID" ; LANGUAGE_USER_KEYID ; > ;
};
};
commit 1066677fd5e10bac78b8e4ebbabfa6bd44dc3859
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 09:52:37 2011 +0200
add a new helper script: addkeyid2pot.pl
It adds key IDs to pot entries in the form of #. type comments.
In Pootle the translator can search for strings using the key IDs.
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index ad2d715..bcbe252 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -40,6 +40,7 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
..\scripts\localize %_DEST%\bin\localize
..\scripts\fast_merge.pl %_DEST%\bin\fast_merge.pl
..\scripts\keyidGen.pl %_DEST%\bin\keyidGen.pl
+..\scripts\addkeyid2pot.pl %_DEST%\bin\addkeyid2pot.pl
..\scripts\po2lo %_DEST%\bin\po2lo
..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx
..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
diff --git a/l10ntools/scripts/addkeyid2pot.pl b/l10ntools/scripts/addkeyid2pot.pl
new file mode 100644
index 0000000..bd66a3b
--- /dev/null
+++ b/l10ntools/scripts/addkeyid2pot.pl
@@ -0,0 +1,106 @@
+:
+eval 'exec perl -S $0 ${1+"$@"}'
+ if 0;
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Andras Timar <atimar at suse.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+# add keyids to pot files
+#
+
+use File::Find;
+
+sub keyidgen
+{
+ my $key = shift;
+ my $crc = crc24($key);
+ my $symbols="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#_";
+ my $keyid = "";
+ while ( length($keyid) < 4 )
+ {
+ $keyid .= substr($symbols, $crc & 63, 1);
+ $crc = $crc >> 6;
+ }
+ return $keyid;
+}
+
+sub crc24
+{
+ my $CRC24_INIT = 0x00b704ce;
+ my $CRC24_POLY = 0x00864cfb;
+ my $key = shift;
+ my $key_length = length($key);
+ my $crc = $CRC24_INIT;
+ my $position = 0;
+
+ while ( $position < $key_length )
+ {
+ $crc ^= (unpack("C", substr($key, $position, 1)) << 16);
+ my $i;
+ for ($i = 0; $i < 8; $i++)
+ {
+ $crc <<= 1;
+ $crc ^= $CRC24_POLY if ($crc & 0x01000000)
+ }
+ $position++;
+ }
+ return $crc & 0x00ffffff;
+}
+
+my $potdir = $ARGV[0];
+
+if (!$potdir) {die "Usage_ $0 <directory of pot files>\n";}
+
+my @potfiles = ();
+
+File::Find::find( sub {/^.*\.pot\z/s && push @potfiles, $File::Find::name;}, $potdir );
+
+foreach $f (@potfiles)
+{
+ open OLDPOT , "< $f" || die("Cannot open source pot file: $f\n");
+ $fnew = $f . ".new";
+ @path = split ("/",$f);
+ $keypart1 = pop @path;
+ $keypart1 =~ s/.pot//;
+ $keypart1 .= "_";
+ $keypart2 = pop @path;
+ $keypart1 = $keypart2 . "_" . $keypart1;
+ open NEWPOT , "> $fnew" || die("Cannot open target pot file: $f\n");
+ while ( <OLDPOT> )
+ {
+ chomp;
+ if( /^#: (.*)$/ )
+ {
+ print NEWPOT "#. " . keyidgen($keypart1 . $1) . "\n";
+ }
+ print NEWPOT $_ . "\n";
+ }
+ close OLDPOT;
+ close NEWPOT;
+ rename $fnew,$f;
+}
+
+exit 0;
commit 81da24399ef43f235968bbc9eb49ca6158170538
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 09:55:50 2011 +0200
rewrite keyidGen.pl
it creates 4 letter key IDs (same as in pot/po files)
diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl
index 53423c2..bb9eae9 100644
--- a/l10ntools/scripts/keyidGen.pl
+++ b/l10ntools/scripts/keyidGen.pl
@@ -31,15 +31,10 @@ eval 'exec perl -S $0 ${1+"$@"}'
# add keyids to sdf file
#
-use Compress::Zlib();
+my $infile = $ARGV[0];
+if ( !$infile ) {die "Usage: $0 <infile> [<outfile>]\n";}
-print "\nkeyidGen version 1.0 \n\n";
-
-my ( $infile,$outfile,$dbimport );
-get_options();
-
-print_help() if ( !defined $infile || $help );
-exit 1 if ( !defined $infile );
+my $outfile = $ARGV[1];
if ( ! defined $outfile )
{
$outfile = $infile;
@@ -47,139 +42,105 @@ if ( ! defined $outfile )
$outfile .= "_KeyID.sdf";
}
-$collisions = 0;
-%hashcodes = ();
-$count = 0;
print "writing to $outfile\n";
open INFILE,"<$infile" || die "could not open $infile $! $^E\n";
open OUTFILE,">$outfile" || die "could not open $outfile $! $^E\n";
while ( <INFILE> )
{
- $line = $_;
- chomp $line;
- $hash = 0;
- if ( $line =~ /^([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)$/ )
+ chomp;
+ if ( /^([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)$/ )
{
- $string="$1 $2 $4 $5 $6 $7 $8";
- $hashp = makeID( $string );
-
- if ( defined ($hashcodes{ $hashp } ) )
- {
- $collisions ++ unless $hashcodes{ $hashp } eq $string;
- }
- $hashcodes{ $hashp } = $string;
- $count++;
- if ( $dbimport )
- {
- my ( $pre, $post, $old );
- $pre = "$1\t$2\t";
- $post = "\t$4\t$5\t$6\t$7\t$8\t$9\t$10\t$11\t$12\t$13\t$14\t$15\n";
- $old = $3;
- $old =~ s/;{0,1}keyid:......;{0,1}//;
- $old =~ s/^0$//;
- if ( $old ne "" ) { $old .= ";"; }
- print OUTFILE "$pre${old}keyid:$hashp$post";
- }
- else
- {
- print OUTFILE "$1\t$2\t$3\t$4\t$5\t$6\t$7\t$8\t$9\t$10\t".makekidstr($hashp,$11)."\t".makekidstr($hashp,$12)."\t$13\t".makekidstr($hashp,$14)."\t$15\n";
- }
+ my $prj = defined $1 ? $1 : '';
+ my $file = defined $2 ? $2 : '';
+ my $dummy = defined $3 ? $3 : '';
+ my $type = defined $4 ? $4 : '';
+ my $gid = defined $5 ? $5 : '';
+ my $lid = defined $6 ? $6 : '';
+ my $helpid = defined $7 ? $7 : '';
+ my $platform = defined $8 ? $8 : '';
+ my $width = defined $9 ? $9 : '';
+ my $lang = defined $10 ? $10 : '';
+ my $text = defined $11 ? $11 : '';
+ my $helptext = defined $12 ? $12 : '';
+ my $quickhelptext = defined $13 ? $13 : '';
+ my $title = defined $14 ? $14 : '';
+ my $timestamp = defined $15 ? $15 : '';
+ @path = split ( "\\\\" , $file );
+ $key = $path[-3] . "_" . $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);}
+ 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";
}
}
-print "$count entries\n";
-print "$collisions collisions\n";
close INFILE;
close OUTFILE;
-sub makeID
+sub keyidgen
{
- my ( $String ) = shift;
- my ( $hash );
- # hardcoded to prevent windows installer to choke on bad directoryname :-((
- if ( $String eq "scp2 source\\ooo\\directory_ooo.ulf LngText STR_DIR_KAPITEL " )
+ my $key = shift;
+ my $crc = crc24($key);
+ my $symbols="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#_";
+ my $keyid = "";
+ while ( length($keyid) < 4 )
{
- return "keyid1";
+ $keyid .= substr($symbols, $crc & 63, 1);
+ $crc = $crc >> 6;
}
-
- $hash = Compress::Zlib::crc32( $String, undef );
- return makenumber( $hash );
+ return $keyid;
}
-sub makenumber
+sub crc24
{
- $h = shift;
- # 1 2 3 4
- # 1234567890123456789012345678901234567890
- $symbols="0123456789abcdefghijklmnopqrstuvwxyz+-[=]";
- $order = length($symbols);
- $result = "";
- while ( length( $result ) < 6 )
+ my $CRC24_INIT = 0x00b704ce;
+ my $CRC24_POLY = 0x00864cfb;
+ my $key = shift;
+ my $key_length = length($key);
+ my $crc = $CRC24_INIT;
+ my $position = 0;
+
+ while ( $position < $key_length )
{
- $result .= substr( $symbols, ($h % $order), 1 );
- $h = int( $h / $order );
+ $crc ^= (unpack("C", substr($key, $position, 1)) << 16);
+ my $i;
+ for ($i = 0; $i < 8; $i++)
+ {
+ $crc <<= 1;
+ $crc ^= $CRC24_POLY if ($crc & 0x01000000)
+ }
+ $position++;
}
- die "makenumber failed because number is too big (this cannot be so this is a strange error)" if $h > 0;
-
- return reverse $result;
+ return $crc & 0x00ffffff;
}
-sub makekidstr
+sub makekeyidstr
{
- $kid = shift;
- $str = shift;
+ my $keyid = shift;
+ my $str = shift;
if ( $str ne "" )
{
# special handling for strings starting with font descriptions like {&Tahoma8} (win system integration)
- if ( $str =~ s/^(\{\&[^\}]+\})// )
+ if ( $str =~ s/^(\{[\&\\][^\}]+\})// )
{
- return "$1$kid‖$str";
+ return "$1$keyid‖$str";
}
else
{
- return "$kid‖$str";
+ return "$keyid‖$str";
}
}
else
{
return "";
}
-# return "default";
-}
-
-sub print_help
-{
- print "\n\n";
- print "keyidGen 0.5 for sdf files\n";
- print "--------------------------\n";
- print "Usage:\n";
- print "keyidGen <infile> [<outfile>] [-dbimport]\n";
- print " add keyids to the entries and write them to a file with\n";
- print " _KeyID added to the name\n";
- print " -dbimport Add KeyID to a new column instead of to the strings.\n";
- print " This is needed to import the IDs into tha database.\n";
- print "\n\n";
-}
-
-
-sub get_options {
- my ($arg,$has_infile);
-
- while ($arg = shift @ARGV) {
- $arg =~ /^-dbimport$/ and $dbimport = 1 and next;
- $arg =~ /^-help$/ and $help = 1 and next; #show help
-
- if ( !$has_infile )
- {
- $infile = $arg;
- $has_infile = 1;
- }
- else
- {
- $outfile = $arg;
- }
- }
}
commit 8c49b1eb73eb8f8433ed86877ffdd08c5f8119c4
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:40:32 2011 +0200
remove former key id language code 'kid'
diff --git a/configure.in b/configure.in
index 8a4c4da..6fd2d00 100755
--- a/configure.in
+++ b/configure.in
@@ -8933,7 +8933,6 @@ fi
# check that the list is valid
for lang in $WITH_LANG ; do
test "$lang" = "ALL" && continue;
- test "$lang" = "kid" && continue;
# need to check for the exact string, so add space before and after the list of all languages
for vl in $ALL_LANGS ; do
if test "$vl" = "$lang" ; then
commit 77962008887b1c26a972a63174a385948d5f5701
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:27:04 2011 +0200
add qtz (key id pseudolanguage) to langlist.mk
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index c0d03c7..161bc5b 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -100,6 +100,7 @@ pa-IN \
pl \
pt \
pt-BR \
+qtz \
ro \
ru \
rw \
commit 9683ab6c7e1aa0da504a10e37b199d2c0a5290f1
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:22:03 2011 +0200
remove unused BrOffice files
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 204c608..0000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-[PRODUCTCODE]
-en-US = "{7FFF1607-39C1-45D7-8D6A-DE97A3FE26A1}"
-pt = "{4BF466E8-7FF4-4422-9FCE-1F0AE3DA00EE}"
-ru = "{34A3166C-BF5E-4751-A52E-CA68C139F688}"
-el = "{614C96E4-DBB0-4EFF-A9BB-2744E75919EB}"
-nl = "{76ABABE4-11C3-4783-BA87-6E76EC58F4DB}"
-fr = "{A8D2F106-57BF-437A-85F2-6FDE96D5E923}"
-es = "{74E55CA0-5F61-4B3F-AFE9-C450C352177F}"
-fi = "{7B47880A-4C73-4052-B41E-9CFDDC09D9B2}"
-hu = "{797671B4-BC60-4171-9084-D97F87B15B99}"
-ca = "{EB478242-B1CC-402C-AAB0-B038446E1BC3}"
-it = "{ED45979C-7EE4-4D04-89C5-489DCEAD1009}"
-cs = "{8DDBA77B-86FB-4AFC-A9CE-7960585108E3}"
-sk = "{7664A926-AA39-4DB6-AE12-98B7305B708B}"
-en-GB = "{4B514E15-F8EB-457D-924E-0C4EA6C29FE5}"
-da = "{6321486D-351A-451F-9C23-FF334A4E41FA}"
-sv = "{76B88102-58E7-4F89-90B9-B21185AA45E5}"
-no = "{1E36FA46-AC57-47FB-94FE-EF7B32B9056C}"
-pl = "{A316E11D-7907-460E-8E64-DEEFCD0F929A}"
-de = "{A3BE065F-8E3B-46CA-946A-101A8E077D2B}"
-pt-BR = "{45B77400-62B3-4469-8B12-A0813B0FE13F}"
-th = "{C37B84EC-EB6B-4909-9866-D582A0E4B27D}"
-et = "{A4107B22-C84B-4783-B1AA-454A884144B7}"
-ja = "{F68C3D57-AB20-4106-B3F2-4A51E8F12D27}"
-ko = "{D6C21010-B224-4121-83BE-BCFD41E2780F}"
-zh-CN = "{D27CE6D1-50E5-4895-8CC0-5D1D25D882F9}"
-zh-TW = "{1203F697-9652-44B2-A806-3F13A53101AC}"
-tr = "{DB6EBF02-F0A5-44ED-AF5C-BF97E2C6570A}"
-hi = "{9BA2E02E-ACFA-4D4A-8F34-12E3F2BA29E5}"
-ar = "{5B8ADBF2-5377-44C7-8ADA-3A3AF516E401}"
-he = "{F893A538-DA46-4667-B580-84DFB3CD5336}"
-multiwestern = "{E954C6C0-1C6E-4BB6-B8F2-F655429E6D73}"
-multiasia = "{881B24EF-5676-481C-B1C4-49964E203329}"
-
-[UPGRADECODE]
-en-US = "{DB4A0242-FD72-41DA-87A2-5466AE05BE03}"
-pt = "{AA393994-0DBE-45A1-8393-BCA1927527F6}"
-ru = "{626BAA92-954C-4A6C-9AF3-F9C146FAEEAB}"
-el = "{B884FE02-C0B1-40A5-9A05-3D92923B10E8}"
-nl = "{83D4730E-7069-4ED8-8D2C-50E2878A84CF}"
-fr = "{2F7D3F37-6191-44BB-8C14-5A0F3D1CDC06}"
-es = "{FCBF48CD-EBE3-4B65-9A9F-C73399CE2BF4}"
-fi = "{CA1322F8-8213-401D-8501-2B70F8F944E0}"
-hu = "{A5FD8B52-2E09-45C5-A84B-67DA1DA8BD93}"
-ca = "{80DD06D1-ABEE-4E85-8C23-E1031FC024B0}"
-it = "{7CA64ED6-373D-4C92-8224-360F1451E828}"
-cs = "{C16BE41C-1534-47E2-9D6F-EE3F45EFB075}"
-sk = "{82ACA684-1BD8-4A22-AC70-5E9754047357}"
-en-GB = "{B2583886-6021-42B5-BB84-71D2C7D9B91E}"
-da = "{953E09D5-4C1E-483A-A792-DD6C9A51D4E9}"
-sv = "{B6DF5C8D-177F-47DE-A9F6-0C6E4FCDF668}"
-no = "{52CFD54B-A5AE-4296-A02C-806083B90FFF}"
-pl = "{9EB27D9C-891F-4B40-A1FA-176D72088860}"
-de = "{73531239-44BD-4EE8-81B1-7EA9A63E2BE1}"
-pt-BR = "{EB286FF5-8182-4F12-8B58-320DABC7472F}"
-th = "{3B67E9E0-7177-420E-AF69-B58A0B9D22D2}"
-et = "{6718E3FB-C936-4699-82C0-E59F45E30D99}"
-ja = "{EDD352F1-431A-4275-A658-C9A516290616}"
-ko = "{69BB5E59-48BC-4906-B700-7E76EAEB076C}"
-zh-CN = "{9D3F52D5-2464-4F4D-9F2A-281B85911F7B}"
-zh-TW = "{8D0A9A70-F424-4FE2-AC27-50F8A409C602}"
-tr = "{CF7A11FA-FE24-427F-979C-016A7E1B2E8E}"
-hi = "{0D1A91F3-4B2D-4893-A720-8795F1DA848B}"
-ar = "{20A9E4BF-6D89-4183-BE25-24C5F693B141}"
-he = "{CC37C202-D6B7-4821-9015-0A25EB4E6CD8}"
-multiwestern = "{B2269A43-2FC5-44AF-A0EE-D85CD2C6135C}"
-multiasia = "{3B4B8C3C-AC32-4644-B7C5-79836EBD6784}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 204c608..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-[PRODUCTCODE]
-en-US = "{7FFF1607-39C1-45D7-8D6A-DE97A3FE26A1}"
-pt = "{4BF466E8-7FF4-4422-9FCE-1F0AE3DA00EE}"
-ru = "{34A3166C-BF5E-4751-A52E-CA68C139F688}"
-el = "{614C96E4-DBB0-4EFF-A9BB-2744E75919EB}"
-nl = "{76ABABE4-11C3-4783-BA87-6E76EC58F4DB}"
-fr = "{A8D2F106-57BF-437A-85F2-6FDE96D5E923}"
-es = "{74E55CA0-5F61-4B3F-AFE9-C450C352177F}"
-fi = "{7B47880A-4C73-4052-B41E-9CFDDC09D9B2}"
-hu = "{797671B4-BC60-4171-9084-D97F87B15B99}"
-ca = "{EB478242-B1CC-402C-AAB0-B038446E1BC3}"
-it = "{ED45979C-7EE4-4D04-89C5-489DCEAD1009}"
-cs = "{8DDBA77B-86FB-4AFC-A9CE-7960585108E3}"
-sk = "{7664A926-AA39-4DB6-AE12-98B7305B708B}"
-en-GB = "{4B514E15-F8EB-457D-924E-0C4EA6C29FE5}"
-da = "{6321486D-351A-451F-9C23-FF334A4E41FA}"
-sv = "{76B88102-58E7-4F89-90B9-B21185AA45E5}"
-no = "{1E36FA46-AC57-47FB-94FE-EF7B32B9056C}"
-pl = "{A316E11D-7907-460E-8E64-DEEFCD0F929A}"
-de = "{A3BE065F-8E3B-46CA-946A-101A8E077D2B}"
-pt-BR = "{45B77400-62B3-4469-8B12-A0813B0FE13F}"
-th = "{C37B84EC-EB6B-4909-9866-D582A0E4B27D}"
-et = "{A4107B22-C84B-4783-B1AA-454A884144B7}"
-ja = "{F68C3D57-AB20-4106-B3F2-4A51E8F12D27}"
-ko = "{D6C21010-B224-4121-83BE-BCFD41E2780F}"
-zh-CN = "{D27CE6D1-50E5-4895-8CC0-5D1D25D882F9}"
-zh-TW = "{1203F697-9652-44B2-A806-3F13A53101AC}"
-tr = "{DB6EBF02-F0A5-44ED-AF5C-BF97E2C6570A}"
-hi = "{9BA2E02E-ACFA-4D4A-8F34-12E3F2BA29E5}"
-ar = "{5B8ADBF2-5377-44C7-8ADA-3A3AF516E401}"
-he = "{F893A538-DA46-4667-B580-84DFB3CD5336}"
-multiwestern = "{E954C6C0-1C6E-4BB6-B8F2-F655429E6D73}"
-multiasia = "{881B24EF-5676-481C-B1C4-49964E203329}"
-
-[UPGRADECODE]
-en-US = "{DB4A0242-FD72-41DA-87A2-5466AE05BE03}"
-pt = "{AA393994-0DBE-45A1-8393-BCA1927527F6}"
-ru = "{626BAA92-954C-4A6C-9AF3-F9C146FAEEAB}"
-el = "{B884FE02-C0B1-40A5-9A05-3D92923B10E8}"
-nl = "{83D4730E-7069-4ED8-8D2C-50E2878A84CF}"
-fr = "{2F7D3F37-6191-44BB-8C14-5A0F3D1CDC06}"
-es = "{FCBF48CD-EBE3-4B65-9A9F-C73399CE2BF4}"
-fi = "{CA1322F8-8213-401D-8501-2B70F8F944E0}"
-hu = "{A5FD8B52-2E09-45C5-A84B-67DA1DA8BD93}"
-ca = "{80DD06D1-ABEE-4E85-8C23-E1031FC024B0}"
-it = "{7CA64ED6-373D-4C92-8224-360F1451E828}"
-cs = "{C16BE41C-1534-47E2-9D6F-EE3F45EFB075}"
-sk = "{82ACA684-1BD8-4A22-AC70-5E9754047357}"
-en-GB = "{B2583886-6021-42B5-BB84-71D2C7D9B91E}"
-da = "{953E09D5-4C1E-483A-A792-DD6C9A51D4E9}"
-sv = "{B6DF5C8D-177F-47DE-A9F6-0C6E4FCDF668}"
-no = "{52CFD54B-A5AE-4296-A02C-806083B90FFF}"
-pl = "{9EB27D9C-891F-4B40-A1FA-176D72088860}"
-de = "{73531239-44BD-4EE8-81B1-7EA9A63E2BE1}"
-pt-BR = "{EB286FF5-8182-4F12-8B58-320DABC7472F}"
-th = "{3B67E9E0-7177-420E-AF69-B58A0B9D22D2}"
-et = "{6718E3FB-C936-4699-82C0-E59F45E30D99}"
-ja = "{EDD352F1-431A-4275-A658-C9A516290616}"
-ko = "{69BB5E59-48BC-4906-B700-7E76EAEB076C}"
-zh-CN = "{9D3F52D5-2464-4F4D-9F2A-281B85911F7B}"
-zh-TW = "{8D0A9A70-F424-4FE2-AC27-50F8A409C602}"
-tr = "{CF7A11FA-FE24-427F-979C-016A7E1B2E8E}"
-hi = "{0D1A91F3-4B2D-4893-A720-8795F1DA848B}"
-ar = "{20A9E4BF-6D89-4183-BE25-24C5F693B141}"
-he = "{CC37C202-D6B7-4821-9015-0A25EB4E6CD8}"
-multiwestern = "{B2269A43-2FC5-44AF-A0EE-D85CD2C6135C}"
-multiasia = "{3B4B8C3C-AC32-4644-B7C5-79836EBD6784}"
commit 2dbfcccc6f87e88ac76e80624f70aa6061cf9080
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:19:48 2011 +0200
change key id pseudolanguage code from kid to qtz
kid is language code of Koshin. It is better to use a code
from the ISO 639 private range.
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
index b833e91..3b3595d 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
@@ -77,7 +77,6 @@ hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
-kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
@@ -114,6 +113,7 @@ pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
+qtz = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
index 0564ebc..6310159 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
@@ -77,7 +77,6 @@ hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
-kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
@@ -114,6 +113,7 @@ pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
+qtz = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
index b833e91..3b3595d 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
@@ -77,7 +77,6 @@ hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
-kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
@@ -114,6 +113,7 @@ pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
+qtz = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
index 0564ebc..6310159 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
@@ -77,7 +77,6 @@ hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
-kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
@@ -114,6 +113,7 @@ pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
+qtz = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index ff3e9f3..6e95e4c 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -56,7 +56,6 @@ ja 932 1041
jbo 0 1624
ka 0 1079 # Georgian
kab 0 1625
-kid 1252 1033 # key id pseudo language
kk 0 1087
km 0 1107 # Khmer
kn 0 1099 # Kannada
@@ -101,6 +100,7 @@ ps 0 2171
pt 1252 2070
pt-BR 1252 1046
pt-PT 1252 2070
+qtz 1252 1033 # key id pseudo language
rm 0 1047 # Raeto-Romance
ro 1250 1048 # Romanian
ru 1251 1049
commit 568e1b979451e29483d06dabebef7ac17b416841
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Fri Sep 16 17:27:16 2011 -0400
When pasting from other apps, fall back on Fragment span.
We need to handle fragment span in case the HTML span is not provided
by the source application. According to the MS spec it is allowed.
The old code assumed that the source app would always provide an
HTML span. Apparently some apps don't, and only provides a fragment
span.
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index badd200..8d0c354 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -44,12 +44,12 @@ MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pStrm )
delete pStrm, pStrm = 0;
rtl::OString sLine, sVersion;
- sal_uIntPtr nStt = 0, nEnd = 0;
+ sal_Int32 nStt = -1, nEnd = -1, nFragStart = -1, nFragEnd = -1;
sal_Int32 nIndex = 0;
rStream.Seek(STREAM_SEEK_TO_BEGIN);
@@ -64,16 +64,20 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
nIndex = 0;
rtl::OString sTmp(sLine.getToken(0, ':', nIndex));
if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML")))
- nStt = (sal_uIntPtr)(sLine.copy(nIndex).toInt32());
+ nStt = sLine.copy(nIndex).toInt32();
else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML")))
- nEnd = (sal_uIntPtr)(sLine.copy(nIndex).toInt32());
+ nEnd = sLine.copy(nIndex).toInt32();
+ else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartFragment")))
+ nFragStart = sLine.copy(nIndex).toInt32();
+ else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndFragment")))
+ nFragEnd = sLine.copy(nIndex).toInt32();
else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("SourceURL")))
sBaseURL = S2U(sLine.copy(nIndex));
- if( nEnd && nStt &&
- ( sBaseURL.Len() || rStream.Tell() >= nStt ))
+ if (nEnd >= 0 && nStt >= 0 &&
+ (sBaseURL.Len() || rStream.Tell() >= static_cast<sal_Size>(nStt)))
{
- bRet = sal_True;
+ bRet = true;
break;
}
}
@@ -89,9 +93,24 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
*pStrm << rStream;
pStrm->SetStreamSize( nEnd - nStt + 1L );
pStrm->Seek( STREAM_SEEK_TO_BEGIN );
+ return pStrm;
}
- return pStrm;
+ if (nFragStart > 0 && nFragEnd > 0 && nFragEnd > nFragStart)
+ {
+ sal_uIntPtr nSize = static_cast<sal_uIntPtr>(nFragEnd - nFragStart + 1);
+ if (nSize < 0x10000L)
+ {
+ rStream.Seek(nFragStart);
+ pStrm = new SvCacheStream(nSize);
+ *pStrm << rStream;
+ pStrm->SetStreamSize(nSize);
+ pStrm->Seek(STREAM_SEEK_TO_BEGIN);
+ return pStrm;
+ }
+ }
+
+ return NULL;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c0022716105b9935ae16d3817191c546d3f8e0da
Author: Tomas Chvatal <tchvatal at suse.cz>
Date: Sat Sep 17 05:44:43 2011 +0200
Fix install for presenter extension.
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 1a3c052..6427c25 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -288,7 +288,7 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
+$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
@echo creating $@
@-$(MKDIRHIER) $(@:d)
$(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list