Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
On Thu, May 17, 2012 at 11:41:52PM -0700, Tor Lillqvist wrote: commit 6868d84b13a52efe91337f2dccb88e59b9f8d2b7 Author: Tor Lillqvist t...@iki.fi Date: Thu May 17 22:45:04 2012 +0300 Add generic --with-build-platform-configure-options diff --git a/configure.in b/configure.in index 9c23d8a..510d82a 100644 --- a/configure.in +++ b/configure.in @@ -991,6 +991,9 @@ AC_ARG_WITH(gnu-patch, [Specify location of GNU patch on Solaris or FreeBSD.]), ,) +AC_ARG_WITH(build-platform-configure-options, +[Specify options for the configure script run for the *build* platform in a cross-compilation]) + AC_ARG_WITH(gnu-cp, AS_HELP_STRING([--with-gnu-cp], [Specify location of GNU cp on Solaris or FreeBSD.]), @@ -2021,6 +2024,7 @@ AC_ARG_WITH(macosx-version-max-allowed, dnl === dnl options for stuff used during cross-compilation build +dnl These are superseded by --with-build-platform-configure-options dnl === AC_ARG_WITH(system-boost-for-build, @@ -3472,6 +3476,7 @@ if test $cross_compiling = yes; then test -n $with_system_expat_for_build sub_conf_opts=$sub_conf_opts --with-system-expat test $with_system_icu_for_build = yes -o $with_system_icu_for_build = force sub_conf_opts=$sub_conf_opts --with-system-icu test -n $with_system_libxml_for_build sub_conf_opts=$sub_conf_opts --with-system-libxml +sub_conf_opts=$sub_conf_opts $with_build_platform_configure_options ./configure \ --disable-mozilla \ --disable-build-mozilla \ This is a good idea, but I think it would be even better to have autogen.lastrun.build (or whatever you want to call it). Then we would not need to specify _any_ build-specific options for the host configure. Opinions? D. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Thu, May 17, 2012 at 09:00:51PM +0100, Michael Meeks wrote: + 3.6 status + connectivity, reportreader, shell, scp2 + will enable adding 10-12 modules to tail_build. + will merge next week, in time for 3.6 I should clarify this item a bit for the people who did not attend the call: it is about gbuild conversions I have done recently but have not merged into master yet. So it would be better phrased as: + pending gbuild conversions: connectivity, reportbuilder, shell, scp2 + ... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - configure.in README.cross
README.cross | 66 +++ configure.in |5 2 files changed, 27 insertions(+), 44 deletions(-) New commits: commit bc229ca1abf8b179631ae563ef77f565a1a9d496 Author: Tor Lillqvist t...@iki.fi Date: Thu May 17 22:57:46 2012 +0300 Update README.cross to match reality better Change-Id: I14e97bb9e3351ed7a5e7e8c853253353bfe9df2e diff --git a/README.cross b/README.cross index 7dcb03c..c66e1d4 100644 --- a/README.cross +++ b/README.cross @@ -1,29 +1,15 @@ Cross-compiling LibreOffice === -The cross-compilation experimentation is going on for four platforms: -Windows, iOS, Android and PowerPC Mac OS X. It happens in the master -branch of LibreOffice. Some people have talked about setting up a -separate branch for Android work, or even separate clones at github, -but that is not necessary. - -Cross-compilation of LibreOffice completely is not possible yet. Much -work has been done, baby steps for some platforms, much more for -others, but a lot remains. For iOS and Android this work is highly -experimental, originally done in spare time just for the hacking -pleasure. No promise, explicit or implied, is given that it will ever -be finished. - -Searching for information about cross-compilation of OpenOffice.org -(the predecessor of LibreOffice) you will find information about what -actually was not cross-compilation, but using QEMU. +Cross-compilation work has been done, to various degrees, for four +platforms: Windows, iOS, Android and PowerPC Mac OS X. General --- In GNU Autoconf terminology, build is the platform on which you are -running a build on some software and host is the platform on which +running a build of some software and host is the platform on which the software you are building will run. Only in the specific case of building compilers and other programming tools is the term target used to indicate the platform for which the tools your are building @@ -180,7 +166,8 @@ CXX_FOR_BUILD=ccache g++ --without-helppack-integration --without-myspell-dicts -Once you have compiled it, you may want to try to run it: +Once you have compiled it, you may want to try to run it, for instance +using Wine: $ cd /tmp $ tar xf your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US.tar.gz @@ -277,7 +264,8 @@ thought yet. The Apple tool-chain for iOS cross-building is available only for Mac OS X. -Here is an autogen.lastrun for iOS (device) using Xcode 4.3 and clang: +Here is an autogen.lastrun for iOS (device) using Xcode 4.3 and clang, +and Xcode 3 for the build platform parts: CXX=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch armv7 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 @@ -288,31 +276,18 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --without-helppack-integration --without-myspell-dicts -And here for the iOS simulator, using Xcode 4.2 and gcc: -CXX=ccache /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -CC=ccache /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk -CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 -CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 ---with-distro=LibreOfficeiOS ---with-system-nss ---enable-debug ---without-help ---without-helppack-integration ---without-myspell-dicts - -It seems that with the latest iOS SDK one has to do: -sudo ln -s i686-apple-darwin10 /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk/usr/include/c++/4.2.1/i686-apple-darwin11 -or g++ won't find its headers like bits/c++config.h - The --with-system-nss doesn't mean that any Mozilla NSS would be used, it's just a trick to bypass some tests in the configure script. -For the iOS simulator, using Xcode 4.3 and gcc (should switch to clang here, too): -CXX=ccache /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk
[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewdata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit abb26f51eea0399754cc8f5b7d7a7d648d68f630
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri May 18 09:06:30 2012 +0200
One more -Werror=sign-compare
Change-Id: I302da3fdb78bcc298aebb6f7c831bdea75f7b053
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index e7f8882..3775d85 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -486,7 +486,7 @@ void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
void ScViewData::DeleteTab( SCTAB nTab )
{
-if ( nTab maTabData.size() )
+if ( nTab static_castSCTAB(maTabData.size()) )
{
delete maTabData.at(nTab);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/swtypes.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 898d64869f71ebf3ec1fa6f3b9e72e12343caec2 Author: Jan Holesovsky ke...@suse.cz Date: Fri May 18 09:37:27 2012 +0200 writer UI: Decrease the size of the border around the document. This makes the horizontal scrollbar appear in smaller amount of cases, generally improving the user experience mainly on smaller screens. Change-Id: Ic4bf04484f26bd8be572512f6315ecc77d781d11 diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 827ee6e..7b47fcd 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -88,7 +88,7 @@ const SwTwips lMinBorder = 1134; // Margin left and above document. // Half of it is gap between the pages. -#define DOCUMENTBORDER 568L +#define DOCUMENTBORDER 284L #define GAPBETWEENPAGES 284L #define UNDO_ACTION_COUNT 20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Android port problems
On 17 May 2012 14:56, David Tardon dtar...@redhat.com wrote: On Thu, 2012-05-17 at 12:22 +0300, Tor Lillqvist wrote: libraries into fewer. There is an option for that already, --enable-mergelibs, that merges quite a large number of them into one, libmergedlo.so. This works only for libraries in gbuildified modules, built in tail_build. ... Anyway, this indeed has helped a lot. But not enough. I am not sure if the number of libraries merged this way can be easily increased much at this stage of gbuildification. I don't know what is much but it can be easily increased I think. At least conditionally for Android. Originally I understood we want to merge libraries which are always used. I have a year old list of libraries (attached) where I also mark the status of modules. It was created by starting ./soffice --calc ./soffice --writer ... 5 different runs. '5ucpgvfs1.uno.so -ucb - GNU - TAIL' says that the library was loaded 5 times (always) and is from tail_build's module ucb. But currently we are merging also fwl and fwm which are not used at the start of Libreoffice. I think we can merge these only for Android and also add more small component libs like fileacc. Attached patch. The simple rules for adding: - library needs to be from tail_build - It must not create circular dependencies because of linking chains All these modules are candidates for adding into tail_build (adding of connectivity immediately allows adding of other modules: svl, sot, unixODBC). And I think there will be a couple of other candidates after these three branches are all merged into master. shell/, unotools/. (Well, we need to move crashrep/ behind tail_build) Next blocker would be pyuno, blocking sax. Actually I have created patch based on feature/gbuild_conversions which adds fsstorage, svl, sot and vcl to libmerged. I am waiting for the merge. But vcl is big, if there are problems with linking.. Best, Matus 5ucpgvfs1.uno.so -ucb - GNU - TAIL 5stocservices.uno.so -stoc - GNU 5localebe1.uno.so-shell- GNU - TAIL 5libxolo.so -xmloff - GNU - TAIL 5libxmlreader.so -xmlreader- GNU 5libxml2.so.2-libxml2 - EXT 5libxcrlo.so -xmlscript- GNU - TAIL 5libvclplug_gtklo.so -vcl - GNU - TAIL 5libvclplug_genlo.so -vcl - GNU - TAIL 5libvcllo.so -vcl - GNU - TAIL 5libuuilo.so -uui - GNU - TAIL 5libutllo.so -unotools - GNU 5libuno_sal.so.3 -sal - GNU 5libuno_salhelpergcc3.so.3 -salhelper- GNU 5libuno_cppu.so.3-cppu - GNU 5libuno_cppuhelpergcc3.so.3 -cppuhelper - GNU 5libucpfile1.so -ucb - GNU - TAIL 5libucbhelper4gcc3.so-ucbhelper- GNU 5libucb1.so -ucb - GNU - TAIL 5libtllo.so -tools- GNU 5libtklo.so -toolkit - GNU - TAIL 5libsvxlo.so -svx - GNU - TAIL 5libsvxcorelo.so -svx - GNU - TAIL 5libsvtlo.so -svtools - GNU - TAIL 5libsvllo.so -svl - GNU - TAIL 5libstore.so.3 -store- GNU 5libstdc++.so.6 -external - EXT 5libspllo.so -desktop - GNU - TAIL 5libsotlo.so -sot - GNU - TAIL 5libsofficeapp.so-desktop - GNU - TAIL 5libsfxlo.so -sfx2 - GNU - TAIL 5libsblo.so -basic- GNU - TAIL 5libsaxlo.so -sax - GNU 5libreg.so.3 -registry - GNU 5libpixman-1.so.0-cairo- EXT 5libpackage2.so -package - GNU - TAIL 5liblocaledata_en.so -i18npool - GNU 5liblnglo.so -linguistic - GNU - TAIL 5libjvmfwk.so.3 -jvmfwk - GNU 5libjvmaccessgcc3.so.3 -jvmaccess- GNU 5libicuuc.so.44 -icu - EXT 5libicule.so.44 -icu - EXT 5libicui18n.so.44-icu - EXT 5
Re: minutes of ESC call ...
On Fri, May 18, 2012 at 08:32:47AM +0200, David Tardon wrote: On Thu, May 17, 2012 at 09:00:51PM +0100, Michael Meeks wrote: + 3.6 status + connectivity, reportreader, shell, scp2 + will enable adding 10-12 modules to tail_build. + will merge next week, in time for 3.6 I should clarify this item a bit for the people who did not attend the call: it is about gbuild conversions I have done recently but have not merged into master yet. So it would be better phrased as: + pending gbuild conversions: connectivity, reportbuilder, shell, scp2 + ... And there are some numbers regarding gbuild conversions (inferred from my current master checkout with a bit of help from https://wiki.documentfoundation.org/Development/Build_System/Module_status): modules: 219 + 4*[1] converted: 120 + 1*[2] - internal: 119 + 1 - external: 1*[3] not converted: 83 + 1*[4] - internal: 18 + 1*[5] - external: 65*[6] ignored: 4 + 1*[7] nothing to convert: 2*[8] special: 5*[9] pending: 4*[A] in progress: 1 + 1*[B] *1 X + Y means X modules from repository core, Y modules from other repositories *2 about 35 of these came from OO.o *3 the lucky winner is clucene :-) *4 these do not include pending and in-progress conversions *5 including guw and migrationanalysis, which may not be relevant anymore *6 including lucene, which can be probably removed now *7 autodoc, cosv, dmake, udm + binfilter *8 distro-configs, icon-themes *9 android, ios, cross_tail_build, cross_toolset, tail_build *A connectivity, reportbuilder, scp2, shell *B testtools + helpcontent2 It is plain to see we are finishing internal modules, which is nice :-) On the other side, we still need to come up with a viable way for converting external projects. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 3.5.4 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.5.4. The upcoming 3.5.4 will be the fourth in a series of frequent bugfix releases on our feature-packed 3.5 code line. Please be aware that LibreOffice 3.5.4 RC1 is not ready for production use, you should continue to use LibreOffice 3.5.3 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ A note for Windows users: this Release Candidate will uninstall your current stable build and replace it. If you do not wish this to happen but still would like to test, you should follow the instructions for installing in parallel: http://wiki.documentfoundation.org/Installing_in_parallel Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the RC1 quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: https://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://challenge.documentfoundation.org/ A list of known issues with 3.5.4 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.5.4/RC1 Please find the list of changes against LibreOffice 3.5.3 here: http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-5-4-release-3.5.4.1.log Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors pgpVJp2lR9RPb.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5-4' - unotools/source
unotools/source/config/historyoptions.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 12e49e422e5244173d97bcf61f5354fd90d7fab3
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed May 16 09:32:51 2012 +0200
fdo#46074 fdo#49948 Ignore corrupted items in Recent Documents
...following up on 4ccb4bda483eb548eb6efb5e2f1952f094522320 fdo#46074
Ignore
corrupted items in Recent Documents with another problematic scenario found
with fdo#49948.
Conflicts:
unotools/source/config/historyoptions.cxx
Signed-off-by: Michael Meeks michael.me...@suse.com
(cherry picked from commit fcac9e82d3233d85a6da11bd716a7dc357d5eed2)
Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Jan Holesovsky ke...@suse.cz
Change-Id: I3e7c803813f09c1f031defc2c18cfab6732b1621
diff --git a/unotools/source/config/historyoptions.cxx
b/unotools/source/config/historyoptions.cxx
index 5ba2045..94385f1 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -583,7 +583,23 @@ void SvtHistoryOptions_Impl::AppendItem(
EHistoryType eHistory ,
::rtl::OUString sRemove;
xOrderList-getByName(::rtl::OUString::valueOf(nLength-1)) =
xSet;
xSet-getPropertyValue(s_sHistoryItemRef) = sRemove;
-xItemList-removeByName(sRemove);
+try
+{
+xItemList-removeByName(sRemove);
+}
+catch (css::container::NoSuchElementException )
+{
+// https://bugs.freedesktop.org/show_bug.cgi?id=46074
+// FILEOPEN: No Recent Documents... discusses a problem
+// with corrupted
/org.openoffice.Office/Histories/Histories
+// configuration items; to work around that problem, simply
+// ignore such corrupted individual items here, so that at
+// least newly added items are successfully added:
+if (!sRemove.isEmpty())
+{
+throw;
+}
+}
}
if ( nLength != nMaxSize )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
On Thu, May 17, 2012 at 11:41:52PM -0700, Tor Lillqvist wrote: commit 6868d84b13a52efe91337f2dccb88e59b9f8d2b7 Author: Tor Lillqvist t...@iki.fi Date: Thu May 17 22:45:04 2012 +0300 Add generic --with-build-platform-configure-options diff --git a/configure.in b/configure.in index 9c23d8a..510d82a 100644 --- a/configure.in +++ b/configure.in @@ -991,6 +991,9 @@ AC_ARG_WITH(gnu-patch, [Specify location of GNU patch on Solaris or FreeBSD.]), ,) +AC_ARG_WITH(build-platform-configure-options, +[Specify options for the configure script run for the *build* platform in a cross-compilation]) + AC_ARG_WITH(gnu-cp, AS_HELP_STRING([--with-gnu-cp], [Specify location of GNU cp on Solaris or FreeBSD.]), @@ -2021,6 +2024,7 @@ AC_ARG_WITH(macosx-version-max-allowed, dnl === dnl options for stuff used during cross-compilation build +dnl These are superseded by --with-build-platform-configure-options dnl === AC_ARG_WITH(system-boost-for-build, @@ -3472,6 +3476,7 @@ if test $cross_compiling = yes; then test -n $with_system_expat_for_build sub_conf_opts=$sub_conf_opts --with-system-expat test $with_system_icu_for_build = yes -o $with_system_icu_for_build = force sub_conf_opts=$sub_conf_opts --with-system-icu test -n $with_system_libxml_for_build sub_conf_opts=$sub_conf_opts --with-system-libxml +sub_conf_opts=$sub_conf_opts $with_build_platform_configure_options ./configure \ --disable-mozilla \ --disable-build-mozilla \ This is a good idea, but I think it would be even better to have autogen.lastrun.build (or whatever you want to call it). Then we would not need to specify _any_ build-specific options for the host configure. Opinions? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED-3-5-4] recent documents corruption fix
On 05/16/2012 11:47 AM, Michael Stahl wrote: On 16/05/12 11:02, Michael Meeks wrote: On Wed, 2012-05-16 at 09:47 +0200, Stephan Bergmann wrote: Please review and consider for backporting to libreoffice-3-5 and libreoffice-3-5-4. Looks great to me; cherry-picked to -3-5, we need another couple of reviews for -3-5-4 I think :-) rubber stamped +1 Cherry-picked to libreoffice-3-5-4 now as http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-4id=12e49e422e5244173d97bcf61f5354fd90d7fab3 with Kendy's +1 from IRC. Thanks guys, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
This is a good idea, but I think it would be even better to have autogen.lastrun.build (or whatever you want to call it). Then we would not need to specify _any_ build-specific options for the host configure. Opinions? I don't think that would be easy to implement, and in any case, then we should rename autogen.lastrun to configure.lastun (possibly then suffixed with .host and .build) to avoid confusion. After all, autogen.sh is not run twice in a cross-compiling configuration; configure is. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
On Fri, May 18, 2012 at 11:40:13AM +0300, Tor Lillqvist wrote: This is a good idea, but I think it would be even better to have autogen.lastrun.build (or whatever you want to call it). Then we would not need to specify _any_ build-specific options for the host configure. Opinions? I don't think that would be easy to implement, Why not? Changing the inner configure call to ./configure `cat configure.lastrun.build` seems pretty simple (of course there should be check if the file exists etc.) Or am I missing something? and in any case, then we should rename autogen.lastrun to configure.lastun (possibly then suffixed with .host and .build) to avoid confusion. After all, autogen.sh is not run twice in a cross-compiling configuration; configure is. Yes, that would make sense. I just used the terminology we have now (and I added or whatever you want to call it). D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - sc/inc sc/source
sc/inc/colorscale.hxx | 127 +--
sc/inc/document.hxx| 12 -
sc/inc/fillinfo.hxx| 32
sc/source/core/data/colorscale.cxx | 189 ++---
sc/source/core/data/documen2.cxx |4
sc/source/core/data/documen4.cxx |8 -
sc/source/core/data/fillinfo.cxx | 14 +-
sc/source/core/data/table2.cxx | 10 -
sc/source/filter/excel/xecontent.cxx | 11 +
sc/source/filter/inc/condformatbuffer.hxx | 21 +++
sc/source/filter/inc/condformatcontext.hxx | 13 +
sc/source/filter/oox/condformatbuffer.cxx | 142 -
sc/source/filter/oox/condformatcontext.cxx | 37 +
sc/source/ui/view/output.cxx | 72 ++-
14 files changed, 621 insertions(+), 71 deletions(-)
New commits:
commit d961b694348a0dd048761a6046de7393ac077f31
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 10:33:16 2012 +0200
implement databar import from oox
Change-Id: Id510acbc7291b94610e0e2c769d8cee582baa9a7
diff --git a/sc/source/filter/inc/condformatbuffer.hxx
b/sc/source/filter/inc/condformatbuffer.hxx
index b8b2d65..de2c906 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -39,6 +39,8 @@ namespace com { namespace sun { namespace star {
namespace sheet { class XSheetConditionalEntries; }
} } }
class ScColorScaleFormat;
+class ScDataBarFormat;
+struct ScDataBarFormatData;
namespace oox {
namespace xls {
@@ -112,6 +114,23 @@ private:
sal_uInt32 mnCol;
};
+class DataBarRule : public WorksheetHelper
+{
+public:
+DataBarRule( const CondFormat rFormat );
+void importCfvo( const AttributeList rAttribs );
+void importColor( const AttributeList rAttribs );
+
+void SetData( ScDataBarFormat* pFormat, ScDocument* pDoc, const ScAddress
rAddr );
+
+private:
+const CondFormat mrCondFormat;
+ScDataBarFormatData* mpFormat;
+
+boost::scoped_ptrColorScaleRuleModelEntry mpUpperLimit;
+boost::scoped_ptrColorScaleRuleModelEntry mpLowerLimit;
+};
+
//
@@ -138,11 +157,13 @@ public:
inline sal_Int32getPriority() const { return maModel.mnPriority; }
ColorScaleRule* getColorScale();
+DataBarRule*getDataBar();
private:
const CondFormat mrCondFormat;
CondFormatRuleModel maModel;
boost::scoped_ptrColorScaleRule mpColor;
+boost::scoped_ptrDataBarRule mpDataBar;
};
typedef ::boost::shared_ptr CondFormatRule CondFormatRuleRef;
diff --git a/sc/source/filter/inc/condformatcontext.hxx
b/sc/source/filter/inc/condformatcontext.hxx
index 7af6258..08f5341 100644
--- a/sc/source/filter/inc/condformatcontext.hxx
+++ b/sc/source/filter/inc/condformatcontext.hxx
@@ -48,8 +48,17 @@ public:
virtual voidonStartElement( const AttributeList rAttribs );
virtual voidonCharacters( const ::rtl::OUString rChars );
-virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32
nRecId, SequenceInputStream rStrm );
-virtual voidonStartRecord( SequenceInputStream rStrm );
+private:
+CondFormatRuleRef mxRule;
+};
+
+class DataBarContext : public WorksheetContextBase
+{
+public:
+explicit DataBarContext( CondFormatContext rFormat, CondFormatRuleRef
xRule );
+
+virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32
nElement, const AttributeList rAttribs );
+virtual voidonStartElement( const AttributeList rAttribs );
private:
CondFormatRuleRef mxRule;
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 719f3a5..655b264 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -224,12 +224,11 @@ void ColorScaleRule::importColor( const AttributeList
rAttribs )
++mnCol;
}
-void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat, ScDocument*
pDoc, const ScAddress rAddr )
+namespace {
+
+ScColorScaleEntry* ConvertToModel( const ColorScaleRuleModelEntry rEntry,
ScDocument* pDoc, const ScAddress rAddr )
{
-for(size_t i = 0; i maColorScaleRuleEntries.size(); ++i)
-{
-ScColorScaleEntry* pEntry = new
ScColorScaleEntry(maColorScaleRuleEntries[i].mnVal,
maColorScaleRuleEntries[i].maColor);
-const ColorScaleRuleModelEntry rEntry = maColorScaleRuleEntries[i];
+ScColorScaleEntry* pEntry = new ScColorScaleEntry(rEntry.mnVal,
rEntry.maColor);
if(rEntry.mbMin)
pEntry-SetMin(true);
@@ -241,11 +240,105 @@ void ColorScaleRule::AddEntries( ScColorScaleFormat*
pFormat, ScDocument* pDoc,
if(!rEntry.maFormula.isEmpty())
pEntry-SetFormula(rEntry.maFormula, pDoc, rAddr,
formula::FormulaGrammar::GRAM_ENGLISH_XL_A1);
+
Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
Why not? Changing the inner configure call to ./configure `cat configure.lastrun.build` Sure, but then there would be a discrepancy with how autogen.lastrun works. Or should we realize already that autogen.lastrun isn't actually valued by developers as a backup copy of their last autogen.sh parameters, but it is seen as a precious input file, edited and certainly not intended to get over-written... and remove the code to (re)write it from autogen.sh? Anyway, I am not opposed to this idea. I would perhaps call it configure.args.build (and configure.args.host, if we remove the backup copy aspect)? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)
On 05/16/2012 05:01 PM, Lubos Lunak wrote: - non-debug/dbgutils (i.e. also the default) - -O2 - symbols - -g (probably even -g1, if this is actually meant for release builds with debug info sufficient mainly for backtraces) - debug/dbgutils - -g, making sure it overrides -g1 from symbols - explicit C(XX)FLAGS overrides anything ...and, as something of a special case, no -O... at all (instead of the default -O2) for sc under --enable-debug=-sc/? I think then we're on the same page after all (and I had just misinterpreted what you wrote). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3.5] crasher fdo#45987
Hi somewhat of a containing fix ( I think there is other rework needed, see below ) that avoids the mentioned crasher, please consider cherry-picking to 3.5 Always ( afaict ) the code expects the index of the entry in the (maTabs) vector to correspond a tab of the same index. However the DeleteTab routine patched above will erase the entry for the tab but if that tab isn't the last tab but instead some random tab in the middle won't the order of the tabs be screwed ? We could check and only delete an entry if it is the last entry ( and otherwise make a null entry for the deleted tab ) but then we definitely would expect the code should be ready to deal with such a 'hole' (representing a sheet that no longer exists ) in the vector, that doesn't appear to be the case. Is this how it should work ? I could rework it like that if that is the intention, is it ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3.5] crasher fdo#45987
On 18/05/12 10:26, Noel Power wrote: Hi somewhat of a containing fix ( I think there is other rework needed, see below ) that avoids the mentioned crasher, please consider cherry-picking to 3.5 Always ( afaict ) the code expects the index of the entry in the (maTabs) vector to correspond a tab of the same index. However the DeleteTab routine patched above will erase the entry for the tab but if that tab isn't the last tab but instead some random tab in the middle won't the order of the tabs be screwed ? We could check and only delete an entry if it is the last entry ( and otherwise make a null entry for the deleted tab ) but then we definitely would expect the code should be ready to deal with such a 'hole' (representing a sheet that no longer exists ) in the vector, that doesn't appear to be the case. Is this how it should work ? I could rework it like that if that is the intention, is it ? and I forgot to mention the commit ( or actually 2 commit ids as it appears I introduced a wae that was fixed by sb ) http://cgit.freedesktop.org/libreoffice/core/commit/?id=8b1d29bc9b00bc2730738a990023a65ab6e0219b http://cgit.freedesktop.org/libreoffice/core/commit/?id=abb26f51eea0399754cc8f5b7d7a7d648d68f630 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross
On Fri, May 18, 2012 at 11:59:40AM +0300, Tor Lillqvist wrote: Why not? Changing the inner configure call to ./configure `cat configure.lastrun.build` Sure, but then there would be a discrepancy with how autogen.lastrun works. Or should we realize already that autogen.lastrun isn't actually valued by developers as a backup copy of their last autogen.sh parameters, but it is seen as a precious input file, edited and certainly not intended to get over-written... and remove the code to (re)write it from autogen.sh? TBH, I already forgot it _is_ overwritten :-/ I cannot even remember the last time I run autogen.sh with options... So I am all for treating it as input file unchangeable by autogen.sh. Anyway, I am not opposed to this idea. I would perhaps call it configure.args.build (and configure.args.host, if we remove the backup copy aspect)? I like that. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to get values for rtlbootstrap.mk in configure?
On Fri, May 11, 2012 at 10:40:19PM +0200, Matúš Kukan wrote: There is a comment that the variables (RTL_OS RTL_ARCH) should be set by configure http://cgit.freedesktop.org/libreoffice/core/tree/sdext/platform.mk#n28 Yeah, that comment was written by me. Because the obvious next step would be to set platform ID for extensions in configure too (platform ID is $(RTL_OS)_$(RTL_ARCH) converted to lower case. There is no handy function for lower case conversion of a string in GNU make). How could I do that ? Well, it's easy to get the values for my platform but how to do it for all ? The values are determined by sal/source/rtl/macro.hxx . So what is needed is to map the possible configurations from here on the platform specific settings in configure.in at line 2975. Somebody wants to do it as an easy hack ;-) ? I wanted to create one at that time, but then I was too lazy to check what it would involve :-) D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/colorscale.hxx|1 +
sc/source/ui/view/output.cxx | 14 ++
2 files changed, 15 insertions(+)
New commits:
commit 3e6b90800d679f183c3601f33800d9f236f834a3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 12:16:06 2012 +0200
show dottet line if axis is not at zero
Change-Id: Ifd1d69a6afe9a0392e08e0f5bb0b1a497e1c2606
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 2f968b7..f0d9827 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -49,6 +49,7 @@
#include drawinglayer/processor2d/baseprocessor2d.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include svx/sdr/contact/objectcontacttools.hxx
+#include vcl/lineinfo.hxx
#include svx/unoapi.hxx
#include output.hxx
@@ -832,6 +833,19 @@ void drawDataBars( const ScDataBarInfo* pOldDataBarInfo,
OutputDevice* pDev, con
//TODO: improve this for gradient fill
pDev-SetFillColor(pOldDataBarInfo-maColor);
pDev-DrawRect(aPaintRect);
+
+//draw axis
+if(pOldDataBarInfo-mnZero)
+{
+Point aPoint1(nPosZero, rRect.Top());
+Point aPoint2(nPosZero, rRect.Bottom());
+LineInfo aLineInfo(LINE_DASH, 1);
+aLineInfo.SetDashCount( 5 );
+pDev-SetFillColor(COL_BLACK);
+pDev-SetLineColor(COL_BLACK);
+pDev-DrawLine(aPoint1, aPoint2, aLineInfo);
+pDev-SetLineColor();
+}
}
void drawCells(const Color* pColor, const SvxBrushItem* pBackground, const
Color* pOldColor, const SvxBrushItem* pOldBackground,
commit 56b41a2b1e89efd24abd02bc319a3c4d38bee3d1
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 12:15:39 2012 +0200
prevent the creation of a default copy c'tor
Change-Id: I5ede869092355739f5e58de71b3a903ff0528051
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 317a27d..a9a5211 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -209,6 +209,7 @@ private:
public:
ScColorFormatList() {};
ScColorFormatList(ScDocument* pDoc, const ScColorFormatList rList);
+ScColorFormatList(const ScColorFormatList rList);
typedef ColorFormatContainer::iterator iterator;
typedef ColorFormatContainer::const_iterator const_iterator;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/qa vcl/unx writerfilter/source
sw/qa/extras/ooxmltok/data/n751077.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx| 32 +++
vcl/unx/generic/plugadapt/salplug.cxx |2
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 26
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2
writerfilter/source/ooxml/OOXMLParserState.cxx| 37 +-
writerfilter/source/ooxml/OOXMLParserState.hxx|9
writerfilter/source/ooxml/model.xml |5 +-
8 files changed, 110 insertions(+), 3 deletions(-)
New commits:
commit d2e09c2872e5018becf06ffb1bc4a825f047f5b2
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri May 18 14:18:16 2012 +0200
testcase for bnc#751077
Change-Id: Iee60b1d41f04f4a583c7392335068ca75668f42c
diff --git a/sw/qa/extras/ooxmltok/data/n751077.docx
b/sw/qa/extras/ooxmltok/data/n751077.docx
new file mode 100644
index 000..62304e1
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n751077.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 9e0473c..896b9fd 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -54,6 +54,7 @@ public:
void testN750935();
void testN757890();
void testFdo49940();
+void testN751077();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -63,6 +64,7 @@ public:
CPPUNIT_TEST(testN750935);
CPPUNIT_TEST(testN757890);
CPPUNIT_TEST(testFdo49940);
+CPPUNIT_TEST(testN751077);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -206,6 +208,36 @@ void Test::testFdo49940()
CPPUNIT_ASSERT_EQUAL(OUString(First Page), aValue);
}
+void Test::testN751077()
+{
+load( n751077.docx );
+
+/*
+enum = ThisComponent.Text.createEnumeration
+enum.NextElement
+para = enum.NextElement
+xray para.String
+xray para.PageStyleName
+*/
+uno::Referencetext::XTextDocument textDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
paraEnumAccess(textDocument-getText(), uno::UNO_QUERY);
+// list of paragraphs
+uno::Referencecontainer::XEnumeration paraEnum =
paraEnumAccess-createEnumeration();
+// go to 1st paragraph
+(void) paraEnum-nextElement();
+// get the 2nd paragraph
+uno::Referenceuno::XInterface paragraph(paraEnum-nextElement(),
uno::UNO_QUERY);
+OUString value;
+// text of the paragraph
+uno::Referencetext::XTextRange text(paragraph, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( OUString( TEXT1 ), text-getString());
+// we want to test the paragraph is on the first page (it was put onto
another page without the fix),
+// use a small trick and instead of checking the page layout, check the
page style
+uno::Referencebeans::XPropertySet paragraphProperties(paragraph,
uno::UNO_QUERY);
+paragraphProperties-getPropertyValue( PageStyleName ) = value;
+CPPUNIT_ASSERT_EQUAL( OUString( First Page ), value );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit f73e75e91c757b20682d1df75de2f79b3972a500
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu May 17 16:24:14 2012 +0200
handle recursive w:p because of shapes (bnc#751077)
w:pw:pict...w:txbxContentw:pw:p/ - in this case, the inner
paragraphs should not interfere with the outer one, but e.g.
detecting whether it was the last paragraph in section could get
broken.
Change-Id: I8634ee6a0d6274f5770423ff798adfa260a33326
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 58d7627..f693319 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -814,6 +814,32 @@ void OOXMLFastContextHandler::endOfParagraph()
mpStream-utext((const sal_uInt8*)sCR, 1);
}
+void OOXMLFastContextHandler::startTxbxContent()
+{
+#ifdef DEBUG_CONTEXT_HANDLER
+debug_logger-element(contexthandler.startTxbxContent);
+#endif
+/*
+This usually means there are recursive w:p elements, and the ones
+inside and outside of w:txbxContent should not interfere (e.g.
+the lastParagraphInSection setting). So save the whole state
+and possibly start new groups for the nested content (not section
+group though, as that'd cause the txbxContent to be moved onto
+another page, I'm not sure how that should work exactly).
+*/
+mpParserState-startTxbxContent();
+startParagraphGroup();
+}
+
+void OOXMLFastContextHandler::endTxbxContent()
+{
+#ifdef DEBUG_CONTEXT_HANDLER
+debug_logger-element(contexthandler.endTxbxContent);
+#endif
+endParagraphGroup();
+mpParserState-endTxbxContent();
+}
+
void OOXMLFastContextHandler::text(const ::rtl::OUString sText)
{
#ifdef DEBUG_CONTEXT_HANDLER
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||33484 --- Comment #311 from Cor Nouws c...@nouenoff.nl 2012-05-18 05:52:10 PDT --- added Bug 33484 - Printing multiple files from Windows Explorer at once makes LibreOffice unusable -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: sc/source
sc/source/ui/view/viewdata.cxx | 37 +
1 file changed, 21 insertions(+), 16 deletions(-)
New commits:
commit 8352eb5a1af1eb44550a9d60d31e6c2fb2dc43b9
Author: Noel Power noel.po...@novell.com
Date: Fri May 18 14:12:25 2012 +0100
attempt to prevent illegal maTabData access(s)
Change-Id: I57076fd1bef6d2b51f8d3c8f0338b5a715c206d0
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 3775d85..b15a961 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -489,8 +489,8 @@ void ScViewData::DeleteTab( SCTAB nTab )
if ( nTab static_castSCTAB(maTabData.size()) )
{
delete maTabData.at(nTab);
-
-maTabData.erase(maTabData.begin() + nTab);
+if ( nTab == maTabData.size() - 1 )
+maTabData.erase(maTabData.begin() + nTab);
UpdateCurrentTab();
mpMarkData-DeleteTab( nTab );
}
@@ -503,8 +503,8 @@ void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
mpMarkData-DeleteTab( nTab + i );
delete maTabData.at(nTab + i);
}
-
-maTabData.erase(maTabData.begin() + nTab, maTabData.begin()+ nTab+nSheets);
+if ( ( nTab + nSheets ) == maTabData.size() - 1 )
+maTabData.erase(maTabData.begin() + nTab, maTabData.begin()+
nTab+nSheets);
UpdateCurrentTab();
}
@@ -541,7 +541,8 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
if (nSrcTab static_castSCTAB(maTabData.size()))
{
pTab = maTabData[nSrcTab];
-maTabData.erase( maTabData.begin() + nSrcTab );
+if ( nSrcTab == maTabData.size() - 1 )
+maTabData.erase( maTabData.begin() + nSrcTab );
}
if (nDestTab static_castSCTAB(maTabData.size()))
@@ -662,15 +663,18 @@ void ScViewData::SetZoom( const Fraction rNewX, const
Fraction rNewY, std::vec
SCTAB i = *it;
if ( i static_castSCTAB(maTabData.size()) maTabData[i] )
{
-if ( bPagebreak )
-{
-maTabData[i]-aPageZoomX = aValidX;
-maTabData[i]-aPageZoomY = aValidY;
-}
-else
+if ( maTabData[i] )
{
-maTabData[i]-aZoomX = aValidX;
-maTabData[i]-aZoomY = aValidY;
+if ( bPagebreak )
+{
+maTabData[i]-aPageZoomX = aValidX;
+maTabData[i]-aPageZoomY = aValidY;
+}
+else
+{
+maTabData[i]-aZoomX = aValidX;
+maTabData[i]-aZoomY = aValidY;
+}
}
}
}
@@ -692,7 +696,8 @@ void ScViewData::SetZoom( const Fraction rNewX, const
Fraction rNewY, sal_Bool
void ScViewData::SetShowGrid( bool bShow )
{
CreateSelectedTabData();
-maTabData[nTabNo]-bShowGrid = bShow;
+if ( maTabData[nTabNo] )
+maTabData[nTabNo]-bShowGrid = bShow;
}
void ScViewData::RefreshZoom()
@@ -2949,7 +2954,7 @@ sal_Bool ScViewData::UpdateFixX( SCTAB nTab )
// sal_True = Wert g
if (!ValidTab(nTab))// Default
nTab=nTabNo;// akuelle Tabelle
-if (!pView || maTabData[nTab]-eHSplitMode != SC_SPLIT_FIX)
+if (!maTabData[nTab] || !pView || maTabData[nTab]-eHSplitMode !=
SC_SPLIT_FIX)
return false;
ScDocument* pLocalDoc = GetDocument();
@@ -2984,7 +2989,7 @@ sal_Bool ScViewData::UpdateFixY( SCTAB nTab )
// sal_True = Wert g
if (!ValidTab(nTab))// Default
nTab=nTabNo;// akuelle Tabelle
-if (!pView || maTabData[nTab]-eVSplitMode != SC_SPLIT_FIX)
+if (!maTabData[nTab] || !pView || maTabData[nTab]-eVSplitMode !=
SC_SPLIT_FIX)
return false;
ScDocument* pLocalDoc = GetDocument();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3.5] crasher fdo#45987
On 18/05/12 10:31, Noel Power wrote: On 18/05/12 10:26, Noel Power wrote: Hi somewhat of a containing fix ( I think there is other rework needed, see below ) that avoids the mentioned crasher, please consider cherry-picking to 3.5 Always ( afaict ) the code expects the index of the entry in the (maTabs) vector to correspond a tab of the same index. However the DeleteTab routine patched above will erase the entry for the tab but if that tab isn't the last tab but instead some random tab in the middle won't the order of the tabs be screwed ? We could check and only delete an entry if it is the last entry ( and otherwise make a null entry for the deleted tab ) but then we definitely would expect the code should be ready to deal with such a 'hole' (representing a sheet that no longer exists ) in the vector, that doesn't appear to be the case. Is this how it should work ? I could rework it like that if that is the intention, is it ? and I forgot to mention the commit ( or actually 2 commit ids as it appears I introduced a wae that was fixed by sb ) http://cgit.freedesktop.org/libreoffice/core/commit/?id=8b1d29bc9b00bc2730738a990023a65ab6e0219b http://cgit.freedesktop.org/libreoffice/core/commit/?id=abb26f51eea0399754cc8f5b7d7a7d648d68f630 I took it that it should work how I outlined above and committed a further fix which should safeguard against illegal access, please additionally consider http://cgit.freedesktop.org/libreoffice/core/commit/?id=8352eb5a1af1eb44550a9d60d31e6c2fb2dc43b9 thanks, Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - sfx2/source sw/source vcl/inc vcl/source vcl/unx
sfx2/source/dialog/tabdlg.cxx|4 -
sw/source/ui/dialog/wordcountdialog.cxx |8 ---
vcl/inc/vcl/dialog.hxx | 12
vcl/inc/vcl/layout.hxx | 14 -
vcl/inc/vcl/settings.hxx | 40 +++
vcl/source/app/settings.cxx |4 +
vcl/source/window/builder.cxx|2
vcl/source/window/dialog.cxx | 70 +-
vcl/source/window/layout.cxx | 81 ---
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 49 ++
10 files changed, 217 insertions(+), 67 deletions(-)
New commits:
commit 5335e33f000e2482a7318dec01599476970aa996
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 18 14:05:20 2012 +0100
and set 3dlook for reused toplevel dialogs
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 183b718..380bebc 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -201,7 +201,7 @@ Window *VclBuilder::insertObject(Window *pParent, const
rtl::OString rClass, co
pCurrentChild = m_pParent;
//toplevels default to resizable
if (pCurrentChild-IsDialog())
-pCurrentChild-SetStyle(pCurrentChild-GetStyle() | WB_SIZEMOVE);
+pCurrentChild-SetStyle(pCurrentChild-GetStyle() | WB_SIZEMOVE |
WB_3DLOOK);
}
else
{
commit 408e45dc0359e2424cc3d9b181f3649e3c869f54
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 18 13:48:13 2012 +0100
implement sucking in the padding from the theme
pretty up dialogs, centralize adding the borders into
VclContainer, reduce default space between buttons
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 474259d..33cb57f 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -523,12 +523,8 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const
String* pUserButtonText )
rtl::OString sFill(RTL_CONSTASCII_STRINGPARAM(fill));
rtl::OString sExpand(RTL_CONSTASCII_STRINGPARAM(expand));
rtl::OString sPackType(RTL_CONSTASCII_STRINGPARAM(pack-type));
-rtl::OString sBorderWidth(RTL_CONSTASCII_STRINGPARAM(border-width));
vbox.setChildProperty(sFill, true);
-//TO-DO, when vcontent_area belongs to dialog via builder, this becomes
-//content-area-border on the dialog
-vbox.setChildProperty(sBorderWidth, sal_Int32(7));
action_area.setChildProperty(sFill, true);
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index 741436f..b7ed417 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -87,12 +87,8 @@ SwWordCountDialog::SwWordCountDialog(Dialog* pParent)
rtl::OString sFill(RTL_CONSTASCII_STRINGPARAM(fill));
rtl::OString sExpand(RTL_CONSTASCII_STRINGPARAM(expand));
rtl::OString sPackType(RTL_CONSTASCII_STRINGPARAM(pack-type));
-rtl::OString sBorderWidth(RTL_CONSTASCII_STRINGPARAM(border-width));
vbox.setChildProperty(sFill, true);
-//TO-DO, when vcontent_area belongs to dialog via builder, this becomes
-//content-area-border on the dialog
-vbox.setChildProperty(sBorderWidth, sal_Int32(7));
action_area.setChildProperty(sFill, true);
@@ -105,7 +101,7 @@ SwWordCountDialog::SwWordCountDialog(Dialog* pParent)
aCurrentSelectionLine.setChildProperty(sExpand, true);
aSelectionBox.setChildProperty(sFill, true);
-aSelectionBox.setChildProperty(sBorderWidth, sal_Int32(7));
+aSelectionBox.set_border_width(7);
aSelectionRow1.setChildProperty(sFill, true);
aSelectionRow1.setChildProperty(sExpand, true);
@@ -130,7 +126,7 @@ SwWordCountDialog::SwWordCountDialog(Dialog* pParent)
aDocLine.setChildProperty(sExpand, true);
aDocBox.setChildProperty(sFill, true);
-aDocBox.setChildProperty(sBorderWidth, sal_Int32(7));
+aDocBox.set_border_width(7);
aDocRow1.setChildProperty(sFill, true);
aDocRow1.setChildProperty(sExpand, true);
diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index 92b29bb..39e50e5 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.hxx
@@ -55,6 +55,7 @@ private:
sal_BoolmbInClose;
sal_BoolmbModalMode;
sal_Int8mnCancelClose; //liuchen 2009-7-22, support Excel VBA
UserForm_QueryClose event
+int m_nBorderWidth;
Timer maLayoutTimer;
SAL_DLLPRIVATE voidImplInitDialogData();
@@ -91,6 +92,17 @@ public:
virtual SizeGetOptimalSize(WindowSizeType eType) const;
virtual voidResize();
boolisLayoutEnabled() const;
+virtual bool set_property(const rtl::OString rKey, const rtl::OString
rValue);
+
+void set_border_width(int nBorderWidth)
+{
+m_nBorderWidth = nBorderWidth;
+}
+int get_border_width() const
+
[Libreoffice-commits] .: 3 commits - lucene/long_path.patch lucene/lucene.patch lucene/makefile.mk lucene/prj lucene/README lucene/version.mk sw/source test/source
lucene/README |1
lucene/long_path.patch | 37
lucene/lucene.patch | 12 -
lucene/makefile.mk | 74
lucene/prj/build.lst|3 -
lucene/prj/d.lst|3 -
lucene/version.mk | 27 ---
sw/source/core/doc/doctxm.cxx |4 -
sw/source/ui/dialog/wordcountdialog.cxx |6 ++
test/source/text/xtextcontent.cxx |6 +-
10 files changed, 11 insertions(+), 162 deletions(-)
New commits:
commit 101149d80303848971463a22976c52a370c46c05
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 18 14:15:14 2012 +0100
WaE: make test msvc2008 warnings free
Change-Id: Ieccb0e425cb505bec3735539ebdf154529fde330
diff --git a/test/source/text/xtextcontent.cxx
b/test/source/text/xtextcontent.cxx
index 8e84dc2..86a811f 100644
--- a/test/source/text/xtextcontent.cxx
+++ b/test/source/text/xtextcontent.cxx
@@ -39,7 +39,7 @@ namespace apitest {
void XTextContent::testGetAnchor()
{
uno::Reference text::XTextContent xTextContent(init(), UNO_QUERY_THROW);
-uno::Reference uno::XInterface xAnchor = xTextContent-getAnchor();
+uno::Reference uno::XInterface xAnchor(xTextContent-getAnchor());
CPPUNIT_ASSERT(xAnchor.is());
}
@@ -58,13 +58,13 @@ void XTextContent::testAttach()
else
xTextContent-attach(xRange);
}
-catch (const lang::IllegalArgumentException e)
+catch (const lang::IllegalArgumentException)
{
bool bAttachSupported = isAttachSupported();
if (bAttachSupported)
CPPUNIT_ASSERT(false);
}
-catch (const RuntimeException e)
+catch (const RuntimeException)
{
bool bAttachSupported = isAttachSupported();
if (bAttachSupported)
commit bcfc9fc3bb3ebc8c6c88349e1c0c530208949e70
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 18 13:38:01 2012 +0100
WaE: make sw msvc2008 warnings free
Change-Id: I348a59b3c1b060a084680328aa07089b3c7ccc66
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 8244b2d..426ecf8 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -986,7 +986,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
// Generate: Evaluate Form and insert the place holder for the
// page number. If it is a TOX_INDEX and the SwForm IsCommaSeparated()
// then a range of entries must be generated into one paragraph
-sal_uInt16 nRange = 1;
+size_t nRange = 1;
if(TOX_INDEX == SwTOXBase::GetType()
GetTOXForm().IsCommaSeparated()
aSortArr[nCnt]-GetType() == TOX_SORT_INDEX)
@@ -1878,7 +1878,7 @@ void SwTOXBaseSection::UpdatePageNum()
GetOptions() : 0,
GetSortAlgorithm() );
-for( sal_uInt16 nCnt = 0; nCnt aSortArr.size(); ++nCnt )
+for( size_t nCnt = 0; nCnt aSortArr.size(); ++nCnt )
{
// Loop over all SourceNodes
std::vectorsal_uInt16 aNums; // the PageNumber
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index f5b1c3b..967733d 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -104,7 +104,13 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings*
_pBindings,
Window *pParent,
SfxChildWinInfo* pInfo)
: SfxModelessDialog(_pBindings, pChild, pParent, SW_RES(DLG_WORDCOUNT)),
+#if defined _MSC_VER
+#pragma warning (disable : 4355)
+#endif
aDlg(this)
+#if defined _MSC_VER
+#pragma warning (default : 4355)
+#endif
{
FreeResource();
Initialize(pInfo);
commit 15a2cdb68eb1e6696cf5b33d2a05a325216e0b85
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 18 13:25:40 2012 +0100
forgot to remove lucene post clucene replacement
Change-Id: Ib68cbc8cbbd2b2b0b6f6069a3c6834c33eff8756
diff --git a/lucene/README b/lucene/README
deleted file mode 100644
index 3948ffc..000
--- a/lucene/README
+++ /dev/null
@@ -1 +0,0 @@
-From [http://lucene.apache.org/]. (CH: What of it is used for what ???)
diff --git a/lucene/long_path.patch b/lucene/long_path.patch
deleted file mode 100644
index d3ab8e3..000
--- a/lucene/long_path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
misc/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java
2008-05-01 22:27:58.0 +0200
-+++ misc/build/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java
2011-02-23 16:36:26.249515000 +0100
-@@ -165,7 +165,15 @@
- public static FSDirectory getDirectory(File file, LockFactory lockFactory)
- throws IOException
- {
--file = new File(file.getCanonicalPath());
-+ String
live issues ticker (was: minutes of ESC call ...)
Hi *, On Thu, May 17, 2012 at 10:00 PM, Michael Meeks michael.me...@suse.com wrote: * Pending Action Items [...] + connect Rainer with sysadmins wrt. status/live issues ticker (Thorsten) [...] Hmm- what is meant with live issues ticker? You might not be aware, but IZBot did announce newly filed issues in the #libreoffice channel by using bugzilla's rss export of queries. i.e. just create a query with product=libreoffice and bug-creation in the last day and you basically have a live feed (a typical rss feed, so not pushed, but pulled) But I don't know what this item involves in addition/whether that would already be enough. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3.5] crasher fdo#45987
On Fri, May 18, 2012 at 9:14 AM, Noel Power nopo...@suse.com wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8b1d29bc9b00bc2730738a990023a65ab6e0219b http://cgit.freedesktop.org/libreoffice/core/commit/?id=abb26f51eea0399754cc8f5b7d7a7d648d68f630 I took it that it should work how I outlined above and committed a further fix which should safeguard against illegal access, please additionally consider http://cgit.freedesktop.org/libreoffice/core/commit/?id=8352eb5a1af1eb44550a9d60d31e6c2fb2dc43b9 So, these extra range checks should be safe; however The original intention of *not* checking the bound of the tab index was that we assumed that this list would be in sync with the maTab in ScDocument at all times. So, if they are out of sync then something else may be causing this problem... Let me ping Markus here. He worked on the rework of ScTable storage, and this issue is related to that work. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: operator new no longer routes through rtl_AllocMemory in libsalcpprt under gbuild link rules
Hi, I checked on Linux and Windows, the memory after a massive allocation and a massive deallocation is really freed, so currently la raison d'être of our internal allocator is gone (need to be checked on Mac Os X). About performance I don't know. Currently there is a mix of system allocator (or jemalloc) and our internal allocator. I don't think it is optimal. I propose to delete all our allocation code and use small stubs for ABI compatibility until LibreOffice 4.0, and we can use the system allocator or jemalloc if there is performance issues, perhaps on Windows. I ask you if I could see if it is a good idea to go on this way or not, and how (branch or trunk). Thanks in advance 2012/3/27 Stephan Bergmann sberg...@redhat.com As discussed offline, and for the record: The original raison d'être for our home-grown memory allocation machinery, IIRC, was loading certain Calc documents, which temporarily required large amounts of heap memory that could be released again later on (either after loading was complete or when closing the specific document; I do not remember). As traditional malloc implementations only ever grow a process's heap and never shrink it again, this meant that an soffice process's memory requirements as seen by the OS could be excessively large, needlessly degrading overall system behaviour. At least to me, it always felt kind of wrong to include memory management facilities in our code base. -- It increases maintenance cost and cuts us off advancements in the OSs' stock memory management facilities. I have no idea if there are still any scenarios where our home-grown memory management is beneficial, let alone if such scenarios would depend on our global new/delete handlers (i.e., if such scenarios obtain the relevant memory via stock C++ new, instead of directly via rtl_allocateMemory or explicitly defined operator new instances that in turn call rtl_allocateMemory). -- Arnaud Versini ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/README | 148 +++- 1 file changed, 123 insertions(+), 25 deletions(-) New commits: commit 2a598ba330b64b85d63ce53b7f0bcd20b6cafcd5 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Fri May 18 15:38:41 2012 +0200 be more kind to people who have not yet seen the world of UNO Change-Id: I63344d31273cb0014f9d1767f8f36f78c9ff1bb8 diff --git a/sw/qa/extras/README b/sw/qa/extras/README index f08cb1a..eb25955 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -12,9 +12,40 @@ The rest of the testcase is about asserting this document model: use the UNO API to retrieve properties, then use `CPPUNIT_ASSERT_EQUAL()` to test against an expected value. -Ideally this alone is enough, but figuring out the UNO API just by reading the -idl files under `offapi/` is not that productive. Xray can help in this case. -Download it from: +See below for more details on writing the UNO code see below. + +== Export tests + +Export tests are similar. Given that test documents are easier to provide in +some format (instead of writing code to build the documents from scratch) in +most cases, we will do an import, then do an export (to invoke the code we want +to test) and then do an import again, so we can do the testing by asserting the +document model, just like we did for import tests. + +Yes, this means that you can test the export code (using this framework) if the +importer is working correctly. (But that's not so bad, users usually expect a +feature to work in both the importer and the exporter.) + +The only difference is that instead of `load()`, you call `roundtrip()` to load +the test document, then you can assert it as discussed above. + +== Helper methods + +When two or more tests do the same (for example determine the number of +characters in the document), helper methods are introduced to avoid code +duplication. When you need something more complex, check if there is already a +helper method, they are also good examples. + +Helper methods which are used by more than one testsuite are in the +`SwModelTestBase` class. For example the `getLength()` method uses the trick +that you can simply enumerate over the document model, getting the paragraphs +of it; and inside those, you can enumerate over their runs. That alone is +enough if you want to test a paragraph or character property. + +== Using UNO for tests + +Figuring out the UNO API just by reading the idl files under `offapi/` is not +that productive. Xray can help in this case. Download it from: http://bernard.marcelly.perso.sfr.fr/index2.html @@ -47,7 +78,8 @@ You can start with: xray ThisComponent -and navigate around. The good thing is that once you write the code, you can +and navigate around (it is a good idea to click Configuration and enable +alphabetical sorting). The good thing is that once you write the code, you can just start F5 without restarting LibreOffice to see the result, so you can develop quickly. @@ -73,30 +105,96 @@ xStyle-getPropertyValue(IsLandscape) = bIsLandscape; CPPUNIT_ASSERT_EQUAL(sal_True, bIsLandscape); -== Export tests +== UNO, in more details, various tips: -Export tests are similar. Given that test documents are easier to provide in -some format (instead of writing code to build the documents from scratch) in -most cases, we will do an import, then do an export (to invoke the code we want -to test) and then do an import again, so we can do the testing by asserting the -document model, just like we did for import tests. +=== writing code based xray inspection: -Yes, this means that you can test the export code (using this framework) if the -importer is working correctly. (But that's not so bad, users usually expect a -feature to work in both the importer and the exporter.) +In general, if you want to access a property, in Basic it's enough to write 'object.property', +such as printing character count that 'xray ThisComponent' prints as 'CharacterCount': -The only difference is that instead of `load()`, you call `roundtrip()` to load -the test document, then you can assert it as discussed above. +count = ThisComponent.CharacterCount +text = paragraph.String -== Helper methods +In C++, this can get more complicated, as you need to use the right interface for access. Xray +prints the internal name of the object (e.g. 'SwXTextDocument' for 'xray ThisComponent') +above the list of its properties. Inspect this class/interface in the code (that is, +under offapi/, udkapi/, or wherever it is implemented) and search for a function named +similarly to the property you want (getXYZ()). If there is none, it is most +probably a property that can be read using XPropertySet: -When two or more tests do the same (for example determine the number of -characters in the document), helper methods are introduced to avoid code -duplication. When you need something more complex, check if there is already a -helper method, they
Re: [REVIEW-3.5] crasher fdo#45987
Hey Noel 2012/5/18 Kohei Yoshida kohei.yosh...@gmail.com: On Fri, May 18, 2012 at 9:14 AM, Noel Power nopo...@suse.com wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8b1d29bc9b00bc2730738a990023a65ab6e0219b http://cgit.freedesktop.org/libreoffice/core/commit/?id=abb26f51eea0399754cc8f5b7d7a7d648d68f630 I took it that it should work how I outlined above and committed a further fix which should safeguard against illegal access, please additionally consider http://cgit.freedesktop.org/libreoffice/core/commit/?id=8352eb5a1af1eb44550a9d60d31e6c2fb2dc43b9 So, these extra range checks should be safe; however The original intention of *not* checking the bound of the tab index was that we assumed that this list would be in sync with the maTab in ScDocument at all times. So, if they are out of sync then something else may be causing this problem... Let me ping Markus here. He worked on the rework of ScTable storage, and this issue is related to that work. I agree with Kohei. Needing a range check at this place will most likely hide a underlying problem. The table container in ScViewData and the one in ScDocument must always be in sync. I fear that this might have been a problem that has always been there. Loosing the sync between the two data structures will result in wrong sheet numbers coming from the view part. Let me check this bug report as soon as I have a clean tree. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-marketing] Re: Developer interviews for the TDF blog
[ cc-ing dev list here to notice people that there is a new episode coming of the famous developer interviews on TDF blog ! ] Hi Marc, Marc Paré wrote (18-05-12 15:30) I was going to attempt to start with the devs who have contributed the most to the project. Is there a way to get a list of ALL devs listed by contribution? There must me some smart git-command that give you this :-) But let me cc the developer list (*), so that people can step in themselves. Maybe there are also suggestions, volunteers. Also note that contributed the most does not necessarily have to match with interesting or whatever. (And what is 'most'? In time, number of commits, smart thinking, helping out others with questions and learning ;-) ) thanks ! Cor * remember when mailing to the dev-list: do a reply-all, to keep the list address itself included -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - bridges/source bridges/test desktop/source extensions/source filter/source forms/source framework/source xmloff/source
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 +-
bridges/test/testcomp.cxx|2 --
desktop/source/app/appinit.cxx |1 -
desktop/source/app/langselect.cxx|1 -
desktop/source/migration/migration.cxx |1 -
extensions/source/bibliography/bibconfig.cxx |1 -
extensions/source/bibliography/datman.cxx|2 --
filter/source/msfilter/msvbahelper.cxx |2 --
filter/source/pdf/pdfexport.cxx |1 -
filter/source/placeware/filter.cxx |2 +-
filter/source/svg/svgfilter.cxx |1 -
filter/source/svg/svgimport.cxx |1 -
filter/source/t602/t602filter.cxx|1 -
filter/source/xmlfilterdetect/filterdetect.cxx |2 --
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |1 -
forms/source/component/ComboBox.cxx |1 -
forms/source/xforms/xpathlib/xpathlib.cxx|3 ---
framework/source/accelerators/moduleacceleratorconfiguration.cxx |1 -
framework/source/dispatch/menudispatcher.cxx |2 --
framework/source/fwe/xml/toolboxdocumenthandler.cxx |1 -
framework/source/fwi/uielement/constitemcontainer.cxx|1 -
framework/source/services/license.cxx|4
framework/source/services/substitutepathvars.cxx |3 ---
framework/source/uielement/addonstoolbarmanager.cxx |2 --
framework/source/uielement/fontsizemenucontroller.cxx|1 -
framework/source/uielement/langselectionmenucontroller.cxx |1 -
framework/source/uielement/statusbarmanager.cxx |3 ---
framework/source/uielement/toolbarmanager.cxx|2 --
xmloff/source/chart/SchXMLParagraphContext.cxx |1 -
xmloff/source/draw/XMLImageMapContext.cxx|2 --
xmloff/source/draw/layerimp.cxx |2 --
xmloff/source/style/ImageStyle.cxx |3 ---
xmloff/source/transform/ChartPlotAreaOASISTContext.cxx |1 -
xmloff/source/transform/ChartPlotAreaOOoTContext.cxx |1 -
34 files changed, 2 insertions(+), 54 deletions(-)
New commits:
commit 00f1180c9628b267bef5884b2e0b9635d7117a1b
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri May 18 22:56:16 2012 +0900
removed unused const rtl::OUString
Change-Id: If02be864f958de96ae1c54fe575b1828410390b1
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 914ca82..26885b2 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -552,8 +552,6 @@ void testOnewayPerformanceOnTwoInterfaces(
void testPerformance( const Reference XCallMe rRemote,
const Reference XCallMe rLocal )
{
-OUString aTestString;
-
sal_Int32 nDoSomething = 1;
sal_Int32 nCalls = 8;
double dRemote, dLocal,dAfterExecution;
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 6741f04..f189695 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -206,7 +206,6 @@ void Desktop::RegisterServices()
RTL_LOGFILE_CONTEXT( aLog, desktop (cd13) ::registerServices );
// read command line parameters
-::rtl::OUString aClientDisplay;
sal_BoolbHeadlessMode = sal_False;
// interpret command line arguments
diff --git a/desktop/source/app/langselect.cxx
b/desktop/source/app/langselect.cxx
index b746434..4bfa8b5 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -435,7 +435,6 @@ sal_Bool LanguageSelection::isInstalledLanguage(OUString
usLocale, sal_Bool bEx
if (!bInstalled !bExact)
{
// no exact match was found, well try to find a substitute
-OUString aInstalledLocale;
for (sal_Int32 i=0; iseqLanguages.getLength(); i++)
{
if (usLocale.indexOf(seqLanguages[i]) == 0)
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index bb4d6e8..583edec 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -1143,7 +1143,6 @@ void MigrationImpl::compareOldAndNewConfig(const
::rtl::OUString sParent,
sSibling = it-m_sCommandURL;
}
-::rtl::OUString sNewSibling;
uno::Reference container::XIndexContainer xPopup;
for (it = vNewItems.begin(); it!=vNewItems.end(); ++it)
{
diff --git a/extensions/source/bibliography/bibconfig.cxx
Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)
On Friday 18 of May 2012, Stephan Bergmann wrote: On 05/16/2012 05:01 PM, Lubos Lunak wrote: - non-debug/dbgutils (i.e. also the default) - -O2 - symbols - -g (probably even -g1, if this is actually meant for release builds with debug info sufficient mainly for backtraces) - debug/dbgutils - -g, making sure it overrides -g1 from symbols - explicit C(XX)FLAGS overrides anything ...and, as something of a special case, no -O... at all (instead of the default -O2) for sc under --enable-debug=-sc/? Yes, but I don't think it's special. The rule, missing in the list above, would be 'debug/dbgutils - optimizations disabled'. So as soon as there's --enable-debug, nothing would get -O2, regardless of symbols. That's actually one more reason why I think -g should be primarily controlled by --enable-symbols and not --enable-debug. I think then we're on the same page after all (and I had just misinterpreted what you wrote). -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2f5885765445d8a8f50037da3420dbcd19d5634f Author: Noel Power noel.po...@novell.com Date: Fri May 18 15:09:38 2012 +0100 fix wae Change-Id: I9b774486e47484ada0c4f84ad8a4c23ed338da0d diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index b15a961..918960d 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -503,7 +503,7 @@ void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets ) mpMarkData-DeleteTab( nTab + i ); delete maTabData.at(nTab + i); } -if ( ( nTab + nSheets ) == maTabData.size() - 1 ) +if ( ( nTab + nSheets ) == static_castSCTAB( maTabData.size() - 1 ) ) maTabData.erase(maTabData.begin() + nTab, maTabData.begin()+ nTab+nSheets); UpdateCurrentTab(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewdata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a1faa06b415f54c0e8ff8a8f1e580e8a57b9296a
Author: Noel Power noel.po...@novell.com
Date: Fri May 18 15:11:08 2012 +0100
and another wae ( that I missed )
Change-Id: Ie4e41d8d7c5c598595aeef49091ebc7fc3cf300f
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 918960d..d2b839f 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -541,7 +541,7 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
if (nSrcTab static_castSCTAB(maTabData.size()))
{
pTab = maTabData[nSrcTab];
-if ( nSrcTab == maTabData.size() - 1 )
+if ( nSrcTab == static_castSCTAB( maTabData.size() - 1 ) )
maTabData.erase( maTabData.begin() + nSrcTab );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Release notes: use bug titles instead of commit messages if possible
Ivan Timofeev píše v Čt 17. 05. 2012 v 18:49 +0400: Hi Petr, On 15.05.2012 22:25, Ivan Timofeev wrote: Hum, sorry for the delay. No problem. Everyone is busy :-) Now here is my second try. Strangely, but it seems to work... I like it very much. The only problem is that I havn't got any title from bugzilla :-) It seems that $response-title() does not return anything here. I can't find the title() method at http://search.cpan.org/~gaas/HTTP-Message-6.03/lib/HTTP/Response.pm So I am in doubts how it is supposed to work. I have tried some other hacks but without success. Does it somehow work for you? Could you please sens some sample parameters that you are using? Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: operator new no longer routes through rtl_AllocMemory in libsalcpprt under gbuild link rules
On 05/18/2012 03:38 PM, Arnaud Versini wrote:
I checked on Linux and Windows, the memory after a massive allocation
and a massive deallocation is really freed, so currently la raison
d'être of our internal allocator is gone (need to be checked on Mac Os
X). About performance I don't know.
Indeed, on Fedora 16 at least,
$ cat test.cc
#include iostream
#include string
int main() {
char * p[10];
for (int i = 0; i != 10; ++i) p[i] = new char[1];
std::cout ...;
std::cin.ignore();
for (int i = 0; i != 10; ++i) delete p[i];
std::cout ...;
std::cin.ignore();
}
$ g++ test.cc
$ ./a.out
and pmap ... | grep total at the two checkpoints reveals a
shrink-again allocation mechanism (from 990752K back to 12736K here).
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: operator new no longer routes through rtl_AllocMemory in libsalcpprt under gbuild link rules
On 18/05/12 15:38, Arnaud Versini wrote: Hi, I checked on Linux and Windows, the memory after a massive allocation and a massive deallocation is really freed, so currently la raison d'être of our internal allocator is gone (need to be checked on Mac Os X). About performance I don't know. checking a massive allocation doesn't really tell us all that much, because allocators typically operate in 2 modes: - for large objects, directly request zero-backed memory via mmap - for small objects, maintain elaborate data structures to allocate these from arenas or whatever in the case where a single object is backed by its own mmap it is trivial for the allocator to unmap the memory on free, and i would expect every system allocator to do that (even 10 years ago); the far more interesting case is what happens when a large number of small objects of different sizes get allocated: is the allocator smart enough to release the memory when all, or a substantial number of them, are freed again? Currently there is a mix of system allocator (or jemalloc) and our internal allocator. I don't think it is optimal. I propose to delete all our allocation code and use small stubs for ABI compatibility until LibreOffice 4.0, and we can use the system allocator or jemalloc if there is performance issues, perhaps on Windows. I ask you if I could see if it is a good idea to go on this way or not, and how (branch or trunk). i don't think there is any pressing need to do this right now, but of course you can experiment a bit, i'm also not happy that we maintain our own allocator, but i'd like to wait for LO4 with actually doing a change. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewdata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9455c44d3f43d17b1d9150a1cd6c6f34e696c6ed
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri May 18 16:24:45 2012 +0200
Yet another -Werror=sign-compare
Change-Id: Ieb77f3b2da130edce01de61f86b1eba722fdb103
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index d2b839f..028ab83 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -489,7 +489,7 @@ void ScViewData::DeleteTab( SCTAB nTab )
if ( nTab static_castSCTAB(maTabData.size()) )
{
delete maTabData.at(nTab);
-if ( nTab == maTabData.size() - 1 )
+if ( nTab == static_castSCTAB(maTabData.size()) - 1 )
maTabData.erase(maTabData.begin() + nTab);
UpdateCurrentTab();
mpMarkData-DeleteTab( nTab );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW-3.5] crasher fdo#45987
On 18/05/12 14:49, Markus Mohrhard wrote: Hey Noel 2012/5/18 Kohei Yoshidakohei.yosh...@gmail.com: On Fri, May 18, 2012 at 9:14 AM, Noel Powernopo...@suse.com wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8b1d29bc9b00bc2730738a990023a65ab6e0219b http://cgit.freedesktop.org/libreoffice/core/commit/?id=abb26f51eea0399754cc8f5b7d7a7d648d68f630 I took it that it should work how I outlined above and committed a further fix which should safeguard against illegal access, please additionally consider http://cgit.freedesktop.org/libreoffice/core/commit/?id=8352eb5a1af1eb44550a9d60d31e6c2fb2dc43b9 So, these extra range checks should be safe; however The original intention of *not* checking the bound of the tab index was that we assumed that this list would be in sync with the maTab in ScDocument at all times. So, if they are out of sync then something else may be causing this problem... Let me ping Markus here. He worked on the rework of ScTable storage, and this issue is related to that work. I agree with Kohei. Needing a range check at this place will most likely hide a underlying problem. The table container in ScViewData and the one in ScDocument must always be in sync. I fear that this might have been a problem that has always been there. Loosing the sync between the two data structures will result in wrong sheet numbers coming from the view part. Let me check this bug report as soon as I have a clean tree. ok I might have jumped the gun ( should have waited for the answer ;-) ), fair enough, feel free to revert those commits in master then. Probably the ViewData should be initialised with the same number of Tabs as the document, being the view doesn't it just track what views have been selected ? ( so probably it has just 1 setup initially e.g. the current view ) saying that though ( now that I think of it I could swear that in fact there were the size of the maTabData was 2 in the bug scenario which is strange, maybe some over zealous allocation ? ) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License Statement
All my past present and future contributions to Libre office are licensed under LGPL/MPL and any other licenses that the project might use Regards Jonathan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - cppu/util cppuhelper/source python/Python-2.6.1-svn-1.7.patch python/makefile.mk sal/util salhelper/source solenv/bin writerfilter/source
cppu/util/cppu.map |1 +
cppu/util/uno_purpenvhelpergcc3.map |1 +
cppuhelper/source/gcc3.map |3 ++-
python/Python-2.6.1-svn-1.7.patch| 12
python/makefile.mk |3 ++-
sal/util/sal.map |1 +
sal/util/sal_textenc/saltextenc.map |1 +
salhelper/source/gcc3.map|5 +++--
solenv/bin/addsym.awk|1 +
writerfilter/source/dmapper/NumberingManager.cxx | 16
10 files changed, 32 insertions(+), 12 deletions(-)
New commits:
commit 76cec6c3fd8fbddf2df706b3a26f38b11b2f0d83
Author: Michael Stahl mst...@redhat.com
Date: Thu May 17 23:53:41 2012 +0200
work around spurious signed overflow warnings
g++ (GCC) 4.7.0 20120507 (Red Hat 4.7.0-5:
/com/sun/star/uno/Sequence.hxx:178:10: error: assuming signed overflow
does not occur when assuming that (X - c) X is always false
[-Werror=strict-overflow]
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 334ee9c..68a3251 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -578,8 +578,8 @@ void ListDef::CreateNumberingRules( DomainMapper rDMapper,
// attributes of the symbol and apply it to the numbering
level
OUString sStyle = rDMapper.getOrCreateCharStyle(
aStyleProps );
aLvlProps.realloc( aLvlProps.getLength() + 1);
-aLvlProps[aLvlProps.getLength() - 1].Name =
aPropNameSupplier.GetName( PROP_CHAR_STYLE_NAME );
-aLvlProps[aLvlProps.getLength() - 1].Value = sStyle;
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1].Name =
aPropNameSupplier.GetName( PROP_CHAR_STYLE_NAME );
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1].Value
= sStyle;
}
// Get the prefix / suffix / Parent numbering
@@ -596,18 +596,18 @@ void ListDef::CreateNumberingRules( DomainMapper
rDMapper,
sText, nLevel, rPrefix, rSuffix );
aLvlProps.realloc( aLvlProps.getLength( ) + 4 );
-aLvlProps[ aLvlProps.getLength( ) - 4 ] = MAKE_PROPVAL(
PROP_PREFIX, rPrefix );
-aLvlProps[ aLvlProps.getLength( ) - 3 ] = MAKE_PROPVAL(
PROP_SUFFIX, rSuffix );
-aLvlProps[ aLvlProps.getLength( ) - 2 ] = MAKE_PROPVAL(
PROP_PARENT_NUMBERING, nParentNum );
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 4] =
MAKE_PROPVAL( PROP_PREFIX, rPrefix );
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 3] =
MAKE_PROPVAL( PROP_SUFFIX, rSuffix );
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 2] =
MAKE_PROPVAL( PROP_PARENT_NUMBERING, nParentNum );
-aLvlProps[ aLvlProps.getLength( ) - 1 ] = MAKE_PROPVAL(
PROP_POSITION_AND_SPACE_MODE,
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1] =
MAKE_PROPVAL( PROP_POSITION_AND_SPACE_MODE,
sal_Int16(
text::PositionAndSpaceMode::LABEL_ALIGNMENT ) );
StyleSheetEntryPtr pParaStyle = pAbsLevel-GetParaStyle( );
if( pParaStyle.get())
{
aLvlProps.realloc( aLvlProps.getLength() + 1 );
-aLvlProps[aLvlProps.getLength( ) - 1] = MAKE_PROPVAL(
PROP_PARAGRAPH_STYLE_NAME,
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1] =
MAKE_PROPVAL( PROP_PARAGRAPH_STYLE_NAME,
pParaStyle-sConvertedStyleName );
}
@@ -623,7 +623,7 @@ void ListDef::CreateNumberingRules( DomainMapper rDMapper,
xOutlines-getChapterNumberingRules( );
aLvlProps.realloc( aLvlProps.getLength() + 1 );
-aLvlProps[aLvlProps.getLength( ) - 1] = MAKE_PROPVAL(
PROP_HEADING_STYLE_NAME,
+
aLvlProps[sal::static_int_castsal_uInt32(aLvlProps.getLength()) - 1] =
MAKE_PROPVAL( PROP_HEADING_STYLE_NAME,
pParaStyle-sConvertedStyleName );
xOutlineRules-replaceByIndex( nLevel, uno::makeAny(
aLvlProps ) );
commit 5729da18a1852d842bd7de05d9d7fdcbec1e9ad5
Author: Michael Stahl mst...@redhat.com
Date: Thu May 17 23:00:20 2012 +0200
fdo#42865: privatized unique empty string symbol:
Unfortunately this --enable-dbg-util only problem (caused by
_GLIBCXX_DEUBG) resurfaced, perhaps because of new std::string based
logging in sal; adapt all map files to export the unique symbol.
diff --git a/cppu/util/cppu.map
Re: operator new no longer routes through rtl_AllocMemory in libsalcpprt under gbuild link rules
On 05/18/2012 04:23 PM, Michael Stahl wrote: checking a massive allocation doesn't really tell us all that much, because allocators typically operate in 2 modes: - for large objects, directly request zero-backed memory via mmap - for small objects, maintain elaborate data structures to allocate these from arenas or whatever I had hoped to address this in the test code in my other post with 100,000 times allocating 10,000 bytes each. However, further inspection reveals that allocation is apparently brk-based there, so that it can only ever shrink memory back to the highest allocation that has not yet been freed. (That is, changing the second, deleting, loop in my test code to run short one item prevents any shrinkage.) Contrast that with the always-mmap approach of rtl/alloc.h, which allows for different shrinkage patterns. (Whether or not that is relevant in practice.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Release notes: use bug titles instead of commit messages if possible
Hi Petr, On 18.05.2012 18:13, Petr Mladek wrote: I like it very much. The only problem is that I havn't got any title from bugzilla :-) LOL :) It seems that $response-title() does not return anything here. I can't find the title() method at http://search.cpan.org/~gaas/HTTP-Message-6.03/lib/HTTP/Response.pm So I am in doubts how it is supposed to work. I have tried some other hacks but without success. HTTP::Response is a subclass of HTTP::Message and therefore inherits its methods. Actually it comes from Headers: http://search.cpan.org/~gaas/HTTP-Message-6.03/lib/HTTP/Headers.pm Does it somehow work for you? Could you please sens some sample parameters that you are using? I do: ~/libo/master$ ./bin/lo-commit-stat --log-suffix=bombom --bugs ./ --after=2012-05-16 and it prints bug numbers, but that's a debugging info that I forgot to remove; and then I do ~/libo/master$ cat bugfixes-master-bombom.log and it prints bnc#760029 floor borders were missing from 3D Charts. [Muthu Subramanian] fdo#40778 Remove dictionary choice when adding new entry to the spellchecker [Caolán McNamara] fdo#49921 UI: UI glitch in Find Replace dialog - buttons invisible [David Tardon] Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - vcl/inc vcl/source
vcl/inc/vcl/layout.hxx|1 +
vcl/source/window/builder.cxx |4 +++-
vcl/source/window/dialog.cxx | 29 +
vcl/source/window/dlgctrl.cxx | 10 --
vcl/source/window/layout.cxx |6 +++---
5 files changed, 40 insertions(+), 10 deletions(-)
New commits:
commit df9ba567c4c0e506848c6face127ab6a5f930aac
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 18 15:54:19 2012 +0100
add prevLogicalChildOfParent
diff --git a/vcl/inc/vcl/layout.hxx b/vcl/inc/vcl/layout.hxx
index c2ed2ed..c146087 100644
--- a/vcl/inc/vcl/layout.hxx
+++ b/vcl/inc/vcl/layout.hxx
@@ -414,6 +414,7 @@ Window* getLegacyNonLayoutParent(Window *pParent);
//in a flat hierarchy where dialogs only have one layer
//of children
Window* nextLogicalChildOfParent(Window *pTopLevel, Window *pChild);
+Window* prevLogicalChildOfParent(Window *pTopLevel, Window *pChild);
#endif
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index d484213..4ffa8ba 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -137,6 +137,35 @@ Window * nextLogicalChildOfParent(Window *pTopLevel,
Window *pChild)
pChild = pParent-GetWindow(WINDOW_NEXT);
}
+if (dynamic_castVclContainer*(pChild))
+pChild = nextLogicalChildOfParent(pTopLevel, pChild);
+
+return pChild;
+}
+
+Window * prevLogicalChildOfParent(Window *pTopLevel, Window *pChild)
+{
+Window *pLastChild = pChild;
+
+if (dynamic_castVclContainer*(pChild))
+pChild = pChild-GetWindow(WINDOW_LASTCHILD);
+else
+pChild = pChild-GetWindow(WINDOW_PREV);
+
+while (!pChild)
+{
+Window *pParent = pLastChild-GetParent();
+if (!pParent)
+return NULL;
+if (pParent == pTopLevel)
+return NULL;
+pLastChild = pParent;
+pChild = pParent-GetWindow(WINDOW_PREV);
+}
+
+if (dynamic_castVclContainer*(pChild))
+pChild = prevLogicalChildOfParent(pTopLevel, pChild);
+
return pChild;
}
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index f7fd592..f7941ff 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -804,7 +804,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent rKEvt,
sal_Bool bKeyInput )
WinBits nStyle = pSWindow-GetStyle();
if ( !(nStyle WB_GROUP) )
{
-pWindow = pWindow-GetWindow( WINDOW_PREV );
+pWindow = prevLogicalChildOfParent(this, pWindow);
while ( pWindow )
{
pWindow = pWindow-ImplGetWindow();
@@ -821,20 +821,18 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent rKEvt,
sal_Bool bKeyInput )
if ( nStyle WB_GROUP )
break;
-pWindow = pWindow-GetWindow( WINDOW_PREV );
+pWindow = prevLogicalChildOfParent(this, pWindow);
}
}
}
else if ( (nKeyCode == KEY_RIGHT) || (nKeyCode == KEY_DOWN) )
{
-Window* pWindow;
-WinBits nStyle;
-pWindow = nextLogicalChildOfParent(this, pSWindow);
+Window* pWindow = nextLogicalChildOfParent(this, pSWindow);
while ( pWindow )
{
pWindow = pWindow-ImplGetWindow();
-nStyle = pWindow-GetStyle();
+WinBits nStyle = pWindow-GetStyle();
if ( nStyle WB_GROUP )
break;
commit 018d94881c90bc69bed4c8408fa78dc63e5dec4f
Author: Caolán McNamara caol...@redhat.com
Date: Fri May 18 15:54:03 2012 +0100
don't reorder children without position properties
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 380bebc..32829ee 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -263,7 +263,9 @@ void VclBuilder::handleChild(Window *pParent,
xmlreader::XmlReader reader)
for (size_t i = 0; i aChilds.size(); ++i)
{
-sal_uInt16 nPosition =
aChilds[i]-getWidgetPropertysal_uInt16(sPosition);
+sal_uInt16 nPosition =
aChilds[i]-getWidgetPropertysal_uInt16(sPosition, 0x);
+if (nPosition == 0x)
+continue;
aChilds[i]-reorderWithinParent(nPosition);
}
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ef31201..a482770 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -529,7 +529,7 @@ const Window *VclBin::get_child() const
{
const WindowImpl* pWindowImpl = ImplGetWindowImpl();
-return pWindowImpl-mpLastChild;
+return pWindowImpl-mpFirstChild;
}
Window *VclBin::get_child()
@@ -546,7 +546,7 @@ Size
Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)
On 05/18/2012 04:05 PM, Lubos Lunak wrote: On Friday 18 of May 2012, Stephan Bergmann wrote: On 05/16/2012 05:01 PM, Lubos Lunak wrote: - non-debug/dbgutils (i.e. also the default) - -O2 - symbols - -g (probably even -g1, if this is actually meant for release builds with debug info sufficient mainly for backtraces) - debug/dbgutils - -g, making sure it overrides -g1 from symbols - explicit C(XX)FLAGS overrides anything ...and, as something of a special case, no -O... at all (instead of the default -O2) for sc under --enable-debug=-sc/? Yes, but I don't think it's special. The rule, missing in the list above, would be 'debug/dbgutils - optimizations disabled'. So as soon as there's --enable-debug, nothing would get -O2, regardless of symbols. That's actually one more reason why I think -g should be primarily controlled by --enable-symbols and not --enable-debug. Ah, you wanted --enable-dbgutil to disable -O2, the same way that --enable-debug does. Had missed that point. Hm, as I said, I prefer my --enable-dbgutil --disable-debug builds to be -O2. So if we change --enable-dbgutil to imply -O0, I'd like to see that changeset also offer a reliable way to get back -O2. (And I'm not sure having to set C(XX)FLAGS can be considered reliable enough, given that pre-set C(XX)FLAGS impact more decisions in our build system than just -O2 vs. -O0. But maybe I'm asking for too much.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Re: input for fdo#45779 from a basegfx knowledgeable person needed
Hello,
On 05/03/2012 11:30 AM, Thorsten Behrens wrote:
So what I suggest is a more defensive fix (or some larger review
across the code is in order): make GetLineArrow() return the
B2DPolyPolygon right away, and have *that one* be empty (i.e. not a
Since I do not intend to become a specialist of this kind of elements, I
choose your more defensive proposition.
So here the patch...
Thanks for a review and an ack before I push it.
Regards
Pierre-André
From b77f2a21d222607edff535d3a069b8c30d4d2664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Andr=C3=A9=20Jacquod?= pjacq...@alumni.ethz.ch
Date: Thu, 17 May 2012 17:51:33 +0200
Subject: [PATCH] fdo#45779 avoiding creation of inconsistent B2DPolygon
this avoid the root cause of this bug, avoiding creating a
B2DPlygon which contains no points.
It seems the code relies somehow on an null B2DPolyPolygon, hence the
change done here. Better would be to have time to look how to remove
this fact. But currently it seems the code relies on a
rSet.Put( XLineStartItem( aArrowName, aPolyPoly) where aPolyPoly is
not defined in certain cases.
Change-Id: I61b75d925090d1c9a0da96ce1a6eea50a2d60e5a
---
filter/source/msfilter/msdffimp.cxx | 29 +++--
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 80785fa..3d9efa7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1099,12 +1099,13 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer rSolver )
-static basegfx::B2DPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_LineEnd eLineEnd,
+static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_LineEnd eLineEnd,
const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLenght,
sal_Int32 rnArrowWidth, sal_Bool rbArrowCenter,
rtl::OUString rsArrowName, sal_Bool bScaleArrow )
{
-basegfx::B2DPolygon aRetval;
+basegfx::B2DPolyPolygon aRetPolyPoly;
+
double fLineWidth = nLineWidth 70 ? 70.0 : nLineWidth;
double fLenghtMul, fWidthMul;
sal_Int32 nLineNumber;
@@ -1140,7 +1141,7 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_L
aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth, fLenghtMul * fLineWidth ));
aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth ));
aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowEnd ));
}
break;
@@ -1169,7 +1170,7 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_L
aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.15, fLenghtMul * fLineWidth ));
aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth * 0.91 ));
aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowOpenEnd ));
}
break;
@@ -1181,7 +1182,7 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_L
aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , fLenghtMul * fLineWidth * 0.60 ));
aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth ));
aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowStealthEnd ));
}
break;
@@ -1193,16 +1194,16 @@ static basegfx::B2DPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_L
aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , fLenghtMul * fLineWidth ));
aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth * 0.50 ));
aTriangle.setClosed(true);
-aRetval = aTriangle;
+aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle);
rbArrowCenter = sal_True;
aArrowName.appendAscii(RTL_CONSTASCII_STRINGPARAM(msArrowDiamondEnd ));
}
break;
case mso_lineArrowOvalEnd :
{
-aRetval = XPolygon( Point( (sal_Int32)( fWidthMul * fLineWidth * 0.50 ), 0 ),
+aRetPolyPoly = basegfx::B2DPolyPolygon( XPolygon( Point( (sal_Int32)( fWidthMul * fLineWidth * 0.50 ), 0 ),
(sal_Int32)( fWidthMul * fLineWidth * 0.50 ),
-(sal_Int32)( fLenghtMul * fLineWidth * 0.50 ), 0, 3600 ).getB2DPolygon();
+
[REVIEW][3-5] gcc 4.7 UNO bridges fixes
so it seems that the C++ UNO bridges, when built with gcc 4.7, crash and
burn in the bridges test in testtools.
fortunately Stephan has fixed this problem on master, at least as far as
i can see, applying the attached patches in a x86_64 --enable-dbgutil
build gives me a nicely working office that passes all subsequent tests.
so, i guess it would make sense to put these into libreoffice-3-5.
From b3b700fe40b8b485ca8a1dbb3b9e3799d173806d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann sberg...@redhat.com
Date: Thu, 29 Mar 2012 17:50:16 +0200
Subject: [PATCH 01/11] Make cpp_uno/gcc3_linux_x86-64 bridge work with GCC
4.7
See comment in callvirtualmethod.cxx for details.
(cherry picked from commit 0fdbb5b0eabbaa571f3747fda12a56c938cba474)
Conflicts:
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
Change-Id: I476df49ce61bc46b8fcdce337d67210d756cdfaf
Signed-off-by: Michael Stahl mst...@redhat.com
---
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx | 13 +-
bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx |6 +-
.../gcc3_linux_x86-64/callvirtualmethod.cxx| 170
.../gcc3_linux_x86-64/callvirtualmethod.hxx| 49 ++
.../source/cpp_uno/gcc3_linux_x86-64/except.cxx|6 +-
.../source/cpp_uno/gcc3_linux_x86-64/makefile.mk |1 +
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |2 -
.../source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 156 +-
8 files changed, 234 insertions(+), 169 deletions(-)
create mode 100644 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
create mode 100644 bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
index 48b7d46..e548095 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx
@@ -59,9 +59,9 @@
OTHER DEALINGS IN THE SOFTWARE.
--- */
-#include abi.hxx
+#include sal/config.h
-#include rtl/ustring.hxx
+#include abi.hxx
using namespace x86_64;
@@ -98,6 +98,7 @@ enum x86_64_reg_class
static enum x86_64_reg_class
merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2)
+throw ()
{
/* Rule #1: If both classes are equal, this is the resulting class. */
if (class1 == class2)
@@ -140,7 +141,7 @@ merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2)
See the x86-64 PS ABI for details.
*/
static int
-classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int byteOffset )
+classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int byteOffset ) throw ()
{
switch ( pTypeRef-eTypeClass )
{
@@ -262,7 +263,7 @@ classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_c
/* Examine the argument and return set number of register required in each
class. Return 0 iff parameter should be passed in memory. */
-bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int nUsedGPR, int nUsedSSE )
+bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int nUsedGPR, int nUsedSSE ) throw ()
{
enum x86_64_reg_class classes[MAX_CLASSES];
int n;
@@ -303,14 +304,14 @@ bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool
return true;
}
-bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef )
+bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef ) throw ()
{
int g, s;
return examine_argument( pTypeRef, true, g, s ) == 0;
}
-void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct )
+void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, const sal_uInt64 *pGPR, const double *pSSE, void *pStruct ) throw ()
{
enum x86_64_reg_class classes[MAX_CLASSES];
int n;
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
index c9f71f1..ba3e8f2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/abi.hxx
@@ -51,7 +51,7 @@ const sal_uInt32 MAX_SSE_REGS = 8;
Return false iff parameter should be passed in memory.
*/
-bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int nUsedGPR, int nUsedSSE );
+bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int nUsedGPR, int nUsedSSE ) throw ();
/** Does function that returns this type use a hidden parameter, or registers?
@@ -59,9 +59,9 @@ bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInRetur
pointer to a structure allocated by the caller),
live issues ticker (was: minutes of ESC call ...)
Hi *, On Thu, May 17, 2012 at 10:00 PM, Michael Meeks michael.me...@suse.com wrote: * Pending Action Items [...] + connect Rainer with sysadmins wrt. status/live issues ticker (Thorsten) [...] Hmm- what is meant with live issues ticker? You might not be aware, but IZBot did announce newly filed issues in the #libreoffice channel by using bugzilla's rss export of queries. i.e. just create a query with product libreoffice, bug creation between now and one day ago → you got a ticker, not fully-live, as it is not pushed, but pulled like any other rss-feed. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW][3-5] fdo#42865, SVN 1.7, etc.
so today i had the glorious idea to do a build on new-fangled not-even
-released-yet Fedora 17 of the libreoffice-3-5 branch with my usual
settings. unfortunately those include -Werror, and if i had known how
many of these turn up with the new gcc 4.7 i would have disabled that
instead of backporting 30 or so patches, but now it is too late :)
on top of that i propose the following for libreoffice-3-5:
* SVN 1.7 breaks python build:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=7e5a6a385051569da1bf872989aef262f2d802e2
* fdo#42865 the --enable-dbgutil only problem of _GLIBCXX_DEBUG adding a
new symbol with unique linkage has re-surfaced and spread further, most
likely due to the new std::string based SAL_LOG stuff; strangely it
seems to work on Fedora 16 but on 17 it crashes and burns immediately in
sal unit tests; attached patch fixes it for -3-5 (the Conflicts are all
the gbuild converted libs on master, on -3-5 it is sufficient to fix the
addsym.awk)
* disable -Wno-deprecated-declarations because nobody cares on the
release branch (kind of silly but prevents the only warnings still left
for me), see attachment.
From 5ee35d18a528447fd42d6bfd4848ec6d7b5849aa Mon Sep 17 00:00:00 2001
From: Michael Stahl mst...@redhat.com
Date: Thu, 17 May 2012 23:00:20 +0200
Subject: [PATCH 10/11] fdo#42865: privatized unique empty string symbol:
Unfortunately this --enable-dbg-util only problem (caused by
_GLIBCXX_DEUBG) resurfaced, perhaps because of new std::string based
logging in sal; adapt all map files to export the unique symbol.
(cherry picked from commit 6ce7c569b0af512217fe4825f4ccc5f7860dceec)
Conflicts:
cppu/util/cppu.map
cppu/util/uno_purpenvhelpergcc3.map
cppuhelper/source/gcc3.map
sal/util/sal.map
sal/util/sal_textenc/saltextenc.map
salhelper/source/gcc3.map
---
solenv/bin/addsym.awk |1 +
1 file changed, 1 insertion(+)
diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 4c18bdc..a9e64fb 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -43,6 +43,7 @@ END {
print GLIBCXX_3.4 {
print global:
print _ZGVNSt7num_put*; _ZNSt7num_put*;
+print _ZNSs4_Rep20_S_empty_rep_storageE;
print };
}
state == 2 {
--
1.7.10.2
From 45b093840003b429a3d747748013f65c6b8d4dc8 Mon Sep 17 00:00:00 2001
From: Michael Stahl mst...@redhat.com
Date: Fri, 18 May 2012 12:53:37 +0200
Subject: [PATCH 11/11] release branch only: -Wno-deprecated-declarations
always on
---
solenv/gbuild/platform/unxgcc.mk | 12 ++--
solenv/inc/unxgcc.mk |4 +---
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7403488..65aceeb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -105,16 +105,8 @@ ifeq ($(HAVE_CXX0X),TRUE)
#a template for SAL_N_ELEMENTS to detect at compiler time its misuse
gb_CXXFLAGS += -std=c++0x
-#We have so many std::auto_ptr uses that we need to be able to disable
-#warnings for those so that -Werror continues to be useful, seeing as moving
-#to unique_ptr isn't an option when we must support different compilers
-
-#When we are using 4.6.0 we can use gcc pragmas to selectively silence auto_ptr
-#warnings in isolation, but for = 4.5.X we need to globally disable
-#deprecation
-ifeq ($(gb_GccLess460),1)
-gb_CXXFLAGS += -Wno-deprecated-declarations
-endif
+# Does anybody care if deprecated stuff is used on a release branch?
+gb_CXXFLAGS += -Wno-deprecated-declarations -Wno-deprecated
endif
ifeq ($(ENABLE_LTO),TRUE)
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index a3231a6..7ebf7c2 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -89,9 +89,7 @@ CFLAGSCXX+=-fvisibility-inlines-hidden
.ENDIF # $(HAVE_GCC_VISIBILITY_FEATURE) == TRUE
.IF $(HAVE_CXX0X) == TRUE
CFLAGSCXX+=-std=c++0x
-.IF $(GCCNUMVER) = 00040005
-CFLAGSCXX+=-Wno-deprecated-declarations
-.ENDIF
+CFLAGSCXX+=-Wno-deprecated-declarations -Wno-deprecated
.ENDIF # $(HAVE_CXX0X) == TRUE
.IF $(PRODUCT)!=full
--
1.7.10.2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] fdo#40778 - Remove dictionary choice when adding new entry to the spellchecker
On Thu, 2012-05-17 at 18:05 +0200, Rob Snelders wrote: Hi All, Here 2 patches related to bug 40778. Patch 1 removes the submenu of adding new words to the dictionary when there is only 1 dictionary in the spellcheck-popupmenu in writer. Patch 2 does the same for the popupmenu in the other programs. Looks good to me, pushed. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - editeng/inc editeng/source svtools/source sw/source
editeng/inc/editeng.hrc |1 +
editeng/inc/editeng/editview.hxx|1 +
editeng/source/editeng/editeng.src |6 ++
editeng/source/editeng/editview.cxx | 14 ++
svtools/source/contnr/imivctl1.cxx |2 --
sw/source/ui/inc/olmenu.hxx |1 +
sw/source/ui/lingu/olmenu.cxx | 21 ++---
sw/source/ui/lingu/olmenu.hrc |1 +
sw/source/ui/lingu/olmenu.src |6 ++
9 files changed, 40 insertions(+), 13 deletions(-)
New commits:
commit a78ee84360cd3bb9c806ceb8a5fc0794971334d4
Author: Rob Snelders programm...@ertai.nl
Date: Thu May 17 17:47:20 2012 +0200
fd0#40778 - Remove dictionary choice when adding new entry
Change-Id: Id7bd039b505d30e71065c2cdf27eba1cb466be56
diff --git a/editeng/inc/editeng.hrc b/editeng/inc/editeng.hrc
index cc1f45c..453bf5c 100644
--- a/editeng/inc/editeng.hrc
+++ b/editeng/inc/editeng.hrc
@@ -35,6 +35,7 @@
#define MN_AUTOCORR 4
#define MN_WORDLANGUAGE 5
#define MN_PARALANGUAGE 6
+#define MN_INSERT_SINGLE7
#define MN_ALTSTART 1000
#define MN_AUTOSTART2000
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 8e034c8..92b6d30 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -82,6 +82,7 @@ public: // Needed for Undo
private:
ImpEditView*pImpEditView;
+String aDicNameSingle;
EDITENG_DLLPRIVATE EditView( const EditView );
EDITENG_DLLPRIVATE EditViewoperator=( const EditView );
diff --git a/editeng/source/editeng/editeng.src
b/editeng/source/editeng/editeng.src
index add1054..896f66f 100644
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
@@ -95,6 +95,12 @@ Menu RID_MENU_SPELL
};
MenuItem
{
+Identifier = MN_INSERT_SINGLE ;
+HelpId = HID_EDITENG_SPELLER_ADDWORD;
+Text [ en-US ] = ~Add ;
+};
+MenuItem
+{
Identifier = MN_IGNORE ;
HelpId = HID_EDITENG_SPELLER_IGNORE;
Text [ en-US ] = Ignore All ;
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 9e0fd27..8ff692f 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1037,6 +1037,7 @@ void EditView::ExecuteSpellPopup( const Point rPosPixel,
Link* pCallBack )
// linguistic entry above
sal_uInt16 nPos = MN_DICTSTART + i;
pInsertMenu-InsertItem( nPos, xDicTmp-getName() );
+aDicNameSingle = xDicTmp-getName();
uno::Reference lang::XServiceInfo xSvcInfo( xDicTmp,
uno::UNO_QUERY );
if (xSvcInfo.is())
@@ -1052,8 +1053,9 @@ void EditView::ExecuteSpellPopup( const Point rPosPixel,
Link* pCallBack )
}
}
}
-
-if ( !pInsertMenu-GetItemCount() )
+if ( pInsertMenu-GetItemCount() != 1)
+aPopupMenu.EnableItem( MN_INSERT_SINGLE, sal_False );
+if ( pInsertMenu-GetItemCount() 2 )
aPopupMenu.EnableItem( MN_INSERT, sal_False );
aPopupMenu.RemoveDisabledEntries( sal_True, sal_True );
@@ -1121,9 +1123,13 @@ void EditView::ExecuteSpellPopup( const Point
rPosPixel, Link* pCallBack )
pCallBack-Call( aInf );
}
}
-else if ( nId = MN_DICTSTART )
+else if ( nId = MN_DICTSTART || nId == MN_INSERT_SINGLE )
{
-String aDicName ( pInsertMenu-GetItemText(nId) );
+String aDicName;
+if (nId = MN_DICTSTART)
+aDicName = pInsertMenu-GetItemText(nId);
+else
+aDicName = aDicNameSingle;
uno::Reference linguistic2::XDictionary xDic;
if (xDicList.is())
commit c867a3037dbe01eeecdd7512e3a02249231cbacd
Author: Rob Snelders programm...@ertai.nl
Date: Thu May 17 16:50:34 2012 +0200
fd0#40778 - Remove dictionary choice when adding new entry
Change-Id: Ieaaf2466474463d19f91c74ea7f164962ba19936
diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx
index d0d45b7..3da80f3 100644
--- a/sw/source/ui/inc/olmenu.hxx
+++ b/sw/source/ui/inc/olmenu.hxx
@@ -62,6 +62,7 @@ class SwSpellPopup : public PopupMenu
std::map sal_Int16, ::rtl::OUString aLangTable_Paragraph;
//std::map sal_Int16, ::rtl::OUString aLangTable_Document;
+String aDicNameSingle;
boolbGrammarResults;// show grammar results? Or show spellcheck
results?
Image aInfo16;
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 6abb921..1d53314 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -460,8 +460,8 @@ SwSpellPopup::SwSpellPopup(
pMenu = GetPopupMenu(MN_ADD_TO_DIC);
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 26
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2
writerfilter/source/ooxml/OOXMLParserState.cxx| 37 +-
writerfilter/source/ooxml/OOXMLParserState.hxx|9
writerfilter/source/ooxml/model.xml |5 +-
5 files changed, 77 insertions(+), 2 deletions(-)
New commits:
commit d32f3048052af80b21e8968d24eb55c48d298052
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu May 17 16:24:14 2012 +0200
handle recursive w:p because of shapes (bnc#751077)
w:pw:pict...w:txbxContentw:pw:p/ - in this case, the inner
paragraphs should not interfere with the outer one, but e.g.
detecting whether it was the last paragraph in section could get
broken.
Change-Id: I8634ee6a0d6274f5770423ff798adfa260a33326
(cherry picked from commit f73e75e91c757b20682d1df75de2f79b3972a500)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 4b183b9..9716e6a 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -816,6 +816,32 @@ void OOXMLFastContextHandler::endOfParagraph()
mpStream-utext((const sal_uInt8*)sCR, 1);
}
+void OOXMLFastContextHandler::startTxbxContent()
+{
+#ifdef DEBUG_CONTEXT_HANDLER
+debug_logger-element(contexthandler.startTxbxContent);
+#endif
+/*
+This usually means there are recursive w:p elements, and the ones
+inside and outside of w:txbxContent should not interfere (e.g.
+the lastParagraphInSection setting). So save the whole state
+and possibly start new groups for the nested content (not section
+group though, as that'd cause the txbxContent to be moved onto
+another page, I'm not sure how that should work exactly).
+*/
+mpParserState-startTxbxContent();
+startParagraphGroup();
+}
+
+void OOXMLFastContextHandler::endTxbxContent()
+{
+#ifdef DEBUG_CONTEXT_HANDLER
+debug_logger-element(contexthandler.endTxbxContent);
+#endif
+endParagraphGroup();
+mpParserState-endTxbxContent();
+}
+
void OOXMLFastContextHandler::text(const ::rtl::OUString sText)
{
#ifdef DEBUG_CONTEXT_HANDLER
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index bb0e889..31ca2f7 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -211,6 +211,8 @@ public:
void positionOffset(const ::rtl::OUString sText);
void alignH(const ::rtl::OUString sText);
void alignV(const ::rtl::OUString sText);
+void startTxbxContent();
+void endTxbxContent();
virtual void propagateCharacterProperties();
virtual void propagateCharacterPropertiesAsSet(const Id rId);
virtual void propagateTableProperties();
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 943b643..049a7c2 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -46,7 +46,12 @@ OOXMLParserState::OOXMLParserState() :
mbForwardEvents(true),
mnContexts(0),
mnHandle(0),
-mpDocument(NULL)
+mpDocument(NULL),
+inTxbxContent(false),
+savedInSectionGroup(false),
+savedInParagraphGroup(false),
+savedInCharacterGroup(false),
+savedLastParagraphInSection(false)
{
}
@@ -275,6 +280,36 @@ void OOXMLParserState::incContextCount()
mnContexts++;
}
+void OOXMLParserState::startTxbxContent()
+{
+if( inTxbxContent )
+SAL_WARN( writerfilter, Nested w:txbxContent );
+inTxbxContent = true;
+// Do not save and reset section group state, it'd cause a new page.
+//savedInSectionGroup = mbInSectionGroup;
+savedInParagraphGroup = mbInParagraphGroup;
+savedInCharacterGroup = mbInCharacterGroup;
+savedLastParagraphInSection = mbLastParagraphInSection;
+//mbInSectionGroup = false;
+mbInParagraphGroup = false;
+mbInCharacterGroup = false;
+mbLastParagraphInSection = false;
+}
+
+void OOXMLParserState::endTxbxContent()
+{
+if( !inTxbxContent )
+{
+SAL_WARN( writerfilter, Non-matching closing w:txbxContent );
+return;
+}
+//mbInSectionGroup = savedInSectionGroup;
+mbInParagraphGroup = savedInParagraphGroup;
+mbInCharacterGroup = savedInCharacterGroup;
+mbLastParagraphInSection = savedLastParagraphInSection;
+inTxbxContent = false;
+}
+
#if OSL_DEBUG_LEVEL 1
unsigned int OOXMLParserState::getContextCount() const
{
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx
b/writerfilter/source/ooxml/OOXMLParserState.hxx
index 2684592..e3fc657 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++
Re: [REVIEW][3-5] gcc 4.7 UNO bridges fixes
On 05/18/2012 05:13 PM, Michael Stahl wrote: so it seems that the C++ UNO bridges, when built with gcc 4.7, crash and burn in the bridges test in testtools. fortunately Stephan has fixed this problem on master, at least as far as i can see, applying the attached patches in a x86_64 --enable-dbgutil build gives me a nicely working office that passes all subsequent tests. so, i guess it would make sense to put these into libreoffice-3-5. One subsequent fix that should then probably also be backported is http://cgit.freedesktop.org/libreoffice/core/commit/?id=e2b7e28c12bb836fd7ab1dcbfc2460f807dd27f6 adjust gcc3_linux_intel bridge to work with clang. From my notes from early April: Ported the cpp_uno bridge changes needed for GCC 4.7 to the Linux x86 bridge as well, only for Lubos to report that his Clang tinderbox now fails with that. Turns out Clang still requires a call to dummy_can_throw_anything in callVirtualMethod so that exceptions thrown from within the asm block's call properly unwind through the function, while GCC 4.7 -O0 breaks if the call to dummy_can_throw_anything is there. Sigh. Back to the drawing board (and my feeling that my understanding hadn't reached the bottom of the problem yet seems right). As I said on IRC, those fixes are still work-in-(somewhat-stalled-at-the-moment-)progress. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/colorscale.hxx |3
sc/source/core/data/colorscale.cxx | 152 +
2 files changed, 124 insertions(+), 31 deletions(-)
New commits:
commit e3fea48ac8523bf3cd4c50906ca85819390594f9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 17:31:29 2012 +0200
correctly get the min value and the max value for data bars
Change-Id: I5e46bf534d1b70536810e9d9ac0a67210b271109
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index b63bc66..0f72475 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -198,6 +198,9 @@ public:
virtual ScColorFormatType GetType() const;
private:
+double getMin(double nMin, double nMax) const;
+double getMax(double nMin, double nMax) const;
+
boost::scoped_ptrScDataBarFormatData mpFormatData;
};
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index f9adede..2a34fd9 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -263,50 +263,61 @@ double getMaxValue(const ScRange rRange, ScDocument*
pDoc)
return aMaxValue;
}
+double getMinValue(const ScRangeList rList, ScDocument* pDoc)
+{
+double aMinValue = std::numeric_limitsdouble::max();
+
+size_t n = rList.size();
+for(size_t i = 0; i n; ++i)
+{
+const ScRange* pRange = rList[i];
+double aVal = getMinValue(*pRange, pDoc);
+if( aVal aMinValue )
+aMinValue = aVal;
+}
+return aMinValue;
+}
+
+double getMaxValue(const ScRangeList rList, ScDocument* pDoc)
+{
+double aMaxVal = std::numeric_limitsdouble::min();
+
+size_t n = rList.size();
+for(size_t i = 0; i n; ++i)
+{
+const ScRange* pRange = rList[i];
+double aVal = getMaxValue(*pRange, pDoc);
+if( aVal aMaxVal )
+aMaxVal = aVal;
+}
+
+return aMaxVal;
+}
+
}
double ScColorScaleFormat::GetMinValue() const
{
const_iterator itr = maColorScales.begin();
-double aMinValue = std::numeric_limitsdouble::max();
if(!itr-GetMin())
return itr-GetValue();
else
{
-size_t n = maRanges.size();
-for(size_t i = 0; i n; ++i)
-{
-const ScRange* pRange = maRanges[i];
-double aVal = getMinValue(*pRange, mpDoc);
-if( aVal aMinValue )
-aMinValue = aVal;
-}
+return getMinValue(maRanges, mpDoc);
}
-
-return aMinValue;
}
double ScColorScaleFormat::GetMaxValue() const
{
ColorScaleEntries::const_reverse_iterator itr = maColorScales.rbegin();
-double aMaxVal = std::numeric_limitsdouble::min();
if(!itr-GetMax())
return itr-GetValue();
else
{
-size_t n = maRanges.size();
-for(size_t i = 0; i n; ++i)
-{
-const ScRange* pRange = maRanges[i];
-double aVal = getMaxValue(*pRange, mpDoc);
-if( aVal aMaxVal )
-aMaxVal = aVal;
-}
+return getMaxValue(maRanges, mpDoc);
}
-
-return aMaxVal;;
}
void ScColorScaleFormat::calcMinMax(double rMin, double rMax) const
@@ -623,6 +634,32 @@ void ScDataBarFormat::UpdateMoveTab(SCTAB nOldTab, SCTAB
nNewTab)
mpFormatData-mpLowerLimit-UpdateMoveTab(nOldTab, nNewTab, nThisTab);
}
+double ScDataBarFormat::getMin(double nMin, double nMax) const
+{
+if(mpFormatData-mpLowerLimit-GetMin())
+return nMin;
+
+if(mpFormatData-mpLowerLimit-GetPercent())
+{
+return nMin + (nMax-nMin)/100*mpFormatData-mpLowerLimit-GetValue();
+}
+
+return mpFormatData-mpLowerLimit-GetValue();
+}
+
+double ScDataBarFormat::getMax(double nMin, double nMax) const
+{
+if(mpFormatData-mpUpperLimit-GetMax())
+return nMax;
+
+if(mpFormatData-mpUpperLimit-GetPercent())
+{
+return nMin + (nMax-nMin)/100*mpFormatData-mpLowerLimit-GetValue();
+}
+
+return mpFormatData-mpLowerLimit-GetValue();
+}
+
ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress rAddr) const
{
CellType eCellType = mpDoc-GetCellType(rAddr);
@@ -637,8 +674,10 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const
ScAddress rAddr) const
// now we have for sure a value
//
-double nMin = -2;
-double nMax = 10;
+double nValMin = getMinValue(maRanges, mpDoc);
+double nValMax = getMaxValue(maRanges, mpDoc);
+double nMin = getMin(nValMin, nValMax);
+double nMax = getMax(nValMin, nValMax);
double nValue = mpDoc-GetValue(rAddr);
commit 726051277d90d0dfe384111d03b97835517bb69c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 17:09:26 2012 +0200
update data bars correctly
Change-Id: Icddd688dbf5da8154dd470539b03b6a2d02ca755
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 975e6e9..f9adede 100644
---
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 48345, which changed state. Bug 48345 Summary: Display wrong datasets when scrolling through tables https://bugs.freedesktop.org/show_bug.cgi?id=48345 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] [REVIEW:3-5] fdo#48345 display wrong datasets when scrolling through tables
On Tue, 2012-05-15 at 19:01 +0200, Lionel Elie Mamane wrote: Attached patch fixes fdo#48345, namely that when one scrolls back in a table view, a wrong line is shown. See screenshot at https://bugs.freedesktop.org/attachment.cgi?id=61072 and detailed analysis at https://bugs.freedesktop.org/show_bug.cgi?id=48345#c2 pushed it to 3-5 on the basis that it doesn't look obviously wrong. offending lines appear to come from 1ae17f5b03cc14844fb600ca3573a96deb37ab3b so might be worth seeing if https://issues.apache.org/ooo/show_bug.cgi?id=102625 still works C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - dbaccess/source
dbaccess/source/core/api/KeySet.cxx | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
New commits:
commit be98213ec701ead0f7d13a815770598a5544022b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue May 15 18:37:43 2012 +0200
simplify/clarify code
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index c30d35f..74b8b17 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1142,15 +1142,12 @@ sal_Bool SAL_CALL OKeySet::next( ) throw(SQLException,
RuntimeException)
if(isAfterLast())
return sal_False;
+++m_aKeyIter;
if(!m_bRowCountFinal) // not yet all records fetched
{
-++m_aKeyIter; // this is possible because we stand on begin() and this
is the beforefirst row
- // LEM: above comment is wrong; we may be anywhere but
after last.
if(m_aKeyIter == m_aKeyMap.end() !fetchRow())
m_aKeyIter = m_aKeyMap.end();
}
-else if(!isAfterLast())
-++m_aKeyIter;
refreshRow();
return !isAfterLast();
commit 222ba799ad57b0ff93ac103c8af65c706ca4cf37
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue May 15 18:36:12 2012 +0200
fdo#48345 need to refresh row also when not m_bRowCountFinal
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 8e42b30..c30d35f 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1145,14 +1145,9 @@ sal_Bool SAL_CALL OKeySet::next( ) throw(SQLException,
RuntimeException)
if(!m_bRowCountFinal) // not yet all records fetched
{
++m_aKeyIter; // this is possible because we stand on begin() and this
is the beforefirst row
+ // LEM: above comment is wrong; we may be anywhere but
after last.
if(m_aKeyIter == m_aKeyMap.end() !fetchRow())
m_aKeyIter = m_aKeyMap.end();
-else
-{
-//m_aKeyIter-second.second.second = new
OPrivateRow(_rInsertRow-get());
-m_xRow.set(m_xDriverRow,UNO_QUERY_THROW);
-return !isAfterLast();
-}
}
else if(!isAfterLast())
++m_aKeyIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/colorscale.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a24a38695b857984600f1b17ccc9b976d6ec53d6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 17:44:33 2012 +0200
Light red is better as default color for negative values
Change-Id: I871c67582f60eb56e9ebda22e1b492ff2e321f6e
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 2a34fd9..8364cd1 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -740,7 +740,7 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const
ScAddress rAddr) const
else
{
// default negative color is red
-pInfo-maColor = COL_RED;
+pInfo-maColor = COL_LIGHTRED;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW][3-5] codemaker: write Java 1.5 class files
while playing around with Fedora 17 and building master on that
yesterday (instead of spending this public holiday in the manner
traditional in my country, drinking until keeling over), ran into the
following problem:
the javamaker tool, part of URE that generates Java stubs for UNO
interfaces, uses a trick to write class files that work with JREs from
version 1.2 onwards, but still contain generic types (which are only
officially supported in JRE 1.5) for polymorphic UNO structs: it simply
writes the generic type parameters into the class files, but sets the
version field of the class file corresponding to Java 1.2.
this unfortunately fails now with OpenJDK 1.7: javac in that version
deliberately ignores the type parameters in class files of versions
older than 49, which breaks the build:
http://pastebin.com/ptEFU9AP (somebody else ran into this weeks ago)
there appears to be a related JRE bug for this, at some time javac had
an undocumented option to produce similar class files that are also
rejected now, this has been closed as Not a Defect:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7078419
now of course the test code could be changed to remove the generics
etc., so it is not such a big problem, but i'm afraid this will also
really annoy extension authors that use Java; they will first have to
understand the problem (which is not really obvious), and then have to
choose between using older JDK to develop or adapting their code to
remove generics usage.
for this reason i'm in favor of immediately dropping support for
anything older than Java 1.5 on master, and also on libreoffice-3-5.
(i don't actually know what our official Java baseline is, perhaps it
is already 1.5?)
this page says that Java 1.4 was EOL in 2008(!), so i don't see much
sense in continuing to support it in any case:
http://www.oracle.com/technetwork/java/eol-135779.html
the attached (uncommitted) patch changes codemaker to produce class
files in version 49, supported by JREs 1.5 or later, effectively raising
the baseline to Java 1.5 (if it is not there already).
From 2e2518b92d2ed23263ced9d70382c08a934b6964 Mon Sep 17 00:00:00 2001
From: Michael Stahl mst...@redhat.com
Date: Fri, 18 May 2012 00:50:25 +0200
Subject: [PATCH] codemaker: write version 49 (1.5) class files
The trick of writing generic types into class files of versions 49
does no longer work with javac from OpenJDK 7:
/comphelper/qa/complex/comphelper/Map.java:154: error: type Pair does
not take parameters
Pair ?, ? [] initialMappings = new Pair ?, ? [ _keys.length ];
---
codemaker/source/javamaker/classfile.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx
index 1a8bf01..6ddd8b2 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -693,7 +693,7 @@ void ClassFile::addMethod(
void ClassFile::write(FileStream file) const {
writeU4(file, 0xCAFEBABE);
writeU2(file, 0);
-writeU2(file, 46);
+writeU2(file, 49); // class file version of JRE 1.5
writeU2(file, m_constantPoolCount);
writeStream(file, m_constantPool);
writeU2(file, static_cast sal_uInt16 (m_accessFlags));
--
1.7.10.2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - bin/lo-commit-stat
bin/lo-commit-stat | 149 ++---
1 file changed, 108 insertions(+), 41 deletions(-)
New commits:
commit dd15b51ddaf4a143d494076a6dd554a059d91489
Author: Petr Mladek pmla...@suse.cz
Date: Fri May 18 18:02:37 2012 +0200
lo-commit-stat: problem with wide character in bug title
+ do not check for - in the bug title; it might be also wide character
in some cases
+ show result when looking for bug titles
+ sort bugs when loolking for bug titles and printing bug numbers
Change-Id: I39496f7d0cf5f7a116e7d3c506b76b4a3de1dee1
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index a14eb3e..a61b326 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -283,7 +283,7 @@ sub print_stat($$)
sub get_bug_name($$)
{
my ($bug, $summary) = @_;
-print $bug\n;
+print $bug: ;
$bug =~ m/(?:(\w*)\#+(\d+))/; # fdo#12345
my $bugzilla = $1;# fdo
@@ -296,9 +296,12 @@ sub get_bug_name($$)
$ua-env_proxy;
my $response = $ua-get($url);
if ($response-is_success) {
-my $title = $response-title();
-if ( $title =~ s/^Bug \d+ â // ) {
+my $title = $response-title;
+if ( $title =~ s/^Bug \d+ . // ) {
+print $title\n;
return $title;
+} else {
+print warning: not found; using commit message\n;
}
}
}
@@ -324,7 +327,8 @@ sub print_bugs($$)
}
# try to replace summaries with bug names from bugzilla
-foreach my $bug ( keys %bugs) {
+print Getting bug titles:\n;
+foreach my $bug ( sort { $a cmp $b } keys %bugs) {
$bugs{$bug}{'summary'} = get_bug_name($bug, $bugs{$bug}{'summary'});
}
@@ -355,7 +359,7 @@ sub print_bugnumbers($$)
}
}
-printf $log join (\n, keys %bugs) . \n;
+printf $log join (\n, sort { $a cmp $b } keys %bugs) . \n;
}
commit b47213604b69df85837b504917caf550c008459f
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu May 17 18:42:46 2012 +0400
lo-commit-stat: remove flags and print_filters
Change-Id: I3d5ecb3cc52aeba780087f4ecb6b3bf86353276c
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 1f067e2..a14eb3e 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -49,7 +49,6 @@ sub search_bugs()
# save the bug number
%{$pdata-{$piece}{$commit_id}{'bugs'}} = () if (! defined
%{$pdata-{$piece}{$commit_id}{'bugs'}});
$pdata-{$piece}{$commit_id}{'bugs'}{$bug} = 1;
-$pdata-{$piece}{$commit_id}{'flags'}{'bug'} = 1;
}
return $line;
@@ -99,7 +98,6 @@ sub load_git_log($)
$commit_id = $1;
$summary=undef;
%{$pdata-{$piece}{$commit_id}} = ();
-%{$pdata-{$piece}{$commit_id}{'flags'}} = ();
next;
}
@@ -222,23 +220,12 @@ sub open_log_file($)
return $log;
}
-sub print_summary_in_stat()
+sub print_summary_in_stat($$)
{
-my ($summary, $pprint_filters, $ppiece_title, $pflags, $pbugs, $pauthors,
$prefix, $log) = @_;
+my ($summary, $ppiece_title, $pbugs, $pauthors, $prefix, $log) = @_;
return if ( $summary eq );
-# do we want to print this summary at all?
-my $print;
-if (%{$pprint_filters}) {
-foreach my $flag (keys %{$pprint_filters}) {
-$print = 1 if (defined $pflags-{$flag});
-}
-} else {
-$print = 1;
-}
-return unless (defined $print);
-
# print piece title if not done yet
if ( defined ${$ppiece_title} ) {
printf $log ${$ppiece_title}\n;
@@ -259,9 +246,9 @@ sub print_summary_in_stat()
printf $log $prefix . $summary . $bugs . $authors . \n;
}
-sub print_stat($$$)
+sub print_stat($$)
{
-my ($pdata, $pprint_filters, $log) = @_;
+my ($pdata, $log) = @_;
foreach my $piece ( sort { $a cmp $b } keys %{$pdata}) {
# check if this piece has any entries at all
@@ -270,15 +257,13 @@ sub print_stat($$$)
my $old_summary=;
my %authors = ();
my %bugs = ();
-my %flags = ();
foreach my $id ( sort { $pdata-{$piece}{$a}{'summary'} cmp
$pdata-{$piece}{$b}{'summary'} } keys %{$pdata-{$piece}}) {
my $summary = $pdata-{$piece}{$id}{'summary'};
if ($summary ne $old_summary) {
-print_summary_in_stat($old_summary, $pprint_filters,
\$piece_title, \%flags, \%bugs, \%authors, + , $log);
+print_summary_in_stat($old_summary, \$piece_title, \%bugs,
\%authors, + , $log);
$old_summary = $summary;
%authors = ();
%bugs = ();
-%flags = ();
}
# collect bug numbers
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/cell.hxx|3
sc/inc/column.hxx |8 +-
sc/source/core/data/cell2.cxx | 10 ++-
sc/source/core/data/column.cxx | 130 +
4 files changed, 106 insertions(+), 45 deletions(-)
New commits:
commit 1735044e9f693cde1af0d905d264c849e3fce311
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri May 18 12:09:54 2012 -0400
Adjust sheet fields in cells when sheet structure changes.
Change-Id: I0aff738968e286df57ef7dd5b67780108cdc6c89
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 3bf2dfe..de4d1ad 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -258,6 +258,9 @@ public:
/** Removes character attribute based on new pattern attributes. */
voidRemoveCharAttribs( const ScPatternAttr rAttr );
+
+/** Update field items if any. */
+void UpdateFields(SCTAB nTab);
};
class ScEditDataArray
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 4988ffc..446f4de 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -281,9 +281,9 @@ public:
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
ScDocument* pUndoDoc = NULL );
-voidUpdateInsertTab( SCTAB nTable, SCTAB nNewSheets = 1);
-voidUpdateInsertTabOnlyCells( SCTAB nTable, SCTAB nNewSheets = 1);
-voidUpdateDeleteTab( SCTAB nTable, bool bIsMove, ScColumn*
pRefUndo = NULL, SCTAB nSheets = 1 );
+void UpdateInsertTab(SCTAB nInsPos, SCTAB nNewSheets = 1);
+void UpdateInsertTabOnlyCells(SCTAB nInsPos, SCTAB nNewSheets = 1);
+void UpdateDeleteTab(SCTAB nDelPos, bool bIsMove, ScColumn* pRefUndo =
NULL, SCTAB nSheets = 1);
voidUpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
voidUpdateCompile( bool bForceIfNameInUse = false );
voidUpdateTranspose( const ScRange rSource, const ScAddress
rDest,
@@ -373,7 +373,7 @@ public:
void GetFilterEntries(SCROW nStartRow, SCROW nEndRow,
std::vectorScTypedStrData rStrings, bool rHasDates);
bool GetDataEntries(SCROW nRow, std::setScTypedStrData rStrings, bool
bLimit);
-voidUpdateInsertTabAbs(SCTAB nNewPos);
+void UpdateInsertTabAbs(SCTAB nNewPos);
boolTestTabRefAbs(SCTAB nTable);
boolGetNextSpellingCell(SCROW nRow, bool bInSel, const ScMarkData
rData) const;
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index c8c6b9b..1e0dcbe 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -78,9 +78,7 @@ ScEditCell::ScEditCell(const ScEditCell rCell, ScDocument
rDoc, const ScAddres
ScBaseCell(rCell), pString(NULL), pDoc(rDoc)
{
SetTextObject( rCell.pData, rCell.pDoc-GetEditPool() );
-
-editeng::FieldUpdater aUpdater = pData-GetFieldUpdater();
-aUpdater.updateTableFields(rDestPos.Tab());
+UpdateFields(rDestPos.Tab());
}
ScEditCell::ScEditCell( const rtl::OUString rString, ScDocument* pDocP ) :
@@ -166,6 +164,12 @@ void ScEditCell::RemoveCharAttribs( const ScPatternAttr
rAttr )
}
}
+void ScEditCell::UpdateFields(SCTAB nTab)
+{
+editeng::FieldUpdater aUpdater = pData-GetFieldUpdater();
+aUpdater.updateTableFields(nTab);
+}
+
void ScEditCell::SetTextObject( const EditTextObject* pObject,
const SfxItemPool* pFromPool )
{
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9ae787b..eebb17a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1668,72 +1668,102 @@ void ScColumn::UpdateGrow( const ScRange rArea, SCCOL
nGrowX, SCROW nGrowY )
}
-void ScColumn::UpdateInsertTab( SCTAB nTable, SCTAB nNewSheets )
+void ScColumn::UpdateInsertTab(SCTAB nInsPos, SCTAB nNewSheets)
{
-if (nTab = nTable)
+if (nTab = nInsPos)
{
nTab += nNewSheets;
pAttrArray-SetTab(nTab);
}
-if ( !maItems.empty() )
-UpdateInsertTabOnlyCells( nTable, nNewSheets );
-}
+UpdateInsertTabOnlyCells(nInsPos, nNewSheets);
+}
-void ScColumn::UpdateInsertTabOnlyCells( SCTAB nTable, SCTAB nNewSheets )
+void ScColumn::UpdateInsertTabOnlyCells(SCTAB nInsPos, SCTAB nNewSheets)
{
-if ( !maItems.empty() )
-for (SCSIZE i = 0; i maItems.size(); i++)
+if (maItems.empty())
+return;
+
+for (size_t i = 0; i maItems.size(); ++i)
+{
+switch (maItems[i].pCell-GetCellType())
{
-ScFormulaCell* pCell = (ScFormulaCell*) maItems[i].pCell;
-if( pCell-GetCellType() == CELLTYPE_FORMULA)
+case CELLTYPE_FORMULA:
{
SCROW nRow = maItems[i].nRow;
-pCell-UpdateInsertTab(nTable, nNewSheets);
-if ( nRow != maItems[i].nRow )
-Search( nRow, i ); // Listener geloescht/eingefuegt?
+
Re: [PUSHED] Release notes: use bug titles instead of commit messages if possible
Ivan Timofeev píše v Pá 18. 05. 2012 v 18:56 +0400:
Hi Petr,
On 18.05.2012 18:13, Petr Mladek wrote:
I like it very much. The only problem is that I havn't got any title
from bugzilla :-)
LOL :)
Ah, there were two problems here:
1. Novell bugzilla does not return any title. I know that you mentioned
it. Unfortunately, the first 5 bugs of my query were from this
bugzilla and I forgot it during the deeper debugging :-)
2. The titles from other bugzillas were ignored because - in the title
was wide character here. I am not sure why it worked for you.
Probably something with UTF-8 locales. Anyway, I solved it by
replacing:
- if ( $title =~ s/^Bug \d+ - // ) {
+ if ( $title =~ s/^Bug \d+ . // ) {
It is not perfect but... Any better solution is welcome.
Next, your debug info is useful. It is good that it prints something
when looking for the titles. It takes time if you have many bugs.
Finally, I added some more sorting and pushed everything into master:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a8b77a529047d2d26b1633df3c0f6511fc379305
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b47213604b69df85837b504917caf550c008459f
http://cgit.freedesktop.org/libreoffice/core/commit/?id=dd15b51ddaf4a143d494076a6dd554a059d91489
If you agree with my changes, I will push it also for 3-5 branch.
Thanks a lot for this cool improvement!
Best Regards,
Petr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: live issues ticker (was: minutes of ESC call ...)
Christian Lohmaier schrieb: + connect Rainer with sysadmins wrt. status/live issues ticker (Thorsten) Hi, I do not need any further information concerning new bugs. I use a query sorting out bugs where already other trusted staff is involved (to avoid double work), and I can't handle more bugs than I find there. Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Release notes: use bug titles instead of commit messages if possible
On 18.05.2012 20:44, Ivan Timofeev wrote:
Maybe adding 'use utf8;' to the script will solve the problem?
or using \N{U+2013} instead of '-':
http://perldoc.perl.org/perlunicode.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)
On 16/05/12 15:09, Lubos Lunak wrote: On Tuesday 08 of May 2012, Michael Stahl wrote: sorry for the late reply Hmm, ok, I don't want to just revert once more, but since it looks to me like you've broken this in several ways, it is possible we don't agree on what i'm biased but i bet i broke it in less ways than you and Bjoern did :-P these switches are actually supposed to do. As far as I can tell, --enable-symbols enables -g, --enable-debug does --enable-symbols and turns on logging+assertions and disables optimizations, and --enable-dbgutils does --enable-symbols plus whatever extra stuff that is BIC. That's indicentally also what --help says about them. What is your idea about what these options do? so there are 3 options, and --enable-symbols differs from the other 2 in that it only adds symbols to the output, it does not enable any debugging feature, or assertion, it does not disable optimizations, and it is primarily used not by developers, but by distributors who want to be able to produce reliable stack traces for _product_ builds, e.g. the Fedora RPM spec file unconditionally sets --enable-symbols, these symbols are split out by some RPM magic into libreoffice-debuginfo package, and then ABRT reports useful stacks to rhbz. which specific compiler flag is used for --enable-symbol is not all that relevant as long as it is sufficient to generate stack traces; for example MSVC uses same flag for --enable-symbol and --enable-debug, while unxgcc.mk sets -ggdb2 for --enable-symbols and -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline for --enable-debug (i wonder if -ggdb1 exists and would be sufficient for symbols but don't care enough to try). the fact that --enable-dbgutil turns on symbols is actually a change from last year, it used to not do this; i wonder if it was really intended to change, or whether that was also some consequence of the debug-level confusion, but i really have no opinion on whether --enable-dbgutil should imply --enable-symbols or not (but i do consider it a bug if --enable-dbgutil --disable-symbols doesn't work as intended, which is currently the case IIRC). commit a50812813de0594ac2aeb064ea4a95d66b8e4e42 Author: Michael Stahl mst...@redhat.com Date: Mon May 7 21:33:01 2012 +0200 gbuild: tie optimization into selective --enable-debug: Let --enable-debug determine whether optimization should be disabled, which works also for debug=t due to the setup in gbuild.mk. Also clean up uses of gb_COMPILEROPTFLAGS: this is now always set to optimization settings, and gb_COMPILERNOOPTFLAGS used in debug case, which should not make a difference because the only actual difference was that on MSVC the debug OPTFLAGS were empty, but -Od is documented as the default for this. Now --enable-debug=-sc/ means that sc/ is built without -g and with -O2. In other words, the compiler spends extra time working on code I don't care about at all. There was a reason why OPT flags was empty in --enable-debug build - as soon as I do a developer build, I don't want the compiler to optimize any code, anywhere, unless explicitly told so. that is surprising; i had thought that developers either want code that runs fast, or code that is debuggable (i.e. the point of disabling optimizations is not to confuse the debugger), but you apparently want slow code that is not debuggable? it has occasionally annoyed me how horribly slow loading certain large documents becomes if optimization is disabled. Moreover, such code actually is built also with -g. I'm not sure why, but something now seems to turn on -g for everything, regardless of the selective symbols. sounds like you also have --enable-symbols on, which works globally, as the intended target audience doesn't know for which parts stack traces need to be generated, so it doesn't make sense to sub-divide this. commit c8fa9bd8849f0503b3803465e8ce119581e11e33 Author: Michael Stahl mst...@redhat.com Date: Mon May 7 20:58:44 2012 +0200 dis-entangle --enable-symbols and --enable-debug: OOo used to use debug level this way: 0 is default for product build 1 for --enable-dbgutil 2 for environment variable debug=t, regardless of dbgutil setting in LO these have now morphed into: 0 is default for product build 1 for environment variable debug=t 2 for --enable-dbgutil (at some intermediate stage in the past) 1 for --enable-dbgutil (today) This has caused a lot of confusion and some things were not converted properly, including a check in LinkTarget.mk. This caused confusion even now. How is OSL_DEBUG_LEVEL relevant here at all? not at all. but there were several if conditionals in makefiles that used the equivalent gb_DEBUGLEVEL, one of which you (rightfully) removed in your original commit. Developers should use --enable-debug to get useful information, including full debug info and
[Libreoffice-commits] .: 2 commits - sw/qa
sw/qa/extras/README | 20
sw/qa/extras/ooxmltok/data/n705956-1.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx| 25 +
3 files changed, 45 insertions(+)
New commits:
commit 1472935fd74c289717cd7783d99bc99d82d7866d
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri May 18 19:18:02 2012 +0200
note how to find images using UNO, as it's not exactly easy to find out
Change-Id: If5440cae646a56fef4c054774705689e5512b8e4
diff --git a/sw/qa/extras/README b/sw/qa/extras/README
index eb25955..49dc9aa 100644
--- a/sw/qa/extras/README
+++ b/sw/qa/extras/README
@@ -198,3 +198,23 @@ uno::Referencecontainer::XIndexAccess
bookmarks(bookmarksSupplier-getBookmark
uno::Referenceuno::XInterface bookmark;
// get the bookmark by index
bookmarks-getByIndex(0) = bookmark;
+
+=== Images
+
+Embedded images seem to be accessed like this:
+
+Basic:
+
+image = ThisComponent.DrawPage.getByIndex(0)
+graphic = image.Graphic
+
+C++:
+
+uno::Referencetext::XTextDocument textDocument(mxComponent, uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPageSupplier drawPageSupplier(textDocument,
uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPage drawPage = drawPageSupplier-getDrawPage();
+uno::Referencedrawing::XShape image;
+drawPage-getByIndex(0) = image;
+uno::Referencebeans::XPropertySet imageProperties(image, uno::UNO_QUERY);
+uno::Referencegraphic::XGraphic graphic;
+imageProperties-getPropertyValue( Graphic ) = graphic;
commit a28f5713a7e91b5d99cc0e63470db1512b997320
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri May 18 19:10:12 2012 +0200
testcase for part of bnc#705956
60cb70b94537e9ff1155fb80255fc04ce41363b2 specifically
Change-Id: I160b24505d3e2425ce807f92f80d6737b725941b
diff --git a/sw/qa/extras/ooxmltok/data/n705956-1.docx
b/sw/qa/extras/ooxmltok/data/n705956-1.docx
new file mode 100644
index 000..edff3ba
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n705956-1.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 896b9fd..1238192 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -27,6 +27,7 @@
#include ../swmodeltestbase.hxx
+#include com/sun/star/awt/XBitmap.hpp
#include com/sun/star/beans/XPropertySet.hpp
#include com/sun/star/drawing/XDrawPageSupplier.hpp
#include com/sun/star/lang/XServiceInfo.hpp
@@ -55,6 +56,7 @@ public:
void testN757890();
void testFdo49940();
void testN751077();
+void testN705956();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -65,6 +67,7 @@ public:
CPPUNIT_TEST(testN757890);
CPPUNIT_TEST(testFdo49940);
CPPUNIT_TEST(testN751077);
+CPPUNIT_TEST(testN705956);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -238,6 +241,28 @@ xray para.PageStyleName
CPPUNIT_ASSERT_EQUAL( OUString( First Page ), value );
}
+void Test::testN705956()
+{
+load( n705956-1.docx );
+/*
+Get the first image in the document and check it's the one image in the
document.
+image = ThisComponent.DrawPage.getByIndex(0)
+graphic = image.Graphic
+xray graphic.Size
+*/
+uno::Referencetext::XTextDocument textDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPageSupplier drawPageSupplier(textDocument,
uno::UNO_QUERY);
+uno::Referencedrawing::XDrawPage drawPage =
drawPageSupplier-getDrawPage();
+uno::Referencedrawing::XShape image;
+drawPage-getByIndex(0) = image;
+uno::Referencebeans::XPropertySet imageProperties(image, uno::UNO_QUERY);
+uno::Referencegraphic::XGraphic graphic;
+imageProperties-getPropertyValue( Graphic ) = graphic;
+uno::Referenceawt::XBitmap bitmap(graphic, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( 120, bitmap-getSize().Width );
+CPPUNIT_ASSERT_EQUAL( 106, bitmap-getSize().Height );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/ui/view/viewdata.cxx | 49 ++---
1 file changed, 22 insertions(+), 27 deletions(-)
New commits:
commit 13bb6dcddcd3e19cd97fdb28e842c778e6e093b3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 19:34:11 2012 +0200
ensure that number of tabs is correctly set in ScViewData, fdo#45987
Change-Id: Ia77ea939f6ce9301afeabe1d1679998ce34b397e
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index b7de81a..71877e8 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2744,6 +2744,9 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence
beans::PropertyValue
sal_Int32 nTemp32(0);
sal_Int16 nTemp16(0);
sal_Bool bPageMode(false);
+
+EnsureTabDataSize(GetDocument()-GetTableCount()-1);
+
for (sal_Int32 i = 0; i nCount; i++)
{
// SC_VIEWID has to parse and use by mba
commit 90d0efb524b2cdd8d65808d18713bfd6b1d117ea
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 18:11:14 2012 +0200
Revert 4 commits related to fdo#45987
Revert and another wae ( that I missed )
This reverts commit a1faa06b415f54c0e8ff8a8f1e580e8a57b9296a.
Revert fix wae
This reverts commit 2f5885765445d8a8f50037da3420dbcd19d5634f.
Revert attempt to prevent illegal maTabData access(s)
This reverts commit 8352eb5a1af1eb44550a9d60d31e6c2fb2dc43b9.
Conflicts:
sc/source/ui/view/viewdata.cxx
Revert fix bad stl access fdo#45987
This reverts commit 8b1d29bc9b00bc2730738a990023a65ab6e0219b.
Conflicts:
sc/source/ui/view/viewdata.cxx
Change-Id: Idba6ec8ab448332ec349f23b10a2cce8b313ff19
33c437c8b9f005c43f03518863e151a6f0fc9589
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 028ab83..b7de81a 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -486,14 +486,11 @@ void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets
)
void ScViewData::DeleteTab( SCTAB nTab )
{
-if ( nTab static_castSCTAB(maTabData.size()) )
-{
-delete maTabData.at(nTab);
-if ( nTab == static_castSCTAB(maTabData.size()) - 1 )
-maTabData.erase(maTabData.begin() + nTab);
-UpdateCurrentTab();
-mpMarkData-DeleteTab( nTab );
-}
+delete maTabData.at(nTab);
+
+maTabData.erase(maTabData.begin() + nTab);
+UpdateCurrentTab();
+mpMarkData-DeleteTab( nTab );
}
void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
@@ -503,8 +500,8 @@ void ScViewData::DeleteTabs( SCTAB nTab, SCTAB nSheets )
mpMarkData-DeleteTab( nTab + i );
delete maTabData.at(nTab + i);
}
-if ( ( nTab + nSheets ) == static_castSCTAB( maTabData.size() - 1 ) )
-maTabData.erase(maTabData.begin() + nTab, maTabData.begin()+
nTab+nSheets);
+
+maTabData.erase(maTabData.begin() + nTab, maTabData.begin()+ nTab+nSheets);
UpdateCurrentTab();
}
@@ -541,8 +538,7 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab )
if (nSrcTab static_castSCTAB(maTabData.size()))
{
pTab = maTabData[nSrcTab];
-if ( nSrcTab == static_castSCTAB( maTabData.size() - 1 ) )
-maTabData.erase( maTabData.begin() + nSrcTab );
+maTabData.erase( maTabData.begin() + nSrcTab );
}
if (nDestTab static_castSCTAB(maTabData.size()))
@@ -663,18 +659,15 @@ void ScViewData::SetZoom( const Fraction rNewX, const
Fraction rNewY, std::vec
SCTAB i = *it;
if ( i static_castSCTAB(maTabData.size()) maTabData[i] )
{
-if ( maTabData[i] )
+if ( bPagebreak )
{
-if ( bPagebreak )
-{
-maTabData[i]-aPageZoomX = aValidX;
-maTabData[i]-aPageZoomY = aValidY;
-}
-else
-{
-maTabData[i]-aZoomX = aValidX;
-maTabData[i]-aZoomY = aValidY;
-}
+maTabData[i]-aPageZoomX = aValidX;
+maTabData[i]-aPageZoomY = aValidY;
+}
+else
+{
+maTabData[i]-aZoomX = aValidX;
+maTabData[i]-aZoomY = aValidY;
}
}
}
@@ -696,8 +689,7 @@ void ScViewData::SetZoom( const Fraction rNewX, const
Fraction rNewY, sal_Bool
void ScViewData::SetShowGrid( bool bShow )
{
CreateSelectedTabData();
-if ( maTabData[nTabNo] )
-maTabData[nTabNo]-bShowGrid = bShow;
+maTabData[nTabNo]-bShowGrid = bShow;
}
void ScViewData::RefreshZoom()
@@ -2954,7 +2946,7 @@ sal_Bool ScViewData::UpdateFixX( SCTAB nTab )
// sal_True = Wert g
if (!ValidTab(nTab))
Re: [REVIEW-3.5] crasher fdo#45987
Hello Noel, Kohei, I think [1] is a better patch for 3-5. I'm still not happy with it because I had hoped that we could init the number of sheets already in the constructor but this works only while loading a file and not when we create an empty one. This hack is a bit dirty but was the only useful place that already knows about the number of sheets and does not force us to create some more ugly hacks. It just makes sure that the number of sheets in ScViewData and ScDocument is the same. It is a safe fix and we can include it in 3-5. Regards, Markus [1] http://cgit.freedesktop.org/libreoffice/core/commit/?id=13bb6dcddcd3e19cd97fdb28e842c778e6e093b3 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmltok/ooxmltok.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8ba9f9cd1ea4175751b10e270cc39e481daf1972 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri May 18 19:50:03 2012 +0200 can't compare int and sal_Int32 in CPPUNIT_ASSERT_EQUAL Change-Id: I804e8f27197314d913d2dde138391996338458aa diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx b/sw/qa/extras/ooxmltok/ooxmltok.cxx index 1238192..2b639e0 100644 --- a/sw/qa/extras/ooxmltok/ooxmltok.cxx +++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx @@ -259,8 +259,8 @@ xray graphic.Size uno::Referencegraphic::XGraphic graphic; imageProperties-getPropertyValue( Graphic ) = graphic; uno::Referenceawt::XBitmap bitmap(graphic, uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL( 120, bitmap-getSize().Width ); -CPPUNIT_ASSERT_EQUAL( 106, bitmap-getSize().Height ); +CPPUNIT_ASSERT_EQUAL( static_castsal_Int32(120), bitmap-getSize().Width ); +CPPUNIT_ASSERT_EQUAL( static_castsal_Int32(106), bitmap-getSize().Height ); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: live issues ticker (was: minutes of ESC call ...)
On Fri, May 18, 2012 at 6:39 PM, Rainer Bielefeld libreoff...@bielefeldundbuss.de wrote: Christian Lohmaier schrieb: + connect Rainer with sysadmins wrt. status/live issues ticker (Thorsten) I do not need any further information concerning new bugs. I use a query sorting out bugs where already other trusted staff is involved (to avoid double work), and I can't handle more bugs than I find there. Well - what is the item about then? ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/view/viewdata.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit aab5d1e0caed5f65562d5eb4ac78c8467fb7c979
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri May 18 19:34:11 2012 +0200
ensure that number of tabs is correctly set in ScViewData, fdo#45987
Change-Id: Ia77ea939f6ce9301afeabe1d1679998ce34b397e
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 26c6346..ee7ab0d 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2737,6 +2737,9 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence
beans::PropertyValue
sal_Int32 nTemp32(0);
sal_Int16 nTemp16(0);
sal_Bool bPageMode(false);
+
+EnsureTabDataSize(GetDocument()-GetTableCount()-1);
+
for (sal_Int32 i = 0; i nCount; i++)
{
// SC_VIEWID has to parse and use by mba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEWED] [3.5] [PUSHED] crasher fdo#45987
On Fri, May 18, 2012 at 1:43 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hello Noel, Kohei, I think [1] is a better patch for 3-5. I'm still not happy with it because I had hoped that we could init the number of sheets already in the constructor but this works only while loading a file and not when we create an empty one. This hack is a bit dirty but was the only useful place that already knows about the number of sheets and does not force us to create some more ugly hacks. It just makes sure that the number of sheets in ScViewData and ScDocument is the same. It is a safe fix and we can include it in 3-5. I concur. I also verified that this change fixes the reported bug. Pushed to 3-5 with my sign off. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: live issues ticker (was: minutes of ESC call ...)
On Fri, 2012-05-18 at 20:35 +0200, Christian Lohmaier wrote: Well - what is the item about then? My fault for being typically terse :-) I think the idea was to have a ticker for live sysadmin issues, such as the wiki being down for maintenance, or databases being re-built, or ... to avoid thrash on mailing lists. Of course, it's just an idea. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/printer/cupsmgr.cxx | 76 +++-
1 file changed, 15 insertions(+), 61 deletions(-)
New commits:
commit ef48b58387fdc04050c3362440ffe3ca0037d8d0
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri May 18 20:52:15 2012 +0200
Revert fix for #i86306# prepare against really broken CUPS
installations...
...from 8046a87ecc879651ee9cf344211cdd198a419cab. At least sometimes in
sw_complex test (with various bundled Java extensions enabled) under load,
this
code reports Signal 11 during cups initialization called, ignoring cups
and
in-process JVM aborts in panic. Looks like a legitimate SIGSEGV (to be
translated into java.lang.NullPointerException) from JVM code is erroneously
caught by the temporary lcl_signal_action in cupsmgr.cxx instead. As there
is
no non-cooperative way to have different signal handlers for different
threads
(at least under POSIX), and
https://issues.apache.org/ooo/show_bug.cgi?id=86306 office crashes at
startup
on Solaris Intel suggests this signal-catching business is only there to
work
around a completely broken machine, I think it is best to simply remove it
again.
Change-Id: I55b95a71d622f83c975989a4ffb1d95ef5737075
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index a0e020a..0f45b46 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -43,8 +43,6 @@
#include rtl/ustrbuf.hxx
#include algorithm
-#include setjmp.h
-#include signal.h
#define CUPS_LIB_NAME libcups.so.2
@@ -442,17 +440,6 @@ void CUPSManager::runDestThread( void* pThis )
((CUPSManager*)pThis)-runDests();
}
-static sigjmp_buf aViolationBuffer;
-
-extern C
-{
-static void lcl_signal_action(int nSignal)
-{
-fprintf( stderr, Signal %d during cups initialization called,
ignoring cups\n, nSignal );
-siglongjmp( aViolationBuffer, 1 );
-}
-}
-
void CUPSManager::runDests()
{
#if OSL_DEBUG_LEVEL 1
@@ -460,62 +447,29 @@ void CUPSManager::runDests()
#endif
cups_dest_t* pDests = NULL;
-// #i86306# prepare against really broken CUPS installations / missing
servers
-
-// install signal handler for SEGV, BUS and ABRT
-struct sigaction act;
-struct sigaction oact[3];
-
-act.sa_handler = lcl_signal_action;
-act.sa_flags = 0;
-sigemptyset((act.sa_mask));
-
-int nSegvSignalInstalled = sigaction(SIGSEGV, act, oact[0]);
-int nBusSignalInstalled = sigaction(SIGBUS, act, oact[1]);
-int nAbortSignalInstalled = sigaction(SIGABRT, act, oact[2]);
-
-// prepare against a signal during FcInit or FcConfigGetCurrent
-if( sigsetjmp( aViolationBuffer, ~0 ) == 0 )
+// n#722902 - do a fast-failing check for cups working *at all* first
+http_t* p_http;
+if( (p_http=m_pCUPSWrapper-httpConnectEncrypt(
+ m_pCUPSWrapper-cupsServer(),
+ m_pCUPSWrapper-ippPort(),
+ m_pCUPSWrapper-cupsEncryption())) != NULL )
{
-// n#722902 - do a fast-failing check for cups working *at
-// all* first
-http_t* p_http;
-if( (p_http=m_pCUPSWrapper-httpConnectEncrypt(
- m_pCUPSWrapper-cupsServer(),
- m_pCUPSWrapper-ippPort(),
- m_pCUPSWrapper-cupsEncryption())) != NULL )
-{
-// neat, cups is up, clean up the canary
-m_pCUPSWrapper-httpClose(p_http);
+// neat, cups is up, clean up the canary
+m_pCUPSWrapper-httpClose(p_http);
-int nDests = m_pCUPSWrapper-cupsGetDests( pDests );
+int nDests = m_pCUPSWrapper-cupsGetDests( pDests );
#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, came out of cupsGetDests\n );
+fprintf( stderr, came out of cupsGetDests\n );
#endif
-osl::MutexGuard aGuard( m_aCUPSMutex );
-m_nDests = nDests;
-m_pDests = pDests;
-m_bNewDests = true;
+osl::MutexGuard aGuard( m_aCUPSMutex );
+m_nDests = nDests;
+m_pDests = pDests;
+m_bNewDests = true;
#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, finished cupsGetDests\n );
+fprintf( stderr, finished cupsGetDests\n );
#endif
-}
}
-else
-{
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, cupsGetDests crashed, not using CUPS\n );
-#endif
-}
-
-// restore old signal handlers
-if( nSegvSignalInstalled == 0 )
-sigaction( SIGSEGV, oact[0], NULL );
-if( nBusSignalInstalled == 0 )
-sigaction( SIGBUS, oact[1], NULL );
-if( nAbortSignalInstalled == 0 )
-sigaction( SIGABRT, oact[2], NULL );
}
void CUPSManager::initialize()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-marketing] Re: Developer interviews for the TDF blog
On Fri, May 18, 2012 at 03:55:40PM +0200, Cor Nouws oo...@nouenoff.nl wrote: There must me some smart git-command that give you this :-) git shortlog -s -n But as you say, a bit of useful work is more meaningful than a lot of useless work. ;-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5] Fixed ThreadPool (and dependent ORequestThread) life cycle
Coincidentally, this bug that, for whatever reason, started to
repeatedly break make check for my local master builds also got
reported against (Fedora) LO 3.5.2 (see
https://bugzilla.redhat.com/show_bug.cgi?id=821134) at about the same
time I came up with the below master fix.
Therefore, I'd like to get this reviewed and backported to
libreoffice-3-5. As the commit message explains, only part of it is
strictly necessary to fix the bug, so I would also be fine if reviewers
insisted on only backporting the two parts that are really necessary and
leaving out the two cleanup topics. As the fix is mildly delicate
(introducing a thread join, which in principle has the potential to
introduce a deadlock) and only relevant for specific scenarios (where
UNO remote communication is involved; i.e., during deployment of
extensions, or in explicit client/server applications), I would not
suggest it for inclusion into upcoming LO 3.5.4.
The below master commit will not cleanly apply to libreoffice-3-5 (at
least not to libreoffice-3-5-4, where I tried it), so find attached an
adapted 0001-Fixed-ThreadPool-and-dependent-ORequestThread-life-c.patch.
Thanks,
Stephan
On 05/16/2012 10:21 PM, Stephan Bergmann wrote:
binaryurp/source/bridge.cxx | 52
--
binaryurp/source/bridge.hxx |4 +-
cppu/source/threadpool/threadpool.cxx | 24 +++
cppu/source/threadpool/threadpool.hxx |4 +-
4 files changed, 52 insertions(+), 32 deletions(-)
New commits:
commit d015384e1d98fe77fd59339044f58efb1ab9fb25
Author: Stephan Bergmannsberg...@redhat.com
Date: Wed May 16 22:09:21 2012 +0200
Fixed ThreadPool (and dependent ORequestThread) life cycle
At least with sw_complex test under load, it happened that an
ORequestThread
could still process a remote release request while the main thread was
already
in exit(3). This was because (a) ThreadPool never joined with the spawned
worker threads (which has been rectified by calling
uno_threadpool_dispose(0)
from the final uno_threadpool_destroy), and (b) binaryurp::Bridge called
uno_threadpool_destroy only from its destructor (which could go as late as
exit(3)) instead of from terminate.
Additional clean up:
* Access to Bridge's threadPool_ is now cleanly controlled by mutex_ (even
though that might not be necessary in every case).
* ThreadPool's stopDisposing got renamed to destroy, to make meaning
clearer.
Change-Id: I45fa76e80e790a11065e7bf8ac9d92af2e62f262
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 50b873f..2d1f622 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -235,22 +235,28 @@ Bridge::Bridge(
}
void Bridge::start() {
-assert(threadPool_ == 0 !writer_.is() !reader_.is());
-threadPool_ = uno_threadpool_create();
-assert(threadPool_ != 0);
-writer_.set(new Writer(this));
-writer_-launch();
-reader_.set(new Reader(this));
-reader_-launch();
-// it is important to call reader_-launch() last here; both
-// Writer::execute and Reader::execute can call Bridge::terminate, but
-// Writer::execute is initially blocked in unblocked_.wait() until
-// Reader::execute has called bridge_-sendRequestChangeRequest(), so
-// effectively only reader_-launch() can lead to an early call to
-// Bridge::terminate
+rtl::Reference Reader r(new Reader(this));
+rtl::Reference Writer w(new Writer(this));
+{
+osl::MutexGuard g(mutex_);
+assert(threadPool_ == 0 !writer_.is() !reader_.is());
+threadPool_ = uno_threadpool_create();
+assert(threadPool_ != 0);
+reader_ = r;
+writer_ = w;
+}
+// It is important to call reader_-launch() last here; both
+// Writer::execute and Reader::execute can call Bridge::terminate, but
+// Writer::execute is initially blocked in unblocked_.wait() until
+// Reader::execute has called bridge_-sendRequestChangeRequest(), so
+// effectively only reader_-launch() can lead to an early call to
+// Bridge::terminate
+w-launch();
+r-launch();
}
void Bridge::terminate() {
+uno_ThreadPool tp;
rtl::Reference Reader r;
rtl::Reference Writer w;
Listeners ls;
@@ -259,6 +265,7 @@ void Bridge::terminate() {
if (terminated_) {
return;
}
+tp = threadPool_;
std::swap(reader_, r);
std::swap(writer_, w);
ls.swap(listeners_);
@@ -273,8 +280,8 @@ void Bridge::terminate() {
w-stop();
joinThread(r.get());
joinThread(w.get());
-assert(threadPool_ != 0);
-uno_threadpool_dispose(threadPool_);
+assert(tp != 0);
+uno_threadpool_dispose(tp);
Stubs s;
{
osl::MutexGuard g(mutex_);
@@ -301,6 +308,7 @@ void Bridge::terminate() {
[REVIEW-3-5] Revert fix for #i86306# prepare against really broken CUPS installations...
Please review the below master fix for backporting to libreoffice-3-5.
(I actually first encountered the problem on the LO 3.5 codeline.)
The below master commit will not cleanly apply to libreoffice-3-5 (at
least not to libreoffice-3-5-4, where I tried it), so find attached an
adapted 0001-Revert-fix-for-i86306-prepare-against-really-broken-.patch.
Thanks,
Stephan
On 05/18/2012 09:12 PM, Stephan Bergmann wrote:
vcl/unx/generic/printer/cupsmgr.cxx | 76
+++-
1 file changed, 15 insertions(+), 61 deletions(-)
New commits:
commit ef48b58387fdc04050c3362440ffe3ca0037d8d0
Author: Stephan Bergmannsberg...@redhat.com
Date: Fri May 18 20:52:15 2012 +0200
Revert fix for #i86306# prepare against really broken CUPS
installations...
...from 8046a87ecc879651ee9cf344211cdd198a419cab. At least sometimes in
sw_complex test (with various bundled Java extensions enabled) under load,
this
code reports Signal 11 during cups initialization called, ignoring cups
and
in-process JVM aborts in panic. Looks like a legitimate SIGSEGV (to be
translated into java.lang.NullPointerException) from JVM code is
erroneously
caught by the temporary lcl_signal_action in cupsmgr.cxx instead. As
there is
no non-cooperative way to have different signal handlers for different
threads
(at least under POSIX), and
https://issues.apache.org/ooo/show_bug.cgi?id=86306 office crashes at
startup
on Solaris Intel suggests this signal-catching business is only there to
work
around a completely broken machine, I think it is best to simply remove it
again.
Change-Id: I55b95a71d622f83c975989a4ffb1d95ef5737075
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index a0e020a..0f45b46 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -43,8 +43,6 @@
#include rtl/ustrbuf.hxx
#includealgorithm
-#includesetjmp.h
-#includesignal.h
#define CUPS_LIB_NAME libcups.so.2
@@ -442,17 +440,6 @@ void CUPSManager::runDestThread( void* pThis )
((CUPSManager*)pThis)-runDests();
}
-static sigjmp_buf aViolationBuffer;
-
-extern C
-{
-static void lcl_signal_action(int nSignal)
-{
-fprintf( stderr, Signal %d during cups initialization called, ignoring
cups\n, nSignal );
-siglongjmp( aViolationBuffer, 1 );
-}
-}
-
void CUPSManager::runDests()
{
#if OSL_DEBUG_LEVEL 1
@@ -460,62 +447,29 @@ void CUPSManager::runDests()
#endif
cups_dest_t* pDests = NULL;
-// #i86306# prepare against really broken CUPS installations / missing
servers
-
-// install signal handler for SEGV, BUS and ABRT
-struct sigaction act;
-struct sigaction oact[3];
-
-act.sa_handler = lcl_signal_action;
-act.sa_flags = 0;
-sigemptyset((act.sa_mask));
-
-int nSegvSignalInstalled = sigaction(SIGSEGV,act,oact[0]);
-int nBusSignalInstalled = sigaction(SIGBUS,act,oact[1]);
-int nAbortSignalInstalled = sigaction(SIGABRT,act,oact[2]);
-
-// prepare against a signal during FcInit or FcConfigGetCurrent
-if( sigsetjmp( aViolationBuffer, ~0 ) == 0 )
+// n#722902 - do a fast-failing check for cups working *at all* first
+http_t* p_http;
+if( (p_http=m_pCUPSWrapper-httpConnectEncrypt(
+ m_pCUPSWrapper-cupsServer(),
+ m_pCUPSWrapper-ippPort(),
+ m_pCUPSWrapper-cupsEncryption())) != NULL )
{
-// n#722902 - do a fast-failing check for cups working *at
-// all* first
-http_t* p_http;
-if( (p_http=m_pCUPSWrapper-httpConnectEncrypt(
- m_pCUPSWrapper-cupsServer(),
- m_pCUPSWrapper-ippPort(),
- m_pCUPSWrapper-cupsEncryption())) != NULL )
-{
-// neat, cups is up, clean up the canary
-m_pCUPSWrapper-httpClose(p_http);
+// neat, cups is up, clean up the canary
+m_pCUPSWrapper-httpClose(p_http);
-int nDests = m_pCUPSWrapper-cupsGetDests(pDests );
+int nDests = m_pCUPSWrapper-cupsGetDests(pDests );
#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, came out of cupsGetDests\n );
+fprintf( stderr, came out of cupsGetDests\n );
#endif
-osl::MutexGuard aGuard( m_aCUPSMutex );
-m_nDests = nDests;
-m_pDests = pDests;
-m_bNewDests = true;
+osl::MutexGuard aGuard( m_aCUPSMutex );
+m_nDests = nDests;
+m_pDests = pDests;
+m_bNewDests = true;
#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, finished cupsGetDests\n );
+fprintf( stderr, finished cupsGetDests\n );
#endif
-}
}
-else
-{
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, cupsGetDests crashed, not using CUPS\n );
-#endif
-}
-
-// restore old signal handlers
-if( nSegvSignalInstalled == 0 )
-sigaction(
[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_uno_test.mk testtools/Module_testtools.mk
testtools/CustomTarget_bridgetest.mk | 72 +++ testtools/CustomTarget_uno_test.mk |4 - testtools/Module_testtools.mk|1 3 files changed, 75 insertions(+), 2 deletions(-) New commits: commit b149aa29e0953982beeeb1e80fff238495d42725 Author: David Ostrovsky david.ostrov...@gmx.de Date: Sat May 19 00:26:29 2012 +0200 CustomTarget_bridgetest Change-Id: I2457061286dcdfe8e07624cd235261e7ed731172 diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk new file mode 100644 index 000..85a0250 --- /dev/null +++ b/testtools/CustomTarget_bridgetest.mk @@ -0,0 +1,72 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the License); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an AS IS basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky d.ostrov...@gmx.de (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest)) + +workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest) +gb_UNO := $(OUTDIR)/bin/uno + +ifeq ($(OS),WNT) +BATCH_SUFFIX := .bat +GIVE_EXEC_RIGHTS=@echo +else +BATCH_SUFFIX := +GIVE_EXEC_RIGHTS=chmod +x +endif + +$(call gb_CustomTarget_get_target,testtools/bridgetest) : \ + $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \ + $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) + +# which other prerequisits do we need here? +$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ + $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Helper_abbreviate_dirs_native,\ + echo $(gb_UNO) \ + -ro $(OUTDIR)/xml/uno_services.rdb \ + -ro $(OUTDIR)/bin/udkapi.rdb \ + -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \ + -s com.sun.star.test.bridge.BridgeTest \ + -u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test' \ + --singleaccept $@) + $(GIVE_EXEC_RIGHTS) $@ + +# which other prerequisits do we need here? +$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \ + $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Helper_abbreviate_dirs_native,\ + echo $(gb_UNO) \ + -ro $(OUTDIR)/xml/uno_services.rdb \ + -ro $(OUTDIR)/bin/udkapi.rdb \ + -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \ + -s com.sun.star.test.bridge.BridgeTest \ + -u 'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test' \ +$@) + $(GIVE_EXEC_RIGHTS) $@ + +# vim: set noet sw=4 ts=4: diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk index a48a98e..15f8f89 100644 --- a/testtools/CustomTarget_uno_test.mk +++ b/testtools/CustomTarget_uno_test.mk @@ -25,14 +25,14 @@ # instead of those above. $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test)) -gb_UNO := $(OUTDIR)/bin/uno +UNO_EXE := $(OUTDIR)/bin/uno # this target is phony to run it every time .PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test) $(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \ $(call gb_InternalUnoApi_get_target,bridgetest) - $(call gb_Helper_abbreviate_dirs_native, $(gb_UNO) \ + $(call gb_Helper_abbreviate_dirs_native, $(UNO_EXE) \ -ro $(OUTDIR)/xml/uno_services.rdb \ -ro $(OUTDIR)/bin/udkapi.rdb \ -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \ diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index 68382af..e6968d5 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_targets,testtools,\ Library_constructors \ Rdb_uno_services \ CustomTarget_uno_test \ +
[Libreoffice-commits] .: Branch 'feature/gbuild_testtools' - testtools/CustomTarget_bridgetest.mk testtools/Rdb_uno_services.mk
testtools/CustomTarget_bridgetest.mk | 38 +++ testtools/Rdb_uno_services.mk|6 + 2 files changed, 40 insertions(+), 4 deletions(-) New commits: commit 9039bda69c3f2406565e7617327fd9f34e377a01 Author: David Ostrovsky david.ostrov...@gmx.de Date: Sat May 19 01:25:08 2012 +0200 create batch files for test Change-Id: I651bcd35c0a29917bcea21e26a3985b8cf101f7e diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index 85a0250..32d877b 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -27,7 +27,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest)) workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest) -gb_UNO := $(OUTDIR)/bin/uno +UNO_EXE := $(OUTDIR)/bin/uno ifeq ($(OS),WNT) BATCH_SUFFIX := .bat @@ -39,14 +39,16 @@ endif $(call gb_CustomTarget_get_target,testtools/bridgetest) : \ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \ - $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) + $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \ + $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \ + $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \ # which other prerequisits do we need here? $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Helper_abbreviate_dirs_native,\ - echo $(gb_UNO) \ + echo $(UNO_EXE) \ -ro $(OUTDIR)/xml/uno_services.rdb \ -ro $(OUTDIR)/bin/udkapi.rdb \ -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \ @@ -56,11 +58,39 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \ $(GIVE_EXEC_RIGHTS) $@ # which other prerequisits do we need here? +$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \ + $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Helper_abbreviate_dirs_native,\ + echo java \ + -classpath $(OUTDIR)/bin/testComponent.jar \ + com.sun.star.comp.bridge.TestComponentMain \ + \uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test\ \ + singleaccept $@) + $(GIVE_EXEC_RIGHTS) $@ + +# which other prerequisites do we need here? +$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \ + $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Helper_abbreviate_dirs_native,\ + echo JAVA_HOME=$(JAVA_HOME) $(UNO_EXE) \ + -ro $(OUTDIR)/xml/uno_services.rdb \ + -ro $(OUTDIR)/bin/udkapi.rdb \ + -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \ + -s com.sun.star.test.bridge.BridgeTest \ + -env:URE_INTERNAL_JAVA_DIR=$(OUTDIR)/bin \ + -env:URE_INTERNAL_LIB_DIR=$(OUTDIR)/lib \ + -- com.sun.star.test.bridge.JavaTestObject noCurrentContext \ +$@) + $(GIVE_EXEC_RIGHTS) $@ + +# which other prerequisits do we need here? $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \ $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) $(call gb_Helper_abbreviate_dirs_native,\ - echo $(gb_UNO) \ + echo $(UNO_EXE) \ -ro $(OUTDIR)/xml/uno_services.rdb \ -ro $(OUTDIR)/bin/udkapi.rdb \ -ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \ diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk index 7775c94..9fc0dea 100644 --- a/testtools/Rdb_uno_services.mk +++ b/testtools/Rdb_uno_services.mk @@ -32,4 +32,10 @@ $(eval $(call gb_Rdb_add_components,uno_services,\ testtools/source/bridgetest/bridgetest \ )) +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Rdb_add_components,uno_services,\ +testtools/source/bridgetest/testComponent \ +)) +endif + # vim:set shiftwidth=4 softtabstop=4 expandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Licensing of my contributions to Libre Office
To whom it concerns: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. John LeMoyne Castle lemoyne.cas...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: jpeg/makefile.mk jpeg/struct_alignment.patch
jpeg/makefile.mk|9 ++--- jpeg/struct_alignment.patch | 18 ++ 2 files changed, 24 insertions(+), 3 deletions(-) New commits: commit a27a3990b8bbfa8924d2b55c38ceab7c9049ea6d Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Sat May 19 04:02:42 2012 +0200 fdo#47035: Fix loading of jpeg files on Mac/PPC jpeg_decompress_struct gets padded when compiling libjpeg, but the jpeg filter in svtools assume non-padded size, resulting in a mismatch that makes libjpeg refuse to do its work. diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk index 839fbd6..f574d89 100644 --- a/jpeg/makefile.mk +++ b/jpeg/makefile.mk @@ -36,8 +36,8 @@ TARGET=jpeg .IF $(SYSTEM_JPEG) == YES all: -@echo An already available installation of libjpeg should exist on your system. -@echo Therefore the version provided here does not need to be built in addition. + @echo An already available installation of libjpeg should exist on your system. + @echo Therefore the version provided here does not need to be built in addition. .ENDIF # --- Files @@ -47,6 +47,9 @@ TARFILE_NAME=jpeg-8c TARFILE_MD5=a2c10c04f396a9ce72894beb18b4e1f9 PATCH_FILES=jpeg-8c.patch +.IF $(OS)$(CPU)==MACOSXP +PATCH_FILES+=struct_alignment.patch +.ENDIF ADDITIONAL_FILES=makefile.mk jconfig.h @@ -55,7 +58,7 @@ ADDITIONAL_FILES=makefile.mk jconfig.h BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) -OUT2INC= jconfig.h \ +OUT2INC=jconfig.h \ jerror.h \ jmorecfg.h \ jpegint.h \ diff --git a/jpeg/struct_alignment.patch b/jpeg/struct_alignment.patch new file mode 100644 index 000..2eb41bf --- /dev/null +++ b/jpeg/struct_alignment.patch @@ -0,0 +1,18 @@ +without this patch, the jpeg_decompress_struct will be padded, this in turn +results in a mismatch when the jpeg filter in svtools is built, where no +padding is assumed. Only affects Mac/PPC apparenlty, see fdo#47035 +--- misc/jpeg-8c/jpeglib.h 2010-11-17 22:01:56.0 +0100 misc/build/jpeg-8c/jpeglib.h 2012-05-19 03:38:44.0 +0200 +@@ -583,11 +583,11 @@ + /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */ + UINT8 JFIF_major_version; /* JFIF version number */ + UINT8 JFIF_minor_version; ++ UINT8 Adobe_transform; /* Color transform code from Adobe marker */ + UINT8 density_unit; /* JFIF code for pixel size units */ + UINT16 X_density; /* Horizontal pixel density */ + UINT16 Y_density; /* Vertical pixel density */ + boolean saw_Adobe_marker; /* TRUE iff an Adobe APP14 marker was found */ +- UINT8 Adobe_transform; /* Color transform code from Adobe marker */ + + boolean CCIR601_sampling; /* TRUE=first samples are cosited */ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, May 17, 2012 at 09:00:51PM +0100, Michael Meeks wrote: + 3.6 status + connectivity, reportreader, shell, scp2 + will enable adding 10-12 modules to tail_build. + will merge next week, in time for 3.6 I should clarify this item a bit for the people who did not attend the call: it is about gbuild conversions I have done recently but have not merged into master yet. So it would be better phrased as: + pending gbuild conversions: connectivity, reportbuilder, shell, scp2 + ... 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/
Re: [Libreoffice-qa] minutes of ESC call ...
On Fri, May 18, 2012 at 08:32:47AM +0200, David Tardon wrote: On Thu, May 17, 2012 at 09:00:51PM +0100, Michael Meeks wrote: + 3.6 status + connectivity, reportreader, shell, scp2 + will enable adding 10-12 modules to tail_build. + will merge next week, in time for 3.6 I should clarify this item a bit for the people who did not attend the call: it is about gbuild conversions I have done recently but have not merged into master yet. So it would be better phrased as: + pending gbuild conversions: connectivity, reportbuilder, shell, scp2 + ... And there are some numbers regarding gbuild conversions (inferred from my current master checkout with a bit of help from https://wiki.documentfoundation.org/Development/Build_System/Module_status): modules: 219 + 4*[1] converted: 120 + 1*[2] - internal: 119 + 1 - external: 1*[3] not converted: 83 + 1*[4] - internal: 18 + 1*[5] - external: 65*[6] ignored: 4 + 1*[7] nothing to convert: 2*[8] special: 5*[9] pending: 4*[A] in progress: 1 + 1*[B] *1 X + Y means X modules from repository core, Y modules from other repositories *2 about 35 of these came from OO.o *3 the lucky winner is clucene :-) *4 these do not include pending and in-progress conversions *5 including guw and migrationanalysis, which may not be relevant anymore *6 including lucene, which can be probably removed now *7 autodoc, cosv, dmake, udm + binfilter *8 distro-configs, icon-themes *9 android, ios, cross_tail_build, cross_toolset, tail_build *A connectivity, reportbuilder, scp2, shell *B testtools + helpcontent2 It is plain to see we are finishing internal modules, which is nice :-) On the other side, we still need to come up with a viable way for converting external projects. 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/
[Libreoffice-qa] [ANN] LibreOffice 3.5.4 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.5.4. The upcoming 3.5.4 will be the fourth in a series of frequent bugfix releases on our feature-packed 3.5 code line. Please be aware that LibreOffice 3.5.4 RC1 is not ready for production use, you should continue to use LibreOffice 3.5.3 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ A note for Windows users: this Release Candidate will uninstall your current stable build and replace it. If you do not wish this to happen but still would like to test, you should follow the instructions for installing in parallel: http://wiki.documentfoundation.org/Installing_in_parallel Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the RC1 quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: https://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://challenge.documentfoundation.org/ A list of known issues with 3.5.4 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.5.4/RC1 Please find the list of changes against LibreOffice 3.5.3 here: http://download.documentfoundation.org/libreoffice/src/bugfixes-libreoffice-3-5-4-release-3.5.4.1.log Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors pgpFzREaL0m0k.pgp Description: PGP signature ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice QA call 2012-05-18 14:00 UTC
Hi Florian, On Fri, May 18, 2012 at 07:28:37AM +0200, Florian Reisinger wrote: Which room? ( or is it always the same) Ups, sorry forget that. Like always: Dial-in numbers for countries outside Germany can be found at: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Dial-in numbers inside Germany are: +49 40 18881000 (Hamburg, landline) +49 40 95069970 (Hamburg, landline) +49 89 60893 (Munich, landline) +49 1570 3336000 (vistream mobile network) Room: Room number: 53 71 38 No participant PIN is required All calls will be recorded All participants can speak Note that you can also use Skype to join the call. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] verification tweets (was: minutes of the LibreOffice QA call 2012-05-04 14:00 UTC)
Bjoern Michaelsen píše v Po 07. 05. 2012 v 20:56 +0200: On Mon, May 07, 2012 at 08:47:24PM +0200, Bjoern Michaelsen wrote: AA - blog about bug verification (Bjoern) I had some additional thoughts on this and think we should make that another QA EasyHack: Twiiter resolved bugs for verification. The task is to set up a some bot that sends a short tweet about each bug being marked as resolved/fixed by development and ask for testing and verifying the fix on master. Target is again growing the QA community and getting more people to run master builds. If there is no violent disagreement about this, I will create such a EasyHack in a few days. We could do the same asking for bug confirmation, but would need check that we are not creating too many of those compared to those asking for verification. Please, let me know the bug number. We could use there output from lo-commit-messages script. Ivan is just proposing a patch that allows reading bug titles from bugzilla. I am about to review it. Best Regards, Petr ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice QA call 2012-05-18 14:00 UTC
Bjoern Michaelsen píše v Čt 17. 05. 2012 v 18:55 +0200: Hi all, the next LibreOffice QA call is on 2012-05-18 14:00 UTC -- the agenda is suspiciously empty so far this time (I havnt had too much time to dig through the list during UDS), additions and topics most welcome! + inconsistency in the wiki about how to assign bugs, see http://lists.freedesktop.org/archives/libreoffice-qa/2012-May/001648.html I am not sure what is the preferred way these days :-) I personally prefer to put developers only into CC unless there is only one known developer interested into the given area. Best Regards, Petr ___ 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] live issues ticker (was: minutes of ESC call ...)
Hi *, On Thu, May 17, 2012 at 10:00 PM, Michael Meeks michael.me...@suse.com wrote: * Pending Action Items [...] + connect Rainer with sysadmins wrt. status/live issues ticker (Thorsten) [...] Hmm- what is meant with live issues ticker? You might not be aware, but IZBot did announce newly filed issues in the #libreoffice channel by using bugzilla's rss export of queries. i.e. just create a query with product=libreoffice and bug-creation in the last day and you basically have a live feed (a typical rss feed, so not pushed, but pulled) But I don't know what this item involves in addition/whether that would already be enough. ciao Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice QA call 2012-05-18 14:00 UTC
Bjoern Michaelsen schrieb: - create a QA EasyHack Gather own bugzilla requirements (Bjoern) - create a wikipage with what we have so far and link to it (Rainer) Hi, I will start that during next week Best regards Rainer ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] live issues ticker (was: minutes of ESC call ...)
Christian Lohmaier schrieb: + connect Rainer with sysadmins wrt. status/live issues ticker (Thorsten) Hi, I do not need any further information concerning new bugs. I use a query sorting out bugs where already other trusted staff is involved (to avoid double work), and I can't handle more bugs than I find there. Best regards Rainer ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Assigning bug to developer - inconsistency in wiki
Korrawit Pruegsanusak schrieb: I saw Rainer now use method [2] ... and if we confirm using method Hello Korrawit, thank you for the hint, today I found the time to correct that. Best regards Rainer ___ 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 the LibreOffice QA call 2012-05-18 14:00 UTC
Hi all, here are the minutes of the LibreOffice QA call is on 2012-05-18 14:00 UTC. attending: Markus, Florian, Rainer, Petr, Bjoern pending action items: - Update/Create active triagers wiki page (Cor/Rainer) - collect further ideas for spending a dedicated resource (Cor/Rainer) - blocked on CC/Litmus choice availability - write update scenario testcase in Litmus/MozTrap (Kendy) - bulk change remove EasyHacks in summary, make that white board only (Rainer, Florian, all) (actually not possible in bulk, so lets crowdsource this: when you come across a bug with EasyHack in title, please remove it there - Set Cor up with the Community/Forum maintainers at the distros to better propagate Hackfests, Bug Hunting Sessions etc. RedHat, Debian, Gentoo still missing - send a proposal for liberal assigned use in NEEDINFO to Rainer for review (Bjoern) - create a QA EasyHack Gather own bugzilla requirements (Bjoern) - create a wikipage with what we have so far and link to it (Rainer) - blog about bug verification (Bjoern) - bibisect: update docs (Bjoern) completed action items: - MozTrap evaluation install (Bjoern) - obsolete + blog about QA EasyHacks (Cor/Bjoern) - done by Cor, need repetition of course + blog about daily build changes/bugs/features from git log (Cor) - add EasyHack for bugzilla-twitter integration (Bjoern) - bibisect: also rebuild the old ~50 3.5 bibisect installs for the next update (Bjoern) - obsolete, just needs libjpeg62 package installed on precise structured manual testing: - Yifan had good progress setting this up (Petr) - account creation still creates some issues - still might be ready as soon as next week bug wrangling (Rainer): - bugzilla twitter integration - bugzilla git integration might be a blueprint (Markus) - EasyHack: https://bugs.freedesktop.org/show_bug.cgi?id=50096 - assigning policy: really assign or CC? (Petr) - CC is better, dev can then self-assign AA - update bugwrangling docs to say CC instead of assign (Rainer) - some confusion about the use of new components (Rainer) - seems to be a better way to distrubute bugs to devs as teams grow - (assigning to one dev isnt that helpful anymore then) - likely a good topic for our own bugzilla, not worth it earlier (Bjoern) AA - bring topic back to ESC (Rainer, Petr, Bjoern) community building/communication (Cor?) AA+ add yourself on openhatch.org (all) - mark yourself as a mentor for LibreOffice too - QA mentoring (Florian) - EasyHacks seem to work great in dev, we should get something similar for QA - How do we find/identify mentees? - twitter integration might get blood in the project, but here we need those who did some verifications/confirmations to take them to the next level - once we have our own bugzilla we should have a Wanna meet the QA-team-link to the QA-List in the header/footer - QA-List is freedesktop/hasslesome (Florian) AA+ - Invite active bugwranglers to next call/QA list, CC Rainer (Bjoern) bibisect for 3.5 release branch and 3.6 master (Bjoern/Korrawit): AA - merge 3.5 and 3.6 in one big bibisect repo (Bjoern) - should be done with the next update, likely around 3.6 branchoff - having bibisect in a PPA for automatic updates would be nice (Florian) - investigate bibisect in a PPA (Bjoern) The next LibreOffice QA call is on 2012-06-01 14:00 UTC. As always comments and additions welcome. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice QA call 2012-05-18 14:00 UTC
Korrawit Pruegsanusak schrieb: Another topic(?) -- bugzilla version picker for master / daily branch: * do we need to separate builds from master and release branch Hi, I am still a little wishy-washy, but we are not in a hurry - decision will be required when we get the first 3.7.0Alpha build. But it's a good idea to mention it here, may be we can do some discussion next call. Best regards Rainer ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of the LibreOffice QA call 2012-05-18 14:00 UTC
On Fri, May 18, 2012 at 07:38:10PM +0200, Bjoern Michaelsen wrote: - Yifan had good progress setting this up (Petr) this being MozTrap. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 44274] Bizarre behavior of bullets
https://bugs.freedesktop.org/show_bug.cgi?id=44274 Shannon xrf...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | Ever Confirmed|0 |1 --- Comment #4 from Shannon xrf...@gmail.com 2012-05-17 23:03:44 PDT --- Although one of your team member said it is NOT a bug, I insist it is, even it is a behavior by design, that design is not user friendly. I understand that you can use Styles to define your style, but WHY is the unindent behave like that by default? How does it calculate the position it should shift?? Very weird. @Rainer: I have described current behavior and what I expected in the initial report (attachment). If there are anything you feel not clear, please let me know. However, if your team is very familiar with this problem and insist that this is the effect by design, please feel free to close this bug again, and I won't reopen it :-) Thanks a lot! -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 50080] New: EDITING: Application stop working when copy text
https://bugs.freedesktop.org/show_bug.cgi?id=50080 Bug #: 50080 Summary: EDITING: Application stop working when copy text Classification: Unclassified Product: LibreOffice Version: LibO 3.5.3 release Platform: Other OS/Version: All Status: UNCONFIRMED Status Whiteboard: BSA Severity: normal Priority: medium Component: Writer AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: iwans...@gmail.com Problem description: I use Windows 8 customer preview operating system Steps to reproduce: 1. Select texs 2. Ctrl+C or right click = Copy 3. Application stop working and need to close Current behavior: Expected behavior: Platform (if different from the browser): Browser: Mozilla/5.0 (Windows NT 6.2) AppleWebKit/536.5 (KHTML, like Gecko) Chrome/19.0.1084.46 Safari/536.5 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46055] : Support GPOS kerning
https://bugs.freedesktop.org/show_bug.cgi?id=46055 --- Comment #4 from k-j o...@sophia-louise.de 2012-05-17 23:09:10 PDT --- (In reply to comment #2) Well, it still needs someone volunteering to work on it. Can you describe what kind of volunteering you need. So maybe someone can do this or we can ask on the lists. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
