[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-18-fix'
Tag 'suse-4.0-18-fix' created by Andras Timar andras.ti...@collabora.com at 2013-10-10 06:57 -0700 suse-4.0-18-fix Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-18-fix'
Tag 'suse-4.0-18-fix' created by Andras Timar andras.ti...@collabora.com at 2013-10-10 06:57 -0700 suse-4.0-18-fix Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-18-fix'
Tag 'suse-4.0-18-fix' created by Andras Timar andras.ti...@collabora.com at 2013-10-10 06:57 -0700 suse-4.0-18-fix Changes since suse-4.0-18: Andras Timar (1): Bump for 4.0-18 --- instsetoo_native/util/openoffice.lst | 16 1 file changed, 8 insertions(+), 8 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-18-fix'
Tag 'suse-4.0-18-fix' created by Andras Timar andras.ti...@collabora.com at 2013-10-10 06:57 -0700 suse-4.0-18-fix Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/canvasbitmaptest.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 5c8bd197242b2760d9d84e7fe84fae9300f4 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 08:38:21 2013 +0200 -Werror,-Wunused-variable Change-Id: Icb0e2b1bd7dabc14a3dce9e70ea5e7ef870484e8 diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 197d38e..ebbedb0 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -205,7 +205,6 @@ void checkCanvasBitmap( const rtl::ReferenceVclCanvasBitmap xBmp, if( nOriginalDepth 8 ) { -const uno::Sequencesal_Int8 aComponentTags( xBmp-getComponentTags() ); uno::Sequencerendering::ARGBColor aARGBColor(1); uno::Sequencerendering::RGBColor aRGBColor(1); uno::Sequencesal_Int8 aPixel3, aPixel4; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - configure.ac python3/ExternalProject_python3.mk sdext/source
configure.ac| 32 python3/ExternalProject_python3.mk |4 +-- sdext/source/pdfimport/xpdftest/makefile.mk |2 - 3 files changed, 22 insertions(+), 16 deletions(-) New commits: commit d79f3e6ff03722db0dd082aecc3e3e6e29cfbb4f Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 10 09:55:31 2013 +0300 Normalize ENABLE_VALGRIND: TRUE or empty Change-Id: I21521d1d7e4a139a1ea0c3f4fe6c51b4637c595f diff --git a/configure.ac b/configure.ac index 3b8cda6..a917cfb 100644 --- a/configure.ac +++ b/configure.ac @@ -5524,17 +5524,18 @@ AC_DEFINE_UNQUOTED(SAL_TYPES_ALIGNMENT8,$SAL_TYPES_ALIGNMENT8) dnl === dnl Check if valgrind headers are available dnl === -if test $cross_compiling = yes; then -ENABLE_VALGRIND=FALSE -else +ENABLE_VALGRIND= +if test $cross_compiling != yes; then prev_cppflags=$CPPFLAGS +# Is VALGRIND_CFLAGS something one is supposed to have in the environment, +# or where does it come from? CPPFLAGS=$CPPFLAGS $VALGRIND_CFLAGS AC_CHECK_HEADER([valgrind/valgrind.h], -[ENABLE_VALGRIND=TRUE],[ENABLE_VALGRIND=FALSE]) +[ENABLE_VALGRIND=TRUE]) CPPFLAGS=$prev_cppflags fi AC_SUBST([ENABLE_VALGRIND]) -if test $ENABLE_VALGRIND = FALSE; then +if test -z $ENABLE_VALGRIND; then VALGRIND_CFLAGS= fi AC_SUBST([VALGRIND_CFLAGS]) diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk index 3abf24a..8e7769b 100644 --- a/python3/ExternalProject_python3.mk +++ b/python3/ExternalProject_python3.mk @@ -52,7 +52,7 @@ else # specific name like build/lib.linux-x86_64-3.3 python3_cflags = $(ZLIB_CFLAGS) -ifeq ($(ENABLE_VALGRIND),TRUE) +ifneq (,$(ENABLE_VALGRIND)) python3_cflags += $(VALGRIND_CFLAGS) endif @@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \ + $(if $(ENABLE_VALGRIND),--with-valgrind) \ --prefix=/python-inst \ $(if $(filter MACOSX,$(OS)),,--with-system-expat) \ $(if $(filter AIX,$(OS)), \ commit 85f5f2301d2efaa3246d7dde87c5e3a969711140 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 10 09:41:26 2013 +0300 Untabify Change-Id: I8cd9246f9f8866ebbf19455b00cfadee5db8354a diff --git a/configure.ac b/configure.ac index 8055dae..3b8cda6 100644 --- a/configure.ac +++ b/configure.ac @@ -10036,10 +10036,10 @@ if test -n $enable_sdremote -a $enable_sdremote != no; then AC_MSG_RESULT([external]) AC_CHECK_HEADER(bluetooth/bluetooth.h, [], [AC_MSG_ERROR(bluetooth.h not found. install bluez)], []) - SYSTEM_BLUEZ=YES +SYSTEM_BLUEZ=YES else AC_MSG_RESULT([internal]) - SYSTEM_BLUEZ=NO +SYSTEM_BLUEZ=NO fi else AC_MSG_RESULT([no, dbus disabled]) commit 46ddcbbe2a4b2e97770f2c962c6450a48f539cd9 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 10 09:38:58 2013 +0300 Normalize ENABLE_PDFIMPORT: TRUE or empty Change-Id: I962b37757dbf3569df73e70ae2d7c666d7cdf43e diff --git a/configure.ac b/configure.ac index f6c0c01..8055dae 100644 --- a/configure.ac +++ b/configure.ac @@ -773,6 +773,11 @@ AC_ARG_ENABLE(lpsolve, [Disable compilation of the lp solve solver ]) ) +AC_ARG_ENABLE(pdfimport, +AS_HELP_STRING([--disable-pdfimport], +[Disable building the PDF import feature.]) +) + ### dnl -- *** -- @@ -4514,11 +4519,11 @@ if test $cross_compiling = yes; then # Don't bother having configure look for stuff not needed for the build platform anyway ./configure \ --disable-graphite \ +--disable-pdfimport \ --disable-postgresql-sdbc \ --with-parallelism=$with_parallelism \ --without-doxygen \ --without-java \ -ENABLE_PDFIMPORT=FALSE \ $sub_conf_opts \ --srcdir=$srcdir \ 21 | sed -e 's/^//' @@ -10347,15 +10352,16 @@ fi AC_SUBST(ENABLE_MINIMIZER) # pdf import? -AC_MSG_CHECKING([whether to build the PDF import]) -if test $_os != Android -a $_os != iOS -a $ENABLE_PDFIMPORT != FALSE; then +AC_MSG_CHECKING([whether to build the PDF import feature]) +ENABLE_PDFIMPORT= +if test $_os != Android -a $_os != iOS -a \( -z $enable_pdfimport -o $enable_pdfimport = yes \); then AC_MSG_RESULT([yes])
LibreOffice Gerrit News 2013-10-10
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#61950 De-externalize Presentation Minimizer in https://gerrit.libreoffice.org/6143 from David Ostrovsky + sw: Smart-Art related UTs updated to new option in https://gerrit.libreoffice.org/6139 from Andres Gomez + unotools: add menu option to enable/disable Smart-Art lock in https://gerrit.libreoffice.org/6138 from Andres Gomez + cui: allow lines in MS filter section to have independently enabled check in https://gerrit.libreoffice.org/6137 from Andres Gomez + oox: added methods to lock Smart-Art edition in https://gerrit.libreoffice.org/6059 from Andres Gomez + fdo#51165 svg: add vertex to polygon if close command (z/Z) is detected in https://gerrit.libreoffice.org/6177 from Christina Roßmanith + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + fdo#44689: fix for specific case of page restart-value 0 in https://gerrit.libreoffice.org/5681 from Adam CloudOn * Merged changes on master for project core changed in the last 25 hours: + fdo#54938: Adapt connectivity module to use cppu::supportsService in https://gerrit.libreoffice.org/6172 from Marcos Souza + Fix for iOS scroll by pixels, and pinch to zoom in https://gerrit.libreoffice.org/5742 from Ptyl + fdo#63866 Remove checkbox also for new separators in https://gerrit.libreoffice.org/6087 from Samuel Mehrbrodt + fdo#57490 deprecate IsSpellCapitalization in https://gerrit.libreoffice.org/6140 from Thomas Arnhold + fix building debs with epm (find libgetuid.so in instdir) in https://gerrit.libreoffice.org/6142 from Christian Lohmaier + Make CalcFocusRect look right in https://gerrit.libreoffice.org/6165 from Stephan Bergmann + Fix fdo#70143 by reporting swaping of positions in https://gerrit.libreoffice.org/6156 from Arnaud Versini * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + 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 + fdo#69407 Putting no fill frame color instead of transparent by default in https://gerrit.libreoffice.org/5996 from matthieu gay + 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 + fix polygon rendering with clip area of one line only in https://gerrit.libreoffice.org/5709 from Tsahi Glik @ CloudOn + 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 + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 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: How are installation sets being built?
On 10/09/2013 10:58 PM, Christian Lohmaier wrote: On Tue, Oct 8, 2013 at 10:50 AM, Stephan Bergmann sberg...@redhat.com wrote: I was always thinking that --enable-epm (despite its name) was the magic autogen.input switch to instruct a top-level make (or make check) to also build installation sets (deb, rpm, dmg, msi, ...), on all platforms. Nope - but it is the prerequisite to build deb and rpms - and was also uses for dmg, due to similarities, but msi is completely different and not supported by epm. Sure. It's just that I think we want to have a trigger whether or not to produce installation sets during a build, and I always thought that --enable-epm, despite its name and original purpose, achieved that. (But, it appears, it happens to achieve that only for non-Windows builds.) So, I am wondering how exactly the official TDF-released installation sets are being built for the various platforms. What are the autogen.sh (autogen.input) switches, and what are the exact make command lines? https://wiki.documentfoundation.org/Development/ReleaseBuilds Ah, good to know. And the commands issued to do the build are just ./autogen.sh and a no-arguments make? (Btw, https://wiki.documentfoundation.org/Development/ReleaseBuilds#Linux_.28same_options_for_x86_.26_x86_64.29 misses the manually updated flex now, IIUC, right?) Where is that stored in git or similar (if it is stored anywhere at all)? Not stored in git - the relevant feature switches are all in the distro-config, the other parameters are just details, like where to store external tarballs, what languages to build, options to accellerate one-off builds (disable-dependency-tracking) - and the packaging options for linux. Yeah, I get the idea. build process creates input file for epm, and epm converts to rpm spec file and deb input file and runs rpmbuild/dpkg to pack the binaries into the package. without epm, you cannot feed rpmbuild/deb with the corresponding controlfile, so that's why this also toggles building of installation sets. I don't know why it is used for Mac, as there are no individual packages, but I assume that's scp2 heritage. ...which brings me back to my original question for a universal trigger whether or not to produce installation sets during a build. Seeing that --enable-epm currently effectively fulfills that role everywhere but on Windows, one option would be to make it fulfill that role on Windows too. (I have a local patch to do that.) The alternative would be to introduce an explicit --enable-installation-sets. Opinions, anyone? Similarly, how exactly are any of those nightly installation sets (uploaded from select tinderboxes, IIUC) being built? How can you trace that? My understanding is that those are the regular installsets that are created using epm. Yes, that's my understanding, too. The configure switches for the individual tinderboxes are in the logs on tinderbox.libreoffice.org, and there should be a build-info file in the directory with the uploaded packages, e.g. http://dev-builds.libreoffice.org/daily/libreoffice-4-1/MacOSX-Intel@27-OSX_10.7.0-gcc_4.2.1_llvm/2013-10-09_13.15.57/libreoffice-4-1~2013-10-09_13.15.57_build_info.txt that lists the configure switches. Ah, there's an example of such a file, thanks. I was pretty sure we had something like that, just couldn't find any in that maze of mostly empty directories at http://dev-builds.libreoffice.org/daily/. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: offapi/type_reference
offapi/type_reference/offapi.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bf1284d34e3bf53179a1513265accc0c3f54337c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 09:16:40 2013 +0200 Keep type_reference/offapi.idl at backwards-compatibility reference status ...i.e., only change it to reflect cases where we deliberately became incompatible, do not change it to reflect compatible changes. This reverts part of d567671196fccf20a350f3cbf210eef088fa7ce3 fdo#57490 deprecate IsSpellCapitalization. Change-Id: I2ed58a1740cc22ef1ad4fdcbe04c4a0d2ef547bd diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl index ee989db..7647760 100644 --- a/offapi/type_reference/offapi.idl +++ b/offapi/type_reference/offapi.idl @@ -8945,7 +8945,7 @@ module com { [attribute] boolean IsIgnoreControlCharacters; [attribute] boolean IsSpellUpperCase; [attribute] boolean IsSpellWithDigits; - /** @deprecated */ [attribute] boolean IsSpellCapitalization; + [attribute] boolean IsSpellCapitalization; [attribute] short HyphMinLeading; [attribute] short HyphMinTrailing; [attribute] short HyphMinWordLength; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 - pt_PT/pt_PT.dic | 75 ++ 2 files changed, 53 insertions(+), 24 deletions(-) New commits: commit f1a4ecab4b10fe7e5daadd6529516d5ffeba0fda Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 diff --git a/pt_PT/description.xml b/pt_PT/description.xml index f3196f2..92bec39 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=13.7.2.1 / +version value=13.10.1.2 / identifier value=Natura.OOo3.pt-PT-dictionary / display-name diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index e73e46c..fad14ba 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43909 +43938 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -20,9 +20,10 @@ abalo/p [CAT=nc,G=m,N=s] abalroar/XYPLcM[CAT=v,T=inf,TR=t] abanadela/p[CAT=nc,G=f,N=s] abanadura/p[CAT=nc,G=f,N=s] +abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abandalhar/XYPLcM [CAT=v,T=inf,TR=t] +abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] @@ -824,6 +825,7 @@ agarrar/XYPLDW [CAT=v,T=inf,TR=_] agasalhar/XYPLD[CAT=v,T=inf,TR=t] agasalho/p [CAT=nc,G=m,N=s] agastar/XYPLM [CAT=v,T=inf,TR=t] +ágata/p [CAT=nc,G=f,N=s] agemado[CAT=adj,N=s,G=m] agência/p [CAT=nc,G=f,N=s] agenciar/LP[CAT=v,T=inf,TR=t] @@ -935,6 +937,7 @@ aguadeiro/p [CAT=a_nc,G=m,N=s] água-marinha [CAT=nc,G=f,N=s] água-oxigenada[CAT=nc,G=f,N=s] água-pé/p[CAT=nc,G=f,N=s] +aguapé/p [CAT=nc,G=f,N=s] aguardar/XYPLD [CAT=v,T=inf,TR=t] aguardenteiro [CAT=nc,G=m,N=s] aguardente/p [CAT=nc,G=f,N=s] @@ -1097,7 +1100,7 @@ alcoolemia[CAT=nc,G=f,N=s] alcoólico/fpx [CAT=adj,N=s,G=m] alcoolificar/XYPLc [CAT=v,T=inf,TR=t] alcoolismo/p [CAT=nc,G=m,N=s] -alcoolizar/XYPLc [CAT=v,T=inf,TR=t] +alcoolizar/XYPLcv [CAT=v,T=inf,TR=t] álcool[CAT=nc,G=m,N=s] alcoolometria/p[CAT=nc,G=f,N=s] alcoolómetro [CAT=nc,G=m,N=s] @@ -1114,7 +1117,7 @@ aldeÃdo/p[CAT=nc,G=m,N=s] aldeola/p [CAT=nc,G=f,N=s] aldeota[CAT=nc,G=f,N=s] aldrabada [CAT=nc,G=f,N=s] -aldrabão/p[CAT=a_nc,G=m,N=s] +aldrabão/pf [CAT=a_nc,G=m,N=s] aldrabar/XYPLc [CAT=v,T=inf,TR=t] aldrabeiro [CAT=a_nc,G=m,N=s] aldrabice/p[CAT=nc,G=f,N=s] @@ -2672,12 +2675,12 @@ arcaz [CAT=nc,G=m,N=s] arcebispado[CAT=nc,G=m,N=s] arcebispal [CAT=adj,N=s,G=_] arcebispo/p[CAT=nc,G=m,N=s] -arcediago [CAT=nc,G=m,N=s] +arcediago/p[CAT=nc,G=m,N=s] archeiro/p [CAT=nc,G=m,N=s] archoteiro [CAT=nc,G=m,N=s] archote/pt [CAT=nc,G=m,N=s] arciforme/p[CAT=adj,N=s,G=_] -arcipreste [CAT=nc,G=m,N=s] +arcipreste/p [CAT=nc,G=m,N=s] arco-celeste [CAT=nc,G=m,N=s] arco-irisar/XYPL [CAT=v,T=inf,TR=_] arco-Ãris [CAT=nc,G=m,N=s] @@ -3728,6 +3731,7 @@ autógamo [CAT=adj,N=s,G=m] autogéneo [CAT=adj,N=s,G=m] autogénese[CAT=nc,G=f,N=s] autogenético [CAT=adj,N=s,G=m] +autogestão[CAT=nc,G=f,N=s] autognose [CAT=nc,G=f,N=s] autogolo/p [CAT=nc,G=m,N=s] autogoverno/p [CAT=nc,G=m,N=s] @@ -3964,7 +3968,7 @@ babadura [CAT=nc,G=f,N=s] baba/p [CAT=nc,G=f,N=s] babão/fp [CAT=a_nc,G=m,N=s] babar/XYPL [CAT=v,T=inf,TR=t] -babeiro[CAT=nc,G=m,N=s] +babeiro/p [CAT=nc,G=m,N=s] babélico [CAT=adj,N=s,G=m] babel [CAT=nc,G=f,N=s] babilónia [CAT=nc,G=f,N=s] @@ -9283,7 +9287,7 @@ convento/p[CAT=nc,G=m,N=s] conventual/p [CAT=nc,G=m,N=s] convergência/p[CAT=nc,G=f,N=s] convergente/p [CAT=adj,N=s,G=_] -convergir/XYL [CAT=v,T=inf,TR=i] +convergir/YL [CAT=v,T=inf,TR=i] conversadeira [CAT=a_nc,G=f,N=s] conversado [CAT=a_nc,G=m,N=s] conversador[CAT=a_nc,G=m,N=s] @@ -11931,7 +11935,7 @@ dissociar/XYPLcv[CAT=v,T=inf,TR=t] dissociativo [CAT=adj,N=s,G=m] dissolução/p [CAT=nc,G=f,N=s] dissolutivo[CAT=adj,N=s,G=m] -dissoluto [CAT=adj,N=s,G=m] +dissoluto/pf [CAT=adj,N=s,G=m] dissolúvel/dpI[CAT=adj,N=s,G=_] dissolvência/p[CAT=nc,G=f,N=s] dissolvente/p [CAT=a_nc,G=2,N=s] @@ -17340,7 +17344,7 @@ harmónica [CAT=a_nc,G=f,N=s] harmónico/fpH [CAT=adj,N=s,G=m] harmónio/p[CAT=nc,G=m,N=s] harmonioso/fpSm[CAT=adj,N=s,G=m] -harmonista [CAT=nc,G=_,N=s] +harmonista/p [CAT=nc,G=_,N=s] harmonizador [CAT=a_nc,G=m,N=s] harmonizar/XYPLcDv
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ee83131e8bf27758c20392d78bac298cde1e5161 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 Updated core Project: dictionaries f1a4ecab4b10fe7e5daadd6529516d5ffeba0fda diff --git a/dictionaries b/dictionaries index 80bedbd..f1a4eca 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 80bedbd4f97f262e99f35e7b9a9413626f189a63 +Subproject commit f1a4ecab4b10fe7e5daadd6529516d5ffeba0fda ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
When to change {udkapi,offapi}/type_reference/{udkapi,offapi}.idl
Hi all, The *.idl (formerly *.rdb) files in {udkapi,offapi}/type_reference/ are meant to represent the status of our (published) UNO API as previously released, to allow detecting inadvertent incompatible changes. Therefore, these files should generally be left unchanged. The only time to change them is when a deliberate incompatible change (with a commit message containing [API CHANGE]) would otherwise break the compatibility checks when building udkapi or offapi. (And in the past, when those type_references were binary *.rdb files, that was a somewhat tricky task. Now that they are textual *.idl files it has become (too?) trivial.) (So, if there are any git-hook aficionados out there, maybe there's a way to prevent commits that change {udkapi,offapi}/type_reference/{udkapi,offapi}.idl but do not contain [API CHANGE] in the commit message.) (I just pushed http://cgit.freedesktop.org/libreoffice/core/commit/?id=bf1284d34e3bf53179a1513265accc0c3f54337c Keep type_reference/offapi.idl at backwards-compatibility reference status to revert one such inadvertent change.) Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c98566be40d6991467dde665af3eb0085d4ad80c Author: Herbert Dürr h...@apache.org Date: Thu Oct 10 06:57:44 2013 + #i123456# add Caladea and Carlito as fallback fonts diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 9e94115..226734c 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -1830,7 +1830,7 @@ node oor:name=calibri oor:op=replace prop oor:name=SubstFonts - valuehiraginomarugothicpronw3;hiraginomarugothicprow3/value + valuecarlito;hiraginomarugothicpronw3;hiraginomarugothicprow3/value /prop prop oor:name=FontTypevalueNormal,SansSerif/value/prop /node @@ -1840,7 +1840,7 @@ node oor:name=cambria oor:op=replace prop oor:name=SubstFonts - valueapplelisung/value + valuecaladea;applelisung/value /prop prop oor:name=FontTypevalueNormal,Serif/value/prop /node ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - offapi/type_reference udkapi/com udkapi/type_reference unoidl/source
offapi/type_reference/offapi.idl| 32 ++-- udkapi/com/sun/star/beans/XMultiHierarchicalPropertySet.idl |4 - udkapi/com/sun/star/beans/XMultiPropertySet.idl | 12 ++-- udkapi/com/sun/star/beans/XMultiPropertyStates.idl |8 +-- udkapi/com/sun/star/beans/XPropertySetInfo.idl |4 - udkapi/com/sun/star/beans/XPropertyState.idl|4 - udkapi/com/sun/star/registry/XRegistryKey.idl | 16 +++--- udkapi/com/sun/star/registry/XSimpleRegistry.idl|4 - udkapi/com/sun/star/script/XDebugging.idl |4 - udkapi/com/sun/star/script/XInvocationAdapterFactory2.idl |4 - udkapi/com/sun/star/script/XLibraryAccess.idl |4 - udkapi/com/sun/star/uno/XAggregation.idl|6 +- udkapi/type_reference/udkapi.idl|2 unoidl/source/unoidl-check.cxx |3 - 14 files changed, 54 insertions(+), 53 deletions(-) New commits: commit 62828c9e11e27a2a9b69a9ad0919279df9a10359 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 10:12:13 2013 +0200 Make changes of interface method parameter names a hard failure ...instead of a warning, now that all the deliberate changes have been addressed. Change-Id: I6075a36a560bd68826c6840992eefb8f51b939ba diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx index ff84f52..f1264d2 100644 --- a/unoidl/source/unoidl-check.cxx +++ b/unoidl/source/unoidl-check.cxx @@ -537,12 +537,13 @@ void checkMap( } if (k-name != l-name) { std::cerr - Warning: interface type name + interface type name direct method i-name parameter # k - i-parameters.begin() + 1 changed name from k-name to l-name std::endl; +std::exit(EXIT_FAILURE); } } } commit 8a97f996b2a1526e69e32f39fd599aee25140efe Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 10:09:46 2013 +0200 Adapt type_reference to fixes of illegal method parameter names ...UNOIDL identifiers starting with an underscore, or starting with a lowercase letter and containing an underscore, are invalid, so occurrences of those as method parameter names had been changed (even though changing them is strictly speaking incompatible, but correctness trumps compatibility here). Change-Id: I1cd2c32ff1486a13bf0218bcb7d3df5fc615ac01 diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl index 7647760..509fe6b 100644 --- a/offapi/type_reference/offapi.idl +++ b/offapi/type_reference/offapi.idl @@ -4669,9 +4669,9 @@ module com { module document { interface XDocumentEventBroadcaster { interface ::com::sun::star::uno::XInterface; - void addDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener _Listener); - void removeDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener _Listener); - void notifyDocumentEvent([in] string _EventName, [in] ::com::sun::star::frame::XController2 _ViewController, [in] any _Supplement) raises (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException); + void addDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener Listener); + void removeDocumentEventListener([in] ::com::sun::star::document::XDocumentEventListener Listener); + void notifyDocumentEvent([in] string EventName, [in] ::com::sun::star::frame::XController2 ViewController, [in] any Supplement) raises (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException); }; published interface XDocumentPropertiesSupplier { interface ::com::sun::star::uno::XInterface; @@ -6642,8 +6642,8 @@ module com { interface XGridControl { interface ::com::sun::star::form::XGrid; interface ::com::sun::star::form::XGridFieldDataSupplier; - void addGridControlListener([in] ::com::sun::star::form::XGridControlListener _listener); - void removeGridControlListener([in] ::com::sun::star::form::XGridControlListener _listener); + void addGridControlListener([in] ::com::sun::star::form::XGridControlListener listener); + void removeGridControlListener([in] ::com::sun::star::form::XGridControlListener listener); }; /** @deprecated */ published interface XGridPeer { interface ::com::sun::star::uno::XInterface; @@ -9916,14
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f63a40965ccf1db5c5efe5517e3d6bdad6d727a8 Author: Herbert Dürr h...@apache.org Date: Thu Oct 10 06:57:44 2013 + #i123456# add Caladea and Carlito as fallback fonts (cherry picked from commit c98566be40d6991467dde665af3eb0085d4ad80c) diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index b73dacc..e159f61 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -1534,7 +1534,7 @@ /node node oor:name=calibri oor:op=replace prop oor:name=SubstFonts - valuehiraginomarugothicpronw3;hiraginomarugothicprow3/value + valuecarlito;hiraginomarugothicpronw3;hiraginomarugothicprow3/value /prop prop oor:name=FontType valueNormal,SansSerif/value @@ -1547,7 +1547,7 @@ /node node oor:name=cambria oor:op=replace prop oor:name=SubstFonts - valueapplelisung/value + valuecaladea;applelisung/value /prop prop oor:name=FontType valueNormal,Serif/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: strange cppunit test bug - result that is compared changes when modifying the expected value
On 10/10/2013 02:06 AM, Christian Lohmaier wrote: make CppunitTest_sw_ooxmlexport fails on the CentOS 5.9 release-build system because of a weired bug I cannot quite explain: fdo66929.docx,ooxmlexport.cxx:1067:Assertion Test name: Test::run equality assertion failed - Expected: 127 - Actual : 254 line 1067 is: CPPUNIT_ASSERT_EQUAL( sal_Int32( 127 ), getProperty sal_Int32 ( xFrame, BottomBorderDistance ) ); So the test tells that BottomBorderDistance value was not the expected value, HOWEVER: I change that line from 127 to 128: CPPUNIT_ASSERT_EQUAL( sal_Int32( 128 ), getProperty sal_Int32 ( xFrame, BottomBorderDistance ) ); and run the test again, and now I get: fdo66929.docx,ooxmlexport.cxx:1067:Assertion Test name: Test::run equality assertion failed - Expected: 128 - Actual : 127 So mysteriously now the actual value is the correct/the initially expected one?! I assumed corrupted ccache, so I cleared that, also used CCACHE_DISABLE=1 - but neither helped. When I change it back to 127, I get the initial error again. Actual value is claimed to be 254. Sounds like a compiler bug then, esp. since getProperty (sw/qa/extras/inc/swmodeltestbase.hxx) contains T data = T(); properties-getPropertyValue( name ) = data; so does initialize data to zero in case = fails. Same behavior when I disable the other value-checks and only have it check for BottomBorderDistance. Does it still report 254 if the preceding line CPPUNIT_ASSERT_EQUAL( sal_Int32( 254 ), getProperty sal_Int32 ( xFrame, RightBorderDistance ) ); is removed? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: more_fonts/fonts
more_fonts/fonts/fc_local.conf | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) New commits: commit eb79c13a809c2edf99042b114ede512ebd4c2273 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 10:12:44 2013 +0100 update local font.conf for Calibri/Carlito Cambria/Caladea Change-Id: I9391876f2b09750ad5f44483f489743581948d21 diff --git a/more_fonts/fonts/fc_local.conf b/more_fonts/fonts/fc_local.conf index c442c83..6af763c 100644 --- a/more_fonts/fonts/fc_local.conf +++ b/more_fonts/fonts/fc_local.conf @@ -11,13 +11,25 @@ /default /alias -!-- -- alias binding=same familyArial Narrow/family accept familyLiberation Sans Narrow/family /accept /alias -!-- -- + + alias binding=same + familyCalibri/family + accept + familyCarlito/family + /accept + /alias + + alias binding=same + familyCambria/family + accept + familyCaladea/family + /accept + /alias /fontconfig ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit 3d0d0717e8afdeb398931d59b1ab337c43b7197c Author: Muthu Subramanian sumu...@collabora.com Date: Thu Oct 10 14:49:51 2013 +0530 n#812793: Reverting the workaround. diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 3bee95f..5685c49 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1462,11 +1462,6 @@ namespace cppcanvas ::basegfx::B2DPolyPolygon polyPolygon (polygon); -// n#812793: EMF+ Seems to specify transparent background with Alpha=0xFF ! -// Workaround for the problem. -if( isColor brushIndexOrColor == 0x rectangles == 1 ) -brushIndexOrColor = 0xFF; - EMFPPlusFillPolygon (polyPolygon, rFactoryParms, rState, rCanvas, isColor, brushIndexOrColor); } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Test failure
On Wed, Oct 09, 2013 at 07:58:52PM +0200, Michael Stahl mst...@redhat.com wrote: IMHO this disabling of tests based on OS needs to end. I just tried enabling the sw filter tests on Mac, but some fixing is needed there: https://gerrit.libreoffice.org/#/c/6182/ Possibly only RTF is problematic and the rest can be enabled, but better to do that interactively, not via trial and error, using gerrit. :) signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c9/8566be40d6991467dde665af3eb0085d4ad80c
c9/8566be40d6991467dde665af3eb0085d4ad80c |1 + 1 file changed, 1 insertion(+) New commits: commit 15d194b6fac93573a0316a204981cc2d9a1956a1 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 10:57:48 2013 +0100 Notes added by 'git notes add' diff --git a/c9/8566be40d6991467dde665af3eb0085d4ad80c b/c9/8566be40d6991467dde665af3eb0085d4ad80c new file mode 100644 index 000..7cf3920 --- /dev/null +++ b/c9/8566be40d6991467dde665af3eb0085d4ad80c @@ -0,0 +1 @@ +merged as: f63a40965ccf1db5c5efe5517e3d6bdad6d727a8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/text/EnhancedPDFExportHelper.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 225fe06a0370fe2d935b9258f0243fdb7f749fd4 Author: Herbert Dürr h...@apache.org Date: Thu Oct 10 09:20:38 2013 + #i123409# prevent invalid iterator dereference in SwTaggedPDFHelper::CheckReopenTag() Found by: potassium19 Patch by: h...@apache.org Review by: o...@apache.org diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx index 0c9ac4e..1b09633 100644 --- a/sw/source/core/text/EnhancedPDFExportHelper.cxx +++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx @@ -375,8 +375,9 @@ bool SwTaggedPDFHelper::CheckReopenTag() if ( pKey ) { FrmTagIdMap rFrmTagIdMap = SwEnhancedPDFExportHelper::GetFrmTagIdMap(); -const FrmTagIdMap::const_iterator aIter = rFrmTagIdMap.find( pKey ); -nReopenTag = (*aIter).second; +const FrmTagIdMap::const_iterator aIter = rFrmTagIdMap.find( pKey ); +if( aIter != rFrmTagIdMap.end()) +nReopenTag = (*aIter).second; } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/saxparser'
New branch 'feature/saxparser' available with the following commits: commit 89c2a5ce5fed6d94336d0e7a772b68c4e6ac7367 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 8 23:28:32 2013 +0200 FastSaxParser: implementation using two threads Change-Id: I963e6ba2781c92895e6737198c95a275368303f7 commit d26a9f9d5b9f3ae2143f5323ba4e548bae9fdc94 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 8 15:17:01 2013 +0200 FastSaxParser: isolate calls to XFastContextHandler in Entity's methods Unfortunately, we have to store maNamespace in two stacks. One for future parser thread to compute tokens and one for main thread calling XFastContextHandler. Now we are prepared to implement multithreading. Change-Id: I421b55afa2e9ea80142e6068c7a515d31913ba69 commit a29ca3cc5664210e2c3ecaf99a36382805fb0b8f Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 8 12:42:21 2013 +0200 FastSaxParser: store mnNamespaceCount in another stack This is preparation work for multithreading. mnNamespaceCount will be handled in parser thread and the rest in main thread. Change-Id: I571026ea499f6876b8dafb4e1bdc56d1add649e5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: strange cppunit test bug - result that is compared changes when modifying the expected value
Hi, On Thu, Oct 10, 2013 at 11:04:44AM +0200, Stephan Bergmann sberg...@redhat.com wrote: On 10/10/2013 02:06 AM, Christian Lohmaier wrote: make CppunitTest_sw_ooxmlexport fails on the CentOS 5.9 release-build system because of a weired bug I cannot quite explain: fdo66929.docx,ooxmlexport.cxx:1067:Assertion Test name: Test::run equality assertion failed - Expected: 127 - Actual : 254 line 1067 is: CPPUNIT_ASSERT_EQUAL( sal_Int32( 127 ), getProperty sal_Int32 ( xFrame, BottomBorderDistance ) ); So the test tells that BottomBorderDistance value was not the expected value, HOWEVER: I change that line from 127 to 128: CPPUNIT_ASSERT_EQUAL( sal_Int32( 128 ), getProperty sal_Int32 ( xFrame, BottomBorderDistance ) ); and run the test again, and now I get: fdo66929.docx,ooxmlexport.cxx:1067:Assertion Test name: Test::run equality assertion failed - Expected: 128 - Actual : 127 So mysteriously now the actual value is the correct/the initially expected one?! Note that these tests are run twice: http://opengrok.libreoffice.org/xref/core/sw/qa/extras/ooxmlexport/ooxmlexport.cxx#256 Isn't it possible that in the first case the import fails, and in the second case the import-export-import fails? (Or the other way around.) Would it help your situation if SAL_INFO messages would be emitted when a test is started, when the first check is done and when the second check is done? Though, still strange that this happens only on CentOS5, and not on more recent systems. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/docary.hxx |1 + sw/source/core/docnode/nodedump.cxx | 13 + 2 files changed, 14 insertions(+) New commits: commit 5c79177089cd4038276f63577affa7c86dcaab38 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 10 12:44:10 2013 +0200 sw: include SwNumRuleTbl in the doc model dump Change-Id: I385bce4562e4b94102b0758ca24853892b081ea1 diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index db4a419..44e1d4e 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -135,6 +135,7 @@ public: /// the destructor will free all objects still in the vector ~SwNumRuleTbl(); sal_uInt16 GetPos(const SwNumRule* pRule) const; +void dumpAsXml(xmlTextWriterPtr w); }; struct CompareSwRedlineTbl diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 92da056..e974653 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -115,6 +115,7 @@ void SwDoc::dumpAsXml( xmlTextWriterPtr w ) mpFldTypes-dumpAsXml( writer ); mpTxtFmtCollTbl-dumpAsXml( writer ); mpCharFmtTbl-dumpAsXml( writer ); +mpNumRuleTbl-dumpAsXml( writer ); writer.endElement(); } @@ -343,6 +344,18 @@ void SwNumRule::dumpAsXml(xmlTextWriterPtr w) writer.endElement(); } +void SwNumRuleTbl::dumpAsXml(xmlTextWriterPtr w) +{ +if (!empty()) +{ +WriterHelper writer(w); +writer.startElement(swnumruletbl); +for (size_t i = 0; i size(); ++i) +operator[](i)-dumpAsXml(w); +writer.endElement(); +} +} + void SwTxtNode::dumpAsXml( xmlTextWriterPtr w ) { WriterHelper writer( w ); ___ 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 Timur gti...@gmail.com changed: What|Removed |Added Depends on||59918 --- Comment #92 from Timur gti...@gmail.com --- Added Bug 59918 - FILESAVE: FILEOPEN: save document as docx and reopen result in an freeze/endless loop. It's an old bug from LO 3.6, but since 4.0 is approaching to EOL, I add it here. -- 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 'libreoffice-4-1' - vcl/source
vcl/source/control/field2.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit cfb792b7658b3011eb01bbaf007d9eb9b28eaf58 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 11:50:38 2013 +0200 Prevent out-of-bounds arguments to OUString::copy ...which would somewhat unhelpfully result in returning !!br0ken!! (partial backport of 34e951bd7284d2e771c279e3adc3899d191fdad0 More OUString::copy out-of-bounds fixes) Change-Id: Ibf66d218fe5f0d7b6216795a3b991705d4afda73 Reviewed-on: https://gerrit.libreoffice.org/6183 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 5ae0453..080d1fc 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -19,6 +19,8 @@ #include sal/config.h +#include algorithm + #include comphelper/processfactory.hxx #include comphelper/string.hxx #include tools/rc.h @@ -1013,7 +1015,7 @@ static sal_uInt16 ImplCutNumberFromString( OUString rStr ) ++i2; } sal_Int32 nValue = rStr.copy(i1, i2-i1).toInt32(); -rStr = rStr.copy(i2+1); +rStr = rStr.copy(std::min(i2+1, rStr.getLength())); return nValue; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sal/rtl
sal/rtl/strtmpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f81ed484ffd443e2593627f3d8d3133161817af2 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 9 19:10:32 2013 +0200 Fail fast at least in debug builds Change-Id: I266d5cf5b98827617f7ed65c94a772e28808f386 (cherry picked from commit 57a28dc9556b4e6fff337e0eb9d0d8abc5223161) Reviewed-on: https://gerrit.libreoffice.org/6186 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx index dd1effc..47bbc9b 100644 --- a/sal/rtl/strtmpl.cxx +++ b/sal/rtl/strtmpl.cxx @@ -1258,7 +1258,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromSubString )( IMPL_RTL_STRINGDATA** ppT } if ( count 0 || beginIndex 0 || beginIndex + count pFrom-length ) { -OSL_FAIL( Out of bounds substring access ); +assert(false); // fail fast at least in debug builds IMPL_RTL_STRINGNAME( newFromLiteral )( ppThis, !!br0ken!!, 10, 0 ); return; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: strange cppunit test bug - result that is compared changes when modifying the expected value
Hi Miklos, *, On Thu, Oct 10, 2013 at 12:13 PM, Miklos Vajna vmik...@collabora.co.uk wrote: On Thu, Oct 10, 2013 at 11:04:44AM +0200, Stephan Bergmann sberg...@redhat.com wrote: On 10/10/2013 02:06 AM, Christian Lohmaier wrote: make CppunitTest_sw_ooxmlexport [...] I change that line from 127 to 128: CPPUNIT_ASSERT_EQUAL( sal_Int32( 128 ), getProperty sal_Int32 ( xFrame, BottomBorderDistance ) ); and run the test again, and now I get: fdo66929.docx,ooxmlexport.cxx:1067:Assertion Test name: Test::run equality assertion failed - Expected: 128 - Actual : 127 So mysteriously now the actual value is the correct/the initially expected one?! Note that these tests are run twice: http://opengrok.libreoffice.org/xref/core/sw/qa/extras/ooxmlexport/ooxmlexport.cxx#256 Isn't it possible that in the first case the import fails, and in the second case the import-export-import fails? (Or the other way around.) Ah, interesting. With the original value (127) and an puts(FindMeInTheOutput); before the actual check I get this: [...] fdo66929.docx,ooxmlexport.cxx:1065:Assertion Test name: Test::run equality assertion failed - Expected: 127 - Actual : 254 Failures !!! Run: 1 Failure total: 1 Failures: 1 Errors: 0 FindMeInTheOutput FindMeInTheOutput Error: a unit test failed, please do one of: # i.e. indeed called twice. now when I change it to 128 I get: [...] fdo66929.docx,ooxmlexport.cxx:1065:Assertion Test name: Test::run equality assertion failed - Expected: 128 - Actual : 127 Failures !!! Run: 1 Failure total: 1 Failures: 1 Errors: 0 FindMeInTheOutput Error: a unit test failed, please do one of: ## So failed earlier. So on first check, the property returns the proper value, the second time it fails. Though, still strange that this happens only on CentOS5, and not on more recent systems. And even there only on 32bit. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sal/osl sw/qa unoidl/source
sal/osl/unx/thread.c | 10 +- sal/osl/w32/thread.c |9 + sw/qa/extras/inc/swmodeltestbase.hxx |8 unoidl/source/sourceprovider-parser-requires.hxx | 14 ++ unoidl/source/sourceprovider-scanner.hxx |9 +++-- 5 files changed, 23 insertions(+), 27 deletions(-) New commits: commit 215269e3031e31fd64e3aa38167875a042b8c80c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 14:26:54 2013 +0200 Silence some false Covertiy scan warnings about uninitialized members Change-Id: I5e1d870a60f4c0d4b805c615d0e3c958e856bf8c diff --git a/unoidl/source/sourceprovider-parser-requires.hxx b/unoidl/source/sourceprovider-parser-requires.hxx index 9865720..f9cd27e 100644 --- a/unoidl/source/sourceprovider-parser-requires.hxx +++ b/unoidl/source/sourceprovider-parser-requires.hxx @@ -85,13 +85,18 @@ struct SourceProviderType { TYPE_INTERFACE, TYPE_INSTANTIATED_POLYMORPHIC_STRUCT, TYPE_PARAMETER }; -SourceProviderType() {} +SourceProviderType(): +type(), entity() // avoid false warnings about uninitialized members +{} -explicit SourceProviderType(Type theType): type(theType) +explicit SourceProviderType(Type theType): +type(theType), +entity() // avoid false warnings about uninitialized member { assert(theType = TYPE_ANY); } explicit SourceProviderType(SourceProviderType const * componentType): -type(TYPE_SEQUENCE) +type(TYPE_SEQUENCE), +entity() // avoid false warnings about uninitialized member { assert(componentType != 0); subtypes.push_back(*componentType); } SourceProviderType( @@ -113,7 +118,8 @@ struct SourceProviderType { { assert(theEntity != 0); } explicit SourceProviderType(OUString const identifier): -type(TYPE_PARAMETER), name(identifier) +type(TYPE_PARAMETER), name(identifier), +entity() // avoid false warnings about uninitialized member {} OUString getName() const; diff --git a/unoidl/source/sourceprovider-scanner.hxx b/unoidl/source/sourceprovider-scanner.hxx index ed5105f..c1959a7 100644 --- a/unoidl/source/sourceprovider-scanner.hxx +++ b/unoidl/source/sourceprovider-scanner.hxx @@ -233,7 +233,9 @@ struct SourceProviderEntity { explicit SourceProviderEntity(Kind theKind): kind(theKind) { assert(theKind = KIND_INTERFACE_DECL); } -SourceProviderEntity() {} // needed for std::map::operator [] +SourceProviderEntity(): // needed for std::map::operator [] +kind() // avoid false warnings about uninitialized members +{} Kind kind; rtl::Referenceunoidl::Entity entity; @@ -243,7 +245,10 @@ struct SourceProviderEntity { struct SourceProviderScannerData { SourceProviderScannerData( rtl::Referenceunoidl::Manager const theManager): -manager(theManager), errorLine(0) +manager(theManager), +sourcePosition(), sourceEnd(), +// avoid false warnings about uninitialized members +errorLine(0) { assert(manager.is()); } void setSource(void const * address, sal_uInt64 size) { commit acbe968ef0d40fb90e0f839e3e2702a43a0ae703 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 14:26:06 2013 +0200 Minor improvements Change-Id: I1dfe57368f438087d6e6131d36128db4438792eb diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 81a4aa2..29f4dc1 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -161,18 +161,18 @@ protected: } template typename T -T getProperty( uno::Any obj, const OUString name ) const +T getProperty( const uno::Any obj, const OUString name ) const { -uno::Reference beans::XPropertySet properties( obj, uno::UNO_QUERY ); +uno::Reference beans::XPropertySet properties( obj, uno::UNO_QUERY_THROW ); T data = T(); properties-getPropertyValue( name ) = data; return data; } template typename T -T getProperty( uno::Reference uno::XInterface obj, const OUString name ) const +T getProperty( const uno::Reference uno::XInterface obj, const OUString name ) const { -uno::Reference beans::XPropertySet properties( obj, uno::UNO_QUERY ); +uno::Reference beans::XPropertySet properties( obj, uno::UNO_QUERY_THROW ); T data = T(); properties-getPropertyValue( name ) = data; return data; commit 668c627eb4e66208738d5acdecbcad106efa8252 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 14:22:54 2013 +0200 Remove support for undocumented SOLAR_USER_RTL_TEXTENCODING env var ...introduced in 2001 with a Sun-internal bug ID as 3b1d10acc297db493b1f4e1999f6ba71f72db7f1 and 54007bb90c30469a5357c56056b8fdba3a233e24 #84715#
[Libreoffice-commits] core.git: oox/source svtools/source
oox/source/drawingml/colorchoicecontext.cxx |3 ++ oox/source/drawingml/fillproperties.cxx | 39 +--- svtools/source/graphic/transformer.cxx |6 ++-- 3 files changed, 30 insertions(+), 18 deletions(-) New commits: commit efbf0b412bc76149b410d0cd17c7040513d4c203 Author: Muthu Subramanian sumu...@collabora.com Date: Thu Oct 10 18:03:51 2013 +0530 n#812793: clrChange applying for EMFs Also fixed alpha clrChanges. diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index b33b6dd..bec28b0 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include oox/drawingml/drawingmltypes.hxx #include oox/drawingml/colorchoicecontext.hxx #include oox/helper/attributelist.hxx #include oox/drawingml/color.hxx @@ -83,6 +84,8 @@ void ColorValueContext::onStartElement( const AttributeList rAttribs ) switch( nElement ) { case A_TOKEN( alpha ): +mrColor.addTransformation( nElement, rAttribs.getInteger( XML_val, 0 )*PER_PERCENT ); +break; case A_TOKEN( alphaMod ): case A_TOKEN( alphaOff ): case A_TOKEN( blue ): diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index dcac76b..4e6d8e1 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -71,6 +71,29 @@ Reference XGraphic lclCheckAndApplyDuotoneTransform( const BlipFillProperties return xGraphic; } +Reference XGraphic lclCheckAndApplyChangeColorTransform( const BlipFillProperties aBlipProps, Reference XGraphic xGraphic, +const GraphicHelper rGraphicHelper, const sal_Int32 nPhClr ) +{ +if( aBlipProps.maColorChangeFrom.isUsed() aBlipProps.maColorChangeTo.isUsed() ) +{ +sal_Int32 nFromColor = aBlipProps.maColorChangeFrom.getColor( rGraphicHelper, nPhClr ); +sal_Int32 nToColor = aBlipProps.maColorChangeTo.getColor( rGraphicHelper, nPhClr ); +if ( (nFromColor != nToColor) || aBlipProps.maColorChangeTo.hasTransparency() ) try +{ +sal_Int16 nToTransparence = aBlipProps.maColorChangeTo.getTransparency(); +sal_Int8 nToAlpha = static_cast sal_Int8 ( (100 - nToTransparence) * 2.55 ); +Reference XGraphicTransformer xTransformer( aBlipProps.mxGraphic, UNO_QUERY_THROW ); +xGraphic = xTransformer-colorChange( xGraphic, nFromColor, 9, nToColor, nToAlpha ); +} +catch( Exception ) +{ +} +} +return xGraphic; +} + + + BitmapMode lclGetBitmapMode( sal_Int32 nToken ) { OSL_ASSERT((nToken sal_Int32(0x))==0); @@ -480,21 +503,7 @@ void GraphicProperties::pushToPropMap( PropertyMap rPropMap, const GraphicHelpe { // created transformed graphic Reference XGraphic xGraphic = lclCheckAndApplyDuotoneTransform( maBlipProps, maBlipProps.mxGraphic, rGraphicHelper, nPhClr ); -if( maBlipProps.maColorChangeFrom.isUsed() maBlipProps.maColorChangeTo.isUsed() ) -{ -sal_Int32 nFromColor = maBlipProps.maColorChangeFrom.getColor( rGraphicHelper, nPhClr ); -sal_Int32 nToColor = maBlipProps.maColorChangeTo.getColor( rGraphicHelper, nPhClr ); -if ( (nFromColor != nToColor) || maBlipProps.maColorChangeTo.hasTransparency() ) try -{ -sal_Int16 nToTransparence = maBlipProps.maColorChangeTo.getTransparency(); -sal_Int8 nToAlpha = static_cast sal_Int8 ( (100 - nToTransparence) / 39.062 ); // ?!? correct ?!? -Reference XGraphicTransformer xTransformer( maBlipProps.mxGraphic, UNO_QUERY_THROW ); -xGraphic = xTransformer-colorChange( maBlipProps.mxGraphic, nFromColor, 9, nToColor, nToAlpha ); -} -catch( Exception ) -{ -} -} +xGraphic = lclCheckAndApplyChangeColorTransform( maBlipProps, xGraphic, rGraphicHelper, nPhClr ); rPropMap[ PROP_Graphic ] = xGraphic; diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 0b0381b..30f07c7 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -86,7 +86,7 @@ uno::Reference graphic::XGraphic SAL_CALL GraphicTransformer::colorChange( BitmapColor aColorTo( static_cast sal_uInt8 ( nColorTo ), static_cast sal_uInt8 ( nColorTo 8 ), static_cast sal_uInt8 ( nColorTo 16 ) ); const sal_uInt8 cIndexFrom = aColorFrom.GetBlueOrIndex(); -if ( aGraphic.GetType() == GRAPHIC_BITMAP ) +if ( aGraphic.GetType() == GRAPHIC_BITMAP || aGraphic.GetType() == GRAPHIC_GDIMETAFILE ) { BitmapExaBitmapEx(
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67297, which changed state. Bug 67297 Summary: rendering errors of embedded OLE previews (and EMF+'s of them ?) https://bugs.freedesktop.org/show_bug.cgi?id=67297 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: pyuno/source sal/osl
pyuno/source/module/pyuno_module.cxx |5 + sal/osl/unx/process_impl.cxx | 19 --- sal/osl/w32/process.cxx |8 3 files changed, 21 insertions(+), 11 deletions(-) New commits: commit 1acaa577b67158c060d2f57414f7aea86504a489 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 10 13:47:18 2013 +0200 sal: add special handling of argc==0 to osl_setCommandArgs() ... to set up a fake command line. This is used from pyuno, when invoked from the python executable as import uno. On WNT there is an API to get the actual command line, so just use that even in the fake case; on UNX just fake something up. Just for the record the whole osl_setCommandArgs() is called exactly once assumption should work out _unless_ there is a program that uses SAL_MAIN _and_ does a python-level import uno _before_ it wants to create a python-based UNO service (via pyuno_loader::CreateInstance), since pyuno already takes care to call Runtime::initialize() at most once. Change-Id: Ifd23de733ea3e6b694d46ab039b6aa4fd3e7fc1b Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index e34b675..718759f 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -263,10 +263,7 @@ static PyObject* getComponentContext( { // cppu::defaultBootstrap_InitialComponentContext expects // command line arguments to be present -static char * argv [1]; -argv[0] = strdup( -this is just a fake and cheap imitation of a command line); -osl_setCommandArgs(1, argv); +osl_setCommandArgs(0, 0); // fake it OUString iniFile; if( path.isEmpty() ) diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 00766cc..6d1694d 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -208,13 +208,26 @@ oslProcessError SAL_CALL osl_getCommandArg (sal_uInt32 nArg, rtl_uString ** strC **/ void SAL_CALL osl_setCommandArgs (int argc, char ** argv) { -OSL_ASSERT(argc 0); +// special case for argc == 0: set up fake command line +int nArgs(argc ? argc : 1); pthread_mutex_lock ((g_command_args.m_mutex)); assert (g_command_args.m_nCount == 0); if (g_command_args.m_nCount == 0) { -rtl_uString** ppArgs = (rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*)); -if (ppArgs != 0) +rtl_uString** ppArgs = +(rtl_uString**)rtl_allocateZeroMemory(nArgs * sizeof(rtl_uString*)); +if (ppArgs != 0 argc == 0) +{ +// special case: set up fake command line +char const*const arg = +this is just a fake and cheap imitation of a command line; +rtl_string2UString(ppArgs[0], +arg, rtl_str_getLength(arg), RTL_TEXTENCODING_ASCII_US, +OSTRING_TO_OUSTRING_CVTFLAGS); +g_command_args.m_nCount = nArgs; +g_command_args.m_ppArgs = ppArgs; +} +else if (ppArgs != 0) { rtl_TextEncoding encoding = osl_getThreadTextEncoding(); for (int i = 0; i argc; i++) diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index 920e77d..6d55249 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -261,14 +261,14 @@ static struct CommandArgs_Impl g_command_args = #endif static rtl_uString ** osl_createCommandArgs_Impl (int argc, char **) { +int nArgs(0); +LPWSTR *wargv = CommandLineToArgvW( GetCommandLineW(), nArgs ); +assert(argc == nArgs || argc == 0 /* special case - faked */); rtl_uString ** ppArgs = -(rtl_uString**)rtl_allocateZeroMemory (argc * sizeof(rtl_uString*)); +(rtl_uString**)rtl_allocateZeroMemory(nArgs * sizeof(rtl_uString*)); if (ppArgs != 0) { int i; -int nArgs; -LPWSTR *wargv = CommandLineToArgvW( GetCommandLineW(), nArgs ); -OSL_ASSERT( nArgs == argc ); for (i = 0; i nArgs; i++) { /* Convert to unicode */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/thread.c |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 2bace4e9629cd0ee28ae6515bbceeef5c0b7ec1b Author: Stephan Bergmann sberg...@redhat.com Date: Thu Oct 10 14:59:55 2013 +0200 Adapt to C90 Change-Id: I491ca9ccfc5622afcec163e75792aa03a3a24a4f diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c index 3b09d3f..0140936 100644 --- a/sal/osl/unx/thread.c +++ b/sal/osl/unx/thread.c @@ -951,11 +951,13 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData) /*/ static void osl_thread_textencoding_init_Impl (void) { +rtl_TextEncoding defaultEncoding; + /* create thread specific data key */ pthread_key_create ((g_thread.m_textencoding.m_key), NULL); /* determine default text encoding */ -rtl_TextEncoding defaultEncoding = osl_getTextEncodingFromLocale(NULL); +defaultEncoding = osl_getTextEncodingFromLocale(NULL); OSL_ASSERT(defaultEncoding != RTL_TEXTENCODING_DONTKNOW); /* ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/nodedump.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4e8bc6930972fb59cc22a74925071409fd50698e Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 10 14:39:23 2013 +0200 SwNumRule::dumpAsXml: include IsAutoRule() and GetPoolFmtId() output Change-Id: I8f3fbe00f472d694a7b9ea31fd251101c9ad73e3 diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index e974653..0eaa082 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -341,6 +341,9 @@ void SwNumRule::dumpAsXml(xmlTextWriterPtr w) writer.startElement(swnumrule); OString aName = OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8); writer.writeFormatAttribute(name, %s, BAD_CAST(aName.getStr())); + writer.writeFormatAttribute(isautorule, TMP_FORMAT, IsAutoRule()); + if (GetPoolFmtId() != USHRT_MAX) + writer.writeFormatAttribute(poolfmtid, TMP_FORMAT, GetPoolFmtId()); writer.endElement(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] feature/instdir pushed to master
On 09/11/2013 05:56 PM, Stephan Bergmann wrote: One obvious remaining to-do is http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e8491a7e793a6b60a3ffdda8447f2c7000eed10 Get Mac OS X libjava_uno.jnilib - libjava_uno.dylib symlink into instdir: ...not exactly a nice way to do it, though. Plus, further missing instdir .jnilibs are LibreOffice.app/Contents/MacOS/libhsqldb.jnilib - libhsqldb.dylib and LibreOffice.app/Contents/ure-link/lib/libjpipe.jnilib (which should not be a symlink but should replace the corresponding libjpipe.dylib completely). If anybody wants to pick that up... Fixed, since quite a while now, with http://cgit.freedesktop.org/libreoffice/core/commit/?id=a382dad6afefdfc14b5d0c891ddbec149328de3d Clean up Mac OS X .jnilibs. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/colorchoicecontext.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 6ef2910864a6bb2d196d75826fef30dd58b8 Author: Muthu Subramanian sumu...@collabora.com Date: Thu Oct 10 19:37:16 2013 +0530 Partially revert alpha handling. Spec talks about x% while documents seem to contain x*1000 diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx index bec28b0..951033d 100644 --- a/oox/source/drawingml/colorchoicecontext.cxx +++ b/oox/source/drawingml/colorchoicecontext.cxx @@ -84,8 +84,6 @@ void ColorValueContext::onStartElement( const AttributeList rAttribs ) switch( nElement ) { case A_TOKEN( alpha ): -mrColor.addTransformation( nElement, rAttribs.getInteger( XML_val, 0 )*PER_PERCENT ); -break; case A_TOKEN( alphaMod ): case A_TOKEN( alphaOff ): case A_TOKEN( blue ): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How are installation sets being built?
On 10/10/13 09:14, Stephan Bergmann wrote: On 10/09/2013 10:58 PM, Christian Lohmaier wrote: I don't know why it is used for Mac, as there are no individual packages, but I assume that's scp2 heritage. which brings me back to my original question for a universal trigger whether or not to produce installation sets during a build. Seeing that --enable-epm currently effectively fulfills that role everywhere but on Windows, one option would be to make it fulfill that role on Windows too. (I have a local patch to do that.) The alternative would be to introduce an explicit --enable-installation-sets. Opinions, anyone? we already have --with-package-format, much simpler to do nothing if the user doesn't specify that than adding another option, or using --enable-epm on a plaform where EPM is irrelevant. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/kill-set_soenv' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/unitymenus-quantal' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/unitymenus' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/unitymenus-quantal-fix' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-pluggable-opencl' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gbuildfixes' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/inc sc/source
sc/inc/scmatrix.hxx |8 ++--- sc/source/core/data/dociter.cxx | 16 +-- sc/source/core/data/formulacell.cxx |2 - sc/source/core/tool/compiler.cxx|2 - sc/source/core/tool/doubleref.cxx |4 +- sc/source/core/tool/interpr1.cxx| 49 +--- sc/source/core/tool/interpr4.cxx|6 ++-- sc/source/core/tool/interpr5.cxx|8 ++--- sc/source/core/tool/rangeseq.cxx|6 ++-- sc/source/core/tool/scmatrix.cxx| 36 +- sc/source/ui/unoobj/chart2uno.cxx |3 +- 11 files changed, 70 insertions(+), 70 deletions(-) New commits: commit 275450f1cd92b58d7ed404297a733077c6c4d86e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Oct 10 10:28:35 2013 -0400 GetString() from ScMatrix to return SharedString. And adjust all its call sites. Change-Id: Ibb0c754e8fa105bd1a6035f2e0df5cee2d8491c4 diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 6111217..b997506 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -276,15 +276,15 @@ public: double GetDouble( SCSIZE nIndex) const; /// @return empty string if empty or empty path, else string content. -OUString GetString( SCSIZE nC, SCSIZE nR) const; +svl::SharedString GetString( SCSIZE nC, SCSIZE nR) const; /// @return empty string if empty or empty path, else string content. -OUString GetString( SCSIZE nIndex) const; +svl::SharedString GetString( SCSIZE nIndex) const; /** @returns the matrix element's string if one is present, otherwise the numerical value formatted as string, or in case of an error the error string is returned; an empty string for empty, a FALSE string for empty path. */ -OUString GetString( SvNumberFormatter rFormatter, SCSIZE nC, SCSIZE nR) const; +svl::SharedString GetString( SvNumberFormatter rFormatter, SCSIZE nC, SCSIZE nR) const; /// @ATTENTION: If bString the ScMatrixValue-pS may still be NULL to indicate /// an empty string! @@ -337,7 +337,7 @@ public: IterateResult Product(bool bTextAsZero) const; size_t Count(bool bCountStrings) const; size_t MatchDoubleInColumns(double fValue, size_t nCol1, size_t nCol2) const; -size_t MatchStringInColumns(const OUString rStr, size_t nCol1, size_t nCol2) const; +size_t MatchStringInColumns(const svl::SharedString rStr, size_t nCol1, size_t nCol2) const; double GetMaxValue( bool bTextAsZero ) const; double GetMinValue( bool bTextAsZero ) const; diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 3cad91c..eaa496a 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -553,7 +553,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::getCurrent(Value rValue) if (isValidQuery(mnCurRow, rMat)) { -rValue.maString = rMat.GetString(mpParam-mnField, mnCurRow); +rValue.maString = rMat.GetString(mpParam-mnField, mnCurRow).getString(); rValue.mfValue = rMat.GetDouble(mpParam-mnField, mnCurRow); rValue.mbIsNumber = !bIsStrVal; rValue.mnError = 0; @@ -681,19 +681,19 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM do { // Equality check first. -OUString aMatStr = rMat.GetString(nField, nRow); -upperCase(aMatStr); -OUString aQueryStr = rEntry.GetQueryItem().maString.getString(); -upperCase(aQueryStr); +svl::SharedString aMatStr = rMat.GetString(nField, nRow); +svl::SharedString aQueryStr = rEntry.GetQueryItem().maString; bool bDone = false; +rtl_uString* p1 = mpParam-bCaseSens ? aMatStr.getData() : aMatStr.getDataIgnoreCase(); +rtl_uString* p2 = mpParam-bCaseSens ? aQueryStr.getData() : aQueryStr.getDataIgnoreCase(); switch (rEntry.eOp) { case SC_EQUAL: -bValid = aMatStr.equals(aQueryStr); +bValid = (p1 == p2); bDone = true; break; case SC_NOT_EQUAL: -bValid = !aMatStr.equals(aQueryStr); +bValid = (p1 != p2); bDone = true; break; default: @@ -704,7 +704,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM break; // Unequality check using collator. -sal_Int32 nCompare = rCollator.compareString(aMatStr, aQueryStr); +sal_Int32 nCompare = rCollator.compareString(aMatStr.getString(), aQueryStr.getString()); switch (rEntry.eOp) {
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/csvgrid.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 68568d78093c37e5848a19d5eabee163117f7625 Author: Eike Rathke er...@redhat.com Date: Thu Oct 10 17:16:00 2013 +0200 fixed !!br0ken CSV import preview Regression introduced with 24c079605645cf29ba366ca39b7c1177da8b317f Previous String ctor accepted length string length, whereas OUString::copy() does not. Change-Id: If51e6df4e236a59ab0302d2bb683ca8e6d148bd0 diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 2fdf462..bc3f4a2 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -1152,15 +1152,16 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex ) // #i67432# cut string to avoid edit engine performance problems with very large strings sal_Int32 nFirstVisPos = ::std::max( GetColumnPos( nColIndex ), GetFirstVisPos() ); sal_Int32 nLastVisPos = ::std::min( GetColumnPos( nColIndex + 1 ), GetLastVisPos() ); -xub_StrLen nStrPos = static_cast xub_StrLen ( nFirstVisPos - GetColumnPos( nColIndex ) ); -xub_StrLen nStrLen = static_cast xub_StrLen ( nLastVisPos - nFirstVisPos + 1 ); +sal_Int32 nStrPos = nFirstVisPos - GetColumnPos( nColIndex ); +sal_Int32 nStrLen = nLastVisPos - nFirstVisPos + 1; sal_Int32 nStrX = GetX( nFirstVisPos ); for( size_t nLine = 0; nLine nLineCount; ++nLine ) { StringVec rStrVec = maTexts[ nLine ]; if( (nColIndex rStrVec.size()) (rStrVec[ nColIndex ].getLength() nStrPos) ) { -OUString aText = rStrVec[ nColIndex ].copy( nStrPos, nStrLen ); +const OUString rStr = rStrVec[ nColIndex ]; +OUString aText = rStr.copy( nStrPos, ::std::min( nStrLen, rStr.getLength()) - nStrPos ); ImplDrawCellText( Point( nStrX, GetY( GetFirstVisLine() + nLine ) ), aText ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/svids.hrc |2 -- 1 file changed, 2 deletions(-) New commits: commit 125655ae81b408369615c25f77475ca209e4c745 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 13:44:29 2013 +0100 no need to include solar.hrc here Change-Id: Ib54df2162b92da92d1b9ba14185d0e7f837e7cab diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index a788f4a..44579f9 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -20,8 +20,6 @@ #ifndef _SV_SVIDS_HRC #define _SV_SVIDS_HRC -#include svl/solar.hrc - #define SV_RESID_STDOFFSET 0 #define SV_RESID_MONOOFFSET 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/process.cxx |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 01f27b5e5d428cc3c4aeabdcbbb8204494fbd435 Author: Michael Stahl mst...@redhat.com Date: Thu Oct 10 17:20:23 2013 +0200 sal: fix osl_setCommandArgs() on WNT ... was missing from 1acaa577b67158c060d2f57414f7aea86504a489. Change-Id: I9098f4587f1c201328abbbcfb34d42f09d2e8203 diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index 6d55249..0328a4f 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -259,11 +259,15 @@ static struct CommandArgs_Impl g_command_args = #pragma warning( push ) #pragma warning( disable: 4100 ) #endif -static rtl_uString ** osl_createCommandArgs_Impl (int argc, char **) +static rtl_uString ** osl_createCommandArgs_Impl (int argc, char **) { int nArgs(0); LPWSTR *wargv = CommandLineToArgvW( GetCommandLineW(), nArgs ); -assert(argc == nArgs || argc == 0 /* special case - faked */); +if (argc != nArgs) +{ +assert(argc == 0 /* special case - faked */); +argc = nArgs; +} rtl_uString ** ppArgs = (rtl_uString**)rtl_allocateZeroMemory(nArgs * sizeof(rtl_uString*)); if (ppArgs != 0) @@ -372,7 +376,6 @@ oslProcessError SAL_CALL osl_getCommandArg( sal_uInt32 nArg, rtl_uString **strCo void SAL_CALL osl_setCommandArgs (int argc, char ** argv) { -OSL_ASSERT(argc 0); osl_acquireMutex (*osl_getGlobalMutex()); if (g_command_args.m_nCount == 0) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 22/5fe06a0370fe2d935b9258f0243fdb7f749fd4
22/5fe06a0370fe2d935b9258f0243fdb7f749fd4 |1 + 1 file changed, 1 insertion(+) New commits: commit 4fc33d675f8a126071def35706b855fa51a080a1 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 16:26:23 2013 +0100 Notes added by 'git notes add' diff --git a/22/5fe06a0370fe2d935b9258f0243fdb7f749fd4 b/22/5fe06a0370fe2d935b9258f0243fdb7f749fd4 new file mode 100644 index 000..0d5aba7 --- /dev/null +++ b/22/5fe06a0370fe2d935b9258f0243fdb7f749fd4 @@ -0,0 +1 @@ +prefer: 1c7f95b96026abee15519a0e57e8e41f0ce87a4f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/index/swuiidxmrk.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de84cde075cf012037dbfecb88a757fd786ab04a Author: Michael Stahl mst...@redhat.com Date: Thu Oct 10 17:57:30 2013 +0200 warning C4805 unsafe mix of type sal_Bool and type bool Change-Id: Ia9eb65d5c0799437f55da2c59d007ed615da0385 diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index da8f895..9dccf7b 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1233,7 +1233,7 @@ IMPL_LINK_NOARG(SwAuthorMarkPane, InsertHdl) //insert or update the SwAuthorityField... if(pSh) { -bool bDifferent = false; +sal_Bool bDifferent = sal_False; OSL_ENSURE(!m_sFields[AUTH_FIELD_IDENTIFIER].isEmpty() , No Id is set!); OSL_ENSURE(!m_sFields[AUTH_FIELD_AUTHORITY_TYPE].isEmpty() , No authority type is set!); //check if the entry already exists with different content ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/sdpage.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97f864df4ecdeacb36eac694671ff2081242540e Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 17:03:52 2013 +0100 CID#1103712 big element passed by value Change-Id: Ib5ffd719d7054e36605190c521d8650d6b6e2728 diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 18b4a25..1856a54 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -868,7 +868,7 @@ const char* const PresObjKindVector[] = { PRESOBJ_MEDIA, PRESOBJ_MAX }; -void getPresObjProp( SdPage rPage, const char* sObjKind, const char* sPageKind, double presObjPropValue[] ) +void getPresObjProp( const SdPage rPage, const char* sObjKind, const char* sPageKind, double presObjPropValue[] ) { bool bNoObjectFound = true; //used to break from outer loop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/tablink.cxx | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) New commits: commit b1caf176a44b6979d2e0ea47f495a3dacf86e197 Author: Eike Rathke er...@redhat.com Date: Thu Oct 10 18:02:25 2013 +0200 fixed another Out of bounds substring access Introduced with 3c2a26c84e70fd996855181d319970e2230b2459 Didn't have consequences here because the result was used to check for a startsWith condition which it wouldn't had matched anyway. However, use the real startsWith() now. Change-Id: Ia1d558fc106d9a2010ad41c30f7eb2a2a480c59b diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 5a4cfcd..b6255d1 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -501,12 +501,11 @@ bool ScDocumentLoader::GetFilterName( const OUString rFileName, void ScDocumentLoader::RemoveAppPrefix( OUString rFilterName ) { -OUStringBuffer aAppPrefix; -aAppPrefix.appendAscii(STRING_SCAPP); -aAppPrefix.appendAscii(: ); -sal_Int32 nPreLen = aAppPrefix.getLength(); -if (rFilterName.copy(0, nPreLen).equals(aAppPrefix.makeStringAndClear())) -rFilterName = rFilterName.copy(nPreLen); +OUStringBuffer aBuf; +aBuf.appendAscii( STRING_SCAPP).appendAscii( : ); +OUString aAppPrefix( aBuf.makeStringAndClear()); +if (rFilterName.startsWith( aAppPrefix)) +rFilterName = rFilterName.copy( aAppPrefix.getLength()); } ScDocumentLoader::ScDocumentLoader( const OUString rFileName, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/ConnectionHelper.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 541bb859332a790131ad3730fc87ec887266a18c Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 17:06:01 2013 +0100 CID#1103666 check for NULL Change-Id: Idb8cf3c80422d38c271dc2cc8176ff231cf64025 diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index c50f8b4..23da1db 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -143,8 +143,8 @@ DBG_NAME(OConnectionHelper) void OConnectionHelper::implUpdateURLDependentStates() const { -OSL_PRECOND( m_pAdminDialog, OConnectionHelper::implUpdateURLDependentStates: no admin dialog! ); -if ( !m_pAdminDialog ) +OSL_PRECOND( m_pAdminDialog m_pCollection, OConnectionHelper::implUpdateURLDependentStates: no admin dialog! ); +if ( !m_pAdminDialog || !m_pCollection ) return; if ( m_pCollection-isFileSystemBased(m_eType) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
minutes of ESC call ...
* Present: + Miklos, Andras, Caolan, David, kendy, Kohei, Eike, Markus, Stephan, Tibby, Robinson, Cloph, Bjoern, Michael M, Michael S * Completed Action Items + CC developers' mailing list on all the easy hacks (Bjoern) + poke marketing / PR for 4.1.2 announce (Cloph) + change wiki page to eliminate proposed easy hacks (Bjoern) + create a script that counts bug commenters stats for minor release update PR (Bjoern) + switch to 10.8 baseline for Mac / 64bit (Norbert) + ask Rob to turn auto-'regression' status off on the BSA (Robinson) [ bug filed ] * Pending Action Items: + find better way to export from Coverity categories of non-security critical bugs (Caolan) + design-team raising template concerns, address these if possible push (Ahmad) + setup infrastructure to build bibisect repos (Cloph / Bjoern / Norbert) + propose different name for proposed easy hacks (Markus) + produce a VM for the load / crash regressions (Cloph / Markus) + partition document test loads / run them on tinderboxen (Norbert) + produce a VM with callgrind metrics (Matus) + transition and automate this inside a VM for Cloph (Lionel) + create script to auto-mail users list for each API Change commit (Bjoern/Stephan) + ask Florian for a minimal / simple solution for larger bug docs (Robinson) * Release Engineering update (Cloph) + 4.1.2 retrospective + wider RC3 / delay announcement + will activate automatic update today. + 4.0.6 RC1 status + pushed to the mirrors, ready to be announced later today + 4.1.3 RC1 - status + on the way to the mirrors + 4.0.6 RC2 deadline - next Monday + 4.1.3 RC2 - deadline week after + can we include the new bug-triager credits script for minor updaes ? (Bjoern) + a script that generates data on who commented in the related bugs AI: + point Cloph at script in dev-tools (Bjoern) + GSOC / Android iOS remote releases ? + previously pushed every update to the release branch (Miklos) + so ok to release from master ? AI: + get setup wrt. mobile app-store access (Cloph / Thorsten) AI: + ask app-authors wrt. freeze (Kendy) * obsolete git branch cleanup (Thorsten) + git push origin --delete branchName AI: + mail out list of branches (Michael) * New Google C* font replacements (Caolan) + http://comments.gmane.org/gmane.linux.redhat.fedora.devel/186967 + Carlito - Calibri + Caladea - Cambria + packaging them for Fedora - into LibreOffice. * Regression analysis (Bjoern) + good news, fixing more regressions than we're introducing + the stats are going up, but thought to be better QA / triage. + because marking more: + ~50% of bugs closed in a major release, marked as regressions + conclusion: + doing a reasonable job of keeping regressions under control since 3.6 + continued focus on unit-testing important. + could / focus on areas where we detected most regressions. + hope is that fixes come with unit tests so we do focus there (Michael) + would be good to scrape bugzilla for 'regression' that were fixed + identify code in commit find most regression-prone code. AI: + create easy-hack to indentify the above (Bjoern) + https://bugs.freedesktop.org/show_bug.cgi?id=66750 done + way too few unit-tests for impress (Kendy) + contrast with the weekly stats which seem to climb endlessly (Michael M) + around 100 of our 'regressions' - needinfo or unconfirmed (Bjoern) + could we review / de-tagging these ? AI: + QA team can prioritise that (Robinson) + Link that has regressions introduced in recent minor releases (Michael S) http://bit.ly/18RVbgp https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20keywords_type=allwordsquery_format=advancedbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDversion=4.0.1.1%20rcversion=4.0.1.2%20releaseversion=4.0.2.1%20rcversion=4.0.2.2%20releaseversion=4.0.3.1%20rcversion=4.0.3.2%20rcversion=4.0.3.3%20releaseversion=4.0.4.1%20rcversion=4.0.4.2%20releaseversion=4.0.5.1%20rcversion=4.0.5.2%20releaseproduct=LibreOfficelist_id=353044 + be good to look into these specifically * Bundled extensions (Stephan) + one left - presentation minimizer + de-extensionalizing by David O planned + one instdir/ issue - bundled extensions don't show up + lots of --enable-ext-whatever foo in configure, that bundle extn's we hardly ever build, if we get rid of them, we avoid needing to fix instdir to not include them. + distro-configs for TDF builds, include wikipublisher, nlpsolver + do we want to have those ? + we need the nlpsolver (Kohei) + is it built locally - or is it a tarball (Stephan) + external pkg, but built locally (Kohei) + thought there was an UNO wrapper for it.
[Libreoffice-commits] core.git: Branch 'feature/gstreamer-1.0' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/hyphen.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 463ba7b4d347c6fa0bcd1f01a49a18c7470a4ea0 Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 17:16:18 2013 +0100 CID#1103727 the intent is surely to compare nPos, nStart cannot be -1 Change-Id: I27a6622f45ec3fdbb9153e1dcb1114c5dc71e884 diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 6bddeb3..fffb3fc 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -164,7 +164,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl( // find corresponding hyphen pos in string nPos = aTxt.indexOf( sal_Unicode( HYPH_POS_CHAR ), nStart ); -if (nStart == -1) +if (nPos == -1) break; else { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/unitymenus-master' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/liblibo' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [BUILD] Which license do I need to build a professional edition of LibreOffice (4.0.x/4.1.x) of windows ?
Start here: https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies And then ask questions when you run into trouble. Note that building older versions can sometimes be a little tricky as the instructions are geared towards the last version. On 2013-10-09 16:34, Gay, Matthieu wrote: Hello, I still have problem to build under windows, but I wanted to know, what do I need to build LibreOffice (4.0.x/4.1.x) entirely as the original available in the website. First can you confirm that I need a certificate to sign the DLL and a license of Visual Studio 12 (without I can't build ATL and ActiveX modules). Which version of Windows is the best? Do I need a pro version or a familial one? Thanks for your answer, if you find others license/not free component (in cygwin dependency or Microsoft tools by example) don't hesitate to tell me. Matthieu GAY. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: When to change {udkapi, offapi}/type_reference/{udkapi, offapi}.idl
Hi Stephan, thanks for clearing that up! Regards Thomas On 10.10.2013 09:41, Stephan Bergmann wrote: Hi all, The *.idl (formerly *.rdb) files in {udkapi,offapi}/type_reference/ are meant to represent the status of our (published) UNO API as previously released, to allow detecting inadvertent incompatible changes. Therefore, these files should generally be left unchanged. The only time to change them is when a deliberate incompatible change (with a commit message containing [API CHANGE]) would otherwise break the compatibility checks when building udkapi or offapi. (And in the past, when those type_references were binary *.rdb files, that was a somewhat tricky task. Now that they are textual *.idl files it has become (too?) trivial.) (So, if there are any git-hook aficionados out there, maybe there's a way to prevent commits that change {udkapi,offapi}/type_reference/{udkapi,offapi}.idl but do not contain [API CHANGE] in the commit message.) (I just pushed http://cgit.freedesktop.org/libreoffice/core/commit/?id=bf1284d34e3bf53179a1513265accc0c3f54337c Keep type_reference/offapi.idl at backwards-compatibility reference status to revert one such inadvertent change.) Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sdr-dbus' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/sdr-dbus-for-4-0' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/doxygen' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gbuild_mkdir' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/external_gbuild' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/submodules' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/kill_String' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gbuild_extensions' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc_test_improvements' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc_test_improvements2' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc_test_improvements3' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 48 +++- 1 file changed, 20 insertions(+), 28 deletions(-) New commits: commit f4d50ca58143d4592e047cccace9e207448142fe Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 10 18:31:38 2013 +0200 CID#704368 RtfAttributeOutput::ParaNumRule_Impl(): logically dead code Change-Id: I7dae57f890a32511bb00ae5a6e1741fb6701046e diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 47731f4..198da0a 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -2584,20 +2584,17 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL { SAL_WARN_IF(pTxtNd-GetActualListLevel() 0 || pTxtNd-GetActualListLevel() = MAXLEVEL, sw.rtf, text node does not have valid list level); -const bool bExportNumRule = USHRT_MAX != nNumId; const SwNumFmt* pFmt = pRule-GetNumFmt( nLvl ); if( !pFmt ) pFmt = pRule-Get( nLvl ); const SfxItemSet rNdSet = pTxtNd-GetSwAttrSet(); -if ( bExportNumRule ) { -m_aStyles.append('{'); -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LISTTEXT); -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PARD); -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PLAIN); -m_aStyles.append(' '); -} +m_aStyles.append('{'); +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LISTTEXT); +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PARD); +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_PLAIN); +m_aStyles.append(' '); SvxLRSpaceItem aLR( (SvxLRSpaceItem)rNdSet.Get( RES_LR_SPACE ) ); aLR.SetTxtLeft( aLR.GetTxtLeft() + pFmt-GetIndentAt() ); @@ -2621,32 +2618,27 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL m_aStyles.append(msfilter::rtfutil::OutString(sTxt, m_rExport.eDefaultEncoding)); } -if( bExportNumRule ) +if( OUTLINE_RULE != pRule-GetRuleType() ) { -if( OUTLINE_RULE != pRule-GetRuleType() ) +if (sTxt.Len()) +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); +m_aStyles.append('}'); +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); +if( nLvl 8 )// RTF knows only 9 levels { -if (sTxt.Len()) -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); +m_aStyles.append((sal_Int32)8); +m_aStyles.append({ OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SOUTLVL); +m_aStyles.append((sal_Int32)nLvl); m_aStyles.append('}'); -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL); -if( nLvl 8 )// RTF knows only 9 levels -{ -m_aStyles.append((sal_Int32)8); -m_aStyles.append({ OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_SOUTLVL); -m_aStyles.append((sal_Int32)nLvl); -m_aStyles.append('}'); -} -else -m_aStyles.append((sal_Int32)nLvl); } else -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB }); -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LS); -m_aStyles.append((sal_Int32)m_rExport.GetId(*pRule)+1); -m_aStyles.append(' '); +m_aStyles.append((sal_Int32)nLvl); } -else if( sTxt.Len() ) -m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB); +else +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB }); +m_aStyles.append(OOO_STRING_SVTOOLS_RTF_LS); +m_aStyles.append((sal_Int32)m_rExport.GetId(*pRule)+1); +m_aStyles.append(' '); } FormatLRSpace(aLR); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/doctok/DffImpl.cxx | 17 -- writerfilter/source/doctok/resources.xsl |1 writerfilter/source/doctok/resourcesimpl.xsl | 171 --- 3 files changed, 5 insertions(+), 184 deletions(-) New commits: commit 3ef5e2611197fe295c6b3521198390f9ad020f71 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Oct 10 18:56:51 2013 +0200 writerfilter: drop dead isBooleanDffOpt() in doctok Change-Id: I7be21f126eddc6e49649ea3370a7a181d976360b diff --git a/writerfilter/source/doctok/DffImpl.cxx b/writerfilter/source/doctok/DffImpl.cxx index 51141a5..546680f 100644 --- a/writerfilter/source/doctok/DffImpl.cxx +++ b/writerfilter/source/doctok/DffImpl.cxx @@ -338,23 +338,8 @@ DffBSE::get_blip() } // WW8FOPTE -void WW8FOPTE::resolveNoAuto(Properties rHandler) +void WW8FOPTE::resolveNoAuto(Properties ) { -sal_uInt16 nId = get_pid() + 1; -sal_uInt32 nOp = get_op(); -sal_uInt32 nMask = 2; - -while (isBooleanDffOpt(nId)) -{ -WW8Value::Pointer_t pVal = createValue(getDffOptName(nId)); -rHandler.attribute(NS_rtf::LN_shpname, *pVal); - -pVal = createValue((nOp nMask) != 0); -rHandler.attribute(NS_rtf::LN_shpvalue, *pVal); - ---nId; -nMask = nMask 1; -} } // DffFSP diff --git a/writerfilter/source/doctok/resources.xsl b/writerfilter/source/doctok/resources.xsl index a21d9b2..ecd1409 100644 --- a/writerfilter/source/doctok/resources.xsl +++ b/writerfilter/source/doctok/resources.xsl @@ -63,7 +63,6 @@ using namespace ::std;#xa;/xsl:text xsl:apply-templates select=//UML:Class mode=class/ xsl:text OUString getDffOptName(sal_uInt32 nPid); -bool isBooleanDffOpt(sal_uInt32 nId); }} #endif // INCLUDED_RESOURCES_HXX#xa;/xsl:text/out /xsl:template diff --git a/writerfilter/source/doctok/resourcesimpl.xsl b/writerfilter/source/doctok/resourcesimpl.xsl index a1e7748..ddc2bd8 100644 --- a/writerfilter/source/doctok/resourcesimpl.xsl +++ b/writerfilter/source/doctok/resourcesimpl.xsl @@ -451,47 +451,17 @@ using namespace ::std; xsl:param name=classname/ xsl:textvoid /xsl:text xsl:value-of select=$classname/ -xsl:text::resolve(Table amp; rHandler) +xsl:text::resolve(Table amp;) { - sal_uInt32 nCount = getEntryCount(); - writerfilter::Referencelt; Properties gt;::Pointer_t pEntry; - for (sal_uInt32 n = 0; n lt; nCount; ++n) - { - pEntry = getEntry(n); - - if (pEntry.get() != 0x0) - { - try - { - rHandler.entry(n, pEntry); - } - catch (const ExceptionOutOfBoundsamp;) - { - } - } - } } /xsl:text /xsl:template xsl:template match='UML:Model' mode='createsprmprops' writerfilter::Reference lt; Properties gt; ::Pointer_t createSprmProps -(WW8PropertyImpl amp; rProp) +(WW8PropertyImpl amp;) { writerfilter::Reference lt; Properties gt; ::Pointer_t pResult; - -switch (rProp.getId()) -{ -xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref=ww8sprm and .//UML:Stereotype/@xmi.idref=ww8resource]' -case xsl:value-of select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref=sprmcode]//UML:TaggedValue.dataValue'/: -pResult = writerfilter::Reference lt; Properties gt; ::Pointer_t(new WW8xsl:value-of select='@name'/(rProp, 0, rProp.getCount())); - -break; -/xsl:for-each -default: -break; -} - return pResult; } /xsl:template @@ -499,31 +469,9 @@ writerfilter::Reference lt; Properties gt; ::Pointer_t createSprmProps xsl:template match='UML:Model' mode='createsprmbinary' xsl:text writerfilter::Reference lt; BinaryObj gt; ::Pointer_t createSprmBinary -(WW8PropertyImpl amp; rProp) +(WW8PropertyImpl amp;) { writerfilter::Reference lt; BinaryObj gt; ::Pointer_t pResult; - -switch (rProp.getId()) -{#xa; -// warnings -case 0: -break; -/xsl:text -xsl:for-each select='.//UML:Class[.//UML:Stereotype/@xmi.idref=ww8sprmbinary and .//UML:Stereotype/@xmi.idref=ww8resource]' -case xsl:value-of select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref=sprmcode]//UML:TaggedValue.dataValue'/: -{ -WW8xsl:value-of select='@name'/::Pointer_t p(new WW8xsl:value-of select='@name'/(rProp, 0, rProp.getCount())); - -pResult = p-getBinary(); -} - -break; -/xsl:for-each -xsl:text -default: - break; -} - return pResult; } /xsl:text @@ -556,20 +504,9 @@ writerfilter::Reference lt; BinaryObj gt; ::Pointer_t createSprmBinary xsl:template name=getdffoptname xsl:text -OUString getDffOptName(sal_uInt32 nPid) +OUString getDffOptName(sal_uInt32) { OUString result; - -switch (nPid) -{#xa;/xsl:text -xsl:for-each
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/addincol.cxx | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) New commits: commit ddac824d9c109430f5caad05ca1d84cfcd599c4f Author: Winfried Donkers winfrieddonk...@libreoffice.org Date: Wed Sep 25 07:41:34 2013 +0200 fdo#50118 use English add-in function names This patch sets the function names of add-in functions as set in the golbal configuration of LibreOffice ('Use English Function names') Changing this setting has not yet an immediate effect. (I'm still working on that, which is a hard nut to crack.) The add-in function names are set at start up of calc. Change-Id: I5fffd9edb09647c1bcd0c3f35ffa6ab69ef48589 Reviewed-on: https://gerrit.libreoffice.org/6032 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 807bba2..db0d521 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -50,6 +50,7 @@ #include rangeseq.hxx #include funcdesc.hxx #include svl/sharedstring.hxx +#include formulaopt.hxx //fdo50118 using namespace com::sun::star; @@ -746,12 +747,15 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Referenceuno::XInterface uno::Referencelang::XServiceName xName( xInterface, uno::UNO_QUERY ); if ( xAddIn.is() xName.is() ) { -// AddIns must use the language for which the office is installed -lang::Locale aLocale( Application::GetSettings().GetUILanguageTag().getLocale()); -xAddIn-setLocale( aLocale ); +// fdo50118 when GetUseEnglishFunctionName() returns true, set the +// locale to en-US to get English function names +if ( SC_MOD()-GetFormulaOptions().GetUseEnglishFuncName() ) +xAddIn-setLocale( lang::Locale( en, US, )); +else +xAddIn-setLocale( Application::GetSettings().GetUILanguageTag().getLocale()); OUString aServiceName( xName-getServiceName() ); -ScUnoAddInHelpIdGenerator aHelpIdGenerator( xName-getServiceName() ); +ScUnoAddInHelpIdGenerator aHelpIdGenerator( aServiceName ); //! pass XIntrospection to ReadFromAddIn @@ -1001,8 +1005,12 @@ void ScUnoAddInCollection::UpdateFromAddIn( const uno::Referenceuno::XInterface uno::Referencelang::XLocalizable xLoc( xInterface, uno::UNO_QUERY ); if ( xLoc.is() )// optional in new add-ins { -lang::Locale aLocale( Application::GetSettings().GetUILanguageTag().getLocale()); -xLoc-setLocale( aLocale ); +// fdo50118 when GetUseEnglishFunctionName() returns true, set the +// locale to en-US to get English function names +if ( SC_MOD()-GetFormulaOptions().GetUseEnglishFuncName() ) +xLoc-setLocale( lang::Locale( en, US, )); +else +xLoc-setLocale( Application::GetSettings().GetUILanguageTag().getLocale()); } // if function list was already initialized, it must be updated ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: moz/ExternalPackage_moz_lib.mk RepositoryExternal.mk
RepositoryExternal.mk |9 ++--- moz/ExternalPackage_moz_lib.mk |2 -- 2 files changed, 2 insertions(+), 9 deletions(-) New commits: commit c18dc12f292a504b0a6f3d402cbfee77d64a40af Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 10 18:31:27 2013 +0200 fix build with --enable-win-mozab-driver moving staticlibs to workdir broke it since 520c7dc9e8860e506145e879182ca32853617097 Instead of copying the unzipped libs to another directory, reference them from UnpackedTarball directory instead. Change-Id: I711cae4305c6888bd923dcb09e51416cbe363377 Reviewed-on: https://gerrit.libreoffice.org/6191 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5285bcc..dd0e9d2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2234,11 +2234,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\ xpcom_core \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - embed_base_s \ - mozreg_s \ -) - $(call gb_LinkTarget_add_defs,$(1),\ -DMOZILLA_CLIENT \ -DMOZ_REFLOW_PERF \ @@ -2274,8 +2269,8 @@ $(call gb_LinkTarget_add_defs,$(1),\ endif $(call gb_LinkTarget_add_libs,$(1),\ - $(OUTDIR)/lib/embed_base_s.lib \ - $(OUTDIR)/lib/mozreg_s.lib \ + $(call gb_UnpackedTarball_get_dir,moz_lib)/embed_base_s.lib \ + $(call gb_UnpackedTarball_get_dir,moz_lib)/mozreg_s.lib \ ) endif # !GCC diff --git a/moz/ExternalPackage_moz_lib.mk b/moz/ExternalPackage_moz_lib.mk index 85765d3..6246b21 100644 --- a/moz/ExternalPackage_moz_lib.mk +++ b/moz/ExternalPackage_moz_lib.mk @@ -10,8 +10,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,moz_lib,moz_lib)) $(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\ - embed_base_s.lib \ - mozreg_s.lib \ nslber32v50.lib \ nsldap32v50.lib \ xpcom.lib \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Your videos on LibreOffice TDF chanel
Dear developers, We now have an official YouTube channel that I try to populate with useful material for our project: http://www.youtube.com/channel/UCQAClQkZEm2rkWvU5bvCAXQ If you have any videos (related to LibreOffice ;-) that you want to see added here, please send me the link directly. I don't have set a Talk playlist yet, but that will come soon and if you want another playlist, just tell me. Thanks in advance Kind regards Sophie PS: I hope to come soon with an easier link and some visual too. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/source
svtools/source/svhtml/parhtml.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 700883b34ebcdb77f398b4423f358bdf4648a853 Author: Thomas Arnhold tho...@arnhold.org Date: Thu Oct 10 16:34:29 2013 +0200 html: Options need to be lowercase, too Because the lookup table (include/svtools/htmlkywd.hxx) is now lowercase. Change-Id: Ica0606eb1546f74d2b651a70adee8117c956d4e2 Reviewed-on: https://gerrit.libreoffice.org/6193 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 474fd20..b729259 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1470,10 +1470,8 @@ const HTMLOptions HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) OUString sName( aToken.copy( nStt, nPos-nStt ) ); -// PlugIns require original token name. Convert to upper case only for searching. -OUString sNameUpperCase( sName.toAsciiUpperCase() ); - -nToken = GetHTMLOption( sNameUpperCase ); // Name is ready +// PlugIns require original token name. Convert to lower case only for searching. +nToken = GetHTMLOption( sName.toAsciiLowerCase() ); // Name is ready DBG_ASSERTWARNING( nToken!=HTML_O_UNKNOWN, GetOption: unknown HTML option ); bool bStripCRLF = (nToken HTML_OPTION_SCRIPT_START || ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source desktop/source sdext/source
basic/source/comp/sbcomp.cxx |2 +- desktop/source/app/cmdlinehelp.cxx|4 +--- sdext/source/presenter/PresenterTheme.hxx |2 +- 3 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 39022b8b7de60b139a9d21991ae10593e1829e43 Author: Thomas Arnhold tho...@arnhold.org Date: Thu Oct 10 11:51:22 2013 +0200 little String to OUString + documentation Change-Id: I982e44150fd2909da0571409f16051d79377d7a3 Reviewed-on: https://gerrit.libreoffice.org/6192 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx index e4d95f1..fe7d7e6 100644 --- a/basic/source/comp/sbcomp.cxx +++ b/basic/source/comp/sbcomp.cxx @@ -281,7 +281,7 @@ static OString lcl_toOStringSkipLeadingWhites( const OUString aStr ) return aORetStr; } -String lcl_dumpMethodParameters( SbMethod* pMethod ) +OUString lcl_dumpMethodParameters( SbMethod* pMethod ) { OUString aStr; if( pMethod == NULL ) diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index 119f973..8311c5d 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -167,9 +167,7 @@ namespace desktop #else // rest gets a dialog box CmdlineHelpDialog aDlg; -String head = aHelpMessage_version; -head.Append(aHelpMessage_head); -aDlg.m_pftHead-SetText(head); +aDlg.m_pftHead-SetText(aHelpMessage_version + aHelpMessage_head); aDlg.m_pftLeft-SetText(aHelpMessage_left); aDlg.m_pftRight-SetText(aHelpMessage_right); aDlg.m_pftBottom-SetText(aHelpMessage_bottom); diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 45bb5da..24a2c4a 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -47,7 +47,7 @@ namespace sdext { namespace presenter { Example: you want to access the top left bitmap of a pane border (simplified code): -String sStyleName = getPropertyValue(private:resource/pane/Presenter/Pane1); +OUString sStyleName = getPropertyValue(private:resource/pane/Presenter/Pane1); XBitmap xBitmap = getPropertyValue(sStyleName + _TopLeftBitmap); For the offset of the bitmap you can call ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/ui/app/transobj.cxx | 19 +-- sc/source/ui/inc/transobj.hxx |4 +++- 2 files changed, 16 insertions(+), 7 deletions(-) New commits: commit c4b76f0442c452693846a4c92970ba67f26f2226 Author: Armin Le Grand a...@apache.org Date: Thu Oct 10 16:20:50 2013 + i123405 Allow to not limit size to PageSize when creating Metafile content diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 945091e..a8764ff 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -346,11 +346,15 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor rFlavor ) } else if ( nFormat == SOT_FORMAT_GDIMETAFILE ) { -InitDocShell(); +// #123405# Do not limit visual size calculation for metafile creation. +// It seems unlikely that removing the limitation causes problems since +// metafile creation means that no real pixel device in the needed size is +// created. +InitDocShell(false); + SfxObjectShell* pEmbObj = aDocShellRef; // like SvEmbeddedTransfer::GetData: - GDIMetaFile aMtf; VirtualDevice aVDev; MapMode aMapMode( pEmbObj-GetMapUnit() ); @@ -372,7 +376,8 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor rFlavor ) else if ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ) { //TODO/LATER: differentiate between formats?! -InitDocShell(); // set aDocShellRef +// #123405# Do limit visual size calculation to PageSize +InitDocShell(true); // set aDocShellRef SfxObjectShell* pEmbObj = aDocShellRef; bOK = SetObject( pEmbObj, SCTRANS_TYPE_EMBOBJ, rFlavor ); @@ -574,8 +579,10 @@ ScMarkData ScTransferObj::GetSourceMarkData() // // initialize aDocShellRef with a live document from the ClipDoc // +// #123405# added parameter to allow size calculation without limitation +// to PageSize, e.g. used for Metafile creation for clipboard. -void ScTransferObj::InitDocShell() +void ScTransferObj::InitDocShell(bool bLimitToPageSize) { if ( !aDocShellRef.Is() ) { @@ -697,14 +704,14 @@ void ScTransferObj::InitDocShell() for (nCol=nStartX; nCol=nEndX; nCol++) { long nAdd = pDestDoc-GetColWidth( nCol, 0 ); -if ( nSizeX+nAdd aPaperSize.Width() nSizeX ) // above limit? +if ( bLimitToPageSize nSizeX+nAdd aPaperSize.Width() nSizeX ) // above limit? break; nSizeX += nAdd; } for (SCROW nRow=nStartY; nRow=nEndY; nRow++) { long nAdd = pDestDoc-GetRowHeight( nRow, 0 ); -if ( nSizeY+nAdd aPaperSize.Height() nSizeY ) // above limit? +if ( bLimitToPageSize nSizeY+nAdd aPaperSize.Height() nSizeY ) // above limit? break; nSizeY += nAdd; } diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index d74bacc..524614b 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -62,7 +62,9 @@ private: boolbHasFiltered; // if has filtered rows boolbUseInApi; // to recognize clipboard content copied from API -voidInitDocShell(); +// #123405# added parameter to allow size calculation without limitation +// to PageSize, e.g. used for Metafile creation for clipboard. +voidInitDocShell(bool bLimitToPageSize); static void StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, ScDocument* pDestDoc=0, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/backgrnd.cxx | 24 +--- 1 file changed, 9 insertions(+), 15 deletions(-) New commits: commit 95e582de1dec6c7b98d498b158ab8a1f4813c24e Author: Caolán McNamara caol...@redhat.com Date: Thu Oct 10 20:05:08 2013 +0100 CID#1103720 make leak impossible Change-Id: Ife34807a447aae474f1df29ce22f50b9e9d9cacf diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index c52b4ba..cd82984 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1625,8 +1625,8 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) sal_uInt16 nSelPos = pBox-GetSelectEntryPos(); if( pTableBck_Impl pTableBck_Impl-nActPos != nSelPos) { +boost::scoped_ptrSvxBrushItem xItemHolder; SvxBrushItem* pActItem = NULL; -bool bDelete = false; sal_uInt16 nWhich = 0; switch(pTableBck_Impl-nActPos) { @@ -1649,8 +1649,8 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) pTableBck_Impl-nActPos = nSelPos; if(!pActItem) { -pActItem = new SvxBrushItem(nWhich); -bDelete = true; +xItemHolder.reset(new SvxBrushItem(nWhich)); +pActItem = xItemHolder.get(); } if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected { @@ -1693,25 +1693,19 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) nWhich = pTableBck_Impl-nTableWhich; break; default: -if (bDelete) -{ -// The item will be new'ed again below, but that will be the -// default item then, not an existing modified one. -delete pActItem; -bDelete = false; -} +// The item will be new'ed again below, but that will be the +// default item then, not an existing modified one. +xItemHolder.reset(); pActItem = NULL; break; } OUString aUserData = GetUserData(); -if(!pActItem) +if (!pActItem) { -pActItem = new SvxBrushItem(nWhich); -bDelete = true; +xItemHolder.reset(new SvxBrushItem(nWhich)); +pActItem = xItemHolder.get(); } FillControls_Impl(*pActItem, aUserData); -if (bDelete) -delete pActItem; } return 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-projects] minutes of ESC call ...
Hi, On Thu, Oct 10, 2013 at 05:09:34PM +0100, Michael Meeks wrote: * Bundled extensions (Stephan) So, some extra thoughts / suggestions for that: There are two categories of extensions: 1. Internal extensions. These are built from sources and include presentation-minimizer, nlpsolver, wiki-publisher and mysql-connector-ooo. I think it should be easy to add a GeneratedPackage into the Extension gbuild class that copies the extension root dir from workdir to the right place in instdir. (The .oxt file will still be produced and copied to solver, but I do not think this is worth any more effort. Much better way to spend one's time would be to convert these extensions to optional components.) I will look into this tomorrow. 2. External extensions. These are merely copied to solver from $TARBALL_LOCATION (in extras/Package_extensions.mk). It would be very easy to unpack them and copy them to instdir instead (i.e., what is needed is to create an UnpackedTarball and ExternalPackage for every one of them and change ARCHIVE for FILELIST in scp2). There is 14 of these extensions in extras, plus ct2n which is already repacked during build. If this is agreed upon, I suggest to move the makefiles to a new module, e.g., extensions, as extras is cluttered enough already. This would be very suitable for an easy hack. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/uifile-images' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gbuild_ure' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - libcdr/ExternalProject_libcdr.mk liblangtag/ExternalProject_langtag.mk libmspub/ExternalProject_libmspub.mk libmwaw/ExternalProject_libmwaw.mk libodfgen/Ext
libcdr/ExternalProject_libcdr.mk |4 +++- liblangtag/ExternalProject_langtag.mk |4 +++- libmspub/ExternalProject_libmspub.mk |4 +++- libmwaw/ExternalProject_libmwaw.mk |4 +++- libodfgen/ExternalProject_libodfgen.mk |4 +++- liborcus/ExternalProject_liborcus.mk |3 ++- libvisio/ExternalProject_libvisio.mk |4 +++- libwpd/ExternalProject_libwpd.mk |3 ++- libwpg/ExternalProject_libwpg.mk |4 +++- libwps/ExternalProject_libwps.mk |4 +++- sw/source/core/layout/newfrm.cxx |2 +- 11 files changed, 29 insertions(+), 11 deletions(-) New commits: commit 4192ac4a3af3a6ec5152b5fc967537945e749122 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 10 17:48:53 2013 +0300 Fix typo in silly OSL_ENSURE warning text Sure, it would make more sense to print out some information that would actually help in finding out what's wrong... Change-Id: I52f7921ad66214cadc58e39487b2447766bfd102 diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 865193e..c246dbb 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -373,7 +373,7 @@ void _FrmFinit() if( (*SwFrm::GetCachePtr())[ --n ] ) { SwCacheObj* pObj = (*SwFrm::GetCachePtr())[ n ]; -OSL_ENSURE( !pObj, Who didn't derregister?); +OSL_ENSURE( !pObj, Who didn't deregister?); } #endif delete SwRootFrm::pVout; commit 1ca84e796751997a6b18893ae2cb969673bc0317 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 10 13:43:06 2013 +0300 Propagate verbosity to (some) 3rd-party library builds In a verbose (if verbose or VERBOSE are non-empty) build, pass V=1 to some of the Automake-based external projects, to get verbose output from their builds. This is just a start, should check for all bundled libraries whether there is a simple way to make their build verbose. Change-Id: I470b3be7f43aaa09d5f7102da891f538799a3631 diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 1a22490..9dda27f 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -37,7 +37,9 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --disable-weffc \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ -(cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ +(cd $(EXTERNAL_WORKDIR)/src/lib \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE)) \ ) # vim: set noet sw=4 ts=4: diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk index 945bb68..23619ed 100644 --- a/liblangtag/ExternalProject_langtag.mk +++ b/liblangtag/ExternalProject_langtag.mk @@ -33,6 +33,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS=-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2) \ -$(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC=$(shell cygpath -w $(lastword $(CC $(MAKE) \ +$(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC=$(shell cygpath -w $(lastword $(CC \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE) \ ) # vim: set noet sw=4 ts=4: diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index 5fb3133..9da4dc5 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -35,7 +35,9 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --disable-weffc \ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ -(cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ +(cd $(EXTERNAL_WORKDIR)/src/lib \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE)) \ ) # vim: set noet sw=4 ts=4: diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk index 82b4a3d..a500192 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/libmwaw/ExternalProject_libmwaw.mk @@ -32,7 +32,9 @@ $(call
[Bug 39443] continuous integration / tinderboxing
https://bugs.freedesktop.org/show_bug.cgi?id=39443 Joel Madero jmadero@gmail.com changed: What|Removed |Added Assignee|d.ostrov...@gmx.de |libreoffice-b...@lists.free ||desktop.org CC||jmadero@gmail.com Component|WWW |ci-infra -- 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] website.git: Branch 'update' - check.php
check.php | 17 + 1 file changed, 13 insertions(+), 4 deletions(-) New commits: commit 6672a7e7f7876e3c0b90b986d3e1db42023a1a84 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 10 23:03:29 2013 +0200 enable update to 4.1.2 diff --git a/check.php b/check.php index 1fc246a..64c23f1 100644 --- a/check.php +++ b/check.php @@ -216,6 +216,9 @@ $build_hash_to_version = array( '5eca95953c59f90dec2cd6ed6dab4b1f4b3b24c' = '4.0.5.1', '5464147a081647a250913f19c0715bca595af2f' = '4.0.5.2', # Final +# 4.0.6 versions +'7168152d13aa529ba3718c9ae3700216a574137' = '4.0.6.1', + ## # 4.1.0 versions '06ebec34fb5a4351b2d356919d5c68a0d4c2e78' = '4.1.0.0.a1', # alpha1 (buildfix2) @@ -233,6 +236,12 @@ $build_hash_to_version = array( # 4.1.1 versions 'a990db030b8125868501634ff662be1d89d0868' = '4.1.1.1', '7e4286b58adc75a14f6d83f53a03b6c11fa2903' = '4.1.1.2', # (hotfix1) +# 4.1.2 +'bf15ac65c2167fb1ef3daf3710609d4a4c369a9' = '4.1.2.1', +'281b75f427729060b6446ddb3777b32f957a8fb' = '4.1.2.2', +'40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38' = '4.1.2.3', # unscheduled, Final +# 4.1.3 +'b42498da0e3f91b17e51b55c8295ec4f8f22087' = '4.1.3.1', ); # Descriptions of the target versions @@ -252,11 +261,11 @@ $update_map = array( 'update_src' = 'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=4.0.5', 'substitute' = true ), -'latest' = array('gitid' = '7e4286b58adc75a14f6d83f53a03b6c11fa2903', - 'id' = 'LibreOffice 4.1.1', - 'version' = '4.1.1', +'latest' = array('gitid' = '40b2d7fde7e8d2d7bc5a449dc65df4d08a7dd38', + 'id' = 'LibreOffice 4.1.2', + 'version' = '4.1.2', 'update_type' = 'text/html', - 'update_src' = 'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=4.1.1', + 'update_src' = 'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=4.1.2', 'substitute' = true ), ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/slideshowprimitives'
New branch 'feature/slideshowprimitives' available with the following commits: commit ceeb31755064ed5619f94618736398b71b9f16b0 Author: Thorsten Behrens t...@documentfoundation.org Date: Thu Oct 10 23:21:55 2013 +0200 First cut at resuscitating primitive2canvas processor. Change-Id: Ib7b3277bf9a98c07771f70ae1d0d3c2d48def813 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-1' - pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 - pt_PT/pt_PT.dic | 75 ++ 2 files changed, 53 insertions(+), 24 deletions(-) New commits: commit 8349227a9dd98665d90b1ce744247fdaf5582936 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 Reviewed-on: https://gerrit.libreoffice.org/6178 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/pt_PT/description.xml b/pt_PT/description.xml index f3196f2..92bec39 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=13.7.2.1 / +version value=13.10.1.2 / identifier value=Natura.OOo3.pt-PT-dictionary / display-name diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index e73e46c..fad14ba 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43909 +43938 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -20,9 +20,10 @@ abalo/p [CAT=nc,G=m,N=s] abalroar/XYPLcM[CAT=v,T=inf,TR=t] abanadela/p[CAT=nc,G=f,N=s] abanadura/p[CAT=nc,G=f,N=s] +abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abandalhar/XYPLcM [CAT=v,T=inf,TR=t] +abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] @@ -824,6 +825,7 @@ agarrar/XYPLDW [CAT=v,T=inf,TR=_] agasalhar/XYPLD[CAT=v,T=inf,TR=t] agasalho/p [CAT=nc,G=m,N=s] agastar/XYPLM [CAT=v,T=inf,TR=t] +ágata/p [CAT=nc,G=f,N=s] agemado[CAT=adj,N=s,G=m] agência/p [CAT=nc,G=f,N=s] agenciar/LP[CAT=v,T=inf,TR=t] @@ -935,6 +937,7 @@ aguadeiro/p [CAT=a_nc,G=m,N=s] água-marinha [CAT=nc,G=f,N=s] água-oxigenada[CAT=nc,G=f,N=s] água-pé/p[CAT=nc,G=f,N=s] +aguapé/p [CAT=nc,G=f,N=s] aguardar/XYPLD [CAT=v,T=inf,TR=t] aguardenteiro [CAT=nc,G=m,N=s] aguardente/p [CAT=nc,G=f,N=s] @@ -1097,7 +1100,7 @@ alcoolemia[CAT=nc,G=f,N=s] alcoólico/fpx [CAT=adj,N=s,G=m] alcoolificar/XYPLc [CAT=v,T=inf,TR=t] alcoolismo/p [CAT=nc,G=m,N=s] -alcoolizar/XYPLc [CAT=v,T=inf,TR=t] +alcoolizar/XYPLcv [CAT=v,T=inf,TR=t] álcool[CAT=nc,G=m,N=s] alcoolometria/p[CAT=nc,G=f,N=s] alcoolómetro [CAT=nc,G=m,N=s] @@ -1114,7 +1117,7 @@ aldeÃdo/p[CAT=nc,G=m,N=s] aldeola/p [CAT=nc,G=f,N=s] aldeota[CAT=nc,G=f,N=s] aldrabada [CAT=nc,G=f,N=s] -aldrabão/p[CAT=a_nc,G=m,N=s] +aldrabão/pf [CAT=a_nc,G=m,N=s] aldrabar/XYPLc [CAT=v,T=inf,TR=t] aldrabeiro [CAT=a_nc,G=m,N=s] aldrabice/p[CAT=nc,G=f,N=s] @@ -2672,12 +2675,12 @@ arcaz [CAT=nc,G=m,N=s] arcebispado[CAT=nc,G=m,N=s] arcebispal [CAT=adj,N=s,G=_] arcebispo/p[CAT=nc,G=m,N=s] -arcediago [CAT=nc,G=m,N=s] +arcediago/p[CAT=nc,G=m,N=s] archeiro/p [CAT=nc,G=m,N=s] archoteiro [CAT=nc,G=m,N=s] archote/pt [CAT=nc,G=m,N=s] arciforme/p[CAT=adj,N=s,G=_] -arcipreste [CAT=nc,G=m,N=s] +arcipreste/p [CAT=nc,G=m,N=s] arco-celeste [CAT=nc,G=m,N=s] arco-irisar/XYPL [CAT=v,T=inf,TR=_] arco-Ãris [CAT=nc,G=m,N=s] @@ -3728,6 +3731,7 @@ autógamo [CAT=adj,N=s,G=m] autogéneo [CAT=adj,N=s,G=m] autogénese[CAT=nc,G=f,N=s] autogenético [CAT=adj,N=s,G=m] +autogestão[CAT=nc,G=f,N=s] autognose [CAT=nc,G=f,N=s] autogolo/p [CAT=nc,G=m,N=s] autogoverno/p [CAT=nc,G=m,N=s] @@ -3964,7 +3968,7 @@ babadura [CAT=nc,G=f,N=s] baba/p [CAT=nc,G=f,N=s] babão/fp [CAT=a_nc,G=m,N=s] babar/XYPL [CAT=v,T=inf,TR=t] -babeiro[CAT=nc,G=m,N=s] +babeiro/p [CAT=nc,G=m,N=s] babélico [CAT=adj,N=s,G=m] babel [CAT=nc,G=f,N=s] babilónia [CAT=nc,G=f,N=s] @@ -9283,7 +9287,7 @@ convento/p[CAT=nc,G=m,N=s] conventual/p [CAT=nc,G=m,N=s] convergência/p[CAT=nc,G=f,N=s] convergente/p [CAT=adj,N=s,G=_] -convergir/XYL [CAT=v,T=inf,TR=i] +convergir/YL [CAT=v,T=inf,TR=i] conversadeira [CAT=a_nc,G=f,N=s] conversado [CAT=a_nc,G=m,N=s] conversador[CAT=a_nc,G=m,N=s] @@ -11931,7 +11935,7 @@ dissociar/XYPLcv[CAT=v,T=inf,TR=t] dissociativo [CAT=adj,N=s,G=m] dissolução/p [CAT=nc,G=f,N=s] dissolutivo[CAT=adj,N=s,G=m] -dissoluto [CAT=adj,N=s,G=m] +dissoluto/pf [CAT=adj,N=s,G=m] dissolúvel/dpI[CAT=adj,N=s,G=_] dissolvência/p[CAT=nc,G=f,N=s] dissolvente/p [CAT=a_nc,G=2,N=s] @@ -17340,7 +17344,7 @@ harmónica [CAT=a_nc,G=f,N=s] harmónico/fpH [CAT=adj,N=s,G=m] harmónio/p[CAT=nc,G=m,N=s] harmonioso/fpSm
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-0' - pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 - pt_PT/pt_PT.dic | 75 ++ 2 files changed, 53 insertions(+), 24 deletions(-) New commits: commit 009e9843e39257dcfe065bbaa48833710dcbcea3 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 Reviewed-on: https://gerrit.libreoffice.org/6180 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/pt_PT/description.xml b/pt_PT/description.xml index f3196f2..92bec39 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=13.7.2.1 / +version value=13.10.1.2 / identifier value=Natura.OOo3.pt-PT-dictionary / display-name diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index e73e46c..fad14ba 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ -43909 +43938 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -20,9 +20,10 @@ abalo/p [CAT=nc,G=m,N=s] abalroar/XYPLcM[CAT=v,T=inf,TR=t] abanadela/p[CAT=nc,G=f,N=s] abanadura/p[CAT=nc,G=f,N=s] +abananado/fp [CAT=adj,N=s,G=m] abanão/p [CAT=nc,G=m,N=s] abanar/XYPLD [CAT=v,T=inf,TR=t] -abandalhar/XYPLcM [CAT=v,T=inf,TR=t] +abanar/XYPLD [CAT=v,T=inf,TR=t] abandonar/XYPLMv [CAT=v,T=inf,TR=t] abandono/p [CAT=nc,G=m,N=s] aba/p [CAT=nc,G=f,N=s] @@ -824,6 +825,7 @@ agarrar/XYPLDW [CAT=v,T=inf,TR=_] agasalhar/XYPLD[CAT=v,T=inf,TR=t] agasalho/p [CAT=nc,G=m,N=s] agastar/XYPLM [CAT=v,T=inf,TR=t] +ágata/p [CAT=nc,G=f,N=s] agemado[CAT=adj,N=s,G=m] agência/p [CAT=nc,G=f,N=s] agenciar/LP[CAT=v,T=inf,TR=t] @@ -935,6 +937,7 @@ aguadeiro/p [CAT=a_nc,G=m,N=s] água-marinha [CAT=nc,G=f,N=s] água-oxigenada[CAT=nc,G=f,N=s] água-pé/p[CAT=nc,G=f,N=s] +aguapé/p [CAT=nc,G=f,N=s] aguardar/XYPLD [CAT=v,T=inf,TR=t] aguardenteiro [CAT=nc,G=m,N=s] aguardente/p [CAT=nc,G=f,N=s] @@ -1097,7 +1100,7 @@ alcoolemia[CAT=nc,G=f,N=s] alcoólico/fpx [CAT=adj,N=s,G=m] alcoolificar/XYPLc [CAT=v,T=inf,TR=t] alcoolismo/p [CAT=nc,G=m,N=s] -alcoolizar/XYPLc [CAT=v,T=inf,TR=t] +alcoolizar/XYPLcv [CAT=v,T=inf,TR=t] álcool[CAT=nc,G=m,N=s] alcoolometria/p[CAT=nc,G=f,N=s] alcoolómetro [CAT=nc,G=m,N=s] @@ -1114,7 +1117,7 @@ aldeÃdo/p[CAT=nc,G=m,N=s] aldeola/p [CAT=nc,G=f,N=s] aldeota[CAT=nc,G=f,N=s] aldrabada [CAT=nc,G=f,N=s] -aldrabão/p[CAT=a_nc,G=m,N=s] +aldrabão/pf [CAT=a_nc,G=m,N=s] aldrabar/XYPLc [CAT=v,T=inf,TR=t] aldrabeiro [CAT=a_nc,G=m,N=s] aldrabice/p[CAT=nc,G=f,N=s] @@ -2672,12 +2675,12 @@ arcaz [CAT=nc,G=m,N=s] arcebispado[CAT=nc,G=m,N=s] arcebispal [CAT=adj,N=s,G=_] arcebispo/p[CAT=nc,G=m,N=s] -arcediago [CAT=nc,G=m,N=s] +arcediago/p[CAT=nc,G=m,N=s] archeiro/p [CAT=nc,G=m,N=s] archoteiro [CAT=nc,G=m,N=s] archote/pt [CAT=nc,G=m,N=s] arciforme/p[CAT=adj,N=s,G=_] -arcipreste [CAT=nc,G=m,N=s] +arcipreste/p [CAT=nc,G=m,N=s] arco-celeste [CAT=nc,G=m,N=s] arco-irisar/XYPL [CAT=v,T=inf,TR=_] arco-Ãris [CAT=nc,G=m,N=s] @@ -3728,6 +3731,7 @@ autógamo [CAT=adj,N=s,G=m] autogéneo [CAT=adj,N=s,G=m] autogénese[CAT=nc,G=f,N=s] autogenético [CAT=adj,N=s,G=m] +autogestão[CAT=nc,G=f,N=s] autognose [CAT=nc,G=f,N=s] autogolo/p [CAT=nc,G=m,N=s] autogoverno/p [CAT=nc,G=m,N=s] @@ -3964,7 +3968,7 @@ babadura [CAT=nc,G=f,N=s] baba/p [CAT=nc,G=f,N=s] babão/fp [CAT=a_nc,G=m,N=s] babar/XYPL [CAT=v,T=inf,TR=t] -babeiro[CAT=nc,G=m,N=s] +babeiro/p [CAT=nc,G=m,N=s] babélico [CAT=adj,N=s,G=m] babel [CAT=nc,G=f,N=s] babilónia [CAT=nc,G=f,N=s] @@ -9283,7 +9287,7 @@ convento/p[CAT=nc,G=m,N=s] conventual/p [CAT=nc,G=m,N=s] convergência/p[CAT=nc,G=f,N=s] convergente/p [CAT=adj,N=s,G=_] -convergir/XYL [CAT=v,T=inf,TR=i] +convergir/YL [CAT=v,T=inf,TR=i] conversadeira [CAT=a_nc,G=f,N=s] conversado [CAT=a_nc,G=m,N=s] conversador[CAT=a_nc,G=m,N=s] @@ -11931,7 +11935,7 @@ dissociar/XYPLcv[CAT=v,T=inf,TR=t] dissociativo [CAT=adj,N=s,G=m] dissolução/p [CAT=nc,G=f,N=s] dissolutivo[CAT=adj,N=s,G=m] -dissoluto [CAT=adj,N=s,G=m] +dissoluto/pf [CAT=adj,N=s,G=m] dissolúvel/dpI[CAT=adj,N=s,G=_] dissolvência/p[CAT=nc,G=f,N=s] dissolvente/p [CAT=a_nc,G=2,N=s] @@ -17340,7 +17344,7 @@ harmónica [CAT=a_nc,G=f,N=s] harmónico/fpH [CAT=adj,N=s,G=m] harmónio/p[CAT=nc,G=m,N=s] harmonioso/fpSm
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 50c3494e163ab6157f9be1cf129a844a71236616 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 Updated core Project: dictionaries 009e9843e39257dcfe065bbaa48833710dcbcea3 updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 Reviewed-on: https://gerrit.libreoffice.org/6180 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/dictionaries b/dictionaries index 2eadd8d..009e984 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 2eadd8dc30f766ddf6975a435b47b4ec7502f51d +Subproject commit 009e9843e39257dcfe065bbaa48833710dcbcea3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba5c3e040578649a9cb1d9f327c94ade6aa08b52 Author: Andras Timar andras.ti...@collabora.com Date: Thu Oct 10 09:22:36 2013 +0200 Updated core Project: dictionaries 8349227a9dd98665d90b1ce744247fdaf5582936 updated pt dictionary Change-Id: I9380049c2e0b6716287c71aa2693f40dc78facf6 Reviewed-on: https://gerrit.libreoffice.org/6178 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/dictionaries b/dictionaries index 307cb4c..8349227 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 307cb4cdf237ee21d4a90e9059a347b524b13f69 +Subproject commit 8349227a9dd98665d90b1ce744247fdaf5582936 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70357] Sort and clean Wiki pages!
https://bugs.freedesktop.org/show_bug.cgi?id=70357 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Whiteboard||EasyHack DifficultyBeginner ||SkillInfra Severity|minor |trivial Priority|medium |low CC||libreoffice@lists.freedeskt ||op.org Ever confirmed|0 |1 -- 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 70357] Sort and clean Wiki pages!
https://bugs.freedesktop.org/show_bug.cgi?id=70357 --- Comment #1 from Björn Michaelsen bjoern.michael...@canonical.com --- https://wiki.documentfoundation.org/Special:SpecialPages has a lot of good starting points for all this. -- 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: sfx2/source
sfx2/source/appl/fileobj.cxx | 27 +-- 1 file changed, 21 insertions(+), 6 deletions(-) New commits: commit 823278dd095d754d0f673ef140c36c9fa7ebeffd Author: Eike Rathke er...@redhat.com Date: Fri Oct 11 01:08:01 2013 +0200 resolved fdo#69948 honor a detected FilterName TypeDetection::queryTypeByDescriptor() adds the FilterName property to the MediaDescriptor, use that if present. Strangely enough the sequence returned by XNameAccess::getByName(sType) of the type detection contains an empty PreferredFilter value so that is useless in this scenario. Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 97e3504..e790f55 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -399,13 +399,28 @@ OUString impl_getFilter( const OUString _rURL ) OUString sType = xTypeDetection-queryTypeByDescriptor( aDescrList, sal_True ); if ( !sType.isEmpty() ) { -css::uno::Reference css::container::XNameAccess xTypeCont( xTypeDetection, - css::uno::UNO_QUERY ); -if ( xTypeCont.is() ) +// Honor a selected/detected filter. +for (sal_Int32 i=0; i aDescrList.getLength(); ++i) { -::comphelper::SequenceAsHashMap lTypeProps( xTypeCont-getByName( sType ) ); -sFilter = lTypeProps.getUnpackedValueOrDefault( -OUString(PreferredFilter), OUString() ); +if (aDescrList[i].Name == FilterName) +{ +if (aDescrList[i].Value = sFilter) +break; +} +} +if (sFilter.isEmpty()) +{ +css::uno::Reference css::container::XNameAccess xTypeCont( xTypeDetection, +css::uno::UNO_QUERY ); +if ( xTypeCont.is() ) +{ +/* XXX: for fdo#69948 scenario the sequence returned by + * getByName() contains an empty PreferredFilter + * property value (since? expected?) */ +::comphelper::SequenceAsHashMap lTypeProps( xTypeCont-getByName( sType ) ); +sFilter = lTypeProps.getUnpackedValueOrDefault( +OUString(PreferredFilter), OUString() ); +} } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 69948, which changed state. Bug 69948 Summary: EDITING: insert sheet from file - 'modify link' feature not working https://bugs.freedesktop.org/show_bug.cgi?id=69948 What|Removed |Added Status|ASSIGNED|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: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/appl/fileobj.cxx | 31 +-- 1 file changed, 25 insertions(+), 6 deletions(-) New commits: commit 4c8e5c2a5cf67661ebf33be5c5c2700a4c389f7c Author: Eike Rathke er...@redhat.com Date: Fri Oct 11 01:08:01 2013 +0200 resolved fdo#69948 honor a detected FilterName TypeDetection::queryTypeByDescriptor() adds the FilterName property to the MediaDescriptor, use that if present. Strangely enough the sequence returned by XNameAccess::getByName(sType) of the type detection contains an empty PreferredFilter value so that is useless in this scenario. (cherry picked from commit 823278dd095d754d0f673ef140c36c9fa7ebeffd) Conflicts: sfx2/source/appl/fileobj.cxx Backported. Change-Id: I5cdc9fe71e35bdb7c511739c7f7728134941649a Reviewed-on: https://gerrit.libreoffice.org/6208 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 385b8b0..abda2a5 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -397,13 +397,32 @@ String impl_getFilter( const String _rURL ) ::rtl::OUString sType = xTypeDetection-queryTypeByDescriptor( aDescrList, sal_True ); if ( !sType.isEmpty() ) { -css::uno::Reference css::container::XNameAccess xTypeCont( xTypeDetection, - css::uno::UNO_QUERY ); -if ( xTypeCont.is() ) +// Honor a selected/detected filter. +for (sal_Int32 i=0; i aDescrList.getLength(); ++i) { -::comphelper::SequenceAsHashMap lTypeProps( xTypeCont-getByName( sType ) ); -sFilter = lTypeProps.getUnpackedValueOrDefault( -::rtl::OUString(PreferredFilter), ::rtl::OUString() ); +if (aDescrList[i].Name == FilterName) +{ +OUString aFilterName; +if (aDescrList[i].Value = aFilterName) +{ +sFilter = aFilterName; +break; +} +} +} +if (!sFilter.Len()) +{ +css::uno::Reference css::container::XNameAccess xTypeCont( xTypeDetection, +css::uno::UNO_QUERY ); +if ( xTypeCont.is() ) +{ +/* XXX: for fdo#69948 scenario the sequence returned by + * getByName() contains an empty PreferredFilter + * property value (since? expected?) */ +::comphelper::SequenceAsHashMap lTypeProps( xTypeCont-getByName( sType ) ); +sFilter = lTypeProps.getUnpackedValueOrDefault( +::rtl::OUString(PreferredFilter), ::rtl::OUString() ); +} } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] North America Pub Chat
Howdy, I am on CST (*UTC/GMT -5 hours) *and work full time. As a volunteer I would be willing to chat any time outside of my normal 8-6 thanks mike On Mon, Oct 7, 2013 at 11:50 AM, bjoern bjoern.michael...@canonical.comwrote: On Mon, Oct 07, 2013 at 07:44:53AM -0700, Joel Madero wrote: So far I've gotten no interest in this at all (which is unfortunate). If I don't get at least a few responses by Wednesday I' going to call it off (as it's really just not worth it if we don't have minimum of 4 preferably 5-6). It would be really nice to get a North American team consistently contributing as right now Europe dominates the contributor side and IMHO it looks bad for us in North America to be using the product but not contributing something in return as FLOSS software really depends on a community, a give and take relationship. Really 1 hour a month is enough time to give back a bit. Hi, I dont know if I can make it this Friday, but could you also point out the time in UTC too? For a continental european guest a time like 12:00pm EST is ultimately confusing -- is that EST or 2400EST? Best, Bjoern ___ LibreOffice mailing list libreoff...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ 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-qa] minutes of ESC call ...
* Present: + Miklos, Andras, Caolan, David, kendy, Kohei, Eike, Markus, Stephan, Tibby, Robinson, Cloph, Bjoern, Michael M, Michael S * Completed Action Items + CC developers' mailing list on all the easy hacks (Bjoern) + poke marketing / PR for 4.1.2 announce (Cloph) + change wiki page to eliminate proposed easy hacks (Bjoern) + create a script that counts bug commenters stats for minor release update PR (Bjoern) + switch to 10.8 baseline for Mac / 64bit (Norbert) + ask Rob to turn auto-'regression' status off on the BSA (Robinson) [ bug filed ] * Pending Action Items: + find better way to export from Coverity categories of non-security critical bugs (Caolan) + design-team raising template concerns, address these if possible push (Ahmad) + setup infrastructure to build bibisect repos (Cloph / Bjoern / Norbert) + propose different name for proposed easy hacks (Markus) + produce a VM for the load / crash regressions (Cloph / Markus) + partition document test loads / run them on tinderboxen (Norbert) + produce a VM with callgrind metrics (Matus) + transition and automate this inside a VM for Cloph (Lionel) + create script to auto-mail users list for each API Change commit (Bjoern/Stephan) + ask Florian for a minimal / simple solution for larger bug docs (Robinson) * Release Engineering update (Cloph) + 4.1.2 retrospective + wider RC3 / delay announcement + will activate automatic update today. + 4.0.6 RC1 status + pushed to the mirrors, ready to be announced later today + 4.1.3 RC1 - status + on the way to the mirrors + 4.0.6 RC2 deadline - next Monday + 4.1.3 RC2 - deadline week after + can we include the new bug-triager credits script for minor updaes ? (Bjoern) + a script that generates data on who commented in the related bugs AI: + point Cloph at script in dev-tools (Bjoern) + GSOC / Android iOS remote releases ? + previously pushed every update to the release branch (Miklos) + so ok to release from master ? AI: + get setup wrt. mobile app-store access (Cloph / Thorsten) AI: + ask app-authors wrt. freeze (Kendy) * obsolete git branch cleanup (Thorsten) + git push origin --delete branchName AI: + mail out list of branches (Michael) * New Google C* font replacements (Caolan) + http://comments.gmane.org/gmane.linux.redhat.fedora.devel/186967 + Carlito - Calibri + Caladea - Cambria + packaging them for Fedora - into LibreOffice. * Regression analysis (Bjoern) + good news, fixing more regressions than we're introducing + the stats are going up, but thought to be better QA / triage. + because marking more: + ~50% of bugs closed in a major release, marked as regressions + conclusion: + doing a reasonable job of keeping regressions under control since 3.6 + continued focus on unit-testing important. + could / focus on areas where we detected most regressions. + hope is that fixes come with unit tests so we do focus there (Michael) + would be good to scrape bugzilla for 'regression' that were fixed + identify code in commit find most regression-prone code. AI: + create easy-hack to indentify the above (Bjoern) + https://bugs.freedesktop.org/show_bug.cgi?id=66750 done + way too few unit-tests for impress (Kendy) + contrast with the weekly stats which seem to climb endlessly (Michael M) + around 100 of our 'regressions' - needinfo or unconfirmed (Bjoern) + could we review / de-tagging these ? AI: + QA team can prioritise that (Robinson) + Link that has regressions introduced in recent minor releases (Michael S) http://bit.ly/18RVbgp https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20keywords_type=allwordsquery_format=advancedbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDversion=4.0.1.1%20rcversion=4.0.1.2%20releaseversion=4.0.2.1%20rcversion=4.0.2.2%20releaseversion=4.0.3.1%20rcversion=4.0.3.2%20rcversion=4.0.3.3%20releaseversion=4.0.4.1%20rcversion=4.0.4.2%20releaseversion=4.0.5.1%20rcversion=4.0.5.2%20releaseproduct=LibreOfficelist_id=353044 + be good to look into these specifically * Bundled extensions (Stephan) + one left - presentation minimizer + de-extensionalizing by David O planned + one instdir/ issue - bundled extensions don't show up + lots of --enable-ext-whatever foo in configure, that bundle extn's we hardly ever build, if we get rid of them, we avoid needing to fix instdir to not include them. + distro-configs for TDF builds, include wikipublisher, nlpsolver + do we want to have those ? + we need the nlpsolver (Kohei) + is it built locally - or is it a tarball (Stephan) + external pkg, but built locally (Kohei) + thought there was an UNO wrapper for it.
Re: [Libreoffice-qa] [libreoffice-projects] minutes of ESC call ...
Hi, On Thu, Oct 10, 2013 at 05:09:34PM +0100, Michael Meeks wrote: * Bundled extensions (Stephan) So, some extra thoughts / suggestions for that: There are two categories of extensions: 1. Internal extensions. These are built from sources and include presentation-minimizer, nlpsolver, wiki-publisher and mysql-connector-ooo. I think it should be easy to add a GeneratedPackage into the Extension gbuild class that copies the extension root dir from workdir to the right place in instdir. (The .oxt file will still be produced and copied to solver, but I do not think this is worth any more effort. Much better way to spend one's time would be to convert these extensions to optional components.) I will look into this tomorrow. 2. External extensions. These are merely copied to solver from $TARBALL_LOCATION (in extras/Package_extensions.mk). It would be very easy to unpack them and copy them to instdir instead (i.e., what is needed is to create an UnpackedTarball and ExternalPackage for every one of them and change ARCHIVE for FILELIST in scp2). There is 14 of these extensions in extras, plus ct2n which is already repacked during build. If this is agreed upon, I suggest to move the makefiles to a new module, e.g., extensions, as extras is cluttered enough already. This would be very suitable for an easy hack. D. ___ 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/