[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 7744c4a0016be338c6c14b14f620d8af7d76111e Author: László Németh nem...@numbertext.org Date: Fri Oct 25 08:30:30 2013 +0200 librelogo: fix division with measurements Change-Id: I2204002533bbb3e7c801b3228b0310a42b19a882 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 9ad5622..f46f127 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1413,7 +1413,7 @@ def __loadlang__(lang, a): [r(?=\n)__repeat__([^\n]*\w[^\n]*):(?=\n), for %s in range(1, 1+int(\\1)): % repcount], # repeat block [r(?=\d)[%s](?=\d) % a['DECIMAL'], .], # decimal sign [r(?!/)/(?!/), *1.0/], # fix division: /1 - /1.0, but not with // -[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['HOUR'], \\1*30], # 12h = 12*30° +[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['HOUR'], lambda r: str(float(r.group(1).replace(,, .))*30)], # 12h = 12*30° [r(?=\d)(%s) % a['DEG'], ], # 1° - 1 [r(?!:)\b(?:__def__)[ \t]+(\w+)\b[ \t]*([:]?\w[^\n]*), \ndef \\1(\\2):\n[], [r(?!:)\b(?:__def__)\s+(\w+), \ndef \\1():\n[], @@ -1486,9 +1486,9 @@ def __loadlang__(lang, a): [r(?!:)\b(?:%s)\b % a['PRINT'], \n)Print(], [r(?!:)\b(?:%s)\b % a['TURNLEFT'], \n)turnleft(], [r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['PT'], \\1], -[r\b([0-9]+([,.][0-9]+)?)(%s)(?!\w) % a['INCH'], \\1*72], -[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['MM'], \\1*%s % __MM_TO_PT__], -[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['CM'], \\1*%s*10 % __MM_TO_PT__], +[r\b([0-9]+([,.][0-9]+)?)(%s)(?!\w) % a['INCH'], lambda r: str(float(r.group(1).replace(,, .))*72)], +[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['MM'], lambda r: str(float(r.group(1).replace(,, .))*__MM_TO_PT__)], +[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['CM'], lambda r: str(float(r.group(1).replace(,, .))*__MM_TO_PT__*10)], [r\b(__(?:int|float|string)__len|round|abs|sin|cos|sqrt|set|list|tuple|sorted)\b ((?:\w|\d+([,.]\d+)?|0[xX][0-9a-fA-F]+|[-+*/]| )+)\) , \\1(\\2)) ], # fix parsing: (1 + sqrt x) - (1 + sqrt(x)) [r(?=[-*/=+,]) ?\n\)(\w+)\(, \\1()], # read attributes, eg. x = fillcolor [r(?=return) ?\n\)(\w+)\(, \\1()], # return + user function ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Why typing in Writer instantiates the JVM on Mac OS X
Norbert, the problem is that Ubuntu doesnt have the sun java in the repo, it can be installed but not readily available in the default enabled repos. The question I think becomes if its possible to include support for the open jdk. On Fri, Oct 25, 2013 at 12:49 AM, Norbert Thiebaud nthieb...@gmail.comwrote: On Thu, Oct 24, 2013 at 12:02 PM, Stephan Bergmann sberg...@redhat.com wrote: With problems popping up for users after upgrading to Mac OS X Mavericks So... I installed a libreoffice 4.1 (latest stable release) I made sure that java was working for libreoffice. then I upgraded to maverick immediately after the install was done, I started libreoffice again... then selected 'Writer'... typed a charactere A pop up showed-up warning me that Java 1.6 is not avaialble, and asked me if I wanted to install it. I answered no to the request to install java at this point there is no more lo running, although there was no crash-report dialog. I started again... a lo crash recovery windows was presented for the writer document I was on... I said no to recovery and proceeded with creating a new writter document.. same symptom... this time I replied 'yes' to the install of java after java has been installed, Libreoffice is restarted automatically, and a lo-crash-recovery windows is presented again... After that lo works normally Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Jonathan Aquilina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2013-10-25
Moin! * Open changes on master for project core changed in the last 25 hours: + gbuild: refactor Jar target to stop using OUTDIR in https://gerrit.libreoffice.org/6429 from Michael Stahl + gbuild: add gb_ExternalProject_use_jars in https://gerrit.libreoffice.org/6428 from Michael Stahl + stop looking for Jar files in solver in https://gerrit.libreoffice.org/6427 from Michael Stahl + gbuild: add gb_Jar_use_external_jar in https://gerrit.libreoffice.org/6426 from Michael Stahl + RepositoryExternal: fix layer of de-extensionized Jars in https://gerrit.libreoffice.org/6425 from Michael Stahl + fdo#69772: table wizard not functional for Firebird embedded database in https://gerrit.libreoffice.org/6412 from Julien Nabet + include rtl/ustring.hxx instead of tools/string.hxx in https://gerrit.libreoffice.org/6424 from Christina Roßmanith + fdo#54938: More uses of cppu::supportsService in https://gerrit.libreoffice.org/6423 from Marcos Souza + Check no empty font name is exported in https://gerrit.libreoffice.org/6319 from Yogesh Bharate + w:pict element was wrongly exported as child of w:rPr element. in https://gerrit.libreoffice.org/6366 from Sushil Shinde + #65836- Fix for exporting image inside vml data was corrupting file. in https://gerrit.libreoffice.org/6369 from Sushil Shinde * Merged changes on master for project core changed in the last 25 hours: + fdo#54938: Remove SupportsServiceImpl from sw and use cppu instead in https://gerrit.libreoffice.org/6418 from Marcos Souza + avoid localization issue in https://gerrit.libreoffice.org/6419 from Laurent Godard + openssl: use libraries from WORKDIR in https://gerrit.libreoffice.org/6410 from Michael Stahl + remove useless commented code in https://gerrit.libreoffice.org/6414 from Laurent Godard + added links to the image in tiled rendering in https://gerrit.libreoffice.org/6397 from Ptyl + cppunit: remove ExternalPackage in https://gerrit.libreoffice.org/6409 from Michael Stahl * Abandoned changes on master for project core changed in the last 25 hours: + Backport for bug fdo#70345 in https://gerrit.libreoffice.org/6250 from matthieu gay * Open changes needing tweaks, but being untouched for more than a week: + Generate configure before calling ./configure --help in https://gerrit.libreoffice.org/6291 from Arnaud Versini + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Why typing in Writer instantiates the JVM on Mac OS X
On 10/25/2013 07:36 AM, Jonathan Aquilina wrote: Norbert, the problem is that Ubuntu doesnt have the sun java in the repo, it can be installed but not readily available in the default enabled repos. The question I think becomes if its possible to include support for the open jdk. This thread is about a specific problem with Java on Mac OS X. If you have problems in combination with Ubuntu and Java (and note that OpenJDK /is/ generally supported by LO), I'd suggest you take that to an Ubuntu-specific venue. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile |4 ++-- android/experimental/LibreOffice4Android/Makefile |4 ++-- android/experimental/desktop/Makefile |5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) New commits: commit 01a13519e2a12e1e9b61bab1437d340e389e44bf Author: Tor Lillqvist t...@collabora.com Date: Fri Oct 25 10:50:54 2013 +0300 Fix bit-rot Change-Id: Iae6aa3c1326456dde7261f471ba7d963058f20a7 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 034b14f..63104dd 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -38,8 +38,8 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - cp -R $(INSTDIR)/share/registry assets/share mkdir -p assets/share/config + cp -R $(INSTDIR)/share/registry assets/share cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app @@ -60,7 +60,7 @@ copy-stuff: echo LO_LIB_DIR=file:$(APP_DATA_PATH)/lib/ assets/program/fundamentalrc echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/ assets/program/fundamentalrc # checkme - is this used to find configs ? echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc - echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc + echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' assets/program/fundamentalrc echo 'URE_MORE_TYPES=file://$(APP_DATA_PATH)/program/offapi.rdb file://$(APP_DATA_PATH)/program/oovbaapi.rdb' assets/program/fundamentalrc echo 'URE_MORE_SERVICES=file:///assets/program/services/services.rdb' assets/program/fundamentalrc diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index fee5198..ee3325d 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -38,8 +38,8 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - cp -R $(INSTDIR)/share/registry assets/share mkdir -p assets/share/config + cp -R $(INSTDIR)/share/registry assets/share cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app @@ -60,7 +60,7 @@ copy-stuff: echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' assets/program/fundamentalrc echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/' assets/program/fundamentalrc # checkme - is this used to find configs ? echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc - echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc + echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway' assets/program/fundamentalrc # # Set up unorc diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index a42b716..7a00e7e 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -39,8 +39,8 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - cp -R $(INSTDIR)/share/registry assets/share mkdir -p assets/share/config + cp -R $(INSTDIR)/share/registry assets/share cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config # # Set up rc, the inifile. See BootstrapMap::getBaseIni(). As this app @@ -61,7 +61,7 @@ copy-stuff: echo LO_LIB_DIR=file://$(APP_DATA_PATH)/lib/ assets/program/fundamentalrc echo URE_LIB_DIR=file://$(APP_DATA_PATH)/lib/ assets/program/fundamentalrc # checkme - is this used to find configs ? echo 'BRAND_BASE_DIR=file:///assets' assets/program/fundamentalrc - echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry module:$${BRAND_BASE_DIR}/share/registry/modules res:$${BRAND_BASE_DIR}/share/registry' assets/program/fundamentalrc + echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry'
[Libreoffice-commits] dev-tools.git: autogen.sh .git-hooks/commit-msg .git-hooks/post-merge .git-hooks/pre-commit .git-hooks/README
.git-hooks/README |9 ++ .git-hooks/commit-msg | 181 ++ .git-hooks/post-merge | 12 +++ .git-hooks/pre-commit | 139 ++ autogen.sh| 18 5 files changed, 359 insertions(+) New commits: commit 19a4e3902c98c21517fdeb111e188dd4fa7f264c Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Oct 25 10:07:04 2013 +0200 add automatic git hook setting in autogen.sh Change-Id: I13c766e5b8af0bb33a478f59e3910b7149a24341 diff --git a/.git-hooks/README b/.git-hooks/README new file mode 100644 index 000..c6612bc --- /dev/null +++ b/.git-hooks/README @@ -0,0 +1,9 @@ +Git hooks are executable scripts you can place in $GIT_DIR/hooks directory to trigger action at certain points. + +There are two groups of these hooks: client side and server side. +The client-side hooks: +are for client operations such as committing and merging. +The server-side hooks: +are for Git server operations such as receiving pushed commits. + +See Also [ http://git-scm.com/book/en/Customizing-Git-Git-Hooks ] \ No newline at end of file diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg new file mode 100755 index 000..e3dfe69 --- /dev/null +++ b/.git-hooks/commit-msg @@ -0,0 +1,181 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by git-commit with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, make this file executable. + +# Uncomment the below to add a Signed-off-by line to the message. +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*\).*$/Signed-off-by: \1/p') +# grep -qs ^$SOB $1 || echo $SOB $1 + +# This example catches duplicate Signed-off-by lines. + +base_dir=$(dirname $0) +MSG=$1 + +abort() { +cp $1 $1.save +cat 2 EOF +Commit aborted, your commit message was saved as '$1.save'. + +Reason: $2 + +EOF +exit 1 +} + +test = $(grep '^Signed-off-by: ' $1 | +sort | uniq -c | sed -e '/^[ ]*1[]/d') || { + abort $1 Duplicate Signed-off-by lines. +} + +# Check that the first line exists, and is not an asterisk + +if [ -z `head -n 1 $1 | grep -v '^[[:blank:]]*\*$'` ] ; then +abort $1 Please provide the general description on the first line. +fi + +# ...and that it is not too long + +if [ `head -n 1 $1 | wc -c` -gt 79 ] ; then +abort $1 The first line is too long, please try to fit into 79 characters. +fi + +# ...and that it does not continue on the second line +if [ `wc -l $1` -gt 1 -a -n `head -n 2 $1 | tail -n 1 | sed 's/^#.*//'` ] ; then +abort $1 The second line is not empty - maybe the first line continues there? +fi + +# Check that the message is not a ChangeLog-like one + +if [ -n `head -n 1 $1 | grep '^[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}.*.*@.*'` ] ; then +abort $1 The commit message looks like ChangeLog, please use the git form. +fi + +# Check for whitespace in front of *'s + +if [ -n `sed '/^#/,$d' $1 | grep '^[[:space:]]\+\*.*:'` -a -z `grep '^\*' $1` ] ; then +abort $1 Please don't use whitespace in front of '* file: Description.' entries. +fi + +# Check that lines do not start with '#something' (possibly accidental commit, +# such as starting the message with '#ifdef', git commits start with '#whitespace'. + +if [ -n `grep '^#[^[:blank:]]' $1` ] ; then +abort $1 Possible accidental comment in the commit message (leading # without space). +fi + + +#-- copied gerrit commit-msg hook to handle ChangeId -- +# From Gerrit Code Review 2.3 +# +# Part of Gerrit Code Review (http://code.google.com/p/gerrit/) +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the License); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +CHANGE_ID_AFTER=Bug|Issue + +# Check for, and add if missing, a unique Change-Id +# +add_ChangeId() { +clean_message=`sed -e ' +/^diff --git a\/.*/{ +s/// +q +} +/^Signed-off-by:/d +/^#/d +' $MSG | git stripspace` +if test -z $clean_message +then +return +fi + +id=`grep -i '^Change-Id:' $MSG | sed -e s/.*: I//` +temp_msg=`grep -v -i '^Change-Id:' $MSG` +echo $temp_msg
[Libreoffice-commits] core.git: forms/source odk/examples package/source sax/source sccomp/source sd/source svl/source svx/source
forms/source/component/DatabaseForm.cxx | 14 - forms/source/component/Filter.cxx | 13 - forms/source/component/FormComponent.cxx| 25 +- forms/source/component/FormsCollection.cxx | 12 forms/source/runtime/formoperations.cxx | 11 odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx| 16 +- odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx | 19 ++- odk/examples/cpp/counter/counter.cxx| 17 -- odk/examples/cpp/custompanel/ctp_factory.cxx| 20 package/source/xstor/xfactory.cxx |9 --- sax/source/expatwrap/sax_expat.cxx | 10 sax/source/expatwrap/saxwriter.cxx | 13 - sax/source/fastparser/fastparser.cxx| 10 sccomp/source/solver/solver.cxx | 12 sd/source/ui/unoidl/UnoDocumentSettings.cxx | 12 sd/source/ui/unoidl/unomodule.cxx | 12 svl/source/numbers/supservs.cxx |9 --- svx/source/accessibility/svxrectctaccessiblecontext.cxx | 17 -- svx/source/form/legacyformcontroller.cxx| 13 - 19 files changed, 44 insertions(+), 220 deletions(-) New commits: commit da5449da0c056a3a0da239eff2e2b8b66cfd6224 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Thu Oct 24 14:55:08 2013 -0200 fdo#54938: More uses of cppu::supportsService Change-Id: Id6bed78d92eba52283a17ab3ca66e751c225e48d Reviewed-on: https://gerrit.libreoffice.org/6423 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index fc33131..e1eb01f 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -67,6 +67,7 @@ #include connectivity/dbtools.hxx #include cppuhelper/exc_hlp.hxx #include cppuhelper/implbase2.hxx +#include cppuhelper/supportsservice.hxx #include rtl/math.hxx #include rtl/tencinfo.h #include svl/inettype.hxx @@ -3841,31 +3842,20 @@ Sequence OUString SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( R // better solution _may_ be to return the compatible names at runtime, too } -//-- sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString ServiceName) throw( RuntimeException ) { -Sequence OUString aSupported( getSupportedServiceNames() ); -const OUString* pArray = aSupported.getConstArray(); -for( sal_Int32 i = 0; i aSupported.getLength(); ++i, ++pArray ) -if( pArray-equals( ServiceName ) ) -return sal_True; -return sal_False; +return cppu::supportsService(this, ServiceName); } -//== // com::sun::star::io::XPersistObject -//-- - const sal_uInt16 CYCLE = 0x0001; const sal_uInt16 DONTAPPLYFILTER= 0x0002; -//-- OUString ODatabaseForm::getServiceName() throw( RuntimeException ) { return OUString(FRM_COMPONENT_FORM); // old (non-sun) name for compatibility ! } -//-- void SAL_CALL ODatabaseForm::write(const ReferenceXObjectOutputStream _rxOutStream) throw( IOException, RuntimeException ) { DBG_ASSERT(m_xAggregateSet.is(), ODatabaseForm::write : only to be called if the aggregate exists !); diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index cfe1451..fa620de 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -51,6 +51,7 @@ #include comphelper/numbers.hxx #include comphelper/processfactory.hxx #include comphelper/property.hxx +#include cppuhelper/supportsservice.hxx #include connectivity/dbconversion.hxx #include connectivity/dbtools.hxx #include connectivity/formattedcolumnvalue.hxx @@ -873,36 +874,26 @@ namespace frm OSL_ENSURE( m_xConnection.is(), OFilterControl::initialize: unable to determine the form's connection! ); } -//- OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException) { return
Re: dev-tools: make-4.0-gbuild
Hi Thomas, On Thu, Oct 24, 2013 at 10:13:10PM +0200, Thomas Arnhold thomas-l...@arnhold.org wrote: I pushed make-4.0-gbuild to dev-tools some minutes ago. It compiled fine for me under Windows and Linux and the build on Windows started fine. Please feel free to test it. Cool, thanks for that! :-) First I wanted to upload it to gerrit, but due to missing Change-Ids in the commits it was not possible... I just did that with http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=19a4e3902c98c21517fdeb111e188dd4fa7f264c So it should be possible in the future. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - connectivity/source wizards/com
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |8 + connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx | 12 ++ connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 43 +++--- connectivity/source/inc/FDatabaseMetaDataResultSet.hxx |5 - connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx |1 wizards/com/sun/star/wizards/db/DBMetaData.java|2 6 files changed, 58 insertions(+), 13 deletions(-) New commits: commit a95ecd8b65ea2275a66f6694f0c09e3faaef4407 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Oct 24 08:30:41 2013 +0200 fdo#69772 make StringsFromResultSet more robust Correctly handle case argument _xResultSet == null, instead of throwing a NullPointerException. Change-Id: I81e35c77116e2e0302da86f03f7e757a52e97b29 diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index a75009c..9e8b98d 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -959,6 +959,8 @@ public class DBMetaData private String[] StringsFromResultSet(XResultSet _xResultSet, int _icol) { String[] sColValues = null; +if (_xResultSet == null) +return sColValues; try { XRow xRow = UnoRuntime.queryInterface( XRow.class, _xResultSet ); commit d1fdaafd7c1c1ce3d89dda3bd745f9dd594d83ca Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Oct 25 09:59:40 2013 +0200 fdo#6412 firebird-sdbc DatabaseMetaData unimplemented getXXX: provide empty RS As opposed to NULL object. Else, callers that do a UNO_QUERY_THROW get unexpected results. Change-Id: Ie9dd157eed03031ba04ed59c363a45e246bbb001 diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index a1ba07a..fbc82ba 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -91,7 +91,9 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) thro uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException) { -return 0; +OSL_FAIL(Not implemented yet!); +// TODO implement +return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCatalogs); } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() throw(SQLException, RuntimeException) @@ -150,7 +152,9 @@ OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getSchemas() throw(SQLException, RuntimeException) { -return 0; +OSL_FAIL(Not implemented yet!); +// TODO implement +return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eSchemas); } //- Max Sizes/Lengths - @@ -838,7 +842,9 @@ uno::Reference XConnection SAL_CALL ODatabaseMetaData::getConnection() // - uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) { -return NULL; +OSL_FAIL(Not implemented yet!); +// TODO implement +return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); } uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getTypeInfo() @@ -1413,7 +1419,9 @@ uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getProcedureColumns( (void) schemaPattern; (void) procedureNamePattern; (void) columnNamePattern; -return NULL; +OSL_FAIL(Not implemented yet!); +// TODO implement +return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eProcedureColumns); } // - uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getProcedures( @@ -1424,7 +1432,9 @@ uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getProcedures( (void) catalog; (void) schemaPattern; (void) procedureNamePattern; -return NULL; +OSL_FAIL(Not implemented yet!); +// TODO implement +return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eProcedures); } // - uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getVersionColumns( @@ -1434,7 +1444,9 @@ uno::Reference XResultSet SAL_CALL ODatabaseMetaData::getVersionColumns( (void) catalog; (void) schema; (void) table; -return NULL; +OSL_FAIL(Not implemented yet!); +// TODO implement +return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eVersionColumns); } //
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #13 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=da5449da0c056a3a0da239eff2e2b8b66cfd6224 fdo#54938: More uses of cppu::supportsService The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: animations/source avmedia/source basctl/source binaryurp/source bridges/test lingucomponent/source shell/source starmath/source
animations/source/animcore/animcore.cxx| 14 --- avmedia/source/framework/soundhandler.cxx | 41 +- basctl/source/accessibility/accessibledialogcontrolshape.cxx | 22 - basctl/source/accessibility/accessibledialogwindow.cxx | 22 - binaryurp/source/bridgefactory.cxx |9 -- bridges/test/java_uno/acquire/testacquire.cxx | 10 -- bridges/test/java_uno/equals/testequals.cxx|8 - lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 17 lingucomponent/source/languageguessing/guesslang.cxx | 16 --- lingucomponent/source/spellcheck/macosxspell/macspellimp.mm| 17 lingucomponent/source/spellcheck/spell/sspellimp.cxx | 16 --- lingucomponent/source/thesaurus/libnth/nthesimp.cxx| 16 --- shell/source/backends/localebe/localebackend.cxx | 17 shell/source/backends/macbe/macbackend.mm | 15 --- shell/source/backends/wininetbe/wininetbackend.cxx | 16 --- shell/source/cmdmail/cmdmailsuppl.cxx | 18 shell/source/unix/exec/shellexec.cxx | 19 shell/source/win32/SysShExec.cxx | 18 shell/source/win32/simplemail/smplmailsuppl.cxx|9 -- starmath/source/smdetect.cxx | 12 -- 20 files changed, 44 insertions(+), 288 deletions(-) New commits: commit 704f95e5255ff72bfb548d50d66d4da61dc483ef Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Wed Oct 23 14:35:10 2013 -0200 fdo#54938: More uses of cppu::supportsService Change-Id: I90a7a07a43559b8d7e1d4b886b2624255200d46b Reviewed-on: https://gerrit.libreoffice.org/6406 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 90b5062..6678893 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -47,6 +47,7 @@ #include com/sun/star/lang/XUnoTunnel.hpp #include comphelper/servicehelper.hxx #include cppuhelper/interfacecontainer.hxx +#include cppuhelper/supportsservice.hxx #include cppuhelper/weakref.hxx #include cppuhelper/implbase1.hxx @@ -781,23 +782,12 @@ OUString AnimationNode::getImplementationName() throw() } } -// - // XServiceInfo sal_Bool AnimationNode::supportsService(const OUString ServiceName) throw() { -Sequence OUString aSNL( getSupportedServiceNames() ); -const OUString * pArray = aSNL.getConstArray(); - -for( sal_Int32 i = 0; i aSNL.getLength(); i++ ) -if( pArray[i] == ServiceName ) -return sal_True; - -return sal_False; +return cppu::supportsService(this, ServiceName); } -// - // XServiceInfo Sequence OUString AnimationNode::getSupportedServiceNames(void) throw() { diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index bf70b6e..b9e76a2 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -29,6 +29,7 @@ #include cppuhelper/typeprovider.hxx #include cppuhelper/factory.hxx +#include cppuhelper/supportsservice.hxx namespace avmedia{ @@ -134,47 +135,19 @@ OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::Runtime return impl_getStaticImplementationName(); } -/*===*/ -/* XServiceInfo */ -/*===*/ +// XServiceInfo sal_Bool SAL_CALL SoundHandler::supportsService( const OUString sServiceName ) throw( css::uno::RuntimeException ) { -/* Set default return value. */ -bool bReturn = sal_False ; -/* Get names of all supported servicenames. */ -css::uno::Sequence OUString seqServiceNames = getSupportedServiceNames(); -const OUString*pArray = seqServiceNames.getConstArray(); -sal_Int32 nCounter= 0; -sal_Int32 nLength = seqServiceNames.getLength(); -/* Search for right name in list. */ -while ( - ( nCounter nLength ) - ( bReturn == sal_False ) -) -{ -/* Is name was found, say YES,
Re: minutes of ESC call ...
On 10/24/2013 10:35 PM, Michael Meeks wrote: * QA update (Robinson) + OSX / Maverick update: + apparently a Java related update / issue ... + without Java installed we (now) crash on start + TDF has the ability to get under NDA new versions + problem is not so much access but time to play. AI: + test and get backtraces on Maverick (Norbert) + Maverick doesn't have Java by default + conjecture - due to a missing-java wrapper. + potentially related to a Java using extension + not everyone affected floeff: https://plus.google.com/116265564718884370181/posts/RcPNTDtg3bM + could we hot-fix it in 4.1.3 (if we have a fix) + yes, if tripple reviewed etc. http://lists.freedesktop.org/archives/libreoffice/2013-October/056991.html Why typing in Writer instantiates the JVM on Mac OS X explains that this is due to the wiki-publisher extension that comes bundled with TDF LO installation sets for Mac. So, in one form or another, this problem hits everybody who uses LO on a Mac with no Java installed yet (either freshly bought or freshly upgraded to a new OS X version). For most it is apparently only a one-shot annoyance (LO needing to be restarted after the dialog requesting installation of Java popped up), but for some it reportedly is a persistent blocker. I at least see no quick and easy way how to fix the sad fact that the wiki-publisher's Addons.xcu causes JVM instantiation upon pressing the first key in Writer. And it appears difficult to lay hands on useful data why LO actually crashes in the described scenario. Norbert couldn't provide a backtrace (cf. http://lists.freedesktop.org/archives/libreoffice/2013-October/057000.html Re: Why typing in Writer instantiates the JVM on Mac OS X), and I couldn't fake LO into crashing either by manually inserting exception throwing etc. in places I thought might be relevant. Therefore, I suggest to quick-fix this for the TDF LO 4.1.3 Mac installation sets at least by not bundling the wiki-publisher extension with them. All it takes to do that is to remove the --enable-ext-wiki-publisher line from distro-configs/LibreOfficeMacOSX.conf. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #14 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #12) sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString rServiceName ) throw(uno::RuntimeException) { return rServiceName.equalsAscii( SCTABVIEWOBJ_SERVICE ) || rServiceName.equalsAscii( SCVIEWSETTINGS_SERVICE ); } So, can we just exchange this to cppu::supportsService? Or we need to some another pieces of code? Every UNO object O implementing css.lang.XServiceInfo must meet the condition that O.supportsService(S) returns true iff S is in the sequence returned by O.getSupportedServiceNames(). Therefore, any case where the implementation of supportsService could not be replaced by a call to cppu::supportsService would be a bug that needs fixing anyway. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #15 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Marcos Paulo de Souza committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=704f95e5255ff72bfb548d50d66d4da61dc483ef fdo#54938: More uses of cppu::supportsService The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Why typing in Writer instantiates the JVM on Mac OS X
For what it's worth, on my MacBook Air, running 10.9, with no Java (and no intent to install it), I don't get any crash when running the TDF LibreOffice 4.1.1.2 build. I do get those annoying do you want to install Java dialogs twice when typing into Writer (until I turn off Java in Preferences). --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: dev-tools: make-4.0-gbuild
Thanks! On 25.10.2013 10:11, Miklos Vajna wrote: Hi Thomas, On Thu, Oct 24, 2013 at 10:13:10PM +0200, Thomas Arnhold thomas-l...@arnhold.org wrote: I pushed make-4.0-gbuild to dev-tools some minutes ago. It compiled fine for me under Windows and Linux and the build on Windows started fine. Please feel free to test it. Cool, thanks for that! :-) First I wanted to upload it to gerrit, but due to missing Change-Ids in the commits it was not possible... I just did that with http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/commit/?id=19a4e3902c98c21517fdeb111e188dd4fa7f264c So it should be possible in the future. Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67534, which changed state. Bug 67534 Summary: FILEOPEN SMB File claimed to be Locked By Unknown User when opened via double-click in Explorer if LO Explorer Shell Extensions are installed https://bugs.freedesktop.org/show_bug.cgi?id=67534 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - accessibility/CustomTarget_bridge_inc.mk dbaccess/JunitTest_dbaccess_complex.mk desktop/Extension_test-passive.mk languagetool/ExternalProject_languagetool.
RepositoryExternal.mk| 12 +++--- accessibility/CustomTarget_bridge_inc.mk |3 + dbaccess/JunitTest_dbaccess_complex.mk |1 desktop/Extension_test-passive.mk|2 - languagetool/ExternalProject_languagetool.mk | 13 --- nlpsolver/Extension_nlpsolver.mk |4 +- odk/CustomTarget_javadoc.mk |5 +- scripting/Package_java_jars.mk |2 - smoketest/Extension_TestExtension.mk |2 - solenv/gbuild/ExternalProject.mk |9 solenv/gbuild/Jar.mk | 49 --- solenv/gbuild/JavaClassSet.mk|6 +-- solenv/gbuild/JunitTest.mk |4 +- solenv/gbuild/TargetLocations.mk |3 - svl/JunitTest_svl_complex.mk |1 swext/Extension_wiki-publisher.mk|2 - testtools/CustomTarget_bridgetest.mk |4 +- unotest/Jar_test.mk |6 +-- 18 files changed, 78 insertions(+), 50 deletions(-) New commits: commit 30fc3d6cff15ceabea6e1f9c4683cd383c322d72 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 24 21:58:25 2013 +0200 gbuild: refactor Jar target to stop using OUTDIR - gb_Jar_get_target points to layer-specific location - remove gb_Jar_get_outdir_target - add OXT and NONE layers - add a rule for every installed Jar to avoid problems with conflicting pattern rules in instdir Change-Id: Icf11869a454a7a52791c5ae257fc5da87aa46dc2 diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index b71c9dc..2c6ba14 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -23,8 +23,11 @@ gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER) gb_Jar_JARCOMMAND := jar gb_Jar_LAYER_DIRS := \ - OOO:$(LIBO_SHARE_JAVA_FOLDER) \ - URE:$(LIBO_URE_SHARE_JAVA_FOLDER) + URE:$(INSTROOT)/$(LIBO_URE_SHARE_JAVA_FOLDER) \ + OOO:$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER) \ + OXT:$(WORKDIR)/Jar \ + NONE:$(WORKDIR)/Jar \ + # location of files going to be packed into .jar file define gb_Jar_get_workdir @@ -37,7 +40,7 @@ $(call gb_Jar_get_workdir,$(1))/META-INF/MANIFEST.MF endef gb_Jar__get_layer = $(strip $(foreach group,$(gb_Jar_VALIDGROUPS),$(if $(filter $(1),$(gb_Jar_$(group))),$(group -gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(INSTROOT)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS))) +gb_Jar__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS))) gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_layer,$(1)))/$(1).jar # creates classset and META-INF folders if they don't exist @@ -52,7 +55,7 @@ gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_ # the archive with the main class hierarchy and then updating it from # the other one(s), which seems to work .-) define gb_Jar__command - $(call gb_Output_announce,$*,$(true),JAR,3) + $(call gb_Output_announce,$(1),$(true),JAR,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF \ echo Manifest-Version: 1.0 $(call gb_Jar_get_manifest_target,$(1)) \ @@ -70,20 +73,25 @@ endef $(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_Jar_get_classsetname,%)) $(call gb_Output_announce,$*,$(false),JAR,3) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Jar_get_target,$*) $(call gb_Jar_get_outdir_target,$*)) + rm -f $(call gb_Jar_get_target,$*)) -# the outdir target depends on the workdir target and is built by delivering the latter # the workdir target is created by cd'ing to the target directory and adding/updating the files # rule for creating the jar file using the command defined above -$(call gb_Jar_get_target,%) : $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,%)) - $(call gb_Jar__command,$*,$@,$*,$?) +$(WORKDIR)/Jar/%.jar : + $(call gb_Jar__command,$*,$@) + +# call gb_Jar__make_installed_rule,jar +define gb_Jar__make_installed_rule +$(call gb_Jar_get_target,$(1)) : + $$(call gb_Jar__command,$(1),$(call gb_Jar_get_target,$(1))) + +endef # resets scoped variables (see explanations where they are set) # creates a class set and a dependency to it # registers target and clean target # adds jar files to DeliverLogTarget -# adds dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) define gb_Jar_Jar ifeq (,$$(findstring $(1),$$(gb_Jar_KNOWN))) $$(eval $$(call gb_Output_info,Currently known jars are: $(sort $(gb_Jar_KNOWN)),ALL)) @@ -94,18 +102,14 @@ $(call gb_Jar_get_target,$(1)) : JARCLASSPATH := $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(call gb_Jar_get_target,$(1)) : PACKAGEDIRS := $(call gb_Jar_get_target,$(1)) : PACKAGEFILES := +$(call gb_Jar_get_target,$(1)) : \ +
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 223e1295b8f553228951d5165d8c3ee052c45944 Author: László Németh nem...@numbertext.org Date: Fri Oct 25 08:30:30 2013 +0200 librelogo: fix division with measurements Change-Id: I2204002533bbb3e7c801b3228b0310a42b19a882 (cherry picked from commit 7744c4a0016be338c6c14b14f620d8af7d76111e) diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 216bb0f..bfe5686 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1352,7 +1352,7 @@ def __loadlang__(lang, a): [r(?=\n)__repeat__([^\n]*\w[^\n]*):(?=\n), for %s in range(1, 1+int(\\1)): % repcount], # repeat block [r(?=\d)[%s](?=\d) % a['DECIMAL'], .], # decimal sign [r(?!/)/(?!/), *1.0/], # fix division: /1 - /1.0, but not with // -[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['HOUR'], \\1*30], # 12h = 12*30° +[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['HOUR'], lambda r: str(float(r.group(1).replace(,, .))*30)], # 12h = 12*30° [r(?=\d)(%s) % a['DEG'], ], # 1° - 1 [r(?!:)\b(?:__def__)[ \t]+(\w+)\b[ \t]*([:]?\w[^\n]*), \ndef \\1(\\2):\n[], [r(?!:)\b(?:__def__)\s+(\w+), \ndef \\1():\n[], @@ -1424,9 +1424,9 @@ def __loadlang__(lang, a): [r(?!:)\b(?:%s)\b % a['PRINT'], \n)Print(], [r(?!:)\b(?:%s)\b % a['TURNLEFT'], \n)turnleft(], [r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['PT'], \\1], -[r\b([0-9]+([,.][0-9]+)?)(%s)(?!\w) % a['INCH'], \\1*72], -[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['MM'], \\1*%s % __MM_TO_PT__], -[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['CM'], \\1*%s*10 % __MM_TO_PT__], +[r\b([0-9]+([,.][0-9]+)?)(%s)(?!\w) % a['INCH'], lambda r: str(float(r.group(1).replace(,, .))*72)], +[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['MM'], lambda r: str(float(r.group(1).replace(,, .))*__MM_TO_PT__)], +[r\b([0-9]+([,.][0-9]+)?)(%s)\b % a['CM'], lambda r: str(float(r.group(1).replace(,, .))*__MM_TO_PT__*10)], [r\b(__(?:int|float|string)__len|round|abs|sin|cos|sqrt|set|list|tuple|sorted)\b ((?:\w|\d+([,.]\d+)?|0[xX][0-9a-fA-F]+|[-+*/]| )+)\) , \\1(\\2)) ], # fix parsing: (1 + sqrt x) - (1 + sqrt(x)) [r(?=[-*/=+,]) ?\n\)(\w+)\(, \\1()], # read attributes, eg. x = fillcolor [r(?=return) ?\n\)(\w+)\(, \\1()], # return + user function ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py | 36 ++-- 1 file changed, 30 insertions(+), 6 deletions(-) New commits: commit 317d255aa7f1497cdfb929b884066202f721672c Author: László Németh nem...@numbertext.org Date: Fri Oct 25 11:46:45 2013 +0200 fdo#70858 librelogo: fix Logo program halt at font settings (Windows) Change-Id: I3c51ba693caa80c8b530a9eee932a48a125e2eca diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index f46f127..e030fc8 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1374,6 +1374,30 @@ def __float__(x): # handle eg. float(10,5cm) x = eval(x) return float(x) +def fontheight(n = -1): +if n != -1: +_.fontheight = n +else: +return _.fontheight + +def fontweight(n = -1): +if n != -1: +_.fontweight = n +else: +return _.fontweight + +def fontfamily(s = -1): +if s != -1: +_.fontfamily = s +else: +return _.fontfamily + +def fontstyle(n = -1): +if n != -1: +_.fontstyle = n +else: +return _.fontstyle + def __loadlang__(lang, a): global comp, __colors__ __colors__[lang] = {} @@ -1445,13 +1469,13 @@ def __loadlang__(lang, a): [r(?!:)\b(?:%s)(\s+|$) % a['FILLCOLOR'], \n)fillcolor(], [r(?!:)\b(?:%s)(\s+|$) % a['FILLSTYLE'], \n)fillstyle(], [r(?!:)\b(?:%s)(\s+|$) % a['FONTCOLOR'], \n)fontcolor(], -[r(?!:)\b(?:%s)(\s+|$) % a['FONTFAMILY'], \nglobal _\n_.fontfamily=], -[r(?!:)\b(?:%s)(\s+|$) % a['FONTHEIGHT'], \nglobal _\n_.fontheight=], -[r(?!:)\b(?:%s)(\s+|$) % a['FONTWEIGHT'], \nglobal _\n_.fontweight=], -[r(?!:)\b(?:%s)(\s+|$) % a['FONTSTYLE'], \nglobal _\n_.fontstyle=], +[r(?!:)\b(?:%s)(\s+|$) % a['FONTFAMILY'], \n)fontfamily(], +[r(?!:)\b(?:%s)(\s+|$) % a['FONTHEIGHT'], \n)fontheight(], +[r(?!:)\b(?:%s)(\s+|$) % a['FONTWEIGHT'], \n)fontweight(], +[r(?!:)\b(?:%s)(\s+|$) % a['FONTSTYLE'], \n)fontstyle(], [r(?!:)\b(?:%s)(\s+|$) % a['PENWIDTH'], \n)pensize(], -[r(?!:)\b(?:%s)\b % a['PENDOWN'], \nglobal _\n__pen__(1)], -[r(?!:)\b(?:%s)\b % a['PENUP'], \nglobal _\n__pen__(0)], +[r(?!:)\b(?:%s)\b % a['PENDOWN'], \n__pen__(1)], +[r(?!:)\b(?:%s)\b % a['PENUP'], \n__pen__(0)], [r(?!:)\b(?:%s)\b % a['HIDETURTLE'], \nhideturtle()], [r(?!:)\b(?:%s)\b % a['SHOWTURTLE'], \nshowturtle()], [r(?!:)\b(?:%s)\b\[ % a['POSITION'], position()[], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67885, which changed state. Bug 67885 Summary: FILESAVE: Files locked after saved on network drive https://bugs.freedesktop.org/show_bug.cgi?id=67885 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54938] Adapt supportsService implementations to cppu::supportsService
https://bugs.freedesktop.org/show_bug.cgi?id=54938 --- Comment #16 from Marcos Souza marcos.souza@gmail.com --- (In reply to comment #14) (In reply to comment #12) sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString rServiceName ) throw(uno::RuntimeException) { return rServiceName.equalsAscii( SCTABVIEWOBJ_SERVICE ) || rServiceName.equalsAscii( SCVIEWSETTINGS_SERVICE ); } So, can we just exchange this to cppu::supportsService? Or we need to some another pieces of code? Every UNO object O implementing css.lang.XServiceInfo must meet the condition that O.supportsService(S) returns true iff S is in the sequence returned by O.getSupportedServiceNames(). Therefore, any case where the implementation of supportsService could not be replaced by a call to cppu::supportsService would be a bug that needs fixing anyway. Nice! I'll use cppu::supportsService for all places that implements css.lang.XServiceInfo and remove that string comparisons. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/utlui/uitool.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Oct 25 12:49:44 2013 +0200 fdo#70861 SwToSfxPageDescAttr: fix call to SvxExtParagraphTabPage Regression from c2ccd20c0fd92bddfff76447754541705e3eb8f3 (fdo#44689: fix for specific case of page restart-value 0, 2013-08-29), the problem was that commit refactored starting page number handling, so that '0' is now also a valid value, and no longer means no restart. However cui isn't updated yet, so always pass a 0 to it, like we used to do so before, that's better than a crash. Change-Id: I2adab43499bcdd5234da3f26559b0b384e533c2e diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index e0c4a36..512d0bd 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -642,9 +642,10 @@ void SwToSfxPageDescAttr( SfxItemSet rCoreSet ) bPut = false; } -if (oNumOffset) +// TODO for now always pass a page number to cui, it can't make a +// difference between 0 and no page number at the moment. { -SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset.get() ); +SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, oNumOffset ? oNumOffset.get() : 0 ); rCoreSet.Put( aPageNum ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
libexttextcat data garbled in Hungarian
Hi, The data files for libexttextcat in this directory: https://github.com/giuliopaci/libexttextcat/tree/master/langclass/ShortTexts Contains a garbled Hungarian version, it's almost in iso-8859-1 but some characters are destroyed because it doesn't contain all Hungarian characters. It is easy to pick up a utf-8 good version from http://www.ohchr.org/EN/UDHR/Pages/Language.aspx?LangID=hng and see the difference. It's not clear whether this prevents it from classifying Hungarian text correctly, but it may stop it working in utf-8, because most of the other files are in utf-8. Cheers Mark ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: languagetool/ExternalProject_languagetool.mk languagetool/JLanguageTool-1.7.0.patch solenv/gbuild
languagetool/ExternalProject_languagetool.mk |6 +- languagetool/JLanguageTool-1.7.0.patch | 18 -- solenv/gbuild/ExternalProject.mk |2 +- 3 files changed, 6 insertions(+), 20 deletions(-) New commits: commit b2235e49d42cdd10603b33e2708c1449eadfbfbe Author: Michael Stahl mst...@redhat.com Date: Fri Oct 25 13:13:45 2013 +0200 language tool: fix build Change-Id: I6ba856d6817aa838a0519803eb5d8f582598c800 diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk index c32434d..20ebdf5 100644 --- a/languagetool/ExternalProject_languagetool.mk +++ b/languagetool/ExternalProject_languagetool.mk @@ -32,7 +32,11 @@ $(call gb_ExternalProject_get_state_target,languagetool,build) : -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ $(if $(debug),-Dbuild.debug=on) \ - -Dsolver.ooo.dir=$(OUTDIR_FOR_BUILD)/bin dist \ + -Dext.ooo.juh.lib=$(call gb_Jar_get_target,juh) \ + -Dext.ooo.jurt.lib=$(call gb_Jar_get_target,jurt) \ + -Dext.ooo.ridl.lib=$(call gb_Jar_get_target,ridl) \ + -Dext.ooo.unoil.lib=$(call gb_Jar_get_target,unoil) \ + dist \ touch $@ # vim: set noet sw=4 ts=4: diff --git a/languagetool/JLanguageTool-1.7.0.patch b/languagetool/JLanguageTool-1.7.0.patch index d486d2b..782b683 100644 --- a/languagetool/JLanguageTool-1.7.0.patch +++ b/languagetool/JLanguageTool-1.7.0.patch @@ -1,21 +1,3 @@ -diff -Naur misc/build/JLanguageTool-1.7.0/build.properties misc/build/JLanguageTool-1.7.0_patched/build.properties misc/build/JLanguageTool-1.7.0/build.properties2012-06-25 08:22:35.0 +0200 -+++ misc/build/JLanguageTool-1.7.0_patched/build.properties2012-06-25 09:24:21.253494500 +0200 -@@ -67,10 +67,10 @@ - ext.log4j.lib = ${ext.dir}/build/cobertura/log4j-1.2.9.jar - ext.jakarta-oro.lib = ${ext.dir}/build/cobertura/jakarta-oro-2.0.8.jar - --ext.ooo.juh.lib = ${ext.ooo.dir}/juh.jar --ext.ooo.unoil.lib = ${ext.ooo.dir}/unoil.jar --ext.ooo.ridl.lib = ${ext.ooo.dir}/ridl.jar --ext.ooo.jurt.lib = ${ext.ooo.dir}/jurt.jar -+ext.ooo.juh.lib = ${solver.ooo.dir}/juh.jar -+ext.ooo.unoil.lib = ${solver.ooo.dir}/unoil.jar -+ext.ooo.ridl.lib = ${solver.ooo.dir}/ridl.jar -+ext.ooo.jurt.lib = ${solver.ooo.dir}/jurt.jar - - converter.name = RuleConverter - build.meta-inf = ${build.dir}/META-INF diff -Naur misc/build/JLanguageTool-1.7.0/build.xml misc/build/JLanguageTool-1.7.0_patched/build.xml --- misc/build/JLanguageTool-1.7.0/build.xml 2012-06-25 08:22:35.0 +0200 +++ misc/build/JLanguageTool-1.7.0_patched/build.xml 2012-06-25 09:27:39.077442000 +0200 diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 2dd034a..d6f2e60 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -189,7 +189,7 @@ endef # gb_ExternalProject_use_jars external jars define gb_ExternalProject_use_jars $(call gb_ExternalProject_get_preparation_target,$(1)) : \ - $(foreach jar,$(2),$(call gb_Jar_get_target,$(lib))) + $(foreach jar,$(2),$(call gb_Jar_get_target,$(jar))) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/experimental
android/experimental/DocumentLoader/Makefile | 18 +- android/experimental/LibreOffice4Android/Makefile | 18 +- 2 files changed, 18 insertions(+), 18 deletions(-) New commits: commit 6db1f5f4c62afc644d59c9cada59cd483b4c7653 Author: Tor Lillqvist t...@collabora.com Date: Fri Oct 25 14:21:28 2013 +0300 Fix fallout from 30fc3d6cff15ceabea6e1f9c4683cd383c322d72 Change-Id: If97dc13e63986a7c9534f46673cfa8541893269a diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 63104dd..1aa743b 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -113,15 +113,15 @@ build-ant: android_version_setup copy-stuff link-so properties # # Copy jar files we need # - for F in $(strip \ - java_uno \ - juh \ - jurt \ - ridl \ - unoil \ - unoloader \ - ); do \ - $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \ + for F in java_uno \ +juh \ +jurt \ +ridl \ +unoloader; do \ + $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar); \ + done + for F in unoil; do \ + $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \ done # unset JAVA_HOME $(ANT) -quiet debug diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index ee3325d..e15d30b 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -116,15 +116,15 @@ build-ant: android_version_setup copy-stuff link-so properties # # Copy jar files we need # - for F in $(strip \ - java_uno \ - juh \ - jurt \ - ridl \ - unoil \ - unoloader \ - ); do \ - $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \ + for F in java_uno \ +juh \ +jurt \ +ridl \ +unoloader; do \ + $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar); \ + done + for F in unoil; do \ + $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \ done # unset JAVA_HOME $(ANT) -quiet debug ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 5 commits - sc/source
sc/source/core/tool/token.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit a07bdedb589d1caa220e1b910bafb196cc6e2348 Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 15:57:18 2013 +0800 Release control to GPU calc on GAMMA Change-Id: Ie4a80f4f6e7e0eaa0969b9c2d8f3669057a3e86a Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 4f9c167..67197bb 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1351,6 +1351,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocKapz: case ocFisher: case ocFisherInv: +case ocGamma: // Don't change the state. break; default: commit bdd48cc784a99d233c47490e80dd120f09c685b0 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 08:00:36 2013 -0400 [AMLOEXT-44 Bug] Release control of FISHERINV to GPU Calc Change-Id: I0b023a541cc2b3dfe35286ad269846c8210c6fb7 Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 9193073..4f9c167 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1350,6 +1350,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocZGZ: case ocKapz: case ocFisher: +case ocFisherInv: // Don't change the state. break; default: commit e7a953c7dd2f5993a3b837aef0f623bcbbe3c462 Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 15:08:26 2013 +0800 Release control to GPU calc for FISHER Change-Id: I9f21df2306b81d816b9c261071c6ecb74ae0bc6f Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 3ad9663..9193073 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1349,6 +1349,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocZins: case ocZGZ: case ocKapz: +case ocFisher: // Don't change the state. break; default: commit 000ffad378d0ab0a4ca677c6aaf9bbd4874b7ee4 Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 10:44:00 2013 +0800 Release control of PPMT to GPU interpreter Change-Id: I4e59627f1f1d109e9c0cf621a34bf6904f9663ba Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 74a2d4c..3ad9663 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1348,6 +1348,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocRMZ: case ocZins: case ocZGZ: +case ocKapz: // Don't change the state. break; default: commit 230685be3472fda9c48b10dedeb9b7635bec5d9f Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 10:26:03 2013 +0800 Release control of IRR, MIRR, PMT, RATE to GPU Change-Id: Ia77b0bc1d8a2400debcc5d541e64e5b63797fe71 Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 22c1738..74a2d4c 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1343,6 +1343,11 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocCount: case ocCount2: case ocVLookup: +case ocIRR: +case ocMIRR: +case ocRMZ: +case ocZins: +case ocZGZ: // Don't change the state. break; default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sc/source
sc/source/core/tool/token.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit 16133ee184b8382f61474feb8cf5afec6f87179a Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 15:57:18 2013 +0800 Release control to GPU calc on GAMMA Change-Id: Ie4a80f4f6e7e0eaa0969b9c2d8f3669057a3e86a Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 4f9c167..67197bb 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1351,6 +1351,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocKapz: case ocFisher: case ocFisherInv: +case ocGamma: // Don't change the state. break; default: commit cfc5005b4e7c094c3abd590b7f8bb9d8d16dffd2 Author: haochen haoc...@multicorewareinc.com Date: Fri Oct 25 08:00:36 2013 -0400 [AMLOEXT-44 Bug] Release control of FISHERINV to GPU Calc Change-Id: I0b023a541cc2b3dfe35286ad269846c8210c6fb7 Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 9193073..4f9c167 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1350,6 +1350,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocZGZ: case ocKapz: case ocFisher: +case ocFisherInv: // Don't change the state. break; default: commit ada8cd3138cf98a55dd2c8f04a0718952a3c57c7 Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 15:08:26 2013 +0800 Release control to GPU calc for FISHER Change-Id: I9f21df2306b81d816b9c261071c6ecb74ae0bc6f Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 3ad9663..9193073 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1349,6 +1349,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocZins: case ocZGZ: case ocKapz: +case ocFisher: // Don't change the state. break; default: commit 8d86c04aae96340da7590eaa5b74cf598c8ed242 Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 10:44:00 2013 +0800 Release control of PPMT to GPU interpreter Change-Id: I4e59627f1f1d109e9c0cf621a34bf6904f9663ba Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 74a2d4c..3ad9663 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1348,6 +1348,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocRMZ: case ocZins: case ocZGZ: +case ocKapz: // Don't change the state. break; default: commit 0e79a9c26160953cc8477580fd2f7b7437f81cbe Author: haochen haoc...@multicorewareinc.com Date: Wed Oct 23 10:26:03 2013 +0800 Release control of IRR, MIRR, PMT, RATE to GPU Change-Id: Ia77b0bc1d8a2400debcc5d541e64e5b63797fe71 Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 22c1738..74a2d4c 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1343,6 +1343,11 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocCount: case ocCount2: case ocVLookup: +case ocIRR: +case ocMIRR: +case ocRMZ: +case ocZins: +case ocZGZ: // Don't change the state. break; default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ooxmlexport test cases are executed twice
Hi Tushar, On Fri, Oct 25, 2013 at 04:10:35PM +0530, Tushar Bende tushar.be...@synerzip.com wrote: I observed that while running* make CppunitTest_sw_ooxmlexport* some test cases are executed twice.(to be precise 61 out of 75 test cases) I checked code for root cause and observed that it is because of below code in *ooxmlexport.cxx line 254* * * for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) { MethodEntryTest rEntry = aMethods[i]; load(/sw/qa/extras/ooxmlexport/data/, rEntry.pName); // If the testcase is stored in some other format, it's pointless to test. if (OString(rEntry.pName).endsWith(.docx) std::find(vBlacklist.begin(), vBlacklist.end(), rEntry.pName) == vBlacklist.end()) * (this-*rEntry.pMethod)();* reload(Office Open XML Text); * (this-*rEntry.pMethod)();* finish(); } basically it is executing test case twice if (OString(rEntry.pName).endsWith(.docx) std::find(vBlacklist.begin(), vBlacklist.end(), rEntry.pName) == vBlacklist.end()) condition is true. Please let me know what should be done. Yes, that's intentional. See here for rationale: http://opengrok.libreoffice.org/xref/core/sw/qa/extras/README#18 If that causes a problem, then there is probably some bug in the import/export filter. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sd/source
sd/source/ui/view/DocumentRenderer.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 892d6fe2a6e5cd21abf9346e0bd40b73c2973d8b Author: Jan Holesovsky ke...@suse.cz Date: Thu Aug 22 09:40:22 2013 +0200 bnc#835985: When printing handouts using the default, 'Order' did not count. Left to right, then down was the same as Top to bottom, then right when printing handout; set the 6 pages explicitly as the default. Change-Id: I4a5f58c8fcf2efdc85ad7bb23bde791c5fb87584 diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index a544515..6e9e673 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1557,14 +1557,14 @@ private: AutoLayout eLayout = AUTOLAYOUT_HANDOUT6; switch (nSlidesPerHandout) { -case 0: eLayout = AUTOLAYOUT_NONE; break; // AUTOLAYOUT_HANDOUT1; break; case 1: eLayout = AUTOLAYOUT_HANDOUT1; break; case 2: eLayout = AUTOLAYOUT_HANDOUT2; break; case 3: eLayout = AUTOLAYOUT_HANDOUT3; break; case 4: eLayout = AUTOLAYOUT_HANDOUT4; break; -default: -case 6: eLayout = AUTOLAYOUT_HANDOUT6; break; case 9: eLayout = AUTOLAYOUT_HANDOUT9; break; +default: +case 0: +case 6: break; // use the default } if( !mrBase.GetDocument() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 Marcos Souza marcos.souza@gmail.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #7 from Marcos Souza marcos.souza@gmail.com --- Fpicker uses XComponentContext when creating the instance, while inside svtools ::cppu::createOneInstanceFactory it needs a XMultiServiceFactory... What can I do in this case? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit a6a24677bc5bfb30dd97478aedfbe673fef82fea Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Oct 25 14:21:13 2013 +0200 DOCX export: initial table style roundtrip testcase Change-Id: I164833907012f4b94e2be848ea4f26a9e1c8694b diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 867c76d..39b1d45 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1449,6 +1449,9 @@ void Test::testStyleInheritance() // This numbering style wasn't roundtripped. assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='NoList']/w:name, val, No List); + +// Table style wasn't roundtripped. +assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='TableNormal']/w:tblPr/w:tblCellMar/w:left, w, 108); } void Test::testSmartart() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - android/sdremote
android/sdremote/AndroidManifest.xml |9 +++ android/sdremote/res/layout/fragment_computers_list.xml |9 +++ android/sdremote/res/values/dimens.xml |1 android/sdremote/res/values/strings.xml |2 android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java | 26 +++--- android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java |4 + android/sdremote/src/org/libreoffice/impressremote/adapter/ComputersPagerAdapter.java |8 +-- android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java |6 +- android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java | 23 android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java |4 + 10 files changed, 67 insertions(+), 25 deletions(-) New commits: commit b5efef87efdce56c2491e6de1370ad42b998a8df Author: Artur Dryomov artur.dryo...@gmail.com Date: Fri Oct 25 15:31:56 2013 +0300 Change version to 2.0.0. Change-Id: Ic6ca04d61991afec627c7d76270c370233b0892f diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 0983450..80c4ed6 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -19,7 +19,7 @@ manifest xmlns:android=http://schemas.android.com/apk/res/android; package=org.libreoffice.impressremote android:versionCode=8 - android:versionName=1.1 + android:versionName=2.0.0 android:installLocation=auto uses-permission commit 53481041066e39d1309827fc7902228626c3a4c7 Author: Artur Dryomov artur.dryo...@gmail.com Date: Fri Oct 25 15:29:57 2013 +0300 Fix possible NPE. Change-Id: Ifca1e64aacf0f4b4e83f70c9bcbe6bb79f5415fd diff --git a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java index 1dbc22f..4d00217 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java +++ b/android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java @@ -151,6 +151,10 @@ public class SlideShowActivity extends SherlockFragmentActivity implements Servi } private void startSlideShow() { +if (!isServiceBound()) { +return; +} + if (mCommunicationService.getSlideShow().isRunning()) { setUpSlideShowInformation(); return; diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java index 19657cd..ea8c702 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java @@ -459,6 +459,10 @@ public class ComputersFragment extends SherlockListFragment implements ServiceCo } private void stopComputersSearch() { +if (!isServiceBound()) { +return; +} + mCommunicationService.stopServersSearch(); } diff --git a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java index 4692977..a51b416 100644 --- a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java +++ b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java @@ -119,6 +119,10 @@ public class SlidesPagerFragment extends SherlockFragment implements ServiceConn } private void setUpCurrentSlide() { +if (!isServiceBound()) { +return; +} + SlideShow aSlideShow = mCommunicationService.getSlideShow(); getSlidesPager().setCurrentItem(aSlideShow.getCurrentSlideIndex()); commit 16c53fb6aa50a8e433bced25d1361a6bcaeb51a8 Author: Artur Dryomov artur.dryo...@gmail.com Date: Fri Oct 25 15:24:02 2013 +0300 Add learn more link for providing additional information. Change-Id: I3bb3480491d5f92ed7c4e3e6b5cf233636c4bb64 diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml index 82bf17e..0983450 100644 --- a/android/sdremote/AndroidManifest.xml +++ b/android/sdremote/AndroidManifest.xml @@ -78,6 +78,13 @@ activity android:name=.activity.RequirementsActivity android:label=@string/title_requirements + +intent-filter +action android:name=android.intent.action.VIEW/ +data android:scheme=org.libreoffice.impressremote/ +
[Libreoffice-commits] core.git: formula/source include/formula sc/qa sc/source
formula/source/core/resource/core_resource.src | 12 ++ include/formula/compiler.hrc |4 +- include/formula/opcode.hxx |2 + sc/qa/unit/ucalc.cxx |2 + sc/source/core/tool/interpr4.cxx |6 ++- sc/source/filter/excel/xlformula.cxx |4 +- sc/source/filter/oox/formulabase.cxx |4 +- sc/source/ui/src/scfuncs.src | 48 + 8 files changed, 77 insertions(+), 5 deletions(-) New commits: commit 4a122d1e61278debe7e386e3d9f442e68eddba9b Author: Winfried Donkers winfrieddonk...@libreoffice.org Date: Sun Oct 20 09:38:19 2013 +0200 fdo#44134 adding Excel 2010 functions STDEV.P and STDEV.S Change-Id: If7b2767a69285ac72fa7120b1149a66f118cce8f Reviewed-on: https://gerrit.libreoffice.org/6354 Tested-by: Eike Rathke er...@redhat.com Reviewed-by: Eike Rathke er...@redhat.com diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index d1eb878..c6aec3a 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -188,6 +188,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_ST_DEV_A { Text = STDEVA ; }; String SC_OPCODE_ST_DEV_P { Text = STDEVP ; }; String SC_OPCODE_ST_DEV_P_A { Text = STDEVPA ; }; +String SC_OPCODE_ST_DEV_P_MS { Text = COM.MICROSOFT.STDEV.P ; }; +String SC_OPCODE_ST_DEV_S { Text = COM.MICROSOFT.STDEV.S ; }; String SC_OPCODE_B { Text = BINOM.DIST.RANGE ; }; String SC_OPCODE_NORM_DIST { Text = NORMDIST ; }; String SC_OPCODE_EXP_DIST { Text = EXPONDIST ; }; @@ -538,6 +540,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH String SC_OPCODE_ST_DEV_A { Text = STDEVA ; }; String SC_OPCODE_ST_DEV_P { Text = STDEVP ; }; String SC_OPCODE_ST_DEV_P_A { Text = STDEVPA ; }; +String SC_OPCODE_ST_DEV_P_MS { Text = STDEV.P ; }; +String SC_OPCODE_ST_DEV_S { Text = STDEV.S ; }; String SC_OPCODE_B { Text = B ; }; String SC_OPCODE_NORM_DIST { Text = NORMDIST ; }; String SC_OPCODE_EXP_DIST { Text = EXPONDIST ; }; @@ -1307,6 +1311,14 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = STDEVPA ; }; +String SC_OPCODE_ST_DEV_P_MS +{ +Text [ en-US ] = STDEV.P ; +}; +String SC_OPCODE_ST_DEV_S +{ +Text [ en-US ] = STDEV.S ; +}; String SC_OPCODE_B { Text [ en-US ] = B; diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 21449b5..bb80900 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -410,8 +410,10 @@ #define SC_OPCODE_WEBSERVICE412 #define SC_OPCODE_COVARIANCE_S 413 #define SC_OPCODE_COVARIANCE_P 414 +#define SC_OPCODE_ST_DEV_P_MS 415 +#define SC_OPCODE_ST_DEV_S 416 -#define SC_OPCODE_STOP_2_PAR415 /* last function with two or more parameters' OpCode + 1 */ +#define SC_OPCODE_STOP_2_PAR417 /* last function with two or more parameters' OpCode + 1 */ #define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR/* last function's OpCode + 1 */ #define SC_OPCODE_LAST_OPCODE_ID(SC_OPCODE_STOP_FUNCTION - 1) /* last OpCode */ diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 9ebd9d5..79b229c 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -222,6 +222,8 @@ enum OpCodeEnum ocVarP = SC_OPCODE_VAR_P, ocStDev = SC_OPCODE_ST_DEV, ocStDevP= SC_OPCODE_ST_DEV_P, +ocStDevP_MS = SC_OPCODE_ST_DEV_P_MS, +ocStDevS= SC_OPCODE_ST_DEV_S, ocB = SC_OPCODE_B, ocNormDist = SC_OPCODE_NORM_DIST, ocExpDist = SC_OPCODE_EXP_DIST, diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 8e55573..db82ac4 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2425,6 +2425,8 @@ void Test::testFunctionLists() SMALL, STANDARDIZE, STDEV, +STDEV.P, +STDEV.S, STDEVA, STDEVP, STDEVPA, diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index af6424c..1a3e131 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4013,9 +4013,11 @@ StackVar ScInterpreter::Interpret() case ocVarA : ScVar( true );break; case ocVarP : ScVarP( false ); break; case ocVarPA: ScVarP( true ); break; -case ocStDev: ScStDev( false ); break; +case ocStDev: +case ocStDevS : ScStDev( false ); break;
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #8 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #7) Fpicker uses XComponentContext when creating the instance, while inside svtools ::cppu::createOneInstanceFactory it needs a XMultiServiceFactory... Note that svt_component_getFactory (svtools/source/uno/miscservices.cxx) already has an else branch that uses cppu::component_getFactoryHelper on a cppu::ImplementationEntry array s_aServiceEntries, so you can merge g_entries from fpicker/source/generic/fpicker.cxx into it. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) New commits: commit 3b16c98449d120b07ca4f2f312e31127ac655482 Author: Ariel Constenla-Haile arie...@apache.org Date: Fri Oct 25 12:49:16 2013 + i123544 - Prevent accessing empty filters' vector diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index f44ba31..42ebb61 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -915,15 +915,18 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef rRequest) ::rtl::OUString aExt; UINT nFileType; hResult = iDialog-GetFileTypeIndex(nFileType); -if ( SUCCEEDED(hResult) ) +if ( SUCCEEDED(hResult) nFileType 0 ) { ::sal_Int32 nRealIndex = (nFileType-1); // COM dialog base on 1 ... filter container on 0 .-) ::std::vector COMDLG_FILTERSPEC lFilters = lcl_buildFilterList(m_lFilters); -LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec; +if ( nRealIndex lFilters.size() ) +{ +LPCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec; -lpFilterExt = wcsrchr( lpFilterExt, '.' ); -if ( lpFilterExt ) -aFileURL += reinterpret_castconst sal_Unicode*(lpFilterExt); +lpFilterExt = wcsrchr( lpFilterExt, '.' ); +if ( lpFilterExt ) +aFileURL += reinterpret_castconst sal_Unicode*(lpFilterExt); +} } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source setup_native/Package_misc.mk setup_native/source solenv/bin
scp2/source/base/folderitem_base.scp |3 scp2/source/calc/folderitem_calc.scp |3 scp2/source/draw/folderitem_draw.scp |3 scp2/source/impress/folderitem_impress.scp|3 scp2/source/math/folderitem_math.scp |3 scp2/source/ooo/common_brand.scp | 11 +++ scp2/source/ooo/folderitem_ooo.scp| 13 ++-- scp2/source/writer/folderitem_writer.scp |3 setup_native/Package_misc.mk |1 setup_native/source/win32/desktophelper.txt |1 solenv/bin/modules/installer.pm |2 solenv/bin/modules/installer/globals.pm |2 solenv/bin/modules/installer/setupscript.pm | 31 + solenv/bin/modules/installer/windows/component.pm |7 ++ solenv/bin/modules/installer/windows/file.pm | 24 +++ solenv/bin/modules/installer/windows/property.pm |3 solenv/bin/modules/installer/windows/registry.pm | 38 solenv/bin/modules/installer/windows/shortcut.pm | 69 +- solenv/bin/modules/installer/worker.pm| 28 solenv/bin/modules/t/installer-setupscript.t |1 20 files changed, 233 insertions(+), 16 deletions(-) New commits: commit 7d97ec9a3eba9ceacbea631a56185e40b62fdec7 Author: Andras Timar andras.ti...@collabora.com Date: Fri Oct 25 06:38:06 2013 -0700 fdo#65102 respect user's choice not to install desktop icon Using advertised shortcuts -- inspired by Intel AppUp Centre's requirement -- was not a good idea after all. I revert this, and I also revert the commit that actually disabled it in default Windows builds. This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e. This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6. diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 2da4321..51a940b 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; -ModuleID = gid_Module_Brand_Prg_Base; +ModuleID = gid_Module_Prg_Base_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sbase; IconFile = gid_File_Exe_Sbase; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 83dd82b..05db68f 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; -ModuleID = gid_Module_Brand_Prg_Calc; +ModuleID = gid_Module_Prg_Calc_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Scalc; IconFile = gid_File_Exe_Scalc; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index ba59ea7..f692707 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; -ModuleID = gid_Module_Brand_Prg_Draw; +ModuleID = gid_Module_Prg_Draw_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sdraw; IconFile = gid_File_Exe_Sdraw; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index fb5c136..44adbbe 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; -ModuleID = gid_Module_Brand_Prg_Impress; +ModuleID = gid_Module_Prg_Impress_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Simpress; IconFile = gid_File_Exe_Simpress; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 127773f..fb8bbcd 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = %PRODUCTNAME Math; -ModuleID = gid_Module_Brand_Prg_Math; +ModuleID = gid_Module_Prg_Math_Bin;
[Libreoffice-commits] core.git: 2 commits - jurt/CustomTarget_test_urp.mk offapi/UnoApi_offapi.mk oovbaapi/UnoApi_oovbaapi.mk ridljar/CustomTarget_javamaker.mk scp2/source solenv/bin solenv/gbuild udk
jurt/CustomTarget_test_urp.mk |5 offapi/UnoApi_offapi.mk|4 oovbaapi/UnoApi_oovbaapi.mk|4 ridljar/CustomTarget_javamaker.mk |2 scp2/source/ooo/ure.scp|5 solenv/bin/modules/installer.pm|9 - solenv/bin/modules/installer/substfilenamefiles.pm | 156 - solenv/gbuild/TargetLocations.mk |5 solenv/gbuild/UnoApi.mk| 13 - udkapi/UnoApi_udkapi.mk|4 unoil/CustomTarget_javamaker.mk|8 - 11 files changed, 21 insertions(+), 194 deletions(-) New commits: commit 71adf4e972b3e8a32f60e2edf31bfbba3be28dca Author: Michael Stahl mst...@redhat.com Date: Fri Oct 25 16:43:55 2013 +0200 installer: remove SUBST_FILENAME/InstallName with prejudice Change-Id: I24b086643fad46e4403ba087d2b65528bf090422 diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 3d36acf..d5698cf 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -47,7 +47,6 @@ use installer::scriptitems; use installer::setupscript; use installer::simplepackage; use installer::strip qw(strip_libraries); -use installer::substfilenamefiles; use installer::systemactions; use installer::windows::assembly; use installer::windows::binary; @@ -632,14 +631,6 @@ sub run { } # -# Files with flag SUBST_FILENAME -# - -installer::logger::print_message( ... analyzing files with flag SUBST_FILENAME ...\n ); - - installer::substfilenamefiles::resolving_subst_filename_flag($filesinproductlanguageresolvedarrayref, $allvariableshashref, $languagestringref); - -# # Files with flag SCPZIP_REPLACE # diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm deleted file mode 100644 index 839a2af..000 --- a/solenv/bin/modules/installer/substfilenamefiles.pm +++ /dev/null @@ -1,156 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the License); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -package installer::substfilenamefiles; - -use installer::exiter; -use installer::globals; -use installer::logger; -use installer::pathanalyzer; -use installer::systemactions; - -# -# Analyzing files with flag SUBST_FILENAME -# - -sub resolving_subst_filename_flag -{ -my ($filesarrayref, $variableshashref, $languagestringref) = @_; - -my $replacedirbase = installer::systemactions::create_directories(change_filename, $languagestringref); - -installer::logger::include_header_into_logfile(Files with flag SUBST_FILENAME:); - -for ( my $i = 0; $i = $#{$filesarrayref}; $i++ ) -{ -my $onefile = ${$filesarrayref}[$i]; -my $styles = ; - -if ( $onefile-{'Styles'} ) { $styles = $onefile-{'Styles'}; } - -if ( $styles =~ /\bSUBST_FILENAME\b/ ) -{ -# Files with flag SUBST_FILENAME must have a Substitute key -if (( ! $onefile-{'Substitute'} ) ( ! $onefile-{'InstallName'} )) -{ -installer::exiter::exit_program(ERROR: SUBST_FILENAME is set, but no Substitute and no InstallName defined at file $onefile-{'gid'}!, resolving_subst_filename_flag); -} - -# Language specific subdirectory -my $onelanguage = $onefile-{'specificlanguage'}; - -if ($onelanguage eq ) -{ -$onelanguage = 00;# files without language into directory 00 -} - -my $replacedir = $replacedirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; -installer::systemactions::create_directory($replacedir);# creating language specific directories - -# copy files and edit them with the variables defined in the
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unoobj.cxx | 36 +-- sw/source/core/unocore/unoparagraph.cxx |8 +++--- sw/source/core/unocore/unoport.cxx |6 +++- sw/source/core/unocore/unotext.cxx | 42 +--- 4 files changed, 38 insertions(+), 54 deletions(-) New commits: commit 986fa38eb23a397546061c3ce0df9077ba334a07 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Oct 21 16:40:36 2013 +0200 fdo#44736 - set and fetch multiple properties concurrently 2 This fixes commit ee0bf5d58bc59052923c4ced928a989956e71456 Although it's a bit hacky. Change-Id: I4dfe9ff4a56b993fbcdc7acea29ee3700422f7b3 diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 0ffc5b9..5fc9a01 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -1824,6 +1824,18 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, SetPropertyValues(rPaM, rPropSet, aValues, nAttrMode, bTableMode); } +// FN_UNO_PARA_STYLE is known to set attributes for nodes, inside +// SwUnoCursorHelper::SetTxtFmtColl, instead of extending item set. +// We need to get them from nodes in next call to GetCrsrAttr. +// The rest could cause similar problems in theory, so we just list them here. +inline bool propertyCausesSideEffectsInNodes(sal_uInt16 nWID) +{ +return nWID == FN_UNO_PARA_STYLE || + nWID == FN_UNO_CHARFMT_SEQUENCE || + nWID == FN_UNO_NUM_START_VALUE || + nWID == FN_UNO_NUM_RULES; +} + void SwUnoCursorHelper::SetPropertyValues( SwPaM rPaM, const SfxItemPropertySet rPropSet, const uno::Sequence beans::PropertyValue rPropertyValues, @@ -1873,20 +1885,28 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, SfxItemSet aItemSet(pDoc-GetAttrPool(), aWhichPairs[0]); // Fetch, overwrite, and re-set the attributes from the core -SwUnoCursorHelper::GetCrsrAttr( rPaM, aItemSet ); -for (sal_Int32 i = 0; ( i rPropertyValues.getLength() -i (sal_Int32)aEntries.size() ); ++i) +bool bPreviousPropertyCausesSideEffectsInNodes = false; +for (size_t i = 0; i aEntries.size(); ++i) { -const uno::Any rValue = rPropertyValues[i].Value; SfxItemPropertySimpleEntry const*const pEntry = aEntries[i]; -if (!pEntry) -continue; +bool bPropertyCausesSideEffectsInNodes = +propertyCausesSideEffectsInNodes(pEntry-nWID); + +// we need to get up-to-date item set from nodes +if (i == 0 || bPreviousPropertyCausesSideEffectsInNodes) +SwUnoCursorHelper::GetCrsrAttr(rPaM, aItemSet); + +const uno::Any rValue = rPropertyValues[i].Value; +// this can set some attributes in nodes' mpAttrSet if (!SwUnoCursorHelper::SetCursorPropertyValue(*pEntry, rValue, rPaM, aItemSet)) rPropSet.setPropertyValue(*pEntry, rValue, aItemSet); -} -SwUnoCursorHelper::SetCrsrAttr(rPaM, aItemSet, nAttrMode, bTableMode); +if (i + 1 == aEntries.size() || bPropertyCausesSideEffectsInNodes) +SwUnoCursorHelper::SetCrsrAttr(rPaM, aItemSet, nAttrMode, bTableMode); + +bPreviousPropertyCausesSideEffectsInNodes = bPropertyCausesSideEffectsInNodes; +} } if (!aUnknownExMsg.isEmpty()) diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index fbe7c40..3d4e972 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -390,8 +390,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, const SfxItemPropertyMap rMap = m_rPropSet.getPropertyMap(); SwParaSelection aParaSel( aCursor ); -// FIXME: this should be replaced with the significantly faster -// SwUnoCursorHelper::SetPropertyValues... +uno::Sequence beans::PropertyValue aValues( rPropertyNames.getLength() ); for (sal_Int32 nProp = 0; nProp rPropertyNames.getLength(); nProp++) { SfxItemPropertySimpleEntry const*const pEntry = @@ -410,9 +409,10 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, + pPropertyNames[nProp], static_cast cppu::OWeakObject * (m_rThis)); } -SwUnoCursorHelper::SetPropertyValue(aCursor, m_rPropSet, -pPropertyNames[nProp], pValues[nProp]); +aValues[nProp].Name = pPropertyNames[nProp]; +aValues[nProp].Value = pValues[nProp]; } +SwUnoCursorHelper::SetPropertyValues(aCursor, m_rPropSet, aValues); } void SAL_CALL SwXParagraph::setPropertyValues( diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index a50a61c..0c817e5 100644 --- a/sw/source/core/unocore/unoport.cxx +++
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #9 from Marcos Souza marcos.souza@gmail.com --- (In reply to comment #8) (In reply to comment #7) Fpicker uses XComponentContext when creating the instance, while inside svtools ::cppu::createOneInstanceFactory it needs a XMultiServiceFactory... Note that svt_component_getFactory (svtools/source/uno/miscservices.cxx) already has an else branch that uses cppu::component_getFactoryHelper on a cppu::ImplementationEntry array s_aServiceEntries, so you can merge g_entries from fpicker/source/generic/fpicker.cxx into it. Thanks Stephan! https://gerrit.libreoffice.org/#/c/6436/ At least it don't gave me any error when linking, strange don't you think? But, there is another libs that we could merge? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - filter/source include/filter sw/qa sw/source writerfilter/source
filter/source/msfilter/util.cxx |6 + include/filter/msfilter/util.hxx | 11 +- sw/qa/extras/ooxmlexport/data/calendar1.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 ++ sw/source/filter/ww8/docxattributeoutput.cxx | 112 +-- writerfilter/source/dmapper/CellColorHandler.cxx |3 6 files changed, 130 insertions(+), 14 deletions(-) New commits: commit 0a8db454e5005b0c886ae7c5620d8df5bbab80e0 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Oct 25 18:17:55 2013 +0200 DOCX export: more table style export testcases Change-Id: I84a9dde8620b128ab426722fc06f4a1c71b0c5a2 diff --git a/sw/qa/extras/ooxmlexport/data/calendar1.docx b/sw/qa/extras/ooxmlexport/data/calendar1.docx new file mode 100644 index 000..81a5046 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/calendar1.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 39b1d45..d3dcf42 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -120,6 +120,7 @@ public: void testFdo68787(); void testCharacterBorder(); void testStyleInheritance(); +void testCalendar1(); void testSmartart(); void testFdo69636(); void testCharHighlight(); @@ -240,6 +241,7 @@ void Test::run() {fdo68787.docx, Test::testFdo68787}, {charborder.odt, Test::testCharacterBorder}, {style-inheritance.docx, Test::testStyleInheritance}, +{calendar1.docx, Test::testCalendar1}, {smartart.docx, Test::testSmartart}, {fdo69636.docx, Test::testFdo69636}, {char_highlight.docx, Test::testCharHighlight}, @@ -1454,6 +1456,16 @@ void Test::testStyleInheritance() assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='TableNormal']/w:tblPr/w:tblCellMar/w:left, w, 108); } +void Test::testCalendar1() +{ +// Document has a non-trivial table style, test the roundtrip of it. +xmlDocPtr pXmlStyles = parseExport(word/styles.xml); +assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Calendar1']/w:basedOn, val, TableNormal); +assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Calendar1']/w:rsid, val, 00903003); +assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Calendar1']/w:tblPr/w:tblStyleColBandSize, val, 1); +assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Calendar1']/w:tcPr/w:shd, val, clear); +} + void Test::testSmartart() { uno::Referencetext::XTextDocument xTextDocument(mxComponent, uno::UNO_QUERY); commit 6df9dd68ec4fe457103c0327559653ed187b94ce Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Oct 25 18:11:47 2013 +0200 move OOXML_COLOR_AUTO from writerfilter to msfilter, we need it from sw Change-Id: I145c08d17ccb36bfbf734306cd9d27e8423debdd diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 13bc633..c2e48ce 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -287,9 +287,13 @@ TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString rBcp47Lan return eRet; } -OString ConvertColor( const Color rColor ) +OString ConvertColor( const Color rColor, bool bAutoColor ) { OString color( auto ); + +if (bAutoColor rColor.GetColor() == OOXML_COLOR_AUTO) +return color; + if ( rColor.GetColor() != COL_AUTO ) { const char pHexDigits[] = 0123456789ABCDEF; diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 8c9f29a..e57f476 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -71,8 +71,15 @@ enum TextCategory */ MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString rBcp47LanguageTag); -/// Converts tools Color to HTML color (without leading hashmark). -MSFILTER_DLLPUBLIC OString ConvertColor( const Color rColor ); +#define OOXML_COLOR_AUTO 0x0a + +/** + * Converts tools Color to HTML color (without leading hashmark). + * + * @param rColor color to convert + * @param bAutoColor if OOXML_COLOR_AUTO should be recognized as an auto color + */ +MSFILTER_DLLPUBLIC OString ConvertColor( const Color rColor, bool bAutoColor = false ); /** Paper size in 1/100 millimeters. */ diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index ea5b609..3fafa96 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2728,6 +2728,10 @@ void lcl_TableStyleShd(sax_fastparser::FSHelperPtr pSerializer, uno::Sequencebe { if (rShd[i].Name == val) pAttributeList-add(FSNS(XML_w, XML_val), OUStringToOString(rShd[i].Value.getOUString(), RTL_TEXTENCODING_UTF8).getStr()); +else if (rShd[i].Name == color) +pAttributeList-add(FSNS(XML_w,
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||70815 --- Comment #99 from Cor Nouws c...@nouenoff.nl --- Adding Bug 70815 - EDITING: cell is not updated when referenced cell becomes empty due to sort Fixed in master, but worth to fix in 4.1. too? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - sw/qa
sw/qa/tiledrendering/tiledrendering.cxx | 18 ++ sw/qa/tiledrendering/tiledrendering.ui | 11 +-- 2 files changed, 15 insertions(+), 14 deletions(-) New commits: commit 900130c715e95462cc609a0f21ad64b7fd5cfa0c Author: Jan Holesovsky ke...@collabora.com Date: Fri Oct 25 19:27:02 2013 +0200 Tiled rendering: Update the adjustments in the test app .ui. Change-Id: Ia79bfeda1ba5c4044f75257e08ec4cce54b4 diff --git a/sw/qa/tiledrendering/tiledrendering.ui b/sw/qa/tiledrendering/tiledrendering.ui index e5e6d8f..35a6bf6 100644 --- a/sw/qa/tiledrendering/tiledrendering.ui +++ b/sw/qa/tiledrendering/tiledrendering.ui @@ -13,6 +13,13 @@ property name=step_increment1/property property name=page_increment10/property /object + object class=GtkAdjustment id=adjustment3 +property name=lower1/property +property name=upper10/property +property name=value5000/property +property name=step_increment100/property +property name=page_increment10/property + /object object class=GtkWindow id=TiledRendering property name=can_focusFalse/property property name=border_width12/property @@ -195,7 +202,7 @@ property name=invisible_charâ¢/property property name=invisible_char_setTrue/property property name=progress_pulse_step1/property -property name=adjustmentadjustment1/property +property name=adjustmentadjustment3/property property name=numericTrue/property /object packing @@ -213,7 +220,7 @@ property name=width_chars1/property property name=invisible_char_setTrue/property property name=progress_pulse_step1/property -property name=adjustmentadjustment1/property +property name=adjustmentadjustment3/property property name=numericTrue/property /object packing commit 4bc75d825abd9b10dcbb5f75f72e749d2da8d688 Author: Jan Holesovsky ke...@collabora.com Date: Fri Oct 25 19:12:43 2013 +0200 Tiled rendering: Better way to get the values in the test app. Change-Id: I8c4b1cc1d6db3b6572bcf6d80e07567f667e975e diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 389e997..3adbf83 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -97,22 +97,16 @@ public: DECL_LINK ( RenderHdl, Button * ); DECL_LINK ( ChooseDocumentHdl, Button * ); - -int extractInt(const NumericField *pField) -{ -OUString aString(pField-GetText()); -return aString.toInt32(); -} }; IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG ) { -int contextWidth = extractInt(mpContextWidth); -int contextHeight = extractInt(mpContextHeight); -int tilePosX = extractInt(mpTilePosX); -int tilePosY = extractInt(mpTilePosY); -int tileWidth = extractInt(mpTileWidth); -int tileHeight = extractInt(mpTileHeight); +int contextWidth = mpContextWidth-GetValue(); +int contextHeight = mpContextHeight-GetValue(); +int tilePosX = mpTilePosX-GetValue(); +int tilePosY = mpTilePosY-GetValue(); +int tileWidth = mpTileWidth-GetValue(); +int tileHeight = mpTileHeight-GetValue(); // do the same thing we are doing in touch_lo_draw_tile() SwWrtShell *pViewShell = GetActiveWrtShell(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |1 + i18nlangtag/source/isolang/isolang.cxx |6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 8697b72ef81aab80b4fd657e5f8d68c9904735dd Author: Eike Rathke er...@redhat.com Date: Fri Oct 25 19:35:20 2013 +0200 Sindhi 'sd-PK' = 'sd-Arab-PK' Change-Id: I418a991f4555a411ea05237010f64b03552affe5 diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index c9b7af6..4ee2d01 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -615,6 +615,7 @@ static bool checkMapping( const OUString rStr1, const OUString rStr2 ) if (rStr1 == pli ) return rStr2 == pi-Latn; if (rStr1 == ks ) return rStr2 == ks-Arab; if (rStr1 == chr-US ) return rStr2 == chr-Cher-US; +if (rStr1 == sd-PK ) return rStr2 == sd-Arab-PK; return rStr1 == rStr2; } diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 13e5e4d..e7e2340 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -350,7 +350,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_ORIYA, or, IN, 0 }, { LANGUAGE_PUNJABI, pa, IN, 0 }, { LANGUAGE_SANSKRIT,sa, IN, 0 }, -{ LANGUAGE_SINDHI, sd, IN, 0 },// TODO: there's Deva(nagari) and Arab(ic) script, which do we use in 'sd' translation? MS maps this to 'sd-Deva-IN' +{ LANGUAGE_SINDHI, sd, IN, 0 },// TODO: there's Deva(nagari) and Arab(ic) script, MS maps this to 'sd-Deva-IN' { LANGUAGE_TAMIL, ta, IN, 0 }, { LANGUAGE_TAMIL_SRI_LANKA, ta, LK, 0 }, { LANGUAGE_TELUGU, te, IN, 0 }, @@ -358,7 +358,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_PUNJABI_ARABIC_LSO, pnb, , 0 }, { LANGUAGE_PUNJABI_PAKISTAN, lah, PK, kSAME },// macrolanguage code, earlier preferred 'lah' over 'pa' for Western Panjabi, now there is 'pnb' { LANGUAGE_PUNJABI_PAKISTAN,pa, PK, kSAME },// MS maps this to 'pa-Arab-PK', but 'pa'='pan' Eastern Panjabi is not used in PK, only in IN -{ LANGUAGE_SINDHI_PAKISTAN, sd, PK, 0 },// TODO: there's Deva(nagari) and Arab(ic) script, which do we use in 'sd' translation? MS maps this to 'sd-Arab-PK' +{ LANGUAGE_SINDHI_PAKISTAN, sd, PK, kSAME },// Arabic script { LANGUAGE_BELARUSIAN, be, BY, 0 }, { LANGUAGE_CATALAN, ca, ES, 0 },// Spain (default) { LANGUAGE_CATALAN, ca, AD, 0 },// Andorra @@ -677,7 +677,7 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] = { LANGUAGE_UZBEK_LATIN, uz-Latn, UZ, 0 }, // macrolanguage code { LANGUAGE_UZBEK_LATIN_LSO, uz-Latn, , 0 }, // { LANGUAGE_SINDHI, sd-Deva, IN, 0 }, // MS, TODO: see comment above in aImplIsoLangEntries -// { LANGUAGE_SINDHI_PAKISTAN, sd-Arab, PK, 0 }, // MS, TODO: see comment above in aImplIsoLangEntries +{ LANGUAGE_SINDHI_PAKISTAN, sd-Arab, PK, 0 }, // MS { LANGUAGE_SINDHI_ARABIC_LSO, sd-Arab, , 0 }, { LANGUAGE_CHEROKEE_UNITED_STATES, chr-Cher, US, 0 }, // MS { LANGUAGE_CHEROKEE_CHEROKEE_LSO, chr-Cher, , 0 }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/isolang/isolang.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit efa1f08be8194ed97a4b48effd0bbe109d5c2164 Author: Eike Rathke er...@redhat.com Date: Fri Oct 25 19:48:24 2013 +0200 for 'sd' language-only find 'sd-PK' first instead of 'sd-IN' which is overridden by sd-Arab-PK and our 'sd' translation is Arabic script. Change-Id: I5d4c90cbb3b7ff82c61301b86fc7cdd494284236 diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index e7e2340..d4cfc41 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -350,7 +350,6 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_ORIYA, or, IN, 0 }, { LANGUAGE_PUNJABI, pa, IN, 0 }, { LANGUAGE_SANSKRIT,sa, IN, 0 }, -{ LANGUAGE_SINDHI, sd, IN, 0 },// TODO: there's Deva(nagari) and Arab(ic) script, MS maps this to 'sd-Deva-IN' { LANGUAGE_TAMIL, ta, IN, 0 }, { LANGUAGE_TAMIL_SRI_LANKA, ta, LK, 0 }, { LANGUAGE_TELUGU, te, IN, 0 }, @@ -359,6 +358,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_PUNJABI_PAKISTAN, lah, PK, kSAME },// macrolanguage code, earlier preferred 'lah' over 'pa' for Western Panjabi, now there is 'pnb' { LANGUAGE_PUNJABI_PAKISTAN,pa, PK, kSAME },// MS maps this to 'pa-Arab-PK', but 'pa'='pan' Eastern Panjabi is not used in PK, only in IN { LANGUAGE_SINDHI_PAKISTAN, sd, PK, kSAME },// Arabic script +{ LANGUAGE_SINDHI, sd, IN, 0 },// TODO: there's Deva(nagari) and Arab(ic) script, MS maps this to 'sd-Deva-IN' { LANGUAGE_BELARUSIAN, be, BY, 0 }, { LANGUAGE_CATALAN, ca, ES, 0 },// Spain (default) { LANGUAGE_CATALAN, ca, AD, 0 },// Andorra ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/tabpages/tpbitmap.cxx |7 +-- cui/source/tabpages/tpcolor.cxx | 10 ++ cui/source/tabpages/tplneend.cxx | 25 + 3 files changed, 28 insertions(+), 14 deletions(-) New commits: commit 03fa6020a862b1b6faf69f33274022cb871e8f4b Author: Armin Le Grand a...@apache.org Date: Fri Oct 25 16:22:15 2013 + i123497 corrected modify implementations for bitmap, lineend and color diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 17b0d7e..1c86921 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -756,9 +756,12 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) bLoop = sal_False; const BitmapEx aBitmapEx(aBitmapCtl.GetBitmapEx()); -const XBitmapEntry aEntry(Graphic(aBitmapEx), aName); -aLbBitmaps.Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), aEntry, nPos ); +// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted) +XBitmapEntry* pEntry = new XBitmapEntry(Graphic(aBitmapEx), aName); +delete maBitmapList-Replace(pEntry, nPos); + +aLbBitmaps.Modify( rStyleSettings.GetListBoxPreviewDefaultPixelSize(), *pEntry, nPos ); aLbBitmaps.SelectEntryPos( nPos ); // Flag fuer modifiziert setzen diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index d94816c..e9763e0 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -631,13 +631,15 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) if (eCM != CM_RGB) ConvertColorValues (aTmpColor, CM_RGB); -const XColorEntry aEntry(aTmpColor, aName); +// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted) +XColorEntry* pEntry = new XColorEntry(aTmpColor, aName); +delete maColorTab-Replace(pEntry, nPos); -aLbColor.Modify( aEntry, nPos ); +aLbColor.Modify( *pEntry, nPos ); aLbColor.SelectEntryPos( nPos ); -aValSetColorTable.SetItemColor( nPos + 1, aEntry.GetColor() ); -aValSetColorTable.SetItemText( nPos + 1, aEntry.GetName() ); +aValSetColorTable.SetItemColor( nPos + 1, pEntry-GetColor() ); +aValSetColorTable.SetItemText( nPos + 1, pEntry-GetName() ); aEdtName.SetText( aName ); aCtlPreviewOld.Invalidate(); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 0059e87..8114d16 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -402,19 +402,28 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) // Wenn nicht vorhanden, wird Eintrag aufgenommen if( bDifferent ) { -const XLineEndEntry* pEntry = maLineEndList-GetLineEnd( nPos ); +const XLineEndEntry* pOldEntry = maLineEndList-GetLineEnd( nPos ); -aEdtName.SetText( aName ); +if(pOldEntry) +{ +// #123497# Need to replace the existing entry with a new one (old returned needs to be deleted) +XLineEndEntry* pEntry = new XLineEndEntry(pOldEntry-GetLineEnd(), aName); +delete maLineEndList-Replace(pEntry, nPos); -const XLineEndEntry aEntry(pEntry-GetLineEnd(), aName); +aEdtName.SetText( aName ); -aLbLineEnds.Modify( aEntry, nPos, maLineEndList-GetUiBitmap( nPos ) ); -aLbLineEnds.SelectEntryPos( nPos ); +aLbLineEnds.Modify( *pEntry, nPos, maLineEndList-GetUiBitmap( nPos ) ); +aLbLineEnds.SelectEntryPos( nPos ); -// Flag fuer modifiziert setzen -*pnLineEndListState |= CT_MODIFIED; +// Flag fuer modifiziert setzen +*pnLineEndListState |= CT_MODIFIED; -*pPageType = 3; +*pPageType = 3; +} +else +{ +OSL_ENSURE(false, LineEnd to be modified not existing (!)); +} } } return( 0L ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |7 ++- i18nlangtag/source/isolang/isolang.cxx | 10 +- 2 files changed, 11 insertions(+), 6 deletions(-) New commits: commit aaba61ba1ff30956b791836cf05d6bd511f26fa2 Author: Eike Rathke er...@redhat.com Date: Fri Oct 25 20:05:58 2013 +0200 override 'sr-Cyrl*' with 'sr*' which is what we so far always used, though Cyrl is not suppress-script and would be correct, but it's primary usage. Change-Id: If7ce7dfcc6b4cc07c503dd2ff2c2bbe2c55c9338 diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 4ee2d01..fd6fe43 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -588,7 +588,7 @@ static bool checkMapping( const OUString rStr1, const OUString rStr2 ) if (rStr1 == cz ) return rStr2 == cs-CZ; if (rStr1 == iw-IL ) return rStr2 == he-IL; if (rStr1 == in-ID ) return rStr2 == id-ID; -if (rStr1 == sr-YU ) return rStr2 == sr-Cyrl-CS; +if (rStr1 == sr-YU ) return rStr2 == sr-CS; if (rStr1 == sh-RS ) return rStr2 == sr-Latn-RS; if (rStr1 == sh-YU ) return rStr2 == sr-Latn-CS; if (rStr1 == sh-CS ) return rStr2 == sr-Latn-CS; @@ -616,6 +616,11 @@ static bool checkMapping( const OUString rStr1, const OUString rStr2 ) if (rStr1 == ks ) return rStr2 == ks-Arab; if (rStr1 == chr-US ) return rStr2 == chr-Cher-US; if (rStr1 == sd-PK ) return rStr2 == sd-Arab-PK; +if (rStr1 == sr-Cyrl-RS ) return rStr2 == sr-RS; +if (rStr1 == sr-Cyrl-ME ) return rStr2 == sr-ME; +if (rStr1 == sr-Cyrl-BA ) return rStr2 == sr-BA; +if (rStr1 == sr-Cyrl-CS ) return rStr2 == sr-CS; +if (rStr1 == sr-Cyrl ) return rStr2 == sr; return rStr1 == rStr2; } diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index d4cfc41..a7e8987 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -650,11 +650,11 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] = { LANGUAGE_SERBIAN_LATIN_SAM, sr-Latn, YU, 0 }, // legacy Serbian Latin in Yugoslavia { LANGUAGE_SERBIAN_LATIN_LSO, sr-Latn, , 0 }, { LANGUAGE_SERBIAN_LATIN_NEUTRAL, sr-Latn, , 0 }, // MS lists this as 'sr' only, what a mess -{ LANGUAGE_SERBIAN_CYRILLIC_SERBIA, sr-Cyrl, RS, 0 }, // MS -{ LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO, sr-Cyrl, ME, 0 }, // MS -{ LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA, sr-Cyrl, BA, 0 }, // MS -{ LANGUAGE_SERBIAN_CYRILLIC_SAM,sr-Cyrl, CS, 0 }, // MS -{ LANGUAGE_SERBIAN_CYRILLIC_LSO,sr-Cyrl, , 0 }, // MS +{ LANGUAGE_SERBIAN_CYRILLIC_SERBIA, sr-Cyrl, RS, kSAME }, // MS +{ LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO, sr-Cyrl, ME, kSAME }, // MS +{ LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA, sr-Cyrl, BA, kSAME }, // MS +{ LANGUAGE_SERBIAN_CYRILLIC_SAM,sr-Cyrl, CS, kSAME }, // MS +{ LANGUAGE_SERBIAN_CYRILLIC_LSO,sr-Cyrl, , kSAME }, // MS { LANGUAGE_BOSNIAN_CYRILLIC_BOSNIA_HERZEGOVINA, bs-Cyrl, BA, 0 }, { LANGUAGE_BOSNIAN_CYRILLIC_LSO,bs-Cyrl, , 0 }, { LANGUAGE_AZERI_CYRILLIC, az-Cyrl, AZ, 0 }, // macrolanguage code ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx |4 +++- i18nlangtag/source/isolang/isolang.cxx |4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) New commits: commit 116a888b43e4df35a2ef1a0e272182722b75d11c Author: Eike Rathke er...@redhat.com Date: Fri Oct 25 20:24:46 2013 +0200 override 'yi-Hebr-*' with 'yi-*' as Hebr is suppress-script Change-Id: Iaae25a7d517404fc9c8186fd1006f9a4af82f584 diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index fd6fe43..0d6f130 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -604,7 +604,7 @@ static bool checkMapping( const OUString rStr1, const OUString rStr2 ) if (rStr1 == qu-EC ) return rStr2 == quz-EC; if (rStr1 == qu-PE ) return rStr2 == quz-PE; if (rStr1 == ff-NG ) return rStr2 == fuv-NG; -if (rStr1 == ji-IL ) return rStr2 == yi-Hebr-IL; +if (rStr1 == ji-IL ) return rStr2 == yi-IL; if (rStr1 == iu-CA ) return rStr2 == iu-Latn-CA; if (rStr1 == iu ) return rStr2 == iu-Latn; if (rStr1 == gbz-AF ) return rStr2 == prs-AF; @@ -621,6 +621,8 @@ static bool checkMapping( const OUString rStr1, const OUString rStr2 ) if (rStr1 == sr-Cyrl-BA ) return rStr2 == sr-BA; if (rStr1 == sr-Cyrl-CS ) return rStr2 == sr-CS; if (rStr1 == sr-Cyrl ) return rStr2 == sr; +if (rStr1 == yi-Hebr-US ) return rStr2 == yi-US; +if (rStr1 == yi-Hebr-IL ) return rStr2 == yi-IL; return rStr1 == rStr2; } diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index a7e8987..28bb773 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -672,8 +672,8 @@ static IsoLanguageScriptCountryEntry const aImplIsoLangScriptEntries[] = { LANGUAGE_TAJIK_LSO, tg-Cyrl, , 0 }, // MS { LANGUAGE_AZERI_LATIN, az-Latn, AZ, 0 }, // macrolanguage code; MS { LANGUAGE_AZERI_LATIN_LSO, az-Latn, , 0 }, // macrolanguage code; MS -{ LANGUAGE_USER_YIDDISH_US, yi-Hebr, US, 0 }, // macrolanguage code; MS -{ LANGUAGE_YIDDISH, yi-Hebr, IL, 0 }, // macrolanguage code; MS +{ LANGUAGE_USER_YIDDISH_US, yi-Hebr, US, kSAME }, // macrolanguage code; MS, Hebr is suppress-script +{ LANGUAGE_YIDDISH, yi-Hebr, IL, kSAME }, // macrolanguage code; MS, Hebr is suppress-script { LANGUAGE_UZBEK_LATIN, uz-Latn, UZ, 0 }, // macrolanguage code { LANGUAGE_UZBEK_LATIN_LSO, uz-Latn, , 0 }, // { LANGUAGE_SINDHI, sd-Deva, IN, 0 }, // MS, TODO: see comment above in aImplIsoLangEntries ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/qa
sw/qa/tiledrendering/tiledrendering.cxx | 27 +++ 1 file changed, 11 insertions(+), 16 deletions(-) New commits: commit 75878a5a406858bf2a8f852a756f9e63d8df2ada Author: Jan Holesovsky ke...@collabora.com Date: Fri Oct 25 20:44:06 2013 +0200 Tiled rendering: Use VirtualDevice, and set the MapMode correctly. Change-Id: I79394beff70e5f1db3ec2e6995c9a8fd666d00a5 diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx index 3adbf83..9d168d8 100644 --- a/sw/qa/tiledrendering/tiledrendering.cxx +++ b/sw/qa/tiledrendering/tiledrendering.cxx @@ -119,29 +119,24 @@ IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG ) // SystemGraphicsData aData; // [setup the aData] // VirtualDevice aDevice(aData, [color depth]); -/* -// FIXME don't use pViewShell()-GetOut() directly, we need an own -// device here, something like -#ifdef IOS -VirtualDevice aDevice(8); -#else -VirtualDevice aDevice(1); -#endif - -aDevice.SetReferenceDevice(VirtualDevice::REFDEV_MODE_MSO1); +VirtualDevice aDevice; + MapMode aMapMode(aDevice.GetMapMode()); aMapMode.SetMapUnit(MAP_TWIP); +aMapMode.SetOrigin(Point(-tilePosX, -tilePosY)); aDevice.SetMapMode(aMapMode); -aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight)); -*/ +aDevice.SetOutputSizePixel(aDevice.PixelToLogic(Size(contextWidth, contextHeight))); + +// draw +pViewShell-PaintTile(aDevice, Rectangle(Point(tilePosX, tilePosY), Size(tileWidth, tileHeight))); -pViewShell-PaintTile(pViewShell-GetOut(), Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); -// FIXME pViewShell-PaintTile(aDevice, Rectangle(tilePosX, tilePosY, tileWidth, tileHeight)); +// debug +// aDevice.SetFillColor(Color(COL_RED)); +// aDevice.DrawRect(Rectangle(1000, 1000, 2000, 2000)); // copy the aDevice content to mpImage -// FIXME BitmapEx aBitmap(pViewShell-GetOut()-GetBitmapEx(Point(0,0), aDevice.PixelToLogic(Size(contextWidth, contextHeight; -BitmapEx aBitmap(pViewShell-GetOut()-GetBitmapEx(Point(0,0), pViewShell-GetOut()-PixelToLogic(Size(contextWidth, contextHeight; +Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), aDevice.PixelToLogic(Size(contextWidth, contextHeight; mpImage-SetImage(Image(aBitmap)); // update the dialog size ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/source
sw/source/core/view/viewsh.cxx |4 1 file changed, 4 deletions(-) New commits: commit 4d64b7dff2d8f9cd80139f042e181a33806cbafe Author: Jan Holesovsky ke...@collabora.com Date: Fri Oct 25 20:46:59 2013 +0200 Tiled rendering: This is wrong approach, kill it. Change-Id: Ie674d19ae95b9e3c58d739d8cde1543124d1bd1b diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 3a978d4..cf313f5 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1757,10 +1757,6 @@ void ViewShell::PaintTile(OutputDevice *pOut, const Rectangle rRect) { assert(pOut); -pOut-SetPixelOffset(Size(rRect.TopLeft().X(), rRect.TopLeft().Y())); - -// TODO make the tileWidth/Height fit the width/height of the pOut device - // now we need to setup the ViewShell's output device // TODO clean up ViewShell's approach to output devices OutputDevice *pSaveOut = GetOut(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1 writerfilter/source/doctok/WW8Sttbf.cxx | 151 --- writerfilter/source/doctok/WW8Sttbf.hxx | 114 --- writerfilter/source/doctok/resources.xmi |3 4 files changed, 269 deletions(-) New commits: commit b6024aadaac08102a579ee51697e85ec2394c430 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Oct 25 21:36:08 2013 +0200 writerfilter: unused WW8Sttbf class Change-Id: Id6486b49a3ae6e32f48d3c0c11fa26f08b870ae0 diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index ddbd3a4..f608187 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -133,7 +133,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/doctok/WW8PropertySetImpl \ writerfilter/source/doctok/WW8ResourceModelImpl \ writerfilter/source/doctok/WW8StructBase \ -writerfilter/source/doctok/WW8Sttbf \ writerfilter/source/doctok/WW8Table \ writerfilter/source/doctok/WW8Text \ writerfilter/source/filter/ImportFilter \ diff --git a/writerfilter/source/doctok/WW8Sttbf.cxx b/writerfilter/source/doctok/WW8Sttbf.cxx deleted file mode 100644 index d584f90..000 --- a/writerfilter/source/doctok/WW8Sttbf.cxx +++ /dev/null @@ -1,103 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include WW8Sttbf.hxx -#include doctok/resources.hxx - -namespace writerfilter { -namespace doctok -{ - -WW8Sttbf::WW8Sttbf(WW8Stream rStream, sal_uInt32 nOffset, sal_uInt32 nCount) -: WW8StructBase(rStream, nOffset, nCount) -{ -sal_uInt32 nComplexOffset = 0; -if (getU16(0) == 0x) -{ -mbComplex = true; -nComplexOffset = 2; -} - -mnCount = getU16(nComplexOffset); -mnExtraDataCount = getU16(nComplexOffset + 2); - -nOffset = (mbComplex ? 2 : 0) + 4; - -for (sal_uInt32 n = 0; n mnCount; ++n) -{ -mEntryOffsets.push_back(nOffset); - -sal_uInt32 nStringLength = getU16(nOffset); - -nOffset += 2 + nStringLength * (mbComplex ? 2 : 1); - -mExtraOffsets.push_back(nOffset); - -nOffset += mnExtraDataCount; -} -} - -sal_uInt32 WW8Sttbf::getEntryOffset(sal_uInt32 nPos) const -{ -return mEntryOffsets[nPos]; -} - -sal_uInt32 WW8Sttbf::getEntryCount() const -{ -return mnCount; -} - -OUString WW8Sttbf::getEntry(sal_uInt32 nPos) const -{ -return getString(getEntryOffset(nPos)); -} - -sal_uInt32 WW8SttbRgtplc::getEntryCount() -{ -return getU16(2); -} - -::writerfilter::ReferenceProperties::Pointer_t -WW8SttbRgtplc::getEntry(sal_uInt32 nIndex) -{ -::writerfilter::ReferenceProperties::Pointer_t pResult; - -sal_uInt32 nOffset = 6; - -for (sal_uInt32 i = 0; i nIndex; ++i) -{ -sal_uInt16 nCount = getU16(nOffset); -nOffset = nOffset + 2 + nCount; -} - -sal_uInt16 nCount = getU16(nOffset); - -if (nCount 0) -{ -WW8Tplc * pTplc = new WW8Tplc(*this, nOffset + 2, nCount); - -pResult.reset(pTplc); -} - -return pResult; -} - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/doctok/WW8Sttbf.hxx b/writerfilter/source/doctok/WW8Sttbf.hxx deleted file mode 100644 index 02e37a4..000 --- a/writerfilter/source/doctok/WW8Sttbf.hxx +++ /dev/null @@ -1,85 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - *
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - scp2/source setup_native/Package_misc.mk setup_native/source solenv/bin
scp2/source/base/folderitem_base.scp |3 scp2/source/calc/folderitem_calc.scp |3 scp2/source/draw/folderitem_draw.scp |3 scp2/source/impress/folderitem_impress.scp|3 scp2/source/math/folderitem_math.scp |3 scp2/source/ooo/common_brand.scp | 11 +++ scp2/source/ooo/folderitem_ooo.scp| 13 ++-- scp2/source/writer/folderitem_writer.scp |3 setup_native/Package_misc.mk |1 setup_native/source/win32/desktophelper.txt |1 solenv/bin/modules/installer.pm |2 solenv/bin/modules/installer/globals.pm |2 solenv/bin/modules/installer/setupscript.pm | 31 + solenv/bin/modules/installer/windows/component.pm |7 ++ solenv/bin/modules/installer/windows/file.pm | 24 +++ solenv/bin/modules/installer/windows/property.pm |3 solenv/bin/modules/installer/windows/registry.pm | 38 solenv/bin/modules/installer/windows/shortcut.pm | 69 +- solenv/bin/modules/t/installer-setupscript.t |1 19 files changed, 205 insertions(+), 16 deletions(-) New commits: commit 3ce20b3ea9d5ab57fc4e7f0c9b658ecb33c98bf2 Author: Andras Timar andras.ti...@collabora.com Date: Fri Oct 25 06:38:06 2013 -0700 fdo#65102 respect user's choice not to install desktop icon Using advertised shortcuts -- inspired by Intel AppUp Centre's requirement -- was not a good idea after all. I revert this, and I also revert the commit that actually disabled it in default Windows builds. This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e. This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6. Change-Id: I5b465574f7a178fadcdca03a0fe0d68d76621341 diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 2da4321..51a940b 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; -ModuleID = gid_Module_Brand_Prg_Base; +ModuleID = gid_Module_Prg_Base_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sbase; IconFile = gid_File_Exe_Sbase; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 83dd82b..05db68f 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; -ModuleID = gid_Module_Brand_Prg_Calc; +ModuleID = gid_Module_Prg_Calc_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Scalc; IconFile = gid_File_Exe_Scalc; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index ba59ea7..f692707 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; -ModuleID = gid_Module_Brand_Prg_Draw; +ModuleID = gid_Module_Prg_Draw_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sdraw; IconFile = gid_File_Exe_Sdraw; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index fb5c136..44adbbe 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; -ModuleID = gid_Module_Brand_Prg_Impress; +ModuleID = gid_Module_Prg_Impress_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Simpress; IconFile = gid_File_Exe_Simpress; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 127773f..fb8bbcd 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Smath Name = %PRODUCTNAME Math; -ModuleID = gid_Module_Brand_Prg_Math; +ModuleID = gid_Module_Prg_Math_Bin;
[Libreoffice-commits] help.git: git_submodules_suck
0 files changed New commits: commit 35ad87caa5923b90d8ef5e7d951059fa60d6ced8 Author: Michael Stahl mst...@redhat.com Date: Fri Oct 25 23:27:00 2013 +0200 dummy commit to revert time-travel of helpcontent2 module to August Change-Id: I9ce4783fa1d2d83212549952eeed1db4f760 diff --git a/git_submodules_suck b/git_submodules_suck new file mode 100644 index 000..e69de29 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 640d0f0b9e8bee9eb6be8d736bc280969fc8f9a7 Author: Michael Stahl mst...@redhat.com Date: Fri Oct 25 23:27:00 2013 +0200 Updated core Project: help 35ad87caa5923b90d8ef5e7d951059fa60d6ced8 diff --git a/helpcontent2 b/helpcontent2 index 0d8b37c..35ad87c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e +Subproject commit 35ad87caa5923b90d8ef5e7d951059fa60d6ced8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - configure.ac external/apache-commons external/beanshell external/hsqldb external/jfreereport libxmlsec/xmlsec1-configure.patch reportbuilder/java Repository
RepositoryExternal.mk | 30 ++-- configure.ac | 37 -- external/apache-commons/ExternalPackage_apache_commons_logging.mk |8 +- external/apache-commons/ExternalProject_apache_commons_logging.mk |9 -- external/apache-commons/Module_apache-commons.mk |3 external/apache-commons/Package_apache_commons_codec.mk | 16 external/apache-commons/Package_apache_commons_httpclient.mk | 16 external/apache-commons/Package_apache_commons_lang.mk| 16 external/beanshell/ExternalPackage_beanshell.mk |4 - external/hsqldb/ExternalPackage_hsqldb.mk |4 - external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk |4 - external/jfreereport/ExternalPackage_jfreereport_flute.mk |4 - external/jfreereport/ExternalPackage_jfreereport_libbase.mk |4 - external/jfreereport/ExternalPackage_jfreereport_libfonts.mk |4 - external/jfreereport/ExternalPackage_jfreereport_libformula.mk|4 - external/jfreereport/ExternalPackage_jfreereport_liblayout.mk |4 - external/jfreereport/ExternalPackage_jfreereport_libloader.mk |4 - external/jfreereport/ExternalPackage_jfreereport_librepository.mk |4 - external/jfreereport/ExternalPackage_jfreereport_libserializer.mk |4 - external/jfreereport/ExternalPackage_jfreereport_libxml.mk|4 - external/jfreereport/ExternalPackage_jfreereport_sac.mk |4 - external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 13 ++- external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 22 - external/jfreereport/patches/flow-engine.patch| 15 ++-- external/jfreereport/patches/liblayout.patch | 18 +++- external/jfreereport/version.mk |2 libxmlsec/xmlsec1-configure.patch |2 reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf |4 - rhino/ExternalPackage_rhino.mk|4 - scp2/InstallModule_ooo.mk |2 scp2/source/ooo/module_reportbuilder.scp |4 - solenv/gbuild/Extension.mk|9 ++ solenv/gbuild/ExternalPackage.mk | 20 - solenv/gbuild/ExternalProject.mk |5 + solenv/gbuild/Jar.mk | 12 ++- solenv/gbuild/JavaClassSet.mk |6 + swext/Extension_wiki-publisher.mk | 14 ++- tomcat/Module_tomcat.mk |1 tomcat/Package_tomcat.mk | 16 39 files changed, 171 insertions(+), 185 deletions(-) New commits: commit efcd482813e3f411d26c3291eae8d7c90394d161 Author: Michael Stahl mst...@redhat.com Date: Fri Oct 25 22:58:36 2013 +0200 libxmlsec: find internal NSS libs Change-Id: Ic82691ea04fc6e698fb132a157a2bd2dfcf48784 diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch index 1f6b718..622c063 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/libxmlsec/xmlsec1-configure.patch @@ -109,7 +109,7 @@ -ac_nss_lib_dir=/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name -ac_nss_inc_dir=/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name -+ac_nss_lib_dir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT} ++ac_nss_lib_dir=${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/lib +ac_nss_inc_dir=${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/include ${WORKDIR}/UnpackedTarball/nss/mozilla/dist/public AC_MSG_CHECKING(for nspr libraries = $NSPR_MIN_VERSION) commit 7b1da9a478b53c29e5480040687c30460ecaa462 Author: Michael Stahl mst...@redhat.com Date: Fri Oct 25 21:30:05 2013 +0200 gbuild: remove gb_ExternalPackage_add_jar_for_install Deliver all external jar files to INSTDIR directly. Change-Id: Ibfaabf713da01e752517dc400200a6918d82db6d diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk index 992810f..6ee1933 100644 --- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk +++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk @@ -9,8 +9,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging)) +$(eval $(call gb_ExternalPackage_set_outdir,apache_commons_logging,$(INSTROOT))) + $(eval $(call
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5bad73429cd6c105c85c14763edbe012a92e9e49 Author: Michael Stahl mst...@redhat.com Date: Fri Oct 25 23:42:17 2013 +0200 oops, fix gb_ExternalProject__use_commons-logging Change-Id: I11ed8f8c51fde0205d86580c2af46a1d7c399b3a diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 75d2b52..ccb0fdc 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2860,7 +2860,7 @@ $(call gb_Jar_use_external_project,$(1),apache_commons_logging) $(call gb_Jar_use_jar,$(1),commons-logging-1.1.1) endef define gb_ExternalProject__use_commons-logging -$(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging) +$(call gb_ExternalProject_use_package,$(1),apache_commons_logging) endef endif # SYSTEM_APACHE_COMMONS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/jfreereport
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk |2 +- external/jfreereport/ExternalProject_jfreereport_liblayout.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 5570de06507559b68338a29d48bb429942373f8f Author: Michael Stahl mst...@redhat.com Date: Sat Oct 26 00:00:27 2013 +0200 jfreereport: d'oh forgot the comma; why did this build for me??? Change-Id: I0e1abf55250cdc8c792b6894ebc81fcafe20ed67 diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index f8d79d7..5e03d95 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -f build.xml \ -Dbuild.label=build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ - -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ + -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index 8d81c0d..3a9c273 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -f build.xml \ -Dbuild.label=build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ - -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ + -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 J. Kanowitz jkanow...@snet.net changed: What|Removed |Added Depends on||35217, 51168, 70871 --- Comment #100 from J. Kanowitz jkanow...@snet.net --- Adding https://bugs.freedesktop.org/show_bug.cgi?id=35217#c8 re: structured outline limitations... and that anchor does point to my comment cherry-picking a relatively solve-able corner case. In legal documents, the ability to comply with court rules is important. https://bugs.freedesktop.org/show_bug.cgi?id=51168 because doing editing only to discover some list formatting is unexpectedly unchangeable is even more frustrating; I bet the author of Bug 70871 feels the same way about their related problem. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] The garbage into the dev-builds.libreoffice.org
Hi Christian In case you haven't noticed, TB #47 is still not producing any Windows Master binaries... The latest build was on the 15th. Two more folders were created but they only contain the txt file... Christian Lohmaier-2 wrote 2) Add the details of your Tinderbox to the table at https://wiki.documentfoundation.org/Development/Tinderbox Thank you for updating the table. Could you please rename the TB to match the name in the table? Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/The-garbage-into-the-dev-builds-libreoffice-org-tp4074218p4079799.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] daily vs. 4.-0+ bibisect repos [was: Trouble bibisecting - 'com::sun::star::uno::RuntimeException']
Hi Mirosław, Im CC'ing Jibel on this, so he might comment on the things wrt to the Canonical QA lab repo. @Jibel: You find the full post at http://nabble.documentfoundation.org/Libreoffice-qa-Trouble-bibisecting-com-sun-star-uno-RuntimeException-tp4079718p4079667.html On Thu, Oct 24, 2013 at 10:39:24PM +0200, Mirosław Zalewski wrote: First and foremost, we have two repositories from two men. These not only serve different purpose, but also are set up differently, which means that user must perform different steps depending on which one he has. Unfortunately, these differences are never laid out systematically. I learned them by trial and error. I think that versions table could use another column with name of man who created archive in question. Then we can reference to them as Bjoern archive and Jean archive. Thats true. I set up the old bibisect repo and the 2013-10-12 actually pick up exactly were the pre-4.0 build left. As those two are build in the same way they can (and should) be joined: https://bugs.freedesktop.org/show_bug.cgi?id=70652 I build these on my home machine (which then heats the room with 500W for four days). These bibisect repos were never intended to be (and will never be intended to be) updated daily or even monthly, but once for every major release. The Jean archive is set up by jibel (in CC) and shall provide builds continuously. As this doesnt allow for repacking the repo grows huge. In the long run, Norbert (shm_get) and Cloph plan to create bibisect repos from the daily build. Unfortunately, while this has been decided to be the way to go even already in Berlin, it always fell victim to other topics needing emergency attention. If one is to seriously bibisect, he has to download two packages: 1. Bjoern 4.0, which covers everything from 2011-08-06 (about midway between branching 3.4 and 3.5 from master) to 2012-12-08 (around branching 4.0 from master). 2. Either Bjoern 2013-10-12 or Jean 4.0+. They both cover roughly the same area, since 2012-12-08 to 2013-09-17 (later date is subject to change). The difference between them is density of builds - Jean archive is far denser, which means that each build covers fewer commits, which means that finding patch that introduced regression is easier for developer with bisect log. But we pay for this with almost 4 times bigger package. Yes, for bibisecting, currently Bjoern 4.0 and Bjoern 2013-10-12 are the way to go. The Jean archive might be helpful once the Bjoern 2013-10-12 repo grows too old -- OTOH hopefully, by then we have bibisect-from-dailies in place. In Bjoern packages (well, 4.0 that is; I did not checked 2012-10-12, but assume it is set up the same way) our main concern is HEAD set up at oldest commit. This way `git rev-parse HEAD` will produce ID of oldest commit. If we blindly follow instructions at wiki, we will end up assigning latest tag to oldest possible commit. Our second problem is that we have empty git working tree. Both of them can be fixed by issuing: git checkout master Yes, my repos are intentionally checked out at an empty root commit, as everything else would make them bigger without need. If anyone can update wiki page with information provided in this message, please do. Oh, please do yourself -- chinese whispers is a fun game, but its not good for technical documentation. ;) If you dont want that, please at least add a link to this Mail on some archive there, as its a good discussion of the topic. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] daily vs. 4.-0+ bibisect repos [was: Trouble bibisecting - 'com::sun::star::uno::RuntimeException']
Dnia 2013-10-25, o godz. 21:39:15 bjoern bjoern.michael...@canonical.com napisał(a): Yes, for bibisecting, currently Bjoern 4.0 and Bjoern 2013-10-12 are the way to go. The Jean archive might be helpful once the Bjoern 2013-10-12 repo grows too old -- OTOH hopefully, by then we have bibisect-from-dailies in place. Thanks for confirming my assumptions. Personally, I think it would be better to update wiki with info we have and not wait for bibisect-from-dailies to appear. I mean - it might be available in few days, it might be available in few months. We will just update wiki when it will be available, and in the meantime provide instructions for most recent archives we have. If anyone can update wiki page with information provided in this message, please do. Oh, please do yourself -- chinese whispers is a fun game, but its not good for technical documentation. ;) If you dont want that, please at least add a link to this Mail on some archive there, as its a good discussion of the topic. I would, but - well, there are some emergency matters that require my attention. When I have more spare time, I will update wiki page. In the meantime, I left link to my message at discussion page. This way it should not be lost. If someone is willing to pick up challenge and update wiki, do not hesitate to. https://wiki.documentfoundation.org/Talk:QA/HowToBibisect -- Best regards Mirosław Zalewski ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 70841] FILESAVE: export to Excel 2003 XML (aka XMLSS) format issues
https://bugs.freedesktop.org/show_bug.cgi?id=70841 --- Comment #2 from dg dmitryg2...@mail.ru --- (In reply to comment #1) Exporting Office XML files without line breaks is done intentionally to cause problems with Microsoft software to promote LO instead. Developers refuse to fix it. kidding? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70841] FILESAVE: export to Excel 2003 XML (aka XMLSS) format issues
https://bugs.freedesktop.org/show_bug.cgi?id=70841 --- Comment #3 from Urmas davian...@gmail.com --- See #56943. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70855] New: FORMATTING: Imress incompatibility between Libreoffice 4.0 and 4.1 ( The same odp file apply different font format when open it with different version of Libreoffic
https://bugs.freedesktop.org/show_bug.cgi?id=70855 Priority: medium Bug ID: 70855 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FORMATTING: Imress incompatibility between Libreoffice 4.0 and 4.1 ( The same odp file apply different font format when open it with different version of Libreoffice ) Severity: normal Classification: Unclassified OS: Linux (All) Reporter: minhsien0...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.0.4 release Component: Presentation Product: LibreOffice Created attachment 88099 -- https://bugs.freedesktop.org/attachment.cgi?id=88099action=edit The same odp file apply different font format when open it with different version of Libreoffice (4.0 v.s. 4.1) Problem description: I have a odp file show different font format when open it with different version of Libreoffice ( 4.0 and 4.1) Steps to reproduce: 1. Install this 2 fonts: https://sites.google.com/site/minhsien0330/tmp_file/cwheib.ttf?attredirects=0d=1 https://sites.google.com/site/minhsien0330/tmp_file/fireflysung.ttf?attredirects=0d=1 2. Download the attachement after.odp 3. Open after.odp Libreoffice 4.0 and 4.1 respectively, and compare the formating result differences. Current behavior: Libreoffice 4.0 showed the font as 文鼎PL新宋 Libreoffice 4.1 showed the font as cwtex粗黑體 Expected behavior: Both Libreoffice 4.0 and 4.1 should show the font as cwtex粗黑體 If you want to know how do I make this amazing after.odp, please follow these procedures (you can also see the attachment impress_font_problem.png to show this test procedure): 1. Install this 2 fonts: https://sites.google.com/site/minhsien0330/tmp_file/cwheib.ttf?attredirects=0d=1 https://sites.google.com/site/minhsien0330/tmp_file/fireflysung.ttf?attredirects=0d=1 2.Download the attachment before.odp 3.Open before.odp with Libreoffice 4.0, you will see the font is cwtex粗黑體. 3.Open before.odp with Libreoffice 4.1, you will see the font is still cwtex粗黑體. Then please delete the slide one and save this file with Libreoffice 4.1. 4. Reopen before.odp with Libreoffice 4.0, you will see the font was changed to 文鼎PL新宋. Quit without saving, and reopen it with Libreoffice 4.1, the font go back to cwtex粗黑體. It's strange!!! Operating System: Debian Version: 4.1.0.4 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70855] FORMATTING: Imress incompatibility between Libreoffice 4.0 and 4.1 ( The same odp file apply different font format when open it with different version of Libreoffice )
https://bugs.freedesktop.org/show_bug.cgi?id=70855 --- Comment #2 from minhsien0330 minhsien0...@gmail.com --- Created attachment 88101 -- https://bugs.freedesktop.org/attachment.cgi?id=88101action=edit (Screenshots) The testing procedure to show this bug! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70841] FILESAVE: export to Excel 2003 XML (aka XMLSS) format issues
https://bugs.freedesktop.org/show_bug.cgi?id=70841 --- Comment #4 from dg dmitryg2...@mail.ru --- (In reply to comment #3) See #56943. I see. Actually I didn't encounter with software that had parsing problems with such LO output, the only who suffers from it is myself, because it's difficult to read such documents in text editors. Remarkable that MS IE shows such XMLs in structured manner. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70855] FORMATTING: Imress incompatibility between Libreoffice 4.0 and 4.1 ( The same odp file apply different font format when open it with different version of Libreoffice )
https://bugs.freedesktop.org/show_bug.cgi?id=70855 --- Comment #1 from minhsien0330 minhsien0...@gmail.com --- Created attachment 88100 -- https://bugs.freedesktop.org/attachment.cgi?id=88100action=edit You can edit and save this file to make another after.odp to show this bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70855] FORMATTING: Imress incompatibility between Libreoffice 4.0 and 4.1 ( The same odp file apply different font format when open it with different version of Libreoffice )
https://bugs.freedesktop.org/show_bug.cgi?id=70855 minhsien0330 minhsien0...@gmail.com changed: What|Removed |Added Severity|normal |critical -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45261] EDITING: unbalanced distribution of text between columns
https://bugs.freedesktop.org/show_bug.cgi?id=45261 --- Comment #8 from Paolo Benvenuto paolobe...@gmail.com --- Any idea what could this bug depend on or what file could be located in? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69772] EDITING - table wizard not functional for Firebird embedded database
https://bugs.freedesktop.org/show_bug.cgi?id=69772 Lionel Elie Mamane lio...@mamane.lu changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |lio...@mamane.lu |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70855] FORMATTING: Imress incompatibility between Libreoffice 4.0 and 4.1 ( The same odp file apply different font format when open it with different version of Libreoffice )
https://bugs.freedesktop.org/show_bug.cgi?id=70855 --- Comment #3 from minhsien0330 minhsien0...@gmail.com --- Created attachment 88103 -- https://bugs.freedesktop.org/attachment.cgi?id=88103action=edit Sorry! Previos screenshot miss a step, so I upload a new one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39007] Persistent Restore Windows dialog won't disappear, disables key functionality
https://bugs.freedesktop.org/show_bug.cgi?id=39007 suokunl...@gmail.com changed: What|Removed |Added CC||suokunl...@gmail.com --- Comment #107 from suokunl...@gmail.com --- Today someone in the official LibreOffice Chinese QQ Qun mentioned this issue. He was using 4.0.6 when he encounter this problem. When he upgraded to 4.1.2 everything works OK again. Then I found this bug, and noticed that this bug was not commited to 4.0, which is really a pity, as 4.0.6.2 is the last bug fix release for 4.0. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70763] LibreOffice Crashes on FILESAVEAS of Writer ODT Doc, Corrupts Doc, Attempts to RENAME a Copy Crashes Windows Explorer
https://bugs.freedesktop.org/show_bug.cgi?id=70763 Maxim momonas...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #5 from Maxim momonas...@gmail.com --- (In reply to comment #0) ANY attempt to RENAME the copy results in causing Windows Explorer itself to crash! Sounds like a bug in Shell extension. Could you please run LO installation, uninstall Shell extensions, and report if it solves the problem? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69344] Unity launcher shows the StartCenter icon instead of the one of the used LO module
https://bugs.freedesktop.org/show_bug.cgi?id=69344 --- Comment #7 from suokunl...@gmail.com --- @ Jean-Baptiste Faure: Today I upgraded my Ubuntu to 13.10, and installed LibreOffice 4.1.3 RC2, and the above metioned behaviour do not exist any more. So, maybe this bug should be closed as WORKFORME? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70855] FORMATTING: Imress incompatibility between Libreoffice 4.0 and 4.1 ( The same odp file apply different font format when open it with different version of Libreoffice )
https://bugs.freedesktop.org/show_bug.cgi?id=70855 Maxim momonas...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Maxim momonas...@gmail.com --- Hi, Thank you for reporting this bug. It looks like a duplicate of Bug 68431, so it's should be fixed in 4.1.3. Be aware that you should resave your presentation with 4.1.3. *** This bug has been marked as a duplicate of bug 68431 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68431] FILESAVE: Style Font name incompatible with older versions
https://bugs.freedesktop.org/show_bug.cgi?id=68431 Maxim momonas...@gmail.com changed: What|Removed |Added CC||minhsien0...@gmail.com --- Comment #17 from Maxim momonas...@gmail.com --- *** Bug 70855 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70853] RTF Heading numbering not appearing.
https://bugs.freedesktop.org/show_bug.cgi?id=70853 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||c...@nouenoff.nl Ever confirmed|0 |1 --- Comment #2 from Cor Nouws c...@nouenoff.nl --- Hi Alistair, thanks for writing the issue. When I open Tools Outline numbering and set the correct numbering for Heading 1, 2, and 3, all is fine. When I open Tools Outline numbering and unlink Heading 3 from level 3, I can open the window Paragraph style for Heading 3 and associate another type of numbering. IMO this is how it always works? Or what else is the problem ? Cheers, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69344] Unity launcher shows the StartCenter icon instead of the one of the used LO module
https://bugs.freedesktop.org/show_bug.cgi?id=69344 --- Comment #8 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- Thank you for this information. Under Ubuntu 13.04 I still have the bug with LO 4.1.3.2. I will upgrade my distribution next WE and try again. If that solves the problem, that will show that the problem is in Unity version Ubuntu 13.04, not in LibreOffice and I will close this bug report as NotOurBug. Best regards. JBF -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70495] PDF Import: Line breaks aren't recognized
https://bugs.freedesktop.org/show_bug.cgi?id=70495 --- Comment #1 from Dominique Boutry dominique.bout...@laposte.net --- On my computer (LibO 4.1.2.3 on Win7), the given PDF is imported as a set of drawing rectangles (with blue handles rather that green handles : can somebody explain me the difference ?), indeed needing reformating. Bug or not : it depends on the specification of the PDF input filter : what is LibO supposed to be able to do, in this field ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70853] RTF Heading numbering not appearing.
https://bugs.freedesktop.org/show_bug.cgi?id=70853 --- Comment #3 from Alistair Leslie-Hughes leslie_alist...@hotmail.com --- Hi Cor, When I open the document in Open Office or MS Word the numbering appears straight away without having to modify the document. This is how I would expect LibreOffice to work as well. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70495] PDF Import: Line breaks aren't recognized
https://bugs.freedesktop.org/show_bug.cgi?id=70495 Roczek dennisroc...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70850] EDITING - Limited character set using MySql(JDBC)
https://bugs.freedesktop.org/show_bug.cgi?id=70850 rob...@familiegrosskopf.de changed: What|Removed |Added CC||rob...@familiegrosskopf.de --- Comment #1 from rob...@familiegrosskopf.de --- I have tested it with OpenSUSE 12.3 26bit, LO 4.1.1.2. Have searched a little bit to find a font with this music-characters. DejaVu Sans was the first which works in my list. Copied the characters into MariaDB, connected with JDBC. It works right - shows the characters during input and also when saved in a row. What do you see, when you go to Edit → Database → Properties → Additional settings → Character set ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70857] New: Long time delay for formating window popup when enable zh_cn langpack
https://bugs.freedesktop.org/show_bug.cgi?id=70857 Priority: medium Bug ID: 70857 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Long time delay for formating window popup when enable zh_cn langpack Severity: major Classification: Unclassified OS: Linux (All) Reporter: suokunl...@gmail.com Hardware: All Status: UNCONFIRMED Version: unspecified Component: UI Product: LibreOffice Description: LibreOffice takes much longer time for the formating window to show up. Tested both in Calc and Writer. Steps to reproduce: 1. Install a libreoffice version without any lang pack. 2. Create a new spreadsheet, right-click--format cells. the formating window pops up instantly. (Or, create a new writer file, insert a table, right-click--table, or, in writer, right-click--Character, windows pop up instantly). 3. Install the zh_ch lang pack (so the default UI language become Simplified Chinese), and do the same test as show in step 2, the formating window takes around 10s to pop up. 4. Tools(工具)--Options(选项)--Language Settings(语言选项)--Language(语言), set Language of: User Interface(用户界面) to English(英语), then restart LO and test step 2, window pops up instantly. Current Behaviour: Formating window takes much longer time to show up when zh_cn is enabled for UI. OS: Ubuntu 13.10 x86, LibreOffice 4.1.3.2, sys locale: zh_cn. In my memory, this behaviour first began since 4.0, and was reproduciable in Ubuntu 13.04. The same to use LO official build and Ubuntu build. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69344] Unity launcher shows the StartCenter icon instead of the one of the used LO module
https://bugs.freedesktop.org/show_bug.cgi?id=69344 --- Comment #9 from Maxim momonas...@gmail.com --- Looks like a side effect of http://cgit.freedesktop.org/libreoffice/core/commit/?id=ecde9ba00dcf8c1bf3413afd0281236e9429148fh=libreoffice-4-1. Probably related: https://bugs.launchpad.net/bamf/+bug/1026426 https://bugs.launchpad.net/bamf/+bug/1238122 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70850] EDITING - Limited character set using MySql(JDBC)
https://bugs.freedesktop.org/show_bug.cgi?id=70850 t...@tim-passingham.co.uk changed: What|Removed |Added CC||t...@tim-passingham.co.uk --- Comment #2 from t...@tim-passingham.co.uk --- I see 'System'. What is strange is that it works with Mysql(Native) but not with JDBC. I initially assumed I had done something wrong with the LO set-up, or with the database character set. However, since all is well using Mysql(Native) I can only assume it is something to do with JDBC. The only time it goes wrong is if I type the characters into a field on a simple BASE form (where they show correctly), and then save the record. The characters change to ? at this point. Data already stored displays correctly. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70479] Extra line appeared after copy a worksheet with comments unhide
https://bugs.freedesktop.org/show_bug.cgi?id=70479 --- Comment #2 from Dominique Boutry dominique.bout...@laposte.net --- On my computer with LibO 4.1.2.3 on Win7 : - reproduced with your Sheet1_orig ; differently reproduced with the one I created - on the destination sheet from your origine, it appears 6 comments, more or less will superposed ; the 3 extra comments are the ones connected to A1 - on the destination sheet from my origine, the comments are also split, less superposed ; the 3 extra comments appear connected to their original cell - after a save-close-reopen sequence, all the extra comments have disappeared ; some from my origine appear now wrongly connected to A1. - I also noticed that a good comment always connects to the high-right corner of its cell (on the red indicator), while a bad comment may connect to any of 8 gravity points of the cell (corners and side middle). Could it be that the copy command copy comments both as comments and as drawing elements ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56007] Explorer shell extension: Thumbnail generation slow on network drives
https://bugs.freedesktop.org/show_bug.cgi?id=56007 --- Comment #17 from Matthieu matthieu@capgemini.com --- Hello, I confirm that it resolve also fdo#67534. To test you must select the file to generate the explorer thumbnail and after you have to try to open the file. Without the patch it will fail. If you open the file with DOS command by example, without selecting et generating the thumbnail it will be ok. Is there any chance to push the commit on 4.0 branch ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67534] FILEOPEN SMB File claimed to be Locked By Unknown User when opened via double-click in Explorer if LO Explorer Shell Extensions are installed
https://bugs.freedesktop.org/show_bug.cgi?id=67534 Andras Timar tima...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Whiteboard|BSA target:4.2.0|BSA target:4.2.0 ||target:4.1.4 Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |tima...@gmail.com |desktop.org | --- Comment #69 from Andras Timar tima...@gmail.com --- The fix for bug 56007 reportedly fixed this bug, too. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67534, which changed state. Bug 67534 Summary: FILEOPEN SMB File claimed to be Locked By Unknown User when opened via double-click in Explorer if LO Explorer Shell Extensions are installed https://bugs.freedesktop.org/show_bug.cgi?id=67534 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70822] Other: Installation fails
https://bugs.freedesktop.org/show_bug.cgi?id=70822 --- Comment #2 from Maxim momonas...@gmail.com --- Does your problem solved? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70846] CONFIGURATION: Java 1.7 is not recognized
https://bugs.freedesktop.org/show_bug.cgi?id=70846 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG CC||sberg...@redhat.com --- Comment #1 from Stephan Bergmann sberg...@redhat.com --- The LibreOffice for Mac that is available from http://www.libreoffice.org/download is only a 32-bit application for now. As such, it needs a 32-bit JVM, and I assume the JDK 1.7.0_45 that you installed only contains a 64-bit JVM. Therefore, LibreOffice will refuse to use that Java installation. The Java 6 that is provided by Apple (and which pops up some download and install dialog the first time you want to use it) does still contain a 32-bit JVM alongside a 64-bit one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68334] EDITING: The same .odt file has different formatting results (4.0 vs. 4.1)
https://bugs.freedesktop.org/show_bug.cgi?id=68334 --- Comment #29 from minhsien0330 minhsien0...@gmail.com --- Dear all: Umm..., Would anybody change the Status to New please? Or ... can I change it by myself? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70347] Thumbnails in Cells are not visible by LibreOffice
https://bugs.freedesktop.org/show_bug.cgi?id=70347 --- Comment #2 from Dominique Boutry dominique.bout...@laposte.net --- Before looking at an import, I tried to create some thumbnails locally, in a LibO spreadsheet. From what I saw, no way, no mention in the doc. So Enhancement, not Bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68334] EDITING: The same .odt file has different formatting results (4.0 vs. 4.1)
https://bugs.freedesktop.org/show_bug.cgi?id=68334 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #30 from tommy27 ba...@quipo.it --- Ok. set status to new because of independent confirmations in previous comments -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70858] LibreLogo: font settings in procedures stop Logo programs under Windows
https://bugs.freedesktop.org/show_bug.cgi?id=70858 László Németh nem...@numbertext.org changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |nem...@numbertext.org |desktop.org | Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70858] New: LibreLogo: font settings in procedures stop Logo programs under Windows
https://bugs.freedesktop.org/show_bug.cgi?id=70858 Priority: medium Bug ID: 70858 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: LibreLogo: font settings in procedures stop Logo programs under Windows Severity: normal Classification: Unclassified OS: Windows (All) Reporter: nem...@numbertext.org Hardware: Other Status: UNCONFIRMED Version: 4.0.0.3 release Component: Writer Product: LibreOffice Test example (on Windows XP, Windows 7, the following code doesn't work): TO test FONTSIZE 10 FONTSIZE 100 LABEL 'Hello, World!' END test -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70850] EDITING - Limited character set using MySql(JDBC)
https://bugs.freedesktop.org/show_bug.cgi?id=70850 --- Comment #3 from rob...@familiegrosskopf.de --- (In reply to comment #2) The only time it goes wrong is if I type the characters into a field on a simple BASE form (where they show correctly), and then save the record. The characters change to ? at this point. How do you type the characters. I am using the context-menu of the mouse (→ Special Character) Data already stored displays correctly. The new input is later also shown correctly? What font do you use in the form? Are the characters part of the font? How does the input work directly in the table, without a form? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70818] countif() wrong result
https://bugs.freedesktop.org/show_bug.cgi?id=70818 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG --- Comment #4 from Cor Nouws c...@nouenoff.nl --- Hi Lu, (In reply to comment #3) I was getting the spreadsheet ready and accidentally solved it: all of the names had a space after the name except column F - it seems that countif() distinguishes between Fred and Fred . Maybe this could be a feature? I think so. In a spreadsheat a space is not nothing ;) But cool that you solved it yourself! thanks for the prompt response... now to logon to the donation page :-)... Ah that is awesome of course :) Regards, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70853] RTF Heading numbering not appearing.
https://bugs.freedesktop.org/show_bug.cgi?id=70853 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|NEEDINFO|NEW CC||vmik...@collabora.co.uk Version|4.1.2.3 release |4.0.0.0.beta1 Keywords||regression --- Comment #4 from Cor Nouws c...@nouenoff.nl --- OK, that is clear. Thanks, Some testing: version result 3.4.6 1.1.1 foo 3.5.7 1 foo 3.6.6 1.1.1 foo 4.0.0alpha1 1.1.1 foo 4.0.0beta11 foo I set miklos in CC - he knows all of these RTF-stuff. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70859] New: Other: Error saving file to a Vnxe 3100 SAN in NAS CIFS mode
https://bugs.freedesktop.org/show_bug.cgi?id=70859 Priority: medium Bug ID: 70859 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Error saving file to a Vnxe 3100 SAN in NAS CIFS mode Severity: normal Classification: Unclassified OS: Windows (All) Reporter: omo...@mairie-bergerac.fr Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.0.5.2 release Component: Libreoffice Product: LibreOffice Created attachment 88105 -- https://bugs.freedesktop.org/attachment.cgi?id=88105action=edit Error messages in french Problem description: Error saving file to a Vnxe 3100 SAN in NAS CIFS mode Steps to reproduce: Install Librofice 4.x Create a document in a share folder on a Vnxe3100 Modify it Save it After 1 or to oepartion, errot message and file is locked Tested in the same envirronement with Openoffice 4 : OK Operating System: Windows 7 Version: 4.0.5.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs