[Libreoffice-commits] .: boost/boost_1_44_0-clang-warnings.patch boost/makefile.mk
boost/boost_1_44_0-clang-warnings.patch | 61 boost/makefile.mk |3 + 2 files changed, 64 insertions(+) New commits: commit 48d6c11c6fc6276c45bed56318fc4ac0dc033fdf Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 08:03:22 2012 +0200 Some boost warnings with Clang ...on Mac OS X, in what looks like only newly used boost headers. Change-Id: I86612a419311fe5a2dfda9eec520889707f9e5db diff --git a/boost/boost_1_44_0-clang-warnings.patch b/boost/boost_1_44_0-clang-warnings.patch new file mode 100644 index 000..c0c2206 --- /dev/null +++ b/boost/boost_1_44_0-clang-warnings.patch @@ -0,0 +1,61 @@ +--- misc/boost_1_44_0/boost/algorithm/string/detail/find_format_store.hpp 2010-07-10 22:29:03.0 +0200 misc/build/boost_1_44_0/boost/algorithm/string/detail/find_format_store.hpp 2012-06-06 23:13:26.0 +0200 +@@ -71,7 +71,7 @@ + }; + + templatetypename InputT, typename FindResultT +-bool check_find_result(InputT Input, FindResultT FindResult) ++bool check_find_result(InputT, FindResultT FindResult) + { + typedef BOOST_STRING_TYPENAME + range_const_iteratorInputT::type input_iterator_type; +--- misc/boost_1_44_0/boost/date_time/dst_rules.hpp2008-02-27 21:00:24.0 +0100 misc/build/boost_1_44_0/boost/date_time/dst_rules.hpp 2012-06-06 23:11:03.0 +0200 +@@ -371,7 +371,7 @@ + return is_not_in_dst; + } + +- static bool is_dst_boundary_day(date_type d) ++ static bool is_dst_boundary_day(date_type) + { + return false; + } +--- misc/boost_1_44_0/boost/date_time/gregorian_calendar.ipp 2010-01-10 20:17:23.0 +0100 misc/build/boost_1_44_0/boost/date_time/gregorian_calendar.ipp 2012-06-06 22:27:07.0 +0200 +@@ -47,7 +47,7 @@ + return week; + } + +-if ((week == 53)) { ++if (week == 53) { + if((day==6) ||(day == 5 is_leap_year(ymd.year))) { + return week; //under these circumstances week == 53. + } else { +--- misc/boost_1_44_0/boost/date_time/period_formatter.hpp 2008-02-27 21:00:24.0 +0100 misc/build/boost_1_44_0/boost/date_time/period_formatter.hpp 2012-06-06 23:12:48.0 +0200 +@@ -114,10 +114,10 @@ + { + m_range_option = option; + } +-void delimiter_strings(const string_type separator, +- const string_type start_delim, +- const string_type open_end_delim, +- const string_type closed_end_delim) ++void delimiter_strings(const string_type, ++ const string_type, ++ const string_type, ++ const string_type) + { + m_period_separator; + m_period_start_delimeter; +--- misc/boost_1_44_0/boost/token_functions.hpp2010-06-12 14:06:28.0 +0200 misc/build/boost_1_44_0/boost/token_functions.hpp 2012-06-06 23:12:27.0 +0200 +@@ -285,7 +285,7 @@ + template + struct assign_or_plus_equalstd::input_iterator_tag { + templateclass Iterator, class Token +-static void assign(Iterator b, Iterator e, Token t) { } ++static void assign(Iterator, Iterator, Token ) { } + templateclass Token, class Value + static void plus_equal(Token t, const Value v) { + t += v; diff --git a/boost/makefile.mk b/boost/makefile.mk index 6c9db56..5b8957f 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -75,6 +75,9 @@ PATCH_FILES += boost_1_44_0-logical-op-parentheses.patch # Backporting fixes for the GCC 4.7 -std=c++11 mode from Boost 1.48.0: PATCH_FILES += boost_1_44_0-gcc4.7.patch +# Clang warnings: +PATCH_FILES += boost_1_44_0-clang-warnings.patch + ADDITIONAL_FILES= \ libs/thread/src/win32/makefile.mk \ libs/date_time/src/gregorian/makefile.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
libreofficeaustralia.org
Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it will reach somebody there... What's the point with libreofficeaustralia.org ? Is it a copy of libreoffice.org from some point in history? Should we try to persuade its maintainers to turn it off and/or redirect to libreoffice.org, and work on that, our real site, instead? (We are as friendly towards volunteer web developers as we are towards volunteer code developers, I hope?) That site seems to be friendly towards us, so I don't see what its owner/maintainer would win by insisting on keeping it up and confusing users. I mean, if it actually was somehow Australia-specific and contained info about Australian events, user group activites and whatnot, the situation would be different of course, nothing wrong with such sites. I am asking because for some reason apparently my LibreOffice-related blog posts turn up in searches first as mirrored on that site. (I have at least twice seen people link to my blog posts through that site.) And even in weird mock localised trees, like http://www.libreofficeaustralia.org/lt/community/blog/planet/20110328/porting-libreoffice-x64-windows (lt = Lithuanian, huh?). Surely this is pointless and counter-productive. So yeah, sigh, including that link in this email which is publicly archived will increase its apparent significance even more... The real location of that blog post is http://tml-blog.blogspot.com/2011/03/porting-libreoffice-to-x64-windows.html . --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it will reach somebody there... I meant postmaster of course, but that didn't work either;) (Yeah, I guess my age shows in imagining email addressed to postmaster@random.domain would actually reach somebody...) So please remove the bogus hostmas...@libreofficeaustralia.org from CC: if following-up to avoid bounces. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Wouldn't a whois on the domain return you a working email address you can try in regards to contact details? Regards Jonathan Aquilina On 7 Jun 2012, at 08:30, Tor Lillqvist wrote: Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it will reach somebody there... I meant postmaster of course, but that didn't work either;) (Yeah, I guess my age shows in imagining email addressed to postmaster@random.domain would actually reach somebody...) So please remove the bogus hostmas...@libreofficeaustralia.org from CC: if following-up to avoid bounces. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Hey Tor Might have found you another email address you can try for the site and domain owner http://www.websitelooker.com/www/libreofficeaustralia.org Regards Jonathan Aquilina On 7 Jun 2012, at 08:30, Tor Lillqvist wrote: Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it will reach somebody there... I meant postmaster of course, but that didn't work either;) (Yeah, I guess my age shows in imagining email addressed to postmaster@random.domain would actually reach somebody...) So please remove the bogus hostmas...@libreofficeaustralia.org from CC: if following-up to avoid bounces. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
http://www.websitelooker.com/www/libreofficeaustralia.org Thanks. Must be too early in the morning for me when I didn't think that of course there must be services that provide contact information for web sites... Will contact that guy, making it clear that I am speaking just for myself, not as a representative for any community... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Glad i could help :). I have to say that looks like just a replica of the site just with a different looking landing page. Regards Jonathan Aquilina On 7 Jun 2012, at 08:39, Tor Lillqvist wrote: http://www.websitelooker.com/www/libreofficeaustralia.org Thanks. Must be too early in the morning for me when I didn't think that of course there must be services that provide contact information for web sites... Will contact that guy, making it clear that I am speaking just for myself, not as a representative for any community... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Le 07/06/12 08:23, Tor Lillqvist a écrit : Hi Tor, Did you try : ad...@wheatland.com.au As far as I can recall, this site was initially set up as a volunteer Drupal site when there was still ongoing discussion as to the CMS of choice for the official libreoffice website. In the end, it was decided to go with Silverstripe, but I guess the initiator of the Drupal site decided to continue with his own effort. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Le 07/06/12 08:23, Tor Lillqvist a écrit : Hmmm, Michael, the guy who set up the site, left his e-mail address on the LO-website mailing list. Michael Wheatland mich...@wheatland.com.au Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Michael Wheatland mich...@wheatland.com.au Yep, and he also has a gmail address, mailed him there. Let's hope this turns out nicely and not into some controversy, which was not my intention. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: libreofficeaustralia.org
Also got that from the who is that i sent Tor earlier seeing as the domain is registered in his name. Regards Jonathan Aquilina On 7 Jun 2012, at 09:08, Alexander Thurgood wrote: Le 07/06/12 08:23, Tor Lillqvist a écrit : Hmmm, Michael, the guy who set up the site, left his e-mail address on the LO-website mailing list. Michael Wheatland mich...@wheatland.com.au Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Building on Mac OS X 10.7
FYI, attached BUILD-lo script allowed me to build recent LO master on Mac OS X 10.7 with Xcode 4. A few comments: * It builds into ~/Software/lo (which must not yet exist). * It uses MacPorts for the various dependencies, but in a way that does not pollute the machine (by checking out and building a MacPorts installation completely local to the LO build). * The pkgconfig and libidl stuff, and maybe also the grep stuff, is probably only needed for moz (at least, that's the first module where I encounter need for it). * Instead of symlinking doxygen into ~/Software/lo/bin, it could also be included in autogen.lastrun via --with-doxygen=... if it were clarified how to escape content in autogen.lastrun (newlines in HOME, anyone?). (This would of course be avoided if the script would pass the configuration arguments to an explicit call of autogen.sh.) * --with-macosx-version-min-required=10.6 (instead of 10.7) is needed at least for the moz and python modules. * As per SUS an unset or null PATH means implementation-defined behaviour (that cannot easily be added to with PATH=${PATH}:...), the script simply fails on an unset or null PATH. Stephan #!/bin/bash set -ex -o pipefail # On latest Mac OS X 10.7.4 with latest Xcode 4.3.2 (incl. Command Line Tools): mkdir ${HOME?}/Software/lo svn checkout http://svn.macports.org/repository/macports/trunk \ ${HOME?}/Software/lo/mports-src # https instead of http fails to work non-interactively due to: # Error validating server certificate for 'https://svn.macports.org:443': #- The certificate is not issued by a trusted authority. Use the # fingerprint to validate the certificate manually! # Certificate information: #- Hostname: *.macports.org #- Valid: from Tue, 22 Feb 2011 17:29:43 GMT until Tue, 18 Mar 2014 # 23:36:56 GMT #- Issuer: 07969287, http://certificates.godaddy.com/repository, # GoDaddy.com, Inc., Scottsdale, Arizona, US #- Fingerprint: # 4d:ea:4a:77:55:ac:8e:2e:9e:11:8a:59:3d:ec:c7:45:7d:b0:72:19 # (R)eject, accept (t)emporarily or accept (p)ermanently? (cd ${HOME?}/Software/lo/mports-src/base ./configure \ --prefix=${HOME?}/Software/lo/mports --with-no-root-privileges \ --with-applications-dir=${HOME?}/Software/lo/mports-apps \ --with-tclpackage=${HOME?}/Software/lo/mports-tcl make make install) \ || exit 1 ${HOME?}/Software/lo/mports/bin/port selfupdate ${HOME?}/Software/lo/mports/bin/port install libidl +universal ${HOME?}/Software/lo/mports/bin/port install automake doxygen grep pkgconfig mkdir ${HOME?}/Software/lo/bin ln -s ${HOME?}/Software/lo/mports/bin/aclocal ${HOME?}/Software/lo/bin/ ln -s ${HOME?}/Software/lo/mports/bin/autoconf ${HOME?}/Software/lo/bin/ ln -s ${HOME?}/Software/lo/mports/bin/autom4te ${HOME?}/Software/lo/bin/ ln -s ${HOME?}/Software/lo/mports/bin/doxygen ${HOME?}/Software/lo/bin/ mkdir ${HOME?}/Software/lo/pkgconfig ln -s ${HOME?}/Software/lo/mports/lib/pkgconfig/glib-2.0.pc \ ${HOME?}/Software/lo/pkgconfig/ ln -s ${HOME?}/Software/lo/mports/lib/pkgconfig/libIDL-2.0.pc \ ${HOME?}/Software/lo/pkgconfig/ git clone ssh://git.freedesktop.org/git/libreoffice/core \ ${HOME?}/Software/lo/core # moz/unxmacxi/misc/build/mozilla/configure:20225 fails with egrep: Regular # expression too big with default /usr/bin/egrep (egrep (GNU grep) 2.5.1), # and adding this replacement to ${HOME?}/Software/lo/bin (which is added to # PATH) does not help, as config_host.mk contains a rewritten PATH (where # ${HOME?}/Software/lo/bin would always go after /usr/bin): ln -s ${HOME?}/Software/lo/mports/bin/egrep \ ${HOME?}/Software/lo/core/solenv/bin/ # moz/unxmacxi/misc/build/mozilla/gfx/src/mac/nsRegionPool.cpp uses NewRgn, # DisposeRgn, etc. that got removed in 10.7 SDK: cat ${HOME?}/Software/lo/core/autogen.lastrun \EOF --disable-ccache --disable-linkoo --disable-zenity --enable-binfilter --enable-dbgutil --enable-epm --enable-python=internal --enable-werror --with-lang=de en-US --with-macosx-version-min-required=10.6 --with-max-jobs=2 --with-num-cpus=2 CC=clang -m32 CXX=clang++ -m32 EOF ulimit -c unlimited cd ${HOME?}/Software/lo/core printf '%s' ${HOME?} | grep -Fqv : || exit 1 PATH=${PATH:?}:${HOME?}/Software/lo/bin \ PKG_CONFIG=${HOME?}/Software/lo/mports/bin/pkg-config \ PKG_CONFIG_LIBDIR=${HOME?}/Software/lo/pkgconfig make check ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Building on Mac OS X 10.7
* --with-macosx-version-min-required=10.6 (instead of 10.7) is needed at least for the moz and python modules. If I recall correctly, using --with-macosx-version-min-required=10.7 even in a build with no mozilla on python will break in vcl thanks to it using deprecated API (deprecated already in the 10.4 SDK...), which has been finally removed completely from the 10.7 SDK. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - Module_cross_tail_build.mk unodevtools/source
On Wed, Jun 06, 2012 at 08:59:12AM -0700, Tor Lillqvist wrote: Module_cross_tail_build.mk |1 unodevtools/source/skeletonmaker/skeletoncommon.cxx | 34 2 files changed, 8 insertions(+), 27 deletions(-) New commits: commit 9369f5abd785a9df174c5d583d55e3fd6918b542 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Jun 6 18:58:11 2012 +0300 unodevtools is not needed for the build platform in a cross-compilation Change-Id: If77a879178a260590be64253435b6c8adde31878 diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index cc27ed1..86f87fd 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ sax \ shell \ tools \ - unodevtools \ unoil \ unotest \ unotools \ It was in the build.lst for cross_toolset orignally, for some reason... Anyway, I am sure that there are more modules that are not really needed and only got into the list as dependencies. And there are yet other modules that could be removed after some shuffling, e.g., I am pretty sure shell is only needed because of lngconvex. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Incorrect OSL_ENSURE - SAL_WARN_IF conversions (Re: [Libreoffice-commits] .: sw/source)
On Wed, Jun 06, 2012 at 06:28:48PM +0200, Lubos Lunak l.lu...@suse.cz wrote: Hello, please note that when convering from the obsolete OSL_ENSURE or similar macros to SAL_WARN_IF, the condition needs to be inverted. OSL_ENSURE is a (broken) assert-like macro and so it requires the condition to be true or it warns. SAL_WARN_IF, as the name says, requires the condition to be false and warns on true. Hi Lubos, Hah, thanks for pointing that out, didn't notice the difference. Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: calc: function WEEKNUM seems not to conform to ODFF1.2
Hi Eike, I would like to change the behaviour of function WEEKNUM to conform to ODFF1.2 [...] We might get away with strictly complying with ODFF and generate an error for constraint cases if prominently mentioned in release notes that WEEKNUM changed. Users will have to change formulas then and we get angry mails and bug reports ;-) The other [...] quite more complicated than the first solution and introducing interoperability problems. Therefor I'd go with strict ODFF implementation. I will work on strictly implementing ODFF for WEEKNUM and ISOWEEKNUM. I don't know if I will find a way to produce an error message explaining to the user what exactly is wrong when opening old files with WEEKNUM in it. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: binfilter/bf_forms
binfilter/bf_forms/source/component/Image.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 4630cdd4990593733872a264e8abf031fa144e1f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 09:24:45 2012 +0200 Disentangle disposing using Change-Id: I4ad806521063c9e6699488cdb52cec349fe9dfe6 diff --git a/binfilter/bf_forms/source/component/Image.hxx b/binfilter/bf_forms/source/component/Image.hxx index 09d86fa..2863013 100644 --- a/binfilter/bf_forms/source/component/Image.hxx +++ b/binfilter/bf_forms/source/component/Image.hxx @@ -185,8 +185,6 @@ public: // ::com::sun::star::beans::XPropertyChangeListener virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent ) throw(::com::sun::star::uno::RuntimeException); -using OControl::disposing; - protected: ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel getXModel(const InterfaceRef xIface) const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/tabpages/numpages.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 5601c5d395a5eece95a8d8a5600de91aa20485c6 Author: Stephan van den Akker stephanv...@gmail.com Date: Thu Jun 7 09:21:17 2012 +0200 Fix for fdo#49859 Impress bullet indent data entry This fixes fdo#49859 - numbering alignment or indentation is not applied in Impress, by making the tabpage deactivate force-read the values. diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index fc05d72..63e4ae4 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -3007,7 +3007,12 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet rSet) int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) +{ +if(aDistBorderMF.IsEnabled()) +DistanceHdl_Impl(aDistBorderMF); +DistanceHdl_Impl(aIndentMF); FillItemSet(*_pSet); +} return sal_True; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/tabpages/numpages.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 9277c7320406b4737bd71564e341464676c66e31 Author: Stephan van den Akker stephanv...@gmail.com Date: Thu Jun 7 09:21:17 2012 +0200 Fix for fdo#49859 Impress bullet indent data entry This fixes fdo#49859 - numbering alignment or indentation is not applied in Impress, by making the tabpage deactivate force-read the values. diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index fc05d72..63e4ae4 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -3007,7 +3007,12 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet rSet) int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) +{ +if(aDistBorderMF.IsEnabled()) +DistanceHdl_Impl(aDistBorderMF); +DistanceHdl_Impl(aIndentMF); FillItemSet(*_pSet); +} return sal_True; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source sw/source
cui/source/dialogs/postdlg.src |6 +++--- sw/source/ui/inc/shells.hrc |1 - sw/source/ui/ribbar/workctrl.src |6 +++--- sw/source/ui/shells/shells.src |4 4 files changed, 6 insertions(+), 11 deletions(-) New commits: commit f07b7ddb05194be946dc4d8dea39876ce2c2b76b Author: Andras Timar ati...@suse.com Date: Thu Jun 7 09:29:03 2012 +0200 fdo#50809 use the word 'Comment' instead of 'Note' everywhere Change-Id: Ia42060d415516a1ba8e23f913875786fe27c9710 diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 9b65235..33d5871 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -37,7 +37,7 @@ ModalDialog RID_SVXDLG_POSTIT OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 198 , 134 ) ; -Text [ en-US ] = Note ; +Text [ en-US ] = Comment ; Moveable = TRUE ; FixedText FT_LASTEDITLABEL { @@ -122,11 +122,11 @@ ModalDialog RID_SVXDLG_POSTIT // lokale Strings String STR_NOTIZ_EDIT { -Text [ en-US ] = Edit Note ; +Text [ en-US ] = Edit Comment ; }; String STR_NOTIZ_INSERT { -Text [ en-US ] = Insert note ; +Text [ en-US ] = Insert Comment ; }; }; // ** EOF diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index 6c3e409..0c96219 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.hrc @@ -37,7 +37,6 @@ #define STR_GRFILTER_FILTERERROR (RC_SHELLS_BEGIN + 5) #define STR_GRFILTER_TOOBIG(RC_SHELLS_BEGIN + 6) #define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7) -#define STR_NOTIZ_INSERT (RC_SHELLS_BEGIN + 8) #define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9) #define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10) #define STR_REDLINE_COMMENT(RC_SHELLS_BEGIN + 11) diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src index 6aac347..615f35f 100644 --- a/sw/source/ui/ribbar/workctrl.src +++ b/sw/source/ui/ribbar/workctrl.src @@ -197,7 +197,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN }; String ST_POSTIT { -Text [ en-US ] = Note ; +Text [ en-US ] = Comment ; }; String ST_SRCH_REP { @@ -282,7 +282,7 @@ String STR_IMGBTN_MARK_DOWN }; String STR_IMGBTN_POSTIT_DOWN { -Text [ en-US ] = Next Note ; +Text [ en-US ] = Next Comment ; }; String STR_IMGBTN_SRCH_REP_DOWN { @@ -354,7 +354,7 @@ String STR_IMGBTN_MARK_UP }; String STR_IMGBTN_POSTIT_UP { -Text [ en-US ] = Previous Note ; +Text [ en-US ] = Previous Comment ; }; String STR_IMGBTN_SRCH_REP_UP { diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index ee1f6ec..ff8e093 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -66,10 +66,6 @@ String STR_NO_ADDRESSBOOK { Text [ en-US ] = An Address Book does not exist ; }; -String STR_NOTIZ_INSERT -{ -Text [ en-US ] = Insert Note ; -}; String STR_REDLINE_COMMENT { Text [ en-US ] = Comment: ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] proposed fix for fdo#49859
Stephan van den Akker wrote: I believe I found the cause of fdo#49859 FORMATTING, UI: numbering alignment or indentation is not applied in Impress Excellent, thanks so much - now finally pushed, to both master and -3-6 - I propose an addition to DeactivatePage(): int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) { if(_pSet) { if(aDistBorderMF.IsEnabled()) DistanceHdl_Impl(aDistBorderMF); DistanceHdl_Impl(aIndentMF); FillItemSet(*_pSet); } return sal_True; } Yep, makes sense. Question: Ideally, I would wrap the DistanceHdl_Impl() calls in ..MF.HasFocus() checks to prevent unnecessary calls: if(aDistBorderMF.HasFocus() aDistBorderMF.IsEnabled()) DistanceHdl_Impl(aDistBorderMF); if(aIndentMF.HasFocus()) DistanceHdl_Impl(aIndentMF); FillItemSet(*_pSet); But both aDistBorderMF.HasFocus() and aIndentMF.HasFocus() always seem to return false! Is this intentional, or a bug? Looks like the same reason as for the actual bug - stuff gets messaged in different orders here. I wouldn't bother too much. Cheers, -- Thorsten pgplMmADoIQx3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED-3-5] fdo#50144 Additional information in the Selection field of Insert cross-reference dialog
On Wed, Jun 06, 2012 at 11:31:31PM +0200, Andras Timar tima...@gmail.com wrote: Please review it for libreoffice-3-5 http://cgit.freedesktop.org/libreoffice/core/commit/?id=10837b669c9fe3f6b1e1905bfbb855ca02497eb7 Pushed to libreoffice-3-5. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/fields/expfld.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f7dec9b42d347e06b71f81f1e18cbe881e16927 Author: Andras Timar ati...@suse.com Date: Wed Jun 6 23:15:19 2012 +0200 fdo#50144 put full reference text to selection field Change-Id: I99a4a2a3fc6e20f9c8d35213609075f2269eab2f Signed-off-by: Miklos Vajna vmik...@suse.cz diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index d1542c5..ec54fe5 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -607,7 +607,7 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList rList ) pNd-GetNodes().IsDocNodes() ) { _SeqFldLstElem* pNew = new _SeqFldLstElem( -pNd-GetExpandTxt( 0, (*pF-GetTxtFld()-GetStart()) + 1 ), +pNd-GetExpandTxt( 0, USHRT_MAX ), ((SwSetExpField*)pF-GetFld())-GetSeqNumber() ); rList.InsertSort( pNew ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: 2 commits - Module_cross_tail_build.mk unodevtools/source
Anyway, I am sure that there are more modules that are not really needed and only got into the list as dependencies. Yep; I recall that when I started the cross-compiling work I had to include some module X in the list of stuff done on the build platform just because X provided a header that contained some enum or something that was used by some other (unrelated, and actually needed) code. (The library from X was not needed.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.in
configure.in | 70 +-- 1 file changed, 35 insertions(+), 35 deletions(-) New commits: commit 41e7b71bdc86c025ba038d1a69f23bbd66d9cb3b Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Jun 7 10:32:00 2012 +0300 Clean up some Perl leftovers from set_soenv.in Change-Id: I83ba1fac65958e8df30b5454601e7e20fbb58a8f diff --git a/configure.in b/configure.in index bd93fc2..4713dd3 100644 --- a/configure.in +++ b/configure.in @@ -793,7 +793,7 @@ AC_ARG_ENABLE(tdeab, [Disable the TDE address book support.]), , if test $enable_tde = yes; then -enable_tdeab=yes; +enable_tdeab=yes fi ) @@ -808,7 +808,7 @@ AC_ARG_ENABLE(kdeab, [Disable the KDE3 address book support.]), , if test $enable_kde = yes; then -enable_kdeab=yes; +enable_kdeab=yes fi ) @@ -2343,9 +2343,9 @@ COMPATH=`dirname $CC` if test $COMPATH = .; then AC_PATH_PROGS(COMPATH, $CC) dnl double square bracket to get single because of M4 quote... -COMPATH=`echo $COMPATH | $SED s@/[[^/:]]*\\\$@@`; +COMPATH=`echo $COMPATH | $SED s@/[[^/:]]*\\\$@@` fi -COMPATH=`echo $COMPATH | $SED s@/[[Bb]][[Ii]][[Nn]]\\\$@@`; +COMPATH=`echo $COMPATH | $SED s@/[[Bb]][[Ii]][[Nn]]\\\$@@` dnl === dnl Test the Solaris compiler version @@ -2443,7 +2443,7 @@ if test $_os = Darwin; then else AC_MSG_ERROR([$MACOSX_SDK_PATH not found]) fi -FRAMEWORKSHOME=$MACOSX_SDK_PATH/System/Library/Frameworks; +FRAMEWORKSHOME=$MACOSX_SDK_PATH/System/Library/Frameworks MACOSX_DEPLOYMENT_TARGET=$with_macosx_version_min_required case $with_macosx_version_min_required in @@ -2763,14 +2763,14 @@ if test $_os = WINNT; then if test $WITH_MINGW != yes; then AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation path]) if test -z $with_cl_home; then -vctest=`./oowintool --msvc-productdir`; +vctest=`./oowintool --msvc-productdir` if test $CL_X64 = ; then if test -x $vctest/bin/cl.exe; then -with_cl_home=$vctest; +with_cl_home=$vctest fi else if test -x $vctest/bin/amd64/cl.exe; then -with_cl_home=$vctest; +with_cl_home=$vctest fi fi else @@ -3045,7 +3045,7 @@ darwin*) RTL_ARCH=ARM_EABI GUIBASE=cocoatouch OUTPATH=unxiosr -OS=IOS; +OS=IOS ;; powerpc*) CPU=P @@ -3878,7 +3878,7 @@ if test -z $GNUMAKE; then fi AC_MSG_CHECKING([the GNU make version]) -_make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`; +_make_version=`$GNUMAKE --version | grep GNU | $GREP -v GPL | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'` _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*1+\$2*100+\$3 }'` if test $_make_longver -ge 038200; then AC_MSG_RESULT([$GNUMAKE $_make_version]) @@ -3957,7 +3957,7 @@ rm -rf $TESTGMAKEFILEFUNC AC_SUBST(HAVE_GNUMAKE_FILE_FUNC) AC_SUBST(GNUMAKE) -_make_ver_check=`$GNUMAKE --version | grep LibreOffice`; +_make_ver_check=`$GNUMAKE --version | grep LibreOffice` STALE_MAKE= make_warning= if test $_make_ver_check = ; then @@ -4124,7 +4124,7 @@ if test $build_os = cygwin; then MIDL_PATH=$with_cl_home/../Common7/Tools/Bin fi if test -z $MIDL_PATH; then -vstest=`./oowintool --msvs-productdir`; +vstest=`./oowintool --msvs-productdir` if test -x $vstest/Common7/Tools/Bin/midl.exe; then MIDL_PATH=$vstest/Common7/Tools/Bin fi @@ -4153,7 +4153,7 @@ if test $build_os = cygwin; then if test -x $with_csc_path/csc.exe; then CSC_PATH=$with_csc_path else - csctest=`./oowintool --csc-compilerdir`; + csctest=`./oowintool --csc-compilerdir` if test -x $csctest/csc.exe; then CSC_PATH=$csctest fi @@ -4987,7 +4987,7 @@ dnl === AC_MSG_CHECKING([which memory allocator to use]) if test $with_alloc = system; then AC_MSG_RESULT([system]) -ALLOC=SYS_ALLOC; +ALLOC=SYS_ALLOC AC_CHECK_FUNCS([malloc realloc calloc free]) fi if test $with_alloc = tcmalloc; then @@ -4997,7 +4997,7 @@ if test $with_alloc = tcmalloc; then fi AC_CHECK_LIB([tcmalloc], [malloc], [:], [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google Profiling Tools)], []) -ALLOC=TCMALLOC; +ALLOC=TCMALLOC fi if test $with_alloc = jemalloc; then if test $_os != FreeBSD -o $_os != NetBSD; then @@ -5006,11 +5006,11 @@ if test $with_alloc = jemalloc; then CFLAGS=$CFLAGS -pthread AC_CHECK_LIB([jemalloc], [malloc], [:],
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source sw/source
cui/source/dialogs/postdlg.src |6 +++--- sw/source/ui/inc/shells.hrc |1 - sw/source/ui/ribbar/workctrl.src |6 +++--- sw/source/ui/shells/shells.src |4 4 files changed, 6 insertions(+), 11 deletions(-) New commits: commit 5e945f4009769e6349e2b00959803b1e2e94391e Author: Andras Timar ati...@suse.com Date: Thu Jun 7 09:29:03 2012 +0200 fdo#50809 use the word 'Comment' instead of 'Note' everywhere Change-Id: Ia42060d415516a1ba8e23f913875786fe27c9710 diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 9b65235..33d5871 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -37,7 +37,7 @@ ModalDialog RID_SVXDLG_POSTIT OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 198 , 134 ) ; -Text [ en-US ] = Note ; +Text [ en-US ] = Comment ; Moveable = TRUE ; FixedText FT_LASTEDITLABEL { @@ -122,11 +122,11 @@ ModalDialog RID_SVXDLG_POSTIT // lokale Strings String STR_NOTIZ_EDIT { -Text [ en-US ] = Edit Note ; +Text [ en-US ] = Edit Comment ; }; String STR_NOTIZ_INSERT { -Text [ en-US ] = Insert note ; +Text [ en-US ] = Insert Comment ; }; }; // ** EOF diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc index 6c3e409..0c96219 100644 --- a/sw/source/ui/inc/shells.hrc +++ b/sw/source/ui/inc/shells.hrc @@ -37,7 +37,6 @@ #define STR_GRFILTER_FILTERERROR (RC_SHELLS_BEGIN + 5) #define STR_GRFILTER_TOOBIG(RC_SHELLS_BEGIN + 6) #define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7) -#define STR_NOTIZ_INSERT (RC_SHELLS_BEGIN + 8) #define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9) #define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10) #define STR_REDLINE_COMMENT(RC_SHELLS_BEGIN + 11) diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src index 6aac347..615f35f 100644 --- a/sw/source/ui/ribbar/workctrl.src +++ b/sw/source/ui/ribbar/workctrl.src @@ -197,7 +197,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN }; String ST_POSTIT { -Text [ en-US ] = Note ; +Text [ en-US ] = Comment ; }; String ST_SRCH_REP { @@ -282,7 +282,7 @@ String STR_IMGBTN_MARK_DOWN }; String STR_IMGBTN_POSTIT_DOWN { -Text [ en-US ] = Next Note ; +Text [ en-US ] = Next Comment ; }; String STR_IMGBTN_SRCH_REP_DOWN { @@ -354,7 +354,7 @@ String STR_IMGBTN_MARK_UP }; String STR_IMGBTN_POSTIT_UP { -Text [ en-US ] = Previous Note ; +Text [ en-US ] = Previous Comment ; }; String STR_IMGBTN_SRCH_REP_UP { diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index ee1f6ec..ff8e093 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -66,10 +66,6 @@ String STR_NO_ADDRESSBOOK { Text [ en-US ] = An Address Book does not exist ; }; -String STR_NOTIZ_INSERT -{ -Text [ en-US ] = Insert Note ; -}; String STR_REDLINE_COMMENT { Text [ en-US ] = Comment: ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
visio linux praser
Hi, I found your PTT on the web. Did I understand correct that you have develop a visio parser for linux? Thx Matan Kacen - Intel Israel (74) Limited This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: visio linux praser
On 07/06/12 10:13, Kacen, Matan wrote: Did I understand correct that you have develop a visio parser for linux? Yes, you did :) F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/bitmap3.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 666f89632fe42afeae02c6022fe0f50198b7118b Author: Tomaž Vajngerl qui...@gmail.com Date: Wed Jun 6 22:55:30 2012 +0200 Fix new Bitmap creation in Lanczos resampling. Bitmaps in Lanczos resampling were not created correctly. This problem was visible in Impress when the background of a slide was set to tile. Change-Id: Ic77ae1f20a872176eacb1f28175d53b4a0934008 diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 094dcd3..ec458d9 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2208,7 +2208,6 @@ sal_Bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, return bRet; } -//--- bool Bitmap::ImplScaleLanczos( const double rScaleX, const double rScaleY ) { const Size aSizePix( GetSizePixel() ); @@ -2232,7 +2231,7 @@ bool Bitmap::ImplScaleLanczos( const double rScaleX, const double rScaleY ) ImplCalculateContributions( nWidth, nNewWidth, aSupport, aNumberOfContributions, pWeights, pPixels, pCount ); BitmapReadAccess* pReadAcc = AcquireReadAccess(); -Bitmap aNewBitmap( Size( nNewWidth, nHeight ), GetBitCount(), pReadAcc-GetPalette() ); +Bitmap aNewBitmap( Size( nNewWidth, nHeight ), 24); bool bResult = ImplHorizontalConvolution( aNewBitmap, pReadAcc, aNumberOfContributions, pWeights, pPixels, pCount ); // Cleanup @@ -2260,7 +2259,7 @@ bool Bitmap::ImplScaleLanczos( const double rScaleX, const double rScaleY ) ImplCalculateContributions(nHeight, nNewHeight, aSupport, aNumberOfContributions, pWeights, pPixels, pCount ); pReadAcc = AcquireReadAccess(); -aNewBitmap = Bitmap( Size( nNewWidth, nNewHeight ), GetBitCount(), pReadAcc-GetPalette() ); +aNewBitmap = Bitmap( Size( nNewWidth, nNewHeight ), 24); bResult = ImplVerticalConvolution( aNewBitmap, pReadAcc, aNumberOfContributions, pWeights, pPixels, pCount ); // Cleanup ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/inc/postdlg.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e4d49e65a65b5f4fbe3bb27fa1097e414857d535 Author: Andras Timar ati...@suse.com Date: Thu Jun 7 10:27:49 2012 +0200 Hide aAuthorFT fixed text, too, when the button is hidden Change-Id: If8cd9a9f9e5518d054b9648cde28d996454480c5 diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 7d66cc9..953fbef 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -75,7 +75,7 @@ public: voidShowLastAuthor(const String rAuthor, const String rDate); inline void DontChangeAuthor() { aAuthorBtn.Enable(sal_False); } -inline void HideAuthor(){ aAuthorBtn.Hide(); } +inline void HideAuthor(){ aAuthorFT.Hide(); aAuthorBtn.Hide(); } inline void SetReadonlyPostIt(sal_Bool bDisable) { aOKBtn.Enable( !bDisable ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/vba/vbarange.cxx |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) New commits: commit 2bce4c76d5f05d92ffd987c25b7e492d5a2f309b Author: Kevin Hunter hunt...@earlham.edu Date: Thu Jun 7 09:35:05 2012 +0100 fix unused pDocSh variable Change-Id: Iab65ee69a7a653835073f7d7dc4084e252ccd782 diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 95e..bdedeab 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -5530,15 +5530,10 @@ ScVbaRange::AutoFill( const uno::Reference excel::XRange Destination, const } } } -ScDocShell* pDocSh= excel::GetDocShellFromRange( mxRange ); FillCmd eCmd = FILL_AUTO; FillDateCmd eDateCmd = FILL_DAY; -#ifdef VBA_OOBUILD_HACK -double fEndValue = MAXDOUBLE; -#endif - if ( Type.hasValue() ) { sal_Int16 nFillType = excel::XlAutoFillType::xlFillDefault; @@ -5581,6 +5576,8 @@ ScVbaRange::AutoFill( const uno::Reference excel::XRange Destination, const } } #ifdef VBA_OOBUILD_HACK +double fEndValue = MAXDOUBLE; +ScDocShell* pDocSh = excel::GetDocShellFromRange( mxRange ); pDocSh-GetDocFunc().FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd, nCount, fStep, fEndValue, sal_True, sal_True ); #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] newdev review request: sc/.../vbarange.cxx
On 06/06/12 17:41, Kevin Hunter wrote: Hullo List, Having been too excited last time (7+ months) and committed to master way too early, I'm back to basics as I try (once again) to get back into LO dev. Here's a minor cppcheck-found unused variable patch. Please review at your convenience. Patch looks fine, thanks for that, pushed now. Btw if you are interested there are probably quite a few instances of VBA_OOBUILD_HACK buried in there that could do with removal ( and then finally wherever the -D for same passed to the compiler ) Cleaning those out would be appreciated ( by me at least ) Next time for convenience could you use 'git format-patch' for creating the diff ( just makes it easier to process ) thanks alot !! Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
compile LibreOffice
Hi, after ./g pull -r today and some make clean in few modules, I get below: [ build LNK ] Library/libsdfiltlo.so [ build LNK ] Library/libsduilo.so [ build CUT ] sd_uimpress terminate called after throwing an instance of 'com::sun::star::uno::DeploymentException' Aborted Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export GDBCPPUNITTRACE=gdb --args # for interactive debugging export VALGRIND=memcheck# for memory checking and retry. make[2]: *** [/home/luc/git/core/workdir/unxlngx6.pro/CppunitTest/sd_uimpress.test] Fout 1 make[2]: *** Wachten op onvoltooide taken... make[2]: Map '/home/luc/git/core/tail_build' wordt verlaten make[1]: *** [tail_build] Fout 2 make[1]: Map '/home/luc/git/core' wordt verlaten make: *** [tail_build] Fout 2 Any idea how to fix this? Thanks -- Luc Castermans mailto:luc.casterm...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source
vcl/source/gdi/bitmap3.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 08003963cf1cb3ee8558ae6952afc32ca43fb316 Author: Tomaž Vajngerl qui...@gmail.com Date: Wed Jun 6 22:55:30 2012 +0200 Fix new Bitmap creation in Lanczos resampling. Bitmaps in Lanczos resampling were not created correctly. This problem was visible in Impress when the background of a slide was set to tile. Change-Id: Ic77ae1f20a872176eacb1f28175d53b4a0934008 diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 094dcd3..ec458d9 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -2208,7 +2208,6 @@ sal_Bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, return bRet; } -//--- bool Bitmap::ImplScaleLanczos( const double rScaleX, const double rScaleY ) { const Size aSizePix( GetSizePixel() ); @@ -2232,7 +2231,7 @@ bool Bitmap::ImplScaleLanczos( const double rScaleX, const double rScaleY ) ImplCalculateContributions( nWidth, nNewWidth, aSupport, aNumberOfContributions, pWeights, pPixels, pCount ); BitmapReadAccess* pReadAcc = AcquireReadAccess(); -Bitmap aNewBitmap( Size( nNewWidth, nHeight ), GetBitCount(), pReadAcc-GetPalette() ); +Bitmap aNewBitmap( Size( nNewWidth, nHeight ), 24); bool bResult = ImplHorizontalConvolution( aNewBitmap, pReadAcc, aNumberOfContributions, pWeights, pPixels, pCount ); // Cleanup @@ -2260,7 +2259,7 @@ bool Bitmap::ImplScaleLanczos( const double rScaleX, const double rScaleY ) ImplCalculateContributions(nHeight, nNewHeight, aSupport, aNumberOfContributions, pWeights, pPixels, pCount ); pReadAcc = AcquireReadAccess(); -aNewBitmap = Bitmap( Size( nNewWidth, nNewHeight ), GetBitCount(), pReadAcc-GetPalette() ); +aNewBitmap = Bitmap( Size( nNewWidth, nNewHeight ), 24); bResult = ImplVerticalConvolution( aNewBitmap, pReadAcc, aNumberOfContributions, pWeights, pPixels, pCount ); // Cleanup ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source writerfilter/source
oox/inc/oox/vml/vmlshape.hxx |1 + oox/source/token/properties.txt |1 + oox/source/vml/vmlshape.cxx |3 +++ oox/source/vml/vmlshapecontext.cxx|1 + writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +- 5 files changed, 7 insertions(+), 1 deletion(-) New commits: commit 9e8957de203bb9abb208516ad32aee9527feb67b Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 10:51:45 2012 +0200 n#757905 fix VML import of mso-wrap-style:none There were two problems here: 1) SimpleShape::implConvertAndInsert() did not set the anchor type 2) DomainMapper_Impl::PushShapeContext() tried to overwrite it Change-Id: I2c32016c4bb15c891cf287d8208e10817c6291e6 diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index d8e7209..b9e4908 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -85,6 +85,7 @@ struct ShapeTypeModel ::rtl::OUString maFlip; /// Flip type of the shape (can be x or y). sal_BoolmbAutoHeight; /// If true, the height value is a minimum value (mostly used for textboxes) sal_BoolmbVisible; /// Visible or Hidden +::rtl::OUString maWrapStyle;/// Wrapping mode for text. StrokeModel maStrokeModel; /// Border line formatting. FillModel maFillModel;/// Shape fill formatting. diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index f2442e6..596bf82 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -10,6 +10,7 @@ AdjustmentValues Address Align AnchorPosition +AnchorType ApplyFormDesignMode AreaLinks ArrangeOrder diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index aa39fcc..44fc631 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -426,6 +426,9 @@ Reference XShape SimpleShape::implConvertAndInsert( const Reference XShapes aPropertySet.setAnyProperty(PROP_VertOrientPosition, makeAny( aShapeRect.Y ) ); } +if (xShape.is() maTypeModel.maWrapStyle == none) +PropertySet(xShape).setAnyProperty(PROP_AnchorType, makeAny(text::TextContentAnchorType_AS_CHARACTER)); + return xShape; } diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 68793c9..290a737 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -363,6 +363,7 @@ void ShapeTypeContext::setStyle( const OUString rStyle ) else if( aName == flip ) mrTypeModel.maFlip = aValue; else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( visibility ) ) ) mrTypeModel.mbVisible = !aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(hidden) ); +else if( aName == mso-wrap-style ) mrTypeModel.maWrapStyle = aValue; } } } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 88a29d1..08e189b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1539,7 +1539,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference drawing::XShape uno::Referencetext::XTextRange xTextRange(xTextAppend-createTextCursorByRange(xTextAppend-getEnd()), uno::UNO_QUERY_THROW); xTextAppend-insertTextContent(xTextRange, xTextContent, sal_False); } -else +else if (nAnchorType != text::TextContentAnchorType_AS_CHARACTER) { xProps-setPropertyValue( rPropNameSupplier.GetName( PROP_ANCHOR_TYPE ), bIsGraphic ? uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) : uno::makeAny( text::TextContentAnchorType_AT_PARAGRAPH ) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: compile LibreOffice
On Thu, Jun 07, 2012 at 10:42:50AM +0200, Luc Castermans luc.casterm...@gmail.com wrote: after ./g pull -r today and some make clean in few modules, I get below: Try a toplevel 'make clean' - if the problem persists, run the unit test in gdb (as the output says) and check the backtrace. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice meeting (hacking, writing) in Utrecht, Saturday June 9th
Hi all, For those that are able to come to Utrecht next Saturday: there will be a LibreOffice meeting! It is from the Dutch Language group (so Flanders and The Netherlands) and we do both hacking in code and work on documentation. And often we also meet old friends from the OOo-time there. The meeting is part of an event from the Dutch Linux Users Group, NLLGG: http://www.nllgg.nl/bijeenkomst_20120609 Info on the Dutch language wiki: http://wiki.documentfoundation.org/Main_Page/nl#Beurzen.2C_presentaties.2C_bijeenkomsten:_agenda Kind regards, -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Re: [PUSHED] Re: [PATCH] fdo#46378: Poor Resampling Image quality
Hi Tomaž, On 2012-06-06 at 23:22 +0200, Tomaž Vajngerl wrote: Great stuff - I have pushed your patch, and also my patches to default to Lanczos filter. Can you please add an example of before and after where the advantages of the Lanzcos filter are nicely visible to the Release Notes (http://wiki.documentfoundation.org/ReleaseNotes/3.6)? Done. Great picture, thanks a lot! Adding the QA list to the CC: - thanks to Tomaz, we have changed the default of the image resize operations to a new scaling operation. Please be careful about bugs that involve scaling of images, quality of eg. PDF output, or speed of such operations. Regarding bugs.. I have found a problem with creation of Bitmaps in ImplScaleLanczos. I have fixed so the Bitmaps are created in the same way as in ImplScaleInterpolate - the patch is attached. This problem is visible if you go into impress and set the background of a slide to a bitmap which is tiled. I have not found any reports in bugzilla about this yet. Pushed :-) Actually - can you ask for push access? Your patches are consistent, look good, and you know what you are doing, so would be great if you could push them yourself. Of course in case of doubts, you can still ask for a review on the ML first. http://wiki.documentfoundation.org/Development/NewAccount Please CC: michael.me...@novell.com on the bug you create. Tomaz - what interests you next? :-) You've already outlined some ideas regarding the filters, correct? I am working now to on blur/soften filter which uses ImplHorizontalConvolution and ImplVerticalConvolution - which are also used in Lanczos resampling. I have this already working with a parameterized blur radius. Currently the soften filter only uses a fixed 3x3 convolution matrix with 2D convolution algorithm. My solution should be faster and more flexible than the current one. I still need to add a dialog to select the blur radius which I will do in step 2. Other ideas I have is to add reduce image resolution function directly to bitmap so a user could change the image resolution not only in PDF export but in general. When a user applies a filter, the image is changed and saved as a new PNG image into the document. So to create something like this should not be hard. In a long run I want to improve the quality of images in export but I think this is a problem of whole page rendering and not so simple to solve. That sounds great, should you need any code pointers, I'll be glad to help. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 --- Comment #324 from umi bernd.ku...@web.de 2012-06-07 02:37:10 PDT --- I nominate Bug 49582 - FILESAVE: Long delays saving in XP .XLS format. Save as xls/xlsx with table column line must be possible. -- 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
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 umi bernd.ku...@web.de changed: What|Removed |Added CC||bernd.ku...@web.de Depends on||49582 -- 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: Is it ok to remove visual navigator comments?
On 06/06/2012 05:00 PM, Michael Stahl wrote: it is more useful if it separates a chunk of related stuff from another chunk of related stuff, e.g. if there are multiple classes implemented in one file it can be nice to have a separator between the methods of different classes, but this should usually result in a number of separators in a file that can be counted on one hand. The only thing that never looks right is a rule. There is not in existence a page with a rule on it that cannot be instantly and obviously improved by taking the rule out. — George Bernard Shaw, in The Dolphin (1940) [according to Knuth] :) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Is it ok to remove visual navigator comments?
On 07/06/12 11:46, Stephan Bergmann wrote: On 06/06/2012 05:00 PM, Michael Stahl wrote: it is more useful if it separates a chunk of related stuff from another chunk of related stuff, e.g. if there are multiple classes implemented in one file it can be nice to have a separator between the methods of different classes, but this should usually result in a number of separators in a file that can be counted on one hand. The only thing that never looks right is a rule. There is not in existence a page with a rule on it that cannot be instantly and obviously improved by taking the rule out. — George Bernard Shaw, in The Dolphin (1940) [according to Knuth] :) well obviously in a printed work you'd have a page break in this case, so i fully agree with that. however, people rarely print out our source code, so the various files in sw/ that include literal ASCII form feed characters are somewhat outdated; on a non-paginated display medium a rule may make sense :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sal/osl
sal/osl/unx/asm/interlck_x86.s | 52 - 1 file changed, 26 insertions(+), 26 deletions(-) New commits: commit 0de63407f583ad1d5ad3dad9ac014f0c100a83b1 Merge: 4421155... 5583637... Author: Lionel Dricot pl...@ploum.net Date: Thu Jun 7 12:38:33 2012 +0200 Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/core commit 4421155eea4a77420ada79d646ac69b7c6b73146 Author: Lionel Dricot pl...@ploum.net Date: Thu Jun 7 12:36:17 2012 +0200 The correct comment for the assembly file is #, not *. This assembly file is only compiled on x86 Solaris. diff --git a/sal/osl/unx/asm/interlck_x86.s b/sal/osl/unx/asm/interlck_x86.s index c1f9900..f8acd48 100644 --- a/sal/osl/unx/asm/interlck_x86.s +++ b/sal/osl/unx/asm/interlck_x86.s @@ -1,29 +1,29 @@ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / +/# + # + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + # + # Copyright 2000, 2010 Oracle and/or its affiliates. + # + # OpenOffice.org - a multi-platform office productivity suite + # + # This file is part of OpenOffice.org. + # + # OpenOffice.org is free software: you can redistribute it and/or modify + # it under the terms of the GNU Lesser General Public License version 3 + # only, as published by the Free Software Foundation. + # + # OpenOffice.org is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU Lesser General Public License version 3 for more details + # (a copy is included in the LICENSE file that accompanied this code). + # + # You should have received a copy of the GNU Lesser General Public License + # version 3 along with OpenOffice.org. If not, see + # http://www.openoffice.org/license.html + # for a copy of the LGPLv3 License. + # + / .section .text,ax ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: calc: function WEEKNUM seems not to conform to ODFF1.2
Hi Winfried, On Thursday, 2012-06-07 09:23:47 +0200, Winfried Donkers wrote: I will work on strictly implementing ODFF for WEEKNUM and ISOWEEKNUM. I don't know if I will find a way to produce an error message explaining to the user what exactly is wrong when opening old files with WEEKNUM in it. The wording of your comment https://bugs.freedesktop.org/show_bug.cgi?id=50488#c3 sounds as if you plan to add another function with the name ISOWEEKNUM in the UI. Note that confusingly we already have two functions, WEEKNUM in UI saved as ISOWEEKNUM in ODF and WEEKNUM_ADD (which is the Excel WEEKNUM) in UI saved as WEEKNUM in ODF. I think this might be a plan: * enhance WEEKNUM_ADD to support all ODF WEEKNUM modes * in the UI rename WEEKNUM to ISOWEEKNUM * change ISOWEEKNUM to accept only one parameter * during import's formula compile step for ISOWEEKNUM check if a second argument is provided * if so and if it is a constant value !=1 strip the argument (the Monday case that was and is real ISO 8601) * if it is a constant value ==1 map the function to WEEKNUM * there's a slight chance that a user wanted exactly the behavior ISO but Sunday resulting from the current undocumented implementation details, which isn't supported by ODF WEEKNUM definition, but I think that should be a very rare case, if at all, and is neglectable * if it is not a constant (i.e. computed) argument do nothing and let the interpreter complain about the second parameter I may have to help you with the compiler internals, give me a heads-up when you're stuck there. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpp7SKe9OeoL.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: calc: function WEEKNUM seems not to conform to ODFF1.2
Hi Eike, I think this might be a plan: * enhance WEEKNUM_ADD to support all ODF WEEKNUM modes * in the UI rename WEEKNUM to ISOWEEKNUM * change ISOWEEKNUM to accept only one parameter * during import's formula compile step for ISOWEEKNUM check if a second argument is provided * if so and if it is a constant value !=1 strip the argument (the Monday case that was and is real ISO 8601) * if it is a constant value ==1 map the function to WEEKNUM * there's a slight chance that a user wanted exactly the behavior ISO but Sunday resulting from the current undocumented implementation details, which isn't supported by ODF WEEKNUM definition, but I think that should be a very rare case, if at all, and is neglectable * if it is not a constant (i.e. computed) argument do nothing and let the interpreter complain about the second parameter I may have to help you with the compiler internals, give me a heads-up when you're stuck there. My first reaction is, yes, a good plan and in line with what I wanted to do. I will study your plan carefully, work on it step for step and keep you informed. It looks as if after this plan has been executed, there will be two (in UI as well as ods-file) functions, WEEKNUM_ADD and ISOWEEKNUM, but WEEKNUM_ADD is not defined in ODFF and WEEKNUM is... Shouldn't it be WEEKNUM in the UI and ods-file, and WEEKNUM_ADD in excel-files, to be renamed during export/import? (I haven't thought about implementation issues) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - solenv/inc
solenv/inc/unxlngm68k.mk |5 + solenv/inc/unxlngppc.mk |3 --- solenv/inc/unxlngs390.mk |4 +--- 3 files changed, 2 insertions(+), 10 deletions(-) New commits: commit c6b5b20d0a9506ae35421836940bbd1b0e86a3d4 Author: Rene Engelhard r...@debian.org Date: Wed Jun 6 15:50:48 2012 +0200 signed char is default on m68k... Change-Id: I5b57e8e9a9dce3eacc665979844f8cb29f968368 diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk index b6a018a..7ce4156 100644 --- a/solenv/inc/unxlngm68k.mk +++ b/solenv/inc/unxlngm68k.mk @@ -27,10 +27,7 @@ # mk file for Unix Linux m68k using GCC, please make generic modifications to unxlng.mk -CDEFAULTOPT=-Os PICSWITCH:=-fPIC .INCLUDE : unxlng.mk CDEFS+=-DM68K -CFLAGS+=-fsigned-char -fno-omit-frame-pointer -CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char +CFLAGS+=-fno-omit-frame-pointer commit b9cdff5477f830ca01237d95597ebe952e1cc031 Author: Rene Engelhard r...@debian.org Date: Wed Jun 6 15:49:12 2012 +0200 remove -fsigned-char from s390 to fix smoketest.. Change-Id: I66c468e917513cdb096937f9955eb8a41aabaa37 diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk index 0eac39a..af2518f 100644 --- a/solenv/inc/unxlngs390.mk +++ b/solenv/inc/unxlngs390.mk @@ -30,6 +30,4 @@ PICSWITCH:=-fPIC .INCLUDE : unxlng.mk CDEFS+=-DS390 -CFLAGS+=-fsigned-char -fno-omit-frame-pointer -CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char +CFLAGS+=-fno-omit-frame-pointer commit 7e0240f02d78cb19844875b7f9fb78d64b43906c Author: Rene Engelhard r...@debian.org Date: Wed Jun 6 15:46:55 2012 +0200 Revert Revert sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove -fsigned-char This reverts commit 7ef203d2bf72f7d96fd10d1297af06e82550a1c4. diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk index 39d3028..2c690b1 100644 --- a/solenv/inc/unxlngppc.mk +++ b/solenv/inc/unxlngppc.mk @@ -31,6 +31,3 @@ CDEFAULTOPT=-Os PICSWITCH:=-fPIC .INCLUDE : unxlng.mk CDEFS+=-DPOWERPC -DPPC -CFLAGS+=-fsigned-char -CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/inc
solenv/inc/unxlngppc.mk |3 --- 1 file changed, 3 deletions(-) New commits: commit bffc69a86ad7924c2b03e532b8bb1613f599bef5 Author: Rene Engelhard r...@debian.org Date: Wed Jun 6 15:46:55 2012 +0200 Revert Revert sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove -fsigned-char This reverts commit 7ef203d2bf72f7d96fd10d1297af06e82550a1c4. Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk index c7f1372..af528d9 100644 --- a/solenv/inc/unxlngppc.mk +++ b/solenv/inc/unxlngppc.mk @@ -31,6 +31,3 @@ DEFAULTOPT=-Os PICSWITCH:=-fPIC .INCLUDE : unxlng.mk CDEFS+=-DPOWERPC -DPPC -CFLAGS+=-fsigned-char -CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - vcl/inc vcl/source vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx |5 ++ vcl/source/window/decoview.cxx | 11 + vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 61 --- 3 files changed, 73 insertions(+), 4 deletions(-) New commits: commit 866599ab5ce091de56094d4d458e010ba56d22d0 Author: Ruslan Kabatsayev b7.10110...@gmail.com Date: Thu Jun 7 03:54:43 2012 +0400 Implement native FixedLine render, add GTK support for it Change-Id: I142cc8c48331aaed0d157b4b0f81e7c021005624 diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index b4fe837..a8d6584 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -165,6 +165,11 @@ protected: GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect ); sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ); +sal_Bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + const Rectangle rControlRectangle, + const clipList rClipList, + ControlState nState, const ImplControlValue aValue, + const OUString rCaption ); sal_Bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle rControlRectangle, const clipList rClipList, diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 381043e..3e85e2e 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -1087,6 +1087,17 @@ void DecorationView::DrawSeparator( const Point rStart, const Point rStop, boo { Point aStart( rStart ), aStop( rStop ); const StyleSettings rStyleSettings = mpOutDev-GetSettings().GetStyleSettings(); +Window *const pWin = (mpOutDev-GetOutDevType()==OUTDEV_WINDOW) ? (Window*) mpOutDev: NULL; +if(pWin) +{ +ControlPart nPart = ( bVertical ? PART_SEPARATOR_VERT : PART_SEPARATOR_HORZ ); +bool nativeSupported = pWin-IsNativeControlSupported( CTRL_FIXEDLINE, nPart ); +ImplControlValueaValue; +ControlStatenState = 0; +Rectangle aRect(rStart,rStop); +if(nativeSupported pWin-DrawNativeControl(CTRL_FIXEDLINE,nPart,aRect,nState,aValue,rtl::OUString())) +return; +} mpOutDev-Push( PUSH_LINECOLOR ); if ( rStyleSettings.GetOptions() STYLE_OPTION_MONO ) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 6ffbb8c..2b5d3c8 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -635,6 +635,11 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar if(nPart == PART_TRACK_HORZ_AREA || nPart == PART_TRACK_VERT_AREA) return true; break; + +case CTRL_FIXEDLINE: +if(nPart == PART_SEPARATOR_VERT || nPart == PART_SEPARATOR_HORZ) +return true; +break; } return false; @@ -921,6 +926,10 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType nType, { returnVal = NWPaintGTKWindowBackground( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption ); } +else if( nType == CTRL_FIXEDLINE ) +{ +returnVal = NWPaintGTKFixedLine( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption ); +} if(nType==CTRL_FRAME) { @@ -1187,6 +1196,22 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, / * Individual control drawing functions / +sal_Bool GtkSalGraphics::NWPaintGTKFixedLine( +GdkDrawable* gdkDrawable, +ControlType, ControlPart nPart, +const Rectangle rControlRectangle, +const clipList, +ControlState, const ImplControlValue, +const OUString ) +{ +if(nPart == PART_SEPARATOR_HORZ) + gtk_paint_hline(m_pWindow-style,gdkDrawable,GTK_STATE_NORMAL,NULL,m_pWindow,hseparator,rControlRectangle.Left(),rControlRectangle.Right(),rControlRectangle.Top()); +else + gtk_paint_vline(m_pWindow-style,gdkDrawable,GTK_STATE_NORMAL,NULL,m_pWindow,vseparator,rControlRectangle.Top(),rControlRectangle.Bottom(),rControlRectangle.Left()); + +return true; +} + sal_Bool GtkSalGraphics::NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType, ControlPart, commit 7d0d52fb758249a7d6b8fc5e36c0e77354e5f5c3 Author: Ruslan Kabatsayev b7.10110...@gmail.com Date: Wed Jun 6 19:40:23 2012 +0400 Render bg correctly for widgets without theme-visible position Change-Id: I8c9d2a86ee545788d40a27538e583a8dac21095f diff --git
Re: [PUSHED] GTK theming: render background correctly for widgets without GTK parent
Hello, 2012/6/6 Ruslan Kabatsayev b7.10110...@gmail.com: Hello, This patch allows the GTK theme to render background pattern correctly for LO widgets which pass GdkPixmap instead of true GdkWindow for rendering. Without this patch these widgets have no theme-visible position on the window, thus making the theme unable to properly render their background. Pushed to master, thanks. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] GTK theming: implement FixedLine rendering
Hello, 2012/6/7 Ruslan Kabatsayev b7.10110...@gmail.com: Hello, This patch implements support for native rendering of FixedLine, and makes use of it in GTK theming plugin. This makes vertical and horizontal lines look native in e.g. grouping widgets (like Tools-Options-User data-Address) and statusbar separators. Change might be not as visible with usual themes like Clearlooks or Glossy, but is greately changed with oxygen-gtk and QtCurve. Pushed to master, thanks. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.99.1'
Tag 'libreoffice-3.5.99.1' created by Petr Mladek pmla...@suse.cz at 2012-06-07 12:57 -0700 Tag 3.5.99.1 (3.6.0-beta1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP0JciAAoJEPQ0oe+v7q6jSdsQAKEplxuGeAW+jz2QAmDw4C1+ 2ZUgvIzdwpRnjeKK3PgLJ3faV70DjB1CROpH/oRVjUhI6mkFxWyftCIiY/56V8VC vuQL51UF8rWuJgLLCA4wYElvpu1AL0dPnhK46R/UF2jXVkigcPJPDfl6YH/Zt9XS 9w3fyVljZ5PoiYOAYLUAb4BAx8lNJAlALZFRzcbmVb8vByLuCqTMGHhEWa9BDCeW 0xpVaN1ff3qMb52IXyVhCPvUlPQTFEDJUPgGL3AtyOSHTjXOIlU63gMGjG4vfIcF Pvptj9KMlYYxf8RSeORDp5vIlHFgAsQws/wHzzFW2aM7arSzzYe6voRqxHD9+zj/ 8BXulVrHD730oDDtQiVxVMHqn1G8kYpjGzvMEUDOfZ6TwrbK+s4oi0zTUXX8W2KQ 7UwPjVjroxQ0VFBuzH6mjQIayBezH7S0FJRVMOsnytNWKqC5oMVK69ryu2fdpGV/ hT6lsfpoTwGnhkSPSp8DioSTKRjeSr9FfNH2AjcCCptjIrE00Y5f9qLJr9gjfMV+ csfthMr5vQ29Z08UMnd4kqrvmQ8bP/B7kr2mj47Jubn8ZTJUjcC44sJASEI9rx3i gswov/B9xJfuKb/Fb9JbrcZi8cIhAUeMIK/JLPUagIqikPZcIwDWbLviADP3oxRW 7pqMCmuTkGAr+tBA16Bv =lPDH -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-51: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.99.1'
Tag 'libreoffice-3.5.99.1' created by Petr Mladek pmla...@suse.cz at 2012-06-07 12:57 -0700 Tag 3.5.99.1 (3.6.0-beta1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP0JciAAoJEPQ0oe+v7q6jWOMP/iQHFQNeUG6awq2qBEvToGJ4 /aIYnDoso/diyiQq4sNNd5g2fVP1G1kcHcuL3CFJoroxjrEPcJo17LuMIiVkrzn5 0LAMSoJi02MZusRU4axrKVZ6LiAybrFMDv0GK1DsiZ9Coak0sM7cmVek4/RWtsFI 0ZbNmz+qeT/AdxO3oD+1keZfUY+6MSrStT62BrcxyTqs7uUCaFNAgMk3psPTjrM5 qhGjG7Al/E6S47rO4SiCYA4zngFRzegAill0TjUzgHwzFRr9I+KV8uYkPJEwE/Z3 Ko/mmxfk5YszZL6jvi03Tu5gQ0JF0nYDGZ4CuT5vqrzDsC6brD/WeckvGSE3KoIS D6tkhHFWAh6iVDfYB6modbaxrWDfYJE1GcUpw8iROrMfoHOWb/B0ykB3Mm+AbTSZ dsziFC1Ydpozr3A15kALrrB/WvcGO2borIEdSCtMQ2oxpoRMl0lhp6sDHrDC79Oc B9dYLOtQKUJ+eEA02WtLFUp5R42tClUeAj4O0rY1EdSShZUadrF9pypgkLKYqVUy fBgriISOCOq/5vOeKZAVpCECvVVf4CULbzhU33GQXlmd8Jf/IB5sbTmkxeHz7ey5 9KGC8hwSSaNNWbUzhkgwDrtiLMkIw9TBetxIzViGnvqiPkhXARWSlkfVzJr8c/Rx PACHmqIr73hLazUvhHWw =pjpX -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.99.1'
Tag 'libreoffice-3.5.99.1' created by Petr Mladek pmla...@suse.cz at 2012-06-07 12:57 -0700 Tag 3.5.99.1 (3.6.0-beta1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP0JciAAoJEPQ0oe+v7q6jBdAP/Am9N4Pf3FQLDT5FQFbEo5YD K79v9FXQUSd4carj0H2wLtQuGKOzlSRPQrPZCZTV6AAiziOvdbynMBN9MpAofcrd vQPWBpSg9acPFBZA4F/IWDB9ueAYLUrTqyZRw/66q4BqZ8B6i0a1Hu9bp4/pylsN amZQ2kZ8yZjmU45j+4+dIDvuMO6Lf65u5qp24C2GmR5Yr2K5yTFYgbnB5TwT5Xhw cCZDQvwynrJ3nRm92rrfY9lvqkA8jppnVWOY/e/LiofFChWFo6zY53lFujYmhBzu HIOypPhKsFc2Ne5P6ZvxYMy5SOIf5sRgf+O0BsEeTrNx4KfGlfjo8wXqSqB40S8w hoam/jQoodZ18tHzMSyIHFTyDFFgK5eaNQvxckkl7Xj7lhBK4u8gSaBV8kxBsWiW 04aSUahz8q7xgBl3Mnq+lMxx5LZCrsQErg9A/mdHu9eI/TdlbuArohCcNVfO3HQZ KCK9nN0xrLChnvUEGnG7z3ll67KaZYuGi5gVxvByrA9q4mGjV6dwhKDom1K/u7aj klnNxBofByb3AAKWaRZf0N2DrZNsA14AnDgVxEWPQhBZFrWvKQOrp315BWs/Jxc3 z/A724CyecLenEY/17baFtrY2VRmI4KJwvptLfH6K7JFlnQ1b7qTO6NBWTJ2PkCa za/f2uqP5CQzTgU0qRYZ =MjZI -END PGP SIGNATURE- Changes since libreoffice-3-6-branch-point-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/InstallModule.mk |2 +- solenv/gbuild/InternalUnoApi.mk |6 +- solenv/gbuild/Package.mk| 11 --- solenv/gbuild/UnoApi.mk |4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) New commits: commit 31a353719851b08664b7f13ca59f39a993e66ba6 Author: Michael Stahl mst...@redhat.com Date: Thu Jun 7 14:04:06 2012 +0200 gbuild: introduce gb_Package_Package_internal: The gb_InternalUnoApi_set_xmlfile function creates a new package, which registers at the current Module, overwriting the InternalUnoApi targets set there and causing make clean not to clean the InternalUnoApi. Change-Id: I46e9b4437788a479701187334325fe1e065e612c diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk index c04e151..f1b9dbe 100644 --- a/solenv/gbuild/InstallModule.mk +++ b/solenv/gbuild/InstallModule.mk @@ -40,7 +40,7 @@ $(call gb_InstallModule_get_clean_target,%) : define gb_InstallModule_InstallModule $(call gb_InstallModuleTarget_InstallModuleTarget,$(1)) -$(call gb_Package_Package,$(1)_par,$(call gb_InstallModuleTarget_get_workdir,$(1))) +$(call gb_Package_Package_internal,$(1)_par,$(call gb_InstallModuleTarget_get_workdir,$(1))) $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1)) $(call gb_InstallModule_get_target,$(1)) : $(call gb_Package_get_target,$(1)_par) diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index f5c2aa2..a32984f 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -113,8 +113,12 @@ endef define gb_InternalUnoApi_set_xmlfile $(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2)) -$(call gb_Package_Package,$(1)_xml,$(SRCDIR)) +$(call gb_Package_Package_internal,$(1)_xml,$(SRCDIR)) $(call gb_Package_add_file,$(1)_xml,xml/$(notdir $(2)),$(2)) +$(call gb_InternalUnoApi_get_target,$(1)) :| \ + $(call gb_Package_get_target,$(1)_xml) +$(call gb_InternalUnoApi_get_clean_target,$(1)) : \ + $(call gb_Package_get_clean_target,$(1)_xml) endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 02d447c..e1d199e 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -67,15 +67,20 @@ $(call gb_Package_get_target,%) : $(call gb_Output_announce,$*,$(true),PKG,2) mkdir -p $(dir $@) touch $@ - -define gb_Package_Package +# for other targets that want to create Packages, does not register at Module +define gb_Package_Package_internal gb_Package_SOURCEDIR_$(1) := $(2) $(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1)) -$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1 $(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1)) endef +define gb_Package_Package +$(call gb_Package_Package_internal,$(1),$(2)) +$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1 + +endef + define gb_Package_add_file $(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2) $(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 6455999..3619e9a 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -33,8 +33,8 @@ $(call gb_UnoApi_get_clean_target,%) : define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) -$(call gb_Package_Package,$(1)_idl,$(SRCDIR)) -$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) +$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) +$(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(call gb_UnoApiTarget_set_root,$(1),UCR) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - solenv/inc
solenv/inc/unxlngppc.mk |3 --- solenv/inc/unxlngs390.mk |4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) New commits: commit a7bf1ce30cc49928039cd5dba6293267ed9c35c2 Author: Rene Engelhard r...@debian.org Date: Wed Jun 6 15:49:12 2012 +0200 remove -fsigned-char from s390 to fix smoketest.. Change-Id: I66c468e917513cdb096937f9955eb8a41aabaa37 Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk index 0eac39a..af2518f 100644 --- a/solenv/inc/unxlngs390.mk +++ b/solenv/inc/unxlngs390.mk @@ -30,6 +30,4 @@ PICSWITCH:=-fPIC .INCLUDE : unxlng.mk CDEFS+=-DS390 -CFLAGS+=-fsigned-char -fno-omit-frame-pointer -CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char +CFLAGS+=-fno-omit-frame-pointer commit d5dd32259beaf8e28072ce03a59b2421de6e8d3f Author: Rene Engelhard r...@debian.org Date: Wed Jun 6 15:46:55 2012 +0200 Revert Revert sw34bf03: #i81127#: patch by pmladek: linux/ppc: remove -fsigned-char This reverts commit 7ef203d2bf72f7d96fd10d1297af06e82550a1c4. Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk index 39d3028..2c690b1 100644 --- a/solenv/inc/unxlngppc.mk +++ b/solenv/inc/unxlngppc.mk @@ -31,6 +31,3 @@ CDEFAULTOPT=-Os PICSWITCH:=-fPIC .INCLUDE : unxlng.mk CDEFS+=-DPOWERPC -DPPC -CFLAGS+=-fsigned-char -CFLAGSCC+=-fsigned-char -CFLAGSCXX+=-fsigned-char ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 aleusf...@web.de changed: What|Removed |Added Severity|critical|major Priority|highest |medium URL||https://bugs.freedesktop.or ||g/show_bug.cgi?id=42092 --- Comment #325 from aleusf...@web.de 2012-06-07 05:32:29 PDT --- I nominate Bug 42092 (SVG in PDF becomes Bitmap), because many business letters contain SVG-logos and cannot be converted to pdf any more. -- 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] .: Branch 'libreoffice-3-6' - 4 commits - solenv/gbuild ucb/source
solenv/gbuild/InstallModule.mk |2 +- solenv/gbuild/InternalUnoApi.mk |6 +- solenv/gbuild/Package.mk| 11 --- solenv/gbuild/UnoApi.mk |4 ++-- ucb/source/inc/regexpmap.tpt| 35 ++- 5 files changed, 50 insertions(+), 8 deletions(-) New commits: commit c5ec146a759cdbf7d38714ceb382fba1b59ce67a Author: Michael Stahl mst...@redhat.com Date: Thu Jun 7 14:04:06 2012 +0200 gbuild: introduce gb_Package_Package_internal: The gb_InternalUnoApi_set_xmlfile function creates a new package, which registers at the current Module, overwriting the InternalUnoApi targets set there and causing make clean not to clean the InternalUnoApi. Change-Id: I46e9b4437788a479701187334325fe1e065e612c (cherry picked from commit 31a353719851b08664b7f13ca59f39a993e66ba6) diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk index c04e151..f1b9dbe 100644 --- a/solenv/gbuild/InstallModule.mk +++ b/solenv/gbuild/InstallModule.mk @@ -40,7 +40,7 @@ $(call gb_InstallModule_get_clean_target,%) : define gb_InstallModule_InstallModule $(call gb_InstallModuleTarget_InstallModuleTarget,$(1)) -$(call gb_Package_Package,$(1)_par,$(call gb_InstallModuleTarget_get_workdir,$(1))) +$(call gb_Package_Package_internal,$(1)_par,$(call gb_InstallModuleTarget_get_workdir,$(1))) $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1)) $(call gb_InstallModule_get_target,$(1)) : $(call gb_Package_get_target,$(1)_par) diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index f5c2aa2..a32984f 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -113,8 +113,12 @@ endef define gb_InternalUnoApi_set_xmlfile $(call gb_UnoApiTarget_set_xmlfile,$(1)_out,$(2)) -$(call gb_Package_Package,$(1)_xml,$(SRCDIR)) +$(call gb_Package_Package_internal,$(1)_xml,$(SRCDIR)) $(call gb_Package_add_file,$(1)_xml,xml/$(notdir $(2)),$(2)) +$(call gb_InternalUnoApi_get_target,$(1)) :| \ + $(call gb_Package_get_target,$(1)_xml) +$(call gb_InternalUnoApi_get_clean_target,$(1)) : \ + $(call gb_Package_get_clean_target,$(1)_xml) endef diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 02d447c..e1d199e 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -67,15 +67,20 @@ $(call gb_Package_get_target,%) : $(call gb_Output_announce,$*,$(true),PKG,2) mkdir -p $(dir $@) touch $@ - -define gb_Package_Package +# for other targets that want to create Packages, does not register at Module +define gb_Package_Package_internal gb_Package_SOURCEDIR_$(1) := $(2) $(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1)) -$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1 $(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1)) endef +define gb_Package_Package +$(call gb_Package_Package_internal,$(1),$(2)) +$$(eval $$(call gb_Module_register_target,$(call gb_Package_get_target,$(1)),$(call gb_Package_get_clean_target,$(1 + +endef + define gb_Package_add_file $(call gb_Package_get_target,$(1)) : $(OUTDIR)/$(2) $(call gb_Package_get_clean_target,$(1)) : FILES += $(OUTDIR)/$(2) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 6455999..3619e9a 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -33,8 +33,8 @@ $(call gb_UnoApi_get_clean_target,%) : define gb_UnoApi_UnoApi $(call gb_UnoApiTarget_UnoApiTarget,$(1)) $(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1)) -$(call gb_Package_Package,$(1)_idl,$(SRCDIR)) -$(call gb_Package_Package,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) +$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR)) +$(call gb_Package_Package_internal,$(1)_inc,$(call gb_UnoApiHeadersTarget_get_dir,$(1))) $(call gb_UnoApiTarget_set_root,$(1),UCR) commit 20b7bf008b1dcdf402de81c19e3cbd1284048cb2 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jun 6 12:41:41 2012 +0200 Do not copy etc. singular iterator values. This also reverts previous attempts at fixing this, commits 33839f90e6f8275a584b483827585a6da05aab75 ucb: try to fix weird STL assertion on tinderbox and 6506af86b5e20a860c8d2d1dd578a22914df5f53 ucb: second try to fix weird STL assertion on tinderbox. Change-Id: I89d0eb87fbd164c0a4cf24d60f225767cb2bfc1a (cherry picked from commit 9631f96acae6bd179d40ee343ce986296f490741) diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index fec9972..64a412b 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -399,7 +399,7 @@ UniversalContentBroker::registerContentProvider( { osl::MutexGuard aGuard(m_aMutex); -ProviderMap_Impl::iterator
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 aleusf...@web.de changed: What|Removed |Added Depends on||42092 URL|https://bugs.freedesktop.or | |g/show_bug.cgi?id=42092 | -- 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] .: codemaker/source
codemaker/source/cppumaker/cpputype.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b67445306634571cd7d2a62942b00c0edb82b215 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 14:36:05 2012 +0200 XInterfaceTypeDescription missing from isBootstrapType ...it is base of XInterfaceTypeDescription2 (included in isBootstrapType), which ultimately caused uno-skeletonmaker to crash. Change-Id: I17421f58efd9edd4112532a3221125865cc5560e diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 7fc720a..628b4c6 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -123,6 +123,7 @@ bool isBootstrapType(rtl::OString const name) { com/sun/star/reflection/XInterfaceAttributeTypeDescription2, com/sun/star/reflection/XInterfaceMemberTypeDescription, com/sun/star/reflection/XInterfaceMethodTypeDescription, +com/sun/star/reflection/XInterfaceTypeDescription, com/sun/star/reflection/XInterfaceTypeDescription2, com/sun/star/reflection/XMethodParameter, com/sun/star/reflection/XStructTypeDescription, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: [PATCH]fdo 50488 added calc formula XOR as defined in ODFF1.2
Attached patch adds formula XOR to calc. Possibly the function ought to be included in one or more arrays of functions that are or are not known in Excel, Lotus, Qpro. [...] However, you attached a patch for DATEDIF instead of XOR ;-) This time the patch is the one that covers XOR. Winfried From 45326af955b020cc861148c7c1c95449dab858f4 Mon Sep 17 00:00:00 2001 From: Winfried Donkers o...@dci-electronics.nl Date: Wed, 6 Jun 2012 16:33:38 +0200 Subject: [PATCH] fdo#50488 added calc formula XOR as in ODFF1.2 Change-Id: I89c3267d479d5f034ad25ff879d1df8f90b84a55 --- formula/inc/formula/compiler.hrc |3 +- formula/inc/formula/opcode.hxx |1 + formula/source/core/api/FormulaCompiler.cxx| 10 ++- formula/source/core/api/token.cxx |2 +- formula/source/core/resource/core_resource.src |5 + sc/inc/helpids.h |2 +- sc/qa/unit/ucalc.cxx |1 + sc/source/core/inc/interpre.hxx|1 + sc/source/core/tool/interpr1.cxx | 105 sc/source/core/tool/interpr4.cxx |1 + sc/source/core/tool/parclass.cxx |2 + sc/source/filter/oox/formulabase.cxx |2 +- sc/source/ui/src/scfuncs.src | 24 ++ sc/source/ui/vba/vbawsfunction.cxx |2 +- sc/util/hidother.src |1 + 15 files changed, 153 insertions(+), 9 deletions(-) diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index a2d4bb5..54ded84 100644 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -89,7 +89,8 @@ #define SC_OPCODE_INTERSECT 54 #define SC_OPCODE_UNION 55 #define SC_OPCODE_RANGE 56 -#define SC_OPCODE_STOP_BIN_OP57 +#define SC_OPCODE_XOR57 +#define SC_OPCODE_STOP_BIN_OP58 /* NOTE: binary and unary operators must be in sequence for compiler! */ diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index a1543dd..16b12ec 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -89,6 +89,7 @@ enum OpCodeEnum ocGreaterEqual = SC_OPCODE_GREATER_EQUAL, ocAnd = SC_OPCODE_AND, ocOr= SC_OPCODE_OR, +ocXor = SC_OPCODE_XOR, ocIntersect = SC_OPCODE_INTERSECT, ocUnion = SC_OPCODE_UNION, ocRange = SC_OPCODE_RANGE, diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 9e82422..e2de107 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -76,6 +76,7 @@ short lcl_GetRetFormat( OpCode eOpCode ) case ocGreaterEqual: case ocAnd: case ocOr: +case ocXor: case ocNot: case ocTrue: case ocFalse: @@ -1128,6 +1129,7 @@ void FormulaCompiler::Factor() || eOp == ocMacro || eOp == ocAnd || eOp == ocOr +|| eOp == ocXor || eOp == ocBad || ( eOp = ocInternalBegin eOp = ocInternalEnd ) || (bCompileForFAP ((eOp == ocIf) || (eOp == ocChose))) @@ -1440,7 +1442,7 @@ OpCode FormulaCompiler::Expression() return ocStop; //! generate token instead? } NotLine(); -while (pToken-GetOpCode() == ocAnd || pToken-GetOpCode() == ocOr) +while (pToken-GetOpCode() == ocAnd || pToken-GetOpCode() == ocOr || pToken-GetOpCode() == ocXor) { FormulaTokenRef p = pToken; pToken-SetByte( 2 ); // 2 parameters! @@ -1617,7 +1619,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken( rtl::OUStringBuffer rBuff bool bSpaces = false; FormulaToken* t = pTokenP; OpCode eOp = t-GetOpCode(); -if( eOp = ocAnd eOp = ocOr ) +if( eOp = ocAnd eOp = ocXor ) { // AND, OR infix? if ( bAllowArrAdvance ) @@ -1822,8 +1824,8 @@ OpCode FormulaCompiler::NextToken() else { // Before an operator there must not be another operator, with the -// exception of AND and OR. -if ( eOp != ocAnd eOp != ocOr +// exception of AND, OR and XOR. +if ( eOp != ocAnd eOp != ocOr eOp != ocXor (SC_OPCODE_START_BIN_OP = eOp eOp SC_OPCODE_STOP_BIN_OP ) (eLastOp == ocOpen || eLastOp == ocSep || (SC_OPCODE_START_BIN_OP = eLastOp eLastOp SC_OPCODE_STOP_UN_OP))) diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index f426a31..fac4cbd 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -90,7 +90,7 @@ bool FormulaToken::IsFunction() const || (SC_OPCODE_START_2_PAR =
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - codemaker/source
codemaker/source/cppumaker/cpputype.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 916158a42d925c5aaa629a0c1a01698ed6ea17f5 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 14:36:05 2012 +0200 XInterfaceTypeDescription missing from isBootstrapType ...it is base of XInterfaceTypeDescription2 (included in isBootstrapType), which ultimately caused uno-skeletonmaker to crash. Change-Id: I17421f58efd9edd4112532a3221125865cc5560e (cherry picked from commit b67445306634571cd7d2a62942b00c0edb82b215) diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index b4eac78..02370f2 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -123,6 +123,7 @@ bool isBootstrapType(rtl::OString const name) { com/sun/star/reflection/XInterfaceAttributeTypeDescription2, com/sun/star/reflection/XInterfaceMemberTypeDescription, com/sun/star/reflection/XInterfaceMethodTypeDescription, +com/sun/star/reflection/XInterfaceTypeDescription, com/sun/star/reflection/XInterfaceTypeDescription2, com/sun/star/reflection/XMethodParameter, com/sun/star/reflection/XStructTypeDescription, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/worksheetfragment.cxx | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) New commits: commit 0f86f678ff98115d32a381134985a1bd0d8c931e Author: Noel Power noel.po...@novell.com Date: Thu Jun 7 14:00:03 2012 +0100 attempt to use mce::FallBack for control/oleObject import commit commit afbb2d8f7d72292532a9ea54fa2e6757b6d548c2 broke the existing mce::FallBack processing. Change-Id: I05296f6aad3841a8dd40aa345207c0114e0c7701 diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 8616305..3743b0b 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -330,12 +330,26 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const case XLS_TOKEN( evenFooter ): return this;// collect h/f contents in onCharacters() } break; - +// Only process an oleObject or control if outside a mc:AlternateContent +// element OR if within a mc:Fallback. I suppose ideally we +// should process the stuff within 'mc:Choice' + case XLS_TOKEN( controls ): case XLS_TOKEN( oleObjects ): -if( nElement == XLS_TOKEN( oleObject ) aMceState.empty() ) importOleObject( rAttribs ); -break; -case XLS_TOKEN( controls ): -if( nElement == XLS_TOKEN( control ) aMceState.empty() ) importControl( rAttribs ); +if ( getCurrentElement() == XLS_TOKEN( controls ) ) +{ +if( aMceState.empty() || ( !aMceState.empty() aMceState.back() == MCE_STARTED ) ) +{ +if ( getCurrentElement() == XLS_TOKEN( oleObjects ) ) importOleObject( rAttribs ); +else +importControl( rAttribs ); +} +else if ( !aMceState.empty() aMceState.back() == MCE_FOUND_CHOICE ) +{ +// reset the handling within 'Choice' +// this will force attempted handling in Fallback +aMceState.back() = MCE_STARTED; +} +} break; } return 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source
scp2/source/ooo/windowscustomaction_ooo.scp | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 265242f06dbdd21dade56dc6fc6c1789f33ee966 Author: Andras Timar ati...@suse.com Date: Tue Jun 5 16:57:53 2012 +0200 fdo#43989 let unopkg.exe run with elevated privileges during install ... so it can do the pre-registration of bundled extensions in INSTALLLOCATION/share/prereg/bundle. The meaning of Type of custom action is the following: msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData + msidbCustomActionTypeInScript + msidbCustomActionTypeNoImpersonate + msidbCustomActionTypeCommit = 3585 So it is a binary in a dll from the MSI itself, it runs deferred with system privileges and after commit, because msvcrt90.dll is available only after commit. The same type was chosen for the removing part, it works. Change-Id: I14c347b5cbc47789eb0484769a676703361c2193 (cherry picked from commit 8783ead70cc2bc2a83bf473b0dfb51f3ee10b6da) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index c111e17..256a924 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -214,21 +214,21 @@ End WindowsCustomAction gid_Customaction_Register_Extensions Name = RegisterExtensions; - Typ = 1; + Typ = 3585; Source = shlxtmsi.dll; Target = RegisterExtensions; Inbinarytable = 1; - Assignment1 = (InstallExecuteSequence, Not REMOVE=\ALL\, behind_InstallFinalize); - Assignment2 = (AdminExecuteSequence, Not REMOVE=\ALL\, behind_InstallFinalize); + Assignment1 = (InstallExecuteSequence, Not REMOVE=\ALL\, InstallFinalize); + Assignment2 = (AdminExecuteSequence, Not REMOVE=\ALL\, InstallFinalize); End WindowsCustomAction gid_Customaction_Remove_Extensions Name = RemoveExtensions; - Typ = 65; + Typ = 3585; Source = shlxtmsi.dll; Target = RemoveExtensions; Inbinarytable = 1; - Assignment1 = (InstallExecuteSequence, REMOVE=\ALL\ And Not PATCH, FileCost); + Assignment1 = (InstallExecuteSequence, REMOVE=\ALL\ And Not PATCH, InstallFinalize); End WindowsCustomAction gid_Customaction_Set_Admininstall ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED-3-5] Bug 43989 - After installation first launch terminates after splash screen
On 06/05/2012 05:36 PM, Andras Timar wrote: It was a MAB, please review and cherry-pick to libreoffice-3-5. done ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: unodevtools/source
unodevtools/source/skeletonmaker/cppcompskeleton.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9af0eb7e998c7bbf514e324919b710a0ff601244 Author: Michael Stahl mst...@redhat.com Date: Thu Jun 7 15:13:41 2012 +0200 skeletonmaker: add back \ in string literal Seems accidentally removed in ea489b3570efe7d9a53da91ba66fa1563d40ffbb. Change-Id: I7c4be5c41033ca8d4f66557efb30d17f8527b4a8 diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 36dd8e4..825e535 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -165,7 +165,7 @@ void generateCompHelperDefinition(std::ostream o, short i=0; while (iter != services.end()) { -o s[ i++ ] = ::rtl::OUString( +o s[ i++ ] = ::rtl::OUString(\ (*iter).replace('/','.') \);\n; ++iter; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - unodevtools/source
unodevtools/source/skeletonmaker/cppcompskeleton.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 34578f1f0e2683c4a75b7c5c89c04d5b931689cc Author: Michael Stahl mst...@redhat.com Date: Thu Jun 7 15:13:41 2012 +0200 skeletonmaker: add back \ in string literal Seems accidentally removed in ea489b3570efe7d9a53da91ba66fa1563d40ffbb. Change-Id: I7c4be5c41033ca8d4f66557efb30d17f8527b4a8 (cherry picked from commit 9af0eb7e998c7bbf514e324919b710a0ff601244) diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 36dd8e4..825e535 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -165,7 +165,7 @@ void generateCompHelperDefinition(std::ostream o, short i=0; while (iter != services.end()) { -o s[ i++ ] = ::rtl::OUString( +o s[ i++ ] = ::rtl::OUString(\ (*iter).replace('/','.') \);\n; ++iter; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] newdev review request: sc/.../vbarange.cxx
At 4:40am -0400 Thu, 07 Jun 2012, Noel Power wrote: Btw if you are interested there are probably quite a few instances of VBA_OOBUILD_HACK buried in there that could do with removal ( and then finally wherever the -D for same passed to the compiler ) Cleaning those out would be appreciated ( by me at least ) Noted. Will see what comes up. Patch looks fine, thanks for that, pushed now. Next time for convenience could you use 'git format-patch' for creating the diff ( just makes it easier to process ) thanks alot !! I actually have commit access. I just ... jumped the gun when I was working on removing the mpNote pointer from ScBaseCell 7 months ago. Now I'm timid again, and until I get more confidence for anything more than a /dead/ simple patch, I'm nervous. And so it goes. Thanks! Kevin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: compile error in neon
tried again. Same problem... Anyone? Cor Nouws wrote (06-06-12 21:28) Hi, after fresh ./g pull -r error in neon did make.neon clean and make again same error: Making: libneon.so ../../../../../unxlngi6.pro/slo/ne_openssl.o: In function `ne_ssl_context_create': /home/cono/src/git/libo_core/neon/unxlngi6.pro/misc/build/neon-0.29.5/src/ne_openssl.c:572: undefined reference to `SSLv2_server_method' collect2: ld returned 1 exit status dmake: Error code 1, while making '../../../../../unxlngi6.pro/lib/libneon.so' dmake: Error code 255, while making './unxlngi6.pro/misc/build/so_built_so_neon' Help appreciated, -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Draft document-rendering tiling API to be called from viewer apps
On 06/06/12 16:54, Michael Stahl wrote: On 06/06/12 15:31, Stephan Bergmann wrote: On 06/06/2012 03:11 PM, Tor Lillqvist wrote: I would go the UNO approach nevertheless. It's a hard decision to make... With the current state of touch/idl, what you would want to do in C++ is an implementation of the Document service, plus potentially an implementation of an XDocumentRenderCallback object (if you want to call the service's XDocument.render from C++ code). The boilerplate for the former boils down to a derivation of cppu::WeakImplHelper1XDocument, plus a component_getFactory function (just calling cppu::component_getFactoryHelper) if this is the first service implementation in a given library. The boilerplate for the latter boils down to a derivation of cppu::WeakImplHelper1XDocumentRenderCallback. Let me know if you need skeleton code (or any other form of help) for that. by the way, there is a skeletonmaker tool that can write a lot of the boilerplate for you, something like this: uno-skeletonmaker -env:UNO_TYPES=file:///so/ws/DEV300/unxsoli4.pro/bin.4/types.rdb component --cpp --all -n CBlankNode -t com.sun.star.rdf.BlankNode -lh so the following actually works for me now on master and produces a sensible result, after 2 bug fixes to get the tool to work again: LD_LIBRARY_PATH=/work/lo/master/solver/unxlngx6/lib solver/unxlngx6/bin/uno-skeletonmaker -env:UNO_TYPES=file:///work/lo/master/solver/unxlngx6/bin/types.rdb -env:UNO_SERVICES=file:///work/lo/master/solver/unxlngx6/xml/ure/services.rdb component --cpp --all -n CBlankNode -t com.sun.star.rdf.BlankNode -lh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/inc oox/source
oox/inc/oox/vml/vmlshape.hxx |1 + oox/source/vml/vmlshape.cxx| 11 +-- oox/source/vml/vmlshapecontext.cxx |2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) New commits: commit ecc15dab3df98d8d7683b7eeb2a5c68ccf1accd0 Author: Noel Power noel.po...@novell.com Date: Wed Jun 6 16:45:54 2012 +0100 import vmlshape 'hidden' style attribute and apply to controls bnc#757609 ensure 'hidden' controls are imported as such. diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index b60e251..d8e7209 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -84,6 +84,7 @@ struct ShapeTypeModel ::rtl::OUString maRotation; /// Rotation of the shape, in degrees. ::rtl::OUString maFlip; /// Flip type of the shape (can be x or y). sal_BoolmbAutoHeight; /// If true, the height value is a minimum value (mostly used for textboxes) +sal_BoolmbVisible; /// Visible or Hidden StrokeModel maStrokeModel; /// Border line formatting. FillModel maFillModel;/// Shape fill formatting. diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 4e5e4ac..aa39fcc 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -34,6 +34,7 @@ #include com/sun/star/drawing/PointSequenceSequence.hpp #include com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp #include com/sun/star/drawing/XShapes.hpp +#include com/sun/star/drawing/XControlShape.hpp #include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/text/HoriOrientation.hpp #include com/sun/star/text/RelOrientation.hpp @@ -115,7 +116,8 @@ Rectangle lclGetAbsRect( const Rectangle rRelRect, const Rectangle rShapeRect, // ShapeTypeModel::ShapeTypeModel(): -mbAutoHeight( sal_False ) +mbAutoHeight( sal_False ), +mbVisible( sal_True ) { } @@ -305,7 +307,12 @@ Reference XShape ShapeBase::convertAndInsert( const Reference XShapes rxS PropertySet aShapeProp( xShape ); if( aShapeProp.hasProperty( PROP_Name ) ) aShapeProp.setProperty( PROP_Name, getShapeName() ); - +Reference XControlShape xControlShape( xShape, uno::UNO_QUERY ); +if ( xControlShape.is() !getTypeModel().mbVisible ) +{ +PropertySet aControlShapeProp( xControlShape-getControl() ); +aControlShapeProp.setProperty( PROP_EnableVisible, uno::makeAny( sal_False ) ); +} /* Notify the drawing that a new shape has been inserted. For convenience, pass the rectangle that contains position and size of the shape. */ diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 3134282..68793c9 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -361,6 +361,8 @@ void ShapeTypeContext::setStyle( const OUString rStyle ) else if( aName == mso-fit-shape-to-text ) mrTypeModel.mbAutoHeight = sal_True; else if( aName == rotation ) mrTypeModel.maRotation = aValue; else if( aName == flip ) mrTypeModel.maFlip = aValue; +else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( visibility ) ) ) +mrTypeModel.mbVisible = !aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(hidden) ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 3.5.3rc1 win32 / debug package ...
Hi bfo, I am sorry for the late replay. I had busy days. On Mon, 2012-06-04 at 08:55 -0700, bfo wrote: Petr Mladek wrote Yes, any help is really appreciated. If you feel like, please propose some prioritization. From my users perspective the proposal is simple: 1. crashers 2. dataloss 3. regressions 4. something do not work as expected bugs 5. enhancements Nice, it looks very reasonable! I like that it is easy. I am unable to create such easy rules myself ;-) Well, I slightly miss some more aspects: + how many people are affected + how the problem is visible + workaround exists and how it is complicated + how old the problem is (2-3 years old bugs might loose the regression taste; people are getting used to the new behavior; we should not have such regressions but we sometimes end there because it is hard to debug and the other aspects) If I compare it with the rules for Novell bugzilla, I see the following differences: 1. Novell rules put crashers and dataloss bugs on the same level (critical). IMHO, it is reasonable. I guess that you would end there as well ;-) 2. Novell rules do not stress the word regression. They are more influenced by the other aspects and try to split functional problems into three categories (Major, Normal, Minor). I would like to have this in our proposal as well. IMHO, it does not make sense to spend time on regression that is hard to reproduce and fix if there are more important problems that people miss. On the other hand, it makes sense to fix behavior of a new feature that people like and start using heavily. It is not regression but it annoys quite some people. Also we need to somehow propose rules for the priorities flag. Would you be interested into creating more precise proposal that would incomporate the other aspects? We need not make too complex rules. The severity and priority are just helper items. Developers do not strictly follow the flags. Of course, they concentrate more on the severe bugs. Though, when they debug or rework some piece of code, they fix even less important bugs. It is more effective when they have the code in the head. BTW: With time scheduled release cycle (monthly in your case) IMHO it is difficult to triage bugs as blockers or critical anyway. I do not know if you are prepared to do chemspills, emergency releases or stop the release channel if things go wrong big time... Good point! I tried to get out of this trap by rules described at https://wiki.documentfoundation.org/Release_Criteria#Blocker_Bug_Definition Maybe, but changing to NEW is quite complicated in your workflow, so mostly I leave them as UNCONFIRMED. Heh, what is complicated about it? Is the documentation unclear? IMHO, if you make sure that e bug is reproducible with the given information, you could move it to the state NEW. I thought so, but according to http://wiki.documentfoundation.org/BugTriage there are three bold ANDs before you can change a status to NEW. Further more, an exclamation mark at the end of that paragraph (and the whole scary sentence before it) discouraged me to change anything in the Status field at all. I wonder if the new wording is better. In each case, we need to make it friedly. We need more people doing the bug triage. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: fpicker/source framework/inc framework/source i18npool/inc lotuswordpro/source package/source rsc/source sal/inc sc/source
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 10 framework/inc/dispatch/popupmenudispatcher.hxx |6 framework/inc/framework/interaction.hxx | 30 -- framework/source/fwe/dispatch/interaction.cxx | 114 -- i18npool/inc/transliterationImpl.hxx|9 lotuswordpro/source/filter/lwpdocdata.cxx | 39 --- lotuswordpro/source/filter/lwpgrfobj.cxx|6 lotuswordpro/source/filter/lwpoleobject.hxx |6 lotuswordpro/source/filter/lwpsdwfileloader.cxx | 46 lotuswordpro/source/filter/utbenvs.cxx | 14 - lotuswordpro/source/filter/xfilter/xfannotation.hxx | 11 lotuswordpro/source/filter/xfilter/xfdrawobj.hxx| 16 - lotuswordpro/source/filter/xfilter/xffooterstyle.hxx| 38 --- lotuswordpro/source/filter/xfilter/xfsection.cxx| 27 -- lotuswordpro/source/filter/xfilter/xfsection.hxx|5 lotuswordpro/source/filter/xfilter/xftable.cxx |6 package/source/zipapi/XUnbufferedStream.cxx | 16 - rsc/source/res/rscarray.cxx | 12 - sal/inc/rtl/locale.hxx |9 sc/source/core/data/documen2.cxx|4 20 files changed, 1 insertion(+), 423 deletions(-) New commits: commit eb0497307bf381e7e065fc4b0b0d7b23f6ceeca9 Author: Takeshi Abe t...@fixedpoint.jp Date: Thu Jun 7 23:02:48 2012 +0900 nuke dead code Change-Id: Id9920ea7b82ea178e904f78bbd41ffc434813e0b diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 48f349a..00f8b55 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -216,15 +216,6 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) const ::rtl::OUString sURL = lcl_getURLFromShellItem2(iItem); if (sURL.getLength() 1) return; -/* -INetURLObject aURL(sURL); -if (aURL.GetProtocol() != INET_PROT_FILE) -return; - -::rtl::OUString sMain = aURL.GetMainURL(INetURLObject::NO_DECODE); -if ( ! ::utl::UCBContentHelper::IsDocument(sURL)) -return; -*/ try { css::uno::Reference css::embed::XStorage xStorage = ::comphelper::OStorageHelper::GetStorageFromURL(sURL, css::embed::ElementModes::READ); @@ -250,7 +241,6 @@ void lcl_updateVersionListDirectly(IFileDialog* pDialog) STDMETHODIMP VistaFilePickerEventHandler::OnSelectionChange(IFileDialog* /*pDialog*/) { impl_sendEvent(E_FILE_SELECTION_CHANGED, 0); -//lcl_updateVersionListDirectly(pDialog); return S_OK; } diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 33651c5..083d66f 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -34,15 +34,9 @@ //_ #include services/frame.hxx -/* -#include macros/generic.hxx -*/ #include macros/xinterface.hxx #include macros/xtypeprovider.hxx #include macros/xserviceinfo.hxx -/* -#include macros/debug.hxx -*/ #include threadhelp/threadhelpbase.hxx #include general.h #include stdtypes.h diff --git a/framework/inc/framework/interaction.hxx b/framework/inc/framework/interaction.hxx index caef8e8..70dd2cf 100644 --- a/framework/inc/framework/interaction.hxx +++ b/framework/inc/framework/interaction.hxx @@ -107,36 +107,6 @@ public: const ::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference ::com::sun::star::task::XInteractionContinuation lContinuations ); }; -/*-//** -@short special request for interaction -@descr User must decide between a preselected and another detected filter. -It capsulate communication with any interaction handler and supports an easy -access on interaction results for user of these class. - -@implements XInteractionRequest - -@base WeakImplHelper1 - -@devstatus ready to use -@threadsafe no (used on once position only!) -*//*-*/ -/* -class RequestAmbigousFilter_Impl; -class RequestAmbigousFilter // seems to be unused currently -{ -RequestAmbigousFilter_Impl* pImp; - -// c++ interface -public: -RequestAmbigousFilter( const
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - setup_native/source
setup_native/source/win32/customactions/sellang/sellang.cxx | 131 1 file changed, 88 insertions(+), 43 deletions(-) New commits: commit 743e3176244691f5d437ef38cf4eeba3d89a0af5 Author: Andras Timar ati...@suse.com Date: Fri Jun 1 15:44:26 2012 +0200 fdo#50509 MSI: UI language selection from command line (e.g. silent install) Change-Id: I1206a0c7f8508942eb844869fe1c75a48a9e01fd Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index e0a775a..0094307 100644 --- a/setup_native/source/win32/customactions/sellang/sellang.cxx +++ b/setup_native/source/win32/customactions/sellang/sellang.cxx @@ -49,6 +49,21 @@ #include sal/macros.h #include systools/win32/uwinapi.h +BOOL GetMsiProp( MSIHANDLE hMSI, const char* pPropName, char** ppValue ) +{ +DWORD sz = 0; +if ( MsiGetProperty( hMSI, pPropName, , sz ) == ERROR_MORE_DATA ) { +sz++; +DWORD nbytes = sz * sizeof( char ); +char* buff = reinterpret_castchar*( malloc( nbytes ) ); +ZeroMemory( buff, nbytes ); +MsiGetProperty( hMSI, pPropName, buff, sz ); +*ppValue = buff; +return ( strlen(buff) 0 ); +} +return FALSE; +} + static const char * langid_to_string( LANGID langid, int *have_default_lang ) { @@ -186,7 +201,7 @@ static BOOL present_in_ui_langs(const char *lang) { for (int i = 0; i num_ui_langs; i++) -if (memcmp (ui_langs[i], lang, 2) == 0) +if (memcmp (ui_langs[i], lang, ( strlen(ui_langs[i]) = strlen(lang) ) ? strlen(lang) : strlen(ui_langs[i]) ) == 0) return TRUE; return FALSE; } @@ -234,58 +249,88 @@ extern C UINT __stdcall SelectLanguage( MSIHANDLE handle ) MsiCloseHandle(view); if (nlangs 0) { -/* Deselect those languages that don't match any of the UI languages - * available on the system. - */ - int i; -int have_system_default_lang = 0; -const char *system_default_lang = langid_to_string(GetSystemDefaultUILanguage(), have_system_default_lang); -const char *user_locale_lang = langid_to_string(LANGIDFROMLCID(GetThreadLocale()), NULL); - -EnumUILanguagesA(enum_ui_lang_proc, 0, 0); - -/* If one of the alternative languages in a multi-language installer - * is the system default UI language, deselect those languages that - * aren't among the UI languages available on the system. - * (On most Windows installations, just one UI language is present, - * which obviously is the same as the default UI language. But - * we want to be generic.) - * If none of the languages in a multi-language installer is the - * system default UI language (this happens now in 2.4.0 where we - * cannot put as many UI languages into the installer as we would - * like, but only half a dozen: en-US,de,es,fr,it,pt-BR), pretend - * that English is the system default UI language, - * so that we will by default deselect everything except - * English. We don't want to by default install all half dozen - * languages for an unsuspecting user of a Finnish Windows, for - * instance. Sigh. - */ -if (system_default_lang[0]) { -for (i = 0; i nlangs; i++) { -if (memcmp (system_default_lang, langs[i], 2) == 0) { -have_system_default_lang = 1; -} +char* pVal = NULL; +if ( (GetMsiProp( handle, UI_LANGS, pVal )) pVal ) { +/* user gave UI languages explicitely with UI_LANGS property */ +int sel_ui_lang = 0; +strcpy(langs[nlangs++], en_US); +char *str_ptr; +str_ptr = strtok(pVal, ,); +for(; str_ptr != NULL ;) { +ui_langs[num_ui_langs] = str_ptr; +num_ui_langs++; +str_ptr = strtok(NULL, ,); } -} - -if (!have_system_default_lang) { -system_default_lang = en; -have_system_default_lang = 1; -} -if (have_system_default_lang) { for (i = 0; i nlangs; i++) { -if (memcmp(system_default_lang, langs[i], 2) != 0 -memcmp(user_locale_lang, langs[i], 2) != 0 -!present_in_ui_langs(langs[i])) { +if (!present_in_ui_langs(langs[i])) { UINT rc; sprintf(feature, gm_Langpack_r_%s, langs[i]); rc = MsiSetFeatureStateA(handle, feature, INSTALLSTATE_ABSENT); } +else { +sel_ui_lang++; +} +} +if ( sel_ui_lang == 0 ) { +/* When UI_LANG property contains only languages that are not present +
[Libreoffice-commits] .: sw/source
sw/source/core/text/porfly.hxx |1 + sw/source/core/text/porlin.hxx |1 + sw/source/core/text/portxt.hxx |1 + 3 files changed, 3 insertions(+) New commits: commit 1247a142b6a5ebe0ff268e82811d2418d648ebb7 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 16:29:57 2012 +0200 sw: doxygen comments for some layout model classes Change-Id: Icc7750fac1ef937c32e97832cbed2ad503536e91 diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index 2f211cc..0a0307b 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -58,6 +58,7 @@ public: *class SwFlyCntPortion */ +/// This portion represents an as-character anchored fly (shape, frame, etc.) class SwFlyCntPortion : public SwLinePortion { void *pContact; // bDraw ? DrawContact : FlyInCntFrm diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 045519a..b7f841b 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -69,6 +69,7 @@ class SwPortionHandler; * class SwLinePortion */ +/// Base class for anything that can be part of a line in the Writer layout. class SwLinePortion: public SwPosSize { protected: diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx index f3cf301..b62d060 100644 --- a/sw/source/core/text/portxt.hxx +++ b/sw/source/core/text/portxt.hxx @@ -42,6 +42,7 @@ class SwTxtGuess; * class SwTxtPortion */ +/// This portion represents a part of the paragraph string. class SwTxtPortion : public SwLinePortion { void BreakCut( SwTxtFormatInfo rInf, const SwTxtGuess rGuess ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/animations/CustomAnimationPane.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 50e0fe3f47354138242442e4b48551d43decbfcb Author: Felix Zhang fezh...@suse.com Date: Sat Apr 28 17:14:55 2012 +0800 n753458: changing the keyboard of the Slide Show button - to avoid C-w shortcut to run slideshow, which colides with more common fshortcut to close window diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src index 267fe12..c4661e2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.src +++ b/sd/source/ui/animations/CustomAnimationPane.src @@ -206,7 +206,7 @@ Control DLG_CUSTOMANIMATIONPANE Size = MAP_APPFONT ( 80 , 14 ) ; TabStop = TRUE; -Text [ en-US ] = Slide Sho~w; +Text [ en-US ] = S~lide Show; }; FixedLine FL_SEPERATOR2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source
sd/source/ui/animations/CustomAnimationPane.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e1f01a686a227bc5aaa8115e70a669d27ddcc52 Author: Felix Zhang fezh...@suse.com Date: Sat Apr 28 17:14:55 2012 +0800 n753458: changing the keyboard of the Slide Show button - to avoid C-w shortcut to run slideshow, which colides with more common fshortcut to close window diff --git a/sd/source/ui/animations/CustomAnimationPane.src b/sd/source/ui/animations/CustomAnimationPane.src index 267fe12..c4661e2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.src +++ b/sd/source/ui/animations/CustomAnimationPane.src @@ -206,7 +206,7 @@ Control DLG_CUSTOMANIMATIONPANE Size = MAP_APPFONT ( 80 , 14 ) ; TabStop = TRUE; -Text [ en-US ] = Slide Sho~w; +Text [ en-US ] = S~lide Show; }; FixedLine FL_SEPERATOR2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
License statement
My previous and all future contributions to LibreOffice, unless stated otherwise, are licensed under LGPLv3+/MPL Stephan van den Akker ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-5][PUSHED] fdo#50509 MSI: UI language selection from command line (e.g. silent install)
2012/6/1 Andras Timar tima...@gmail.com: Hi, Originally silent install installed all 100+ languages and it made the installation slow. For 3.5.4 it was solved by running the language pre-selection custom action not only during normal install, but during silent install, too. Unfortunately it caused another problem, because now users of silent install do not have the opportunity to select UI languages, they always get what the SelectLanguage custom action selects for them, i.e. the languages of the operating system. Here comes the solution. If the UI_LANGS property is set, the language guessing heuristic is switched off, and user can define explicitely, what languages should be installed. E.g.: msiexec /i LibO__.msi UI_LANGS=en_US,de,fr,hu It will install English (US), German, French, and Hungarian. There are still some minor issues with language selection, because for example pt_BR also selects pt implicitely, but this is the same what we have with automatic language selection. When the user tries to fool the installer by giving invalid language codes, installer will fall back to en_US. Also, en_US is not installed by default, unlike with the automatic selection. I tried the patch with a limited set of languages (10), and it worked well. Please review the patch for 3.5 (better to ignore whitespace changes, when you view the patch). http://cgit.freedesktop.org/libreoffice/core/commit/?id=a77d16835504b4f82b6b9e59c213eea8a879219c Fridrich pushed it. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Convert various SV_DECL_PTRARR in SFX2 module
Hi These patches convert various SV_DECL_PTRARR stuff to std::set and std::vector in the SFX2 module. Passes make check at global level, and compiled with debug=true Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html 0005-Convert-SV_DECL_PTRARR_DEL-ExpandedEntries-to-std-ve.patch Description: application/mbox 0006-Convert-SV_DECL_PTRARR_DEL-SfxDockArr_Impl-to-std-ve.patch Description: application/mbox 0007-Convert-SV_DECL_PTRARR_DEL-SfxVerbSlotArr_Impl-to-st.patch Description: application/mbox 0008-Convert-SV_DECL_PTRARR_SORT_DEL-SfxFoundCacheArr_Imp.patch Description: application/mbox 0009-Convert-SV_DECL_PTRARR_DEL-SfxItemPtrArray-to-std-ma.patch Description: application/mbox 0010-Convert-SV_DECL_PTRARR-SvLinkSources-to-std-set.patch Description: application/mbox 0001-Convert-SV_DECL_PTRARR_DEL-SvLinkSource_Array_Impl-t.patch Description: application/mbox 0002-Convert-SV_DECL_PTRARR-SfxDdeDocTopics_Impl-to-std-v.patch Description: application/mbox 0003-Convert-SV_DECL_PTRARR-SfxMacroInfoArr_Impl-to-std-v.patch Description: application/mbox 0004-Convert-SV_DECL_PTRARR_DEL-StyleTreeArr_Impl-to-std-.patch Description: application/mbox ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - oox/source sw/qa sw/source
oox/source/vml/vmlshape.cxx |4 ++ sw/qa/extras/ooxmltok/data/n764745-alignment.docx |binary sw/qa/extras/ooxmltok/ooxmltok.cxx| 19 + sw/source/core/unocore/unodraw.cxx| 31 ++ 4 files changed, 44 insertions(+), 10 deletions(-) New commits: commit 133822bd25e269441faaefe7c1e67091d6692e39 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Jun 7 16:48:00 2012 +0200 testcase of the alignment + anchored inline part of bnc#764745 Change-Id: Iab82a88473c0c1d7cf75fcc1f2064bca105b0293 diff --git a/sw/qa/extras/ooxmltok/data/n764745-alignment.docx b/sw/qa/extras/ooxmltok/data/n764745-alignment.docx new file mode 100644 index 000..d29e980 Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n764745-alignment.docx differ diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx b/sw/qa/extras/ooxmltok/ooxmltok.cxx index 2b050eb..dbd56cd 100644 --- a/sw/qa/extras/ooxmltok/ooxmltok.cxx +++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx @@ -65,6 +65,7 @@ public: void testN760764(); void testN764005(); void testSmartart(); +void testN764745(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -83,6 +84,7 @@ public: CPPUNIT_TEST(testN760764); CPPUNIT_TEST(testN764005); CPPUNIT_TEST(testSmartart); +CPPUNIT_TEST(testN764745); #endif CPPUNIT_TEST_SUITE_END(); @@ -472,6 +474,23 @@ void Test::testSmartart() CPPUNIT_ASSERT_EQUAL(sal_Int32(style::ParagraphAdjust_CENTER), nValue); // Paragraph properties are imported } +void Test::testN764745() +{ +load( n764745-alignment.docx ); +uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY); +uno::Referencebeans::XPropertySet xPropertySet(xDraws-getByIndex(0), uno::UNO_QUERY); +// The paragraph is right-aligned and the picture does not explicitly specify position, +// so check it's anchored as character and in the right side of the document. +text::TextContentAnchorType anchorType; +xPropertySet-getPropertyValue(AnchorType) = anchorType; +CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, anchorType); +awt::Point pos; +xPropertySet-getPropertyValue(AnchorPosition) = pos; +// not sure how to find out the document width, but in my test the anchor x is 12000 +CPPUNIT_ASSERT( pos.X 1 ); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); commit 21eca1c73ffbec4417dad46bd103215e8e20 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Jun 6 20:45:56 2012 +0200 shapes with position:static (default) should be anchored inline Visible with incorrect alignment of the image in the footer in the doc from bnc#764745. Change-Id: Ibea9f38f7404981a9a846c23a09f8244c6020797 diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 44fc631..b66546b 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -612,6 +612,10 @@ Reference XShape ComplexShape::implConvertAndInsert( const Reference XShapes aPropSet.setProperty(PROP_VertOrientPosition, rShapeRect.Y); aPropSet.setProperty(PROP_Opaque, sal_False); } +else if( maTypeModel.maPosition == static || maTypeModel.maPosition.isEmpty()) +{ // static position (the default) means anchored inline +aPropSet.setProperty(PROP_AnchorType, makeAny(text::TextContentAnchorType_AS_CHARACTER)); +} if ( maTypeModel.maPositionVerticalRelative == page ) { aPropSet.setProperty(PROP_VertOrientRelation, text::RelOrientation::PAGE_FRAME); commit 5de61f7a4ddb502730454e4bf3232f7f4b4175e1 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Jun 6 20:29:57 2012 +0200 handle properly anchor transition at page-at paragraph-as character Otherwise setting text range afterwards crashes with pHnt being NULL. Change-Id: Ib4ac2712c061605dcaaa262280c0307f7a9af2ce diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 329bed9..267f6f2 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1344,18 +1344,29 @@ void SwXShape::setPropertyValue(const rtl::OUString rPropertyName, const uno::A aSet.Put( aNewAnchor ); pFmt-SetFmtAttr(aSet); bSetAttr = false; -if( text::TextContentAnchorType_AS_CHARACTER == eNewAnchor -(FLY_AS_CHAR != eOldAnchorId)) +} +if( text::TextContentAnchorType_AS_CHARACTER == eNewAnchor +(FLY_AS_CHAR != eOldAnchorId)) +
[ANNOUNCE] libreoffice-3.5.99.1 tag created (3.6.0-beta1)
Hi, there have been created the libreoffice-3.5.99.1 tag for 3.6.0-beta1 release. The corresponding official builds will be available within next few days. See the attached list of changes against 3.6.0-alpha1. See also http://wiki.documentfoundation.org/ReleaseNotes/3.6 Now, you might switch your current 3-6 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-3.5.99.1 libreoffice-3.5.99.1 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also the schedule at http://wiki.documentfoundation.org/ReleasePlan#3.6_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr PS: Many thanks to Korrawit for improving the script generating the lists of changes. bnc#764005 VML import of absolutely positioned pictures should not be opaque [Miklos Vajna] fdo#30711 LibreOffice saves input fields in a non-standard ODF way [Michael Stahl] fdo#34638 Inconsistent Localisation of CTRL key abbreviation [Thomas Arnhold] fdo#34772 Word count / statistics in the status bar [Muhammad Haggag] fdo#39006 FILEOPEN: LibreOffice hangs with 100% CPU usage on specific .doc file [Michael Stahl] fdo#43989 After installation first launch terminates after splash screen [Andras Timar] fdo#45747 [EasyHack] remove the limitation to 3 sort entries in calc [Albert Thuswaldner] fdo#46112 Cell Border double lines imported from old OOo versions [Michael Stahl] fdo#46361 FILEOPEN: Faulty import of docx file which contains a simple drawing [Miklos Vajna] fdo#46378 Poor Resampling Image quality [Tomaz Vajngerl] fdo#46808 [Easy Hack] Adapt UNO services to new-style [Noel Grandin] fdo#47325 : Existing Base reports won't open in LibreOffice 3.5 [Lionel Elie Mamane] fdo#47473 EDITING: Legacy reports created by Report Wizard fail to load data [Lionel Elie Mamane] fdo#47520 ODBC with sqliteodbc: primary key field mostly empty, broken scolling [Lionel Elie Mamane] fdo#47805 64-bit shell extensions are not registered [Andras Timar] fdo#48018 : Report Does Not Sort by Groupings [Lionel Elie Mamane] fdo#48345 Display wrong datasets when scrolling through tables [Lionel Elie Mamane] fdo#48946 not find JRE [David Ostrovsky] fdo#49291 CRASH at menu Tools - Macros [Stephan Bergmann] fdo#49438 TABLES: drawing layer doesn't paint thin borders in Writer if anti-aliasing disabled [Michael Stahl] fdo#49859 FORMATTING, UI: numbering alignment or indentation is not applied in Impress [Stephan van den Akker] fdo#50139 UI: Cross-references - index tab selection - illustration field contents is cut at left [Andras Timar] fdo#50144 Additional information in the Insert cross-reference dialogue Selection field [Andras Timar] fdo#50169 A document causes LO to crash repeatedly [Martin Hosken, Michael Stahl] fdo#50183 CONFIGURATION: Default number of sheets for new document should be 1 [Stephan Bergmann] fdo#50372 BASE SIGABRT: dereference a past-the-end iterator [Lionel Elie Mamane] fdo#50386 Page count field makes scrolling impossible [Michael Stahl, Muhammad Haggag] fdo#50415 Shortcut names are not localized on Linux [Thomas Arnhold] fdo#50509 Language selection is not possible with silent install [Andras Timar] fdo#50539 FILEOPEN: RTF file opens with black letters and black background [Miklos Vajna] fdo#50540 View area jumps when start drawing [Muhammad Haggag] fdo#50628 CONFIGURATION: scanner crashes program [David Tardon] fdo#50630 packimages: images not found [Korrawit Pruegsanusak, David Tardon] fdo#50631 Vertical rulers completely unreadable on MacOS X [Norbert Thiebaud] fdo#50651 Toolbar: room for toolbar remains after closing from context menu [Ivan Timofeev] fdo#50665 \chpgn ignores formatting [Miklos Vajna] fdo#50680 Module lcms2 doesn't compile under solaris [Lionel Dricot] fdo#50694 EDITING: when 'Insert Sheet' from .csv no source sheet detected [Kohei Yoshida] fdo#50703 Use Blowfish encryption in ODF 1.2 backward-compatibility mode [Thorsten Behrens] fdo#50704 Default to absolute svg:d paths for ODF1.2 backward-compatibility mode [Thorsten Behrens] fdo#50722 scroll bars keep moving out of position until they disappear when zooming [Noel Power] fdo#50783 Can't create database or access table in Base [Petr Mladek] fdo#50809 Tooltip has not been modified to Comment from ”Note [Andras Timar] i#102625 Table Data View + ODBC issues select * from table to get only key data [Lionel Elie Mamane] i#110536 SRB generates wrong 'order by' on report based on query with MS Access [Lionel Elie Mamane] i#22961 AutoComplete unable to differentiate between Capital Letters and Small Letters. [Brad Sowden] i#87757 API: toolkit.AccessibleFixedText::com::sun::star::accessibility::XAccessibleText [Caolán McNamara] i#93609 No automatic row heights after xlsx import [Noel Power] i#94028 XLSX import: drawing objects misplaced [Noel Power] + common + branch libreoffice-3-6 [Petr
[PATCH] dead code: remove ScDocument::DeleteNumberFormat
Hi, this patch removes some dead code. Please could someone review it, especially the part at sc/source/ui/view/tabvwsha.cxx, to be sure it's save. Thanks! Thomas From 7f40dccf502691b02fecbc7614c1d505924e889c Mon Sep 17 00:00:00 2001 From: Thomas Arnhold tho...@arnhold.org Date: Thu, 7 Jun 2012 17:30:33 +0200 Subject: [PATCH] dead code: remove ScDocument::DeleteNumberFormat This method doesn't do anything. Code was commented out and removed with eb0497307bf381e7e065fc4b0b0d7b23f6ceeca9. This is a further cleanup. Change-Id: I7e80894d2ce15907f26c5ad49844fc7ff8c243ca --- sc/inc/document.hxx |1 - sc/source/core/data/documen2.cxx |4 sc/source/ui/inc/tabvwsh.hxx |3 --- sc/source/ui/view/formatsh.cxx |4 sc/source/ui/view/tabvwsh5.cxx | 26 -- sc/source/ui/view/tabvwsha.cxx |7 --- 6 files changed, 45 deletions(-) diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 5508c32..90d2f76 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1266,7 +1266,6 @@ public: bool bPutToPool = false ); SC_DLLPUBLIC void SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr rAttr, bool bPutToPool = false ); -voidDeleteNumberFormat( const sal_uInt32* pDelKeys, sal_uInt32 nCount ); voidAutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_uInt16 nFormatNo, const ScMarkData rMark ); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index dd9b048..9125e8a 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -584,10 +584,6 @@ void ScDocument::ResetClip( ScDocument* pSourceDoc, SCTAB nTab ) } } -void ScDocument::DeleteNumberFormat( const sal_uInt32* /* pDelKeys */, sal_uInt32 /* nCount */ ) -{ -} - void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, sal_uLong nFormatIndex, bool bForceTab ) { diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 5852065..d3c4670 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -403,9 +403,6 @@ public: ScViewData*pViewData, SvxNumberInfoItem**ppItem ); -voidUpdateNumberFormatter ( ScDocument* pDoc, - const SvxNumberInfoItem rInfoItem ); - voidExecuteCellFormatDlg( SfxRequest rReq, sal_uInt16 nTabPage = 0x ); sal_BoolGetFunction( String rFuncStr, sal_uInt16 nErrCode = 0 ); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 98ac665..5af7c51 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -853,10 +853,6 @@ void ScFormatShell::ExecuteStyle( SfxRequest rReq ) if ( SFX_STYLE_FAMILY_PARA == eFam ) { -pTabViewShell-UpdateNumberFormatter( pDoc, -(const SvxNumberInfoItem) -*(pDocSh-GetItem(SID_ATTR_NUMBERFORMAT_INFO)) ); - pTabViewShell-UpdateStyleSheetInUse( pStyleSheet ); pTabViewShell-InvalidateAttribs(); } diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 87bc8c7..98f3dc2 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -410,30 +410,4 @@ void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, } } -//-- - -void ScTabViewShell::UpdateNumberFormatter( -ScDocument* pDoc, -const SvxNumberInfoItem rInfoItem ) -{ -const sal_uInt32 nDelCount = rInfoItem.GetDelCount(); - -if ( nDelCount 0 ) -{ -const sal_uInt32* pDelArr = rInfoItem.GetDelArray(); - -for ( sal_uInt16 i=0; inDelCount; i++ ) -rInfoItem.GetNumberFormatter()-DeleteEntry( pDelArr[i] ); -} - -// sollte besser UpdateNumberFormats() heissen ? -pDoc-DeleteNumberFormat( rInfoItem.GetDelArray(), - rInfoItem.GetDelCount() ); -} - - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index d64de03..413b5d8 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -523,13 +523,6 @@ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest rReq, sal_uInt16 nTabPage { const SfxItemSet* pOutSet = pDlg-GetOutputItemSet(); -const SfxPoolItem* pItem=NULL; -
[Libreoffice-commits] .: Branch 'refs/notes/commits' - 2 commits - 23/2deabc45e2c24c8f91296d8f5afbda4f0c5289 7a/483136d9421aea508f9b436c5560cc96f8e42b
23/2deabc45e2c24c8f91296d8f5afbda4f0c5289 |1 - 7a/483136d9421aea508f9b436c5560cc96f8e42b |1 + 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit bf625e88b1effb88dc219af2d49b2979a35a1b3b Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 16:31:08 2012 +0100 Notes added by 'git notes edit' diff --git a/7a/483136d9421aea508f9b436c5560cc96f8e42b b/7a/483136d9421aea508f9b436c5560cc96f8e42b new file mode 100644 index 000..f35e937 --- /dev/null +++ b/7a/483136d9421aea508f9b436c5560cc96f8e42b @@ -0,0 +1 @@ +split repo tag: calc_LIBREOFFICE_CREATE commit 421c7682ced18d0ed8ba0c14dc244a20e553e753 Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 16:30:53 2012 +0100 Notes removed by 'git notes edit' diff --git a/23/2deabc45e2c24c8f91296d8f5afbda4f0c5289 b/23/2deabc45e2c24c8f91296d8f5afbda4f0c5289 deleted file mode 100644 index f35e937..000 --- a/23/2deabc45e2c24c8f91296d8f5afbda4f0c5289 +++ /dev/null @@ -1 +0,0 @@ -split repo tag: calc_LIBREOFFICE_CREATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/src/popup.src | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 587a3296b3dbf088525929a30da3f923083abf40 Author: Noel Power noel.po...@novell.com Date: Thu Jun 7 16:40:25 2012 +0100 I alway miss these, add Hide and Show items to tab context menu Change-Id: Ic039554b0fac91e27193e3564c40dd0c19c20002 diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index e3e9a11..856f4d7 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -238,6 +238,21 @@ Menu RID_POPUP_TAB //-- MenuItem { +Identifier = FID_TABLE_HIDE ; +HelpId = CMD_FID_TABLE_HIDE ; +Text [ en-US ] = ~Hide ; +}; +MenuItem +{ +Identifier = FID_TABLE_SHOW ; +HelpId = CMD_FID_TABLE_SHOW ; +Text [ en-US ] = ~Show... ; +}; +//-- +MenuItem { Separator = TRUE ; }; +//-- +MenuItem +{ Identifier = FID_TAB_SELECTALL ; HelpId = CMD_FID_TAB_SELECTALL ; Text [ en-US ] = Select All S~heets ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: calc: function WEEKNUM seems not to conform to ODFF1.2
Hi Winfried, On Thursday, 2012-06-07 13:21:01 +0200, Winfried Donkers wrote: My first reaction is, yes, a good plan and in line with what I wanted to do. I will study your plan carefully, work on it step for step and keep you informed. Great we agree :) It looks as if after this plan has been executed, there will be two (in UI as well as ods-file) functions, WEEKNUM_ADD and ISOWEEKNUM, but WEEKNUM_ADD is not defined in ODFF and WEEKNUM is... Shouldn't it be WEEKNUM in the UI and ods-file, and WEEKNUM_ADD in excel-files, to be renamed during export/import? (I haven't thought about implementation issues) Note that UI names may (and sometimes do) differ from ODF file format names, the relation is UI WEEKNUM == ODF ISOWEEKNUM UI WEEKNUM_ADD == ODF WEEKNUM see also formula/source/core/resource/core_resource.src Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_WEEK { Text = ISOWEEKNUM ; }; and the sc/source/core/tool/odffmap.cxx entry for WEEKNUM The mapping Excel WEEKNUM to WEEKNUM_ADD is taken care of in the import/export filters and Analysis Add-In. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp3WhU57CtMY.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH]fdo 50488 added calc formula XOR as defined in ODFF1.2
Hi Winfried, On Thursday, 2012-06-07 14:51:28 +0200, Winfried Donkers wrote: This time the patch is the one that covers XOR. Thanks, I'll take a look at it tomorrow. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp5itROfuOjn.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d4924b747eb6abd439a6313e338384ae50cbdc8e Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 17:47:11 2012 +0200 Revert accidental changes from fd32788092fcb29526ae73ae3bae6767dbb1e490 Change-Id: I1b3ceda236f26be2dcdc7e4d2afa0ef8d0053691 diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu index 198a660..def1b2c 100644 --- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu +++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu @@ -26,7 +26,7 @@ * -- !DOCTYPE oor:component-data SYSTEM ../../../../component-update.dtd -oor:component-data xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; oor:name=Configuration oor:package=org.openoffice.ucb +oor:component-data oor:name=Configuration oor:package=org.openoffice.ucb xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; node oor:name=ContentProviders node oor:name=Local oor:op=replace node oor:name=SecondaryKeys @@ -209,7 +209,7 @@ /prop /node !-- We want the Provider to be the final fallback provider -- -node oor:name=Provider999 oor:op=replace module=gio +node oor:name=Provider999 oor:op=replace install:module=gio prop oor:name=ServiceName valuecom.sun.star.ucb.GIOContentProvider/value /prop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - officecfg/registry
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4b462e9ef9c5bb5ddcc7beeaa4c727e239464377 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 17:47:11 2012 +0200 Revert accidental changes from fd32788092fcb29526ae73ae3bae6767dbb1e490 Change-Id: I1b3ceda236f26be2dcdc7e4d2afa0ef8d0053691 (cherry picked from commit d4924b747eb6abd439a6313e338384ae50cbdc8e) diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu index 198a660..def1b2c 100644 --- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu +++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu @@ -26,7 +26,7 @@ * -- !DOCTYPE oor:component-data SYSTEM ../../../../component-update.dtd -oor:component-data xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; oor:name=Configuration oor:package=org.openoffice.ucb +oor:component-data oor:name=Configuration oor:package=org.openoffice.ucb xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; node oor:name=ContentProviders node oor:name=Local oor:op=replace node oor:name=SecondaryKeys @@ -209,7 +209,7 @@ /prop /node !-- We want the Provider to be the final fallback provider -- -node oor:name=Provider999 oor:op=replace module=gio +node oor:name=Provider999 oor:op=replace install:module=gio prop oor:name=ServiceName valuecom.sun.star.ucb.GIOContentProvider/value /prop ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/Configuration_officecfg.mk officecfg/registry postprocess/packregistry
officecfg/Configuration_officecfg.mk |2 + officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 14 +-- postprocess/packregistry/makefile.mk |6 +++- 3 files changed, 14 insertions(+), 8 deletions(-) New commits: commit 459e482c7a9ba9aff5b5a505cc54247493202b46 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jun 7 17:54:43 2012 +0200 Make webdav and odma ucp configuration properly conditional Change-Id: I9a8eb6a1e9af051d458a5462c01357540c3d9277 diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 0b0a8b0..37372c9 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -206,6 +206,8 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/TypeDetection/UISort-impress.xcu \ org/openoffice/TypeDetection/UISort-math.xcu \ org/openoffice/ucb/Configuration-gio.xcu \ + org/openoffice/ucb/Configuration-neon.xcu \ + org/openoffice/ucb/Configuration-win.xcu \ )) # perhaps this file should be moved 2 levels up? diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu index def1b2c..847f786 100644 --- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu +++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu @@ -26,7 +26,7 @@ * -- !DOCTYPE oor:component-data SYSTEM ../../../../component-update.dtd -oor:component-data oor:name=Configuration oor:package=org.openoffice.ucb xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; +oor:component-data oor:name=Configuration oor:package=org.openoffice.ucb xmlns:install=http://openoffice.org/2004/installation; xmlns:oor=http://openoffice.org/2001/registry; xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; node oor:name=ContentProviders node oor:name=Local oor:op=replace node oor:name=SecondaryKeys @@ -54,7 +54,7 @@ value/ /prop /node -node oor:name=Provider3 oor:op=replace +node oor:name=Provider3 oor:op=replace install:module=neon prop oor:name=ServiceName valuecom.sun.star.ucb.WebDAVContentProvider/value /prop @@ -65,7 +65,7 @@ value/ /prop /node -node oor:name=Provider4 oor:op=replace +node oor:name=Provider4 oor:op=replace install:module=neon prop oor:name=ServiceName valuecom.sun.star.ucb.WebDAVContentProvider/value /prop @@ -98,7 +98,7 @@ value/ /prop /node -node oor:name=Provider7 oor:op=replace +node oor:name=Provider7 oor:op=replace install:module=neon prop oor:name=ServiceName valuecom.sun.star.ucb.WebDAVContentProvider/value /prop @@ -153,7 +153,7 @@ value/ /prop /node -node oor:name=Provider12 oor:op=replace +node oor:name=Provider12 oor:op=replace install:module=neon prop oor:name=ServiceName valuecom.sun.star.ucb.WebDAVContentProvider/value /prop @@ -164,7 +164,7 @@ value/ /prop /node -node oor:name=Provider13 oor:op=replace +node oor:name=Provider13 oor:op=replace install:module=neon prop oor:name=ServiceName valuecom.sun.star.ucb.WebDAVContentProvider/value /prop @@ -186,7 +186,7 @@ value/ /prop /node -node oor:name=Provider42 oor:op=replace +node oor:name=Provider42 oor:op=replace install:module=win prop oor:name=ServiceName valuecom.sun.star.ucb.ODMAContentProvider/value /prop diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 2d1d396..1749b5f 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -316,7 +316,8 @@ MY_FILES_main += \ $(MY_MOD)/org/openoffice/Inet-wnt.xcu \ $(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \ $(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \ -$(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu +$(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \ +$(MY_MOD)/org/openoffice/ucb/Configuration-win.xcu # Inet-wnt.xcu must come after Inet.xcu MY_DRIVERS += ado .ELIF $(GUIBASE) == cocoatouch @@ -328,6 +329,9 @@ MY_DRIVERS += ado .ELSE
[Libreoffice-commits] .: ooo.lst.in
ooo.lst.in |1 + 1 file changed, 1 insertion(+) New commits: commit 798f882e9c9e652ac042d33b3bcc5e6fdd5e394a Author: Eike Rathke er...@redhat.com Date: Thu Jun 7 17:59:05 2012 +0200 added liblangtag Change-Id: I1f09876703482eaa04dd33b56a2bbbf8ad381fca diff --git a/ooo.lst.in b/ooo.lst.in index 2d6e570..0a85248 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -92,6 +92,7 @@ ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz fb1f3777d6562b7ba8c09ac1cfc329e6-libmspub-0.0.0.tar.bz2 +fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ @FONTCONFIG_TARBALL@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sax/source
sax/source/expatwrap/sax_expat.cxx | 72 +++ sax/source/fastparser/fastparser.cxx | 36 + sax/source/fastparser/fastparser.hxx |4 + 3 files changed, 88 insertions(+), 24 deletions(-) New commits: commit 488c13b7b4e77f7ea9f89837d5b138316553362c Author: Michael Stahl mst...@redhat.com Date: Fri May 25 10:32:56 2012 +0200 stop parsing on encountering internal entities in sax_expat.cxx The XML_UnparsedEntityDeclHandler is apparently deprecated anyway, so replace it with the newfangled XML_EntityDeclHandler. Change-Id: Ic6589c340cf9c4e52ee600b4ff5fe3808aa791bc Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index df7dcfc..bf2473d 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -130,6 +130,16 @@ static void call_callbackCharacters( void *userData , const XML_Char *s , int nL pFastParser-callbackCharacters( s, nLen ); } +static void call_callbackEntityDecl(void *userData, const XML_Char *entityName, +int is_parameter_entity, const XML_Char *value, int value_length, +const XML_Char *base, const XML_Char *systemId, +const XML_Char *publicId, const XML_Char *notationName) +{ +FastSaxParser* pFastParser = reinterpret_castFastSaxParser*(userData); +pFastParser-callbackEntityDecl(entityName, is_parameter_entity, value, +value_length, base, systemId, publicId, notationName); +} + static int call_callbackExternalEntityRef( XML_Parser parser, const XML_Char *openEntityNames, const XML_Char *base, const XML_Char *systemId, const XML_Char *publicId ) { @@ -458,6 +468,7 @@ void FastSaxParser::parseStream( const InputSource maStructSource) throw (SAXEx XML_SetUserData( entity.mpParser, this ); XML_SetElementHandler( entity.mpParser, call_callbackStartElement, call_callbackEndElement ); XML_SetCharacterDataHandler( entity.mpParser, call_callbackCharacters ); +XML_SetEntityDeclHandler(entity.mpParser, call_callbackEntityDecl); XML_SetExternalEntityRefHandler( entity.mpParser, call_callbackExternalEntityRef ); pushEntity( entity ); @@ -887,6 +898,31 @@ void FastSaxParser::callbackCharacters( const XML_Char* s, int nLen ) } } +void FastSaxParser::callbackEntityDecl( +const XML_Char * /*entityName*/, +int /*is_parameter_entity*/, +const XML_Char *value, int /*value_length*/, +const XML_Char * /*base*/, +const XML_Char * /*systemId*/, +const XML_Char * /*publicId*/, +const XML_Char * /*notationName*/) +{ +if (value) { // value != 0 means internal entity +OSL_TRACE(FastSaxParser: internal entity declaration, stopping); +XML_StopParser(getEntity().mpParser, XML_FALSE); +getEntity().maSavedException = SAXParseException( +::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( +FastSaxParser: internal entity declaration, stopping)), +static_castOWeakObject*(this), Any(), +mxDocumentLocator-getPublicId(), +mxDocumentLocator-getSystemId(), +mxDocumentLocator-getLineNumber(), +mxDocumentLocator-getColumnNumber() ); +} else { +OSL_TRACE(FastSaxParser: ignoring external entity declaration); +} +} + int FastSaxParser::callbackExternalEntityRef( XML_Parser parser, const XML_Char *context, const XML_Char * /*base*/, const XML_Char *systemId, const XML_Char *publicId ) { diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx index 09a1d72..aac4e1d 100644 --- a/sax/source/fastparser/fastparser.hxx +++ b/sax/source/fastparser/fastparser.hxx @@ -127,6 +127,10 @@ public: void callbackEndElement( const XML_Char* name ); void callbackCharacters( const XML_Char* s, int nLen ); int callbackExternalEntityRef( XML_Parser parser, const XML_Char *openEntityNames, const XML_Char *base, const XML_Char *systemId, const XML_Char *publicId); +void callbackEntityDecl(const XML_Char *entityName, int is_parameter_entity, +const XML_Char *value, int value_length, const XML_Char *base, +const XML_Char *systemId, const XML_Char *publicId, +const XML_Char *notationName); inline void pushEntity( const Entity rEntity ) { maEntities.push( rEntity ); } inline void popEntity() { maEntities.pop(); } commit daa1f797d9dabbec57e613fd70edf045d3af683a Author: Michael Stahl mst...@redhat.com Date: Fri May 25 10:32:56 2012 +0200 stop parsing on encountering internal entities in sax_expat.cxx The XML_UnparsedEntityDeclHandler is apparently deprecated anyway, so replace it with the newfangled XML_EntityDeclHandler. Change-Id: Ic5ed38ed6ded219c12020cef297b3867613325dd Signed-off-by: Petr Mladek pmla...@suse.cz diff --git
Re: [REVIEW-3-5][PUSHED] fdo#47805 rework handling of 64-bit registry entries
2012/6/5 Andras Timar tima...@gmail.com: Hi, This is a big patch, but I think the logic is simple. It makes Windows shell extensions work out of the box on 64-bit Windows. Instead of a (non-working) hack with Reg64 table and 4 registry manipulating custom actions, we use normal MSI actions to set the appropriate registry keys during install and remove them during uninstall. On the other hand, the resulting MSI database fails the ICE80 test, because it associates a 64-bit registry item to a 32-bit directory (WTF?), and installs 64-bit elements from a 32-bit installer. But in real life it seems to be OK, installer does what it has to do (and what I wanted). I tested it on Windows 7 32/64 bit, and Windows 2008 Server R2. http://cgit.freedesktop.org/libreoffice/core/commit/?id=6d9be05a6fb251ed0cbcbcefd55ed174b1e8e39d Please let me know, if you want this in libreoffice-3-5. I did not try, maybe it does not apply cleanly, but I can backport. Fridrich approved it on irc. Pushed the backported patch to libreoffice-3-5. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'refs/notes/commits' - 8 commits - 18/34c5739669225fd9b5fd77d892207d636762b5 24/2eb73b2a27f2a776de19440b9bc53139de7d03 66/d011a310fa779a0b3270c38e4bd4fababfa8d1 7c/1f07
18/34c5739669225fd9b5fd77d892207d636762b5 |2 ++ 24/2eb73b2a27f2a776de19440b9bc53139de7d03 |1 + 66/d011a310fa779a0b3270c38e4bd4fababfa8d1 |2 -- 7c/1f07dee02a5232d3e1ae9dcc4a0f8f02b9a528 |2 ++ 88/76f0c966d9b161ddee0cb698ed2d1386717c21 |2 -- 9a/40168865a9753e91ac01f6b3248f8bcc2e2eb8 |2 -- b7/e95740f8d4e34d3076065664e8b8ca919c201c |1 + e4/4885fd24a23b62e8624d54c681bf9ddc506316 |2 -- 8 files changed, 6 insertions(+), 8 deletions(-) New commits: commit 334c2b4cc8bbda066846ce3de99f1ac5c78350a7 Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 17:10:30 2012 +0100 Notes added by 'git notes edit' diff --git a/9a/40168865a9753e91ac01f6b3248f8bcc2e2eb8 b/9a/40168865a9753e91ac01f6b3248f8bcc2e2eb8 index ae3e139..ddce8f5 100644 --- a/9a/40168865a9753e91ac01f6b3248f8bcc2e2eb8 +++ b/9a/40168865a9753e91ac01f6b3248f8bcc2e2eb8 @@ -1,3 +1 @@ split repo tag: libs-extern_LIBREOFFICE_3_2_99_1 - -split repo tag: libs-extern_LIBREOFFICE_CREATE commit 233d815a7a2a57c1f9dfd8f26c48c272908313f3 Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 17:10:22 2012 +0100 Notes added by 'git notes edit' diff --git a/24/2eb73b2a27f2a776de19440b9bc53139de7d03 b/24/2eb73b2a27f2a776de19440b9bc53139de7d03 new file mode 100644 index 000..2a350fc --- /dev/null +++ b/24/2eb73b2a27f2a776de19440b9bc53139de7d03 @@ -0,0 +1 @@ +split repo tag: libs-extern_LIBREOFFICE_CREATE commit de46fbcb0167dc1d1b4e18ebf8e4f0053b47883b Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 17:09:23 2012 +0100 Notes added by 'git notes edit' diff --git a/66/d011a310fa779a0b3270c38e4bd4fababfa8d1 b/66/d011a310fa779a0b3270c38e4bd4fababfa8d1 index 26437e4..8629c1c 100644 --- a/66/d011a310fa779a0b3270c38e4bd4fababfa8d1 +++ b/66/d011a310fa779a0b3270c38e4bd4fababfa8d1 @@ -1,5 +1,3 @@ split repo tag: postprocess_LIBREOFFICE_3_2_99_1 -split repo tag: postprocess_LIBREOFFICE_CREATE - split repo tag: postprocess_linux-build-fridrich-20100930 commit b00ffa55b1217b97f0c576ae56798d02d8c96b00 Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 17:09:15 2012 +0100 Notes added by 'git notes edit' diff --git a/18/34c5739669225fd9b5fd77d892207d636762b5 b/18/34c5739669225fd9b5fd77d892207d636762b5 index 4e03b68..2948c19 100644 --- a/18/34c5739669225fd9b5fd77d892207d636762b5 +++ b/18/34c5739669225fd9b5fd77d892207d636762b5 @@ -1,3 +1,5 @@ +split repo tag: postprocess_LIBREOFFICE_CREATE + split repo tag: postprocess_ooo/OOO330_m10 split repo tag: postprocess_ooo/OOO330_m11 commit b60d5d3361fad4f71bbaf3fdb1ba9b130ac5 Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 17:01:50 2012 +0100 Notes added by 'git notes edit' diff --git a/e4/4885fd24a23b62e8624d54c681bf9ddc506316 b/e4/4885fd24a23b62e8624d54c681bf9ddc506316 index 40f47f0..aef84d2 100644 --- a/e4/4885fd24a23b62e8624d54c681bf9ddc506316 +++ b/e4/4885fd24a23b62e8624d54c681bf9ddc506316 @@ -1,5 +1,3 @@ split repo tag: sdk_LIBREOFFICE_3_2_99_1 -split repo tag: sdk_LIBREOFFICE_CREATE - split repo tag: sdk_linux-build-fridrich-20100930 commit fa85ec5210a1194c5b3469b2bff22b99e295bbeb Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 17:01:37 2012 +0100 Notes added by 'git notes edit' diff --git a/b7/e95740f8d4e34d3076065664e8b8ca919c201c b/b7/e95740f8d4e34d3076065664e8b8ca919c201c new file mode 100644 index 000..676f69b --- /dev/null +++ b/b7/e95740f8d4e34d3076065664e8b8ca919c201c @@ -0,0 +1 @@ +split repo tag: sdk_LIBREOFFICE_CREATE commit 35f5b4238cd1395df6c0b92f1cba9fd431ad1a8d Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 16:59:59 2012 +0100 Notes added by 'git notes edit' diff --git a/7c/1f07dee02a5232d3e1ae9dcc4a0f8f02b9a528 b/7c/1f07dee02a5232d3e1ae9dcc4a0f8f02b9a528 index 7989748..ceac271 100644 --- a/7c/1f07dee02a5232d3e1ae9dcc4a0f8f02b9a528 +++ b/7c/1f07dee02a5232d3e1ae9dcc4a0f8f02b9a528 @@ -1 +1,3 @@ +split repo tag: testing_LIBREOFFICE_CREATE + split repo tag: testing_ooo/OOO330_m4 commit f078a959d8f878c166f6f882056d0d9b2df83021 Author: Michael Meeks michael.me...@suse.com Date: Thu Jun 7 16:58:06 2012 +0100 Notes added by 'git notes edit' diff --git a/88/76f0c966d9b161ddee0cb698ed2d1386717c21 b/88/76f0c966d9b161ddee0cb698ed2d1386717c21 index 5ca3632..f41d577 100644 --- a/88/76f0c966d9b161ddee0cb698ed2d1386717c21 +++ b/88/76f0c966d9b161ddee0cb698ed2d1386717c21 @@ -1,5 +1,3 @@ split repo tag: testing_LIBREOFFICE_3_2_99_1 -split repo tag: testing_LIBREOFFICE_CREATE - split repo tag: testing_linux-build-fridrich-20100930 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] dead code: remove ScDocument::DeleteNumberFormat
On 06/07/2012 10:34 AM, Thomas Arnhold wrote: Hi, this patch removes some dead code. Please could someone review it, especially the part at sc/source/ui/view/tabvwsha.cxx, to be sure it's save. Thanks! Thomas Hi, Thomas, I'm sure someone more knowledgeable than me will soon reply. However, I think that in ScTabViewShell::UpdateNumberFormatter() only the call to ScDocument::DeleteNumberFormat() should be removed, and the rest should be left alone. Of course this also means that the calls to ScTabViewShell::UpdateNumberFormatter() should not be removed. Respectfully, Daniel Bankston ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'refs/notes/commits' - 2 commits - c1/48ab4b535a6e85bdaaabd487983999c4a023d7 d9/6f09fd06adf1b48ec71b5971e41cb6d0d44519
c1/48ab4b535a6e85bdaaabd487983999c4a023d7 |2 -- d9/6f09fd06adf1b48ec71b5971e41cb6d0d44519 |1 + 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 2476da7ec7c9b66c0c770801af27e5ff5f0b81dd Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:26:23 2012 +0200 Notes added by 'git notes edit' diff --git a/d9/6f09fd06adf1b48ec71b5971e41cb6d0d44519 b/d9/6f09fd06adf1b48ec71b5971e41cb6d0d44519 new file mode 100644 index 000..5df94a0 --- /dev/null +++ b/d9/6f09fd06adf1b48ec71b5971e41cb6d0d44519 @@ -0,0 +1 @@ +split repo tag: libs-gui_LIBREOFFICE_CREATE commit 2349ba08d5c37c781c2b576a605bbbd1f7b49a06 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:25:54 2012 +0200 Notes added by 'git notes edit' diff --git a/c1/48ab4b535a6e85bdaaabd487983999c4a023d7 b/c1/48ab4b535a6e85bdaaabd487983999c4a023d7 index e421da2..8b913cd 100644 --- a/c1/48ab4b535a6e85bdaaabd487983999c4a023d7 +++ b/c1/48ab4b535a6e85bdaaabd487983999c4a023d7 @@ -1,3 +1 @@ -split repo tag: libs-gui_LIBREOFFICE_CREATE - split repo tag: libs-gui_OOO_BUILD_3_2_99_0_PRE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/notes/commits' - 2 commits - 84/faef68713b132b95e2c07e975af7d4e93c91ea cc/435b0bdc80a354bbd16f7579ff6f8bf1b54bab
84/faef68713b132b95e2c07e975af7d4e93c91ea |1 - cc/435b0bdc80a354bbd16f7579ff6f8bf1b54bab |1 + 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit cc88247b09b2959e51832966ec023b542edef9b0 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:27:55 2012 +0200 Notes added by 'git notes edit' diff --git a/cc/435b0bdc80a354bbd16f7579ff6f8bf1b54bab b/cc/435b0bdc80a354bbd16f7579ff6f8bf1b54bab new file mode 100644 index 000..7bd6a09 --- /dev/null +++ b/cc/435b0bdc80a354bbd16f7579ff6f8bf1b54bab @@ -0,0 +1 @@ +split repo tag: components_LIBREOFFICE_CREATE commit feccb9a807cbd986fd7d3db0eb078390fd5ae9ca Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:27:28 2012 +0200 Notes removed by 'git notes edit' diff --git a/84/faef68713b132b95e2c07e975af7d4e93c91ea b/84/faef68713b132b95e2c07e975af7d4e93c91ea deleted file mode 100644 index 7bd6a09..000 --- a/84/faef68713b132b95e2c07e975af7d4e93c91ea +++ /dev/null @@ -1 +0,0 @@ -split repo tag: components_LIBREOFFICE_CREATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/notes/commits' - 2 commits - a6/77e717e322d39831569972fbd09466c823e25a d5/0218006dfa1ee3e09c3850bec5111489d7cab9
a6/77e717e322d39831569972fbd09466c823e25a |1 - d5/0218006dfa1ee3e09c3850bec5111489d7cab9 |1 + 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 5a821017a7ff0ec10c0ac9a90c19941538109c29 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:30:10 2012 +0200 Notes added by 'git notes edit' diff --git a/d5/0218006dfa1ee3e09c3850bec5111489d7cab9 b/d5/0218006dfa1ee3e09c3850bec5111489d7cab9 new file mode 100644 index 000..d717a75 --- /dev/null +++ b/d5/0218006dfa1ee3e09c3850bec5111489d7cab9 @@ -0,0 +1 @@ +split repo tag: impress_LIBREOFFICE_CREATE commit eb02fba5b6d2d584b8a848e33e2b05f6882b13bc Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:29:49 2012 +0200 Notes removed by 'git notes edit' diff --git a/a6/77e717e322d39831569972fbd09466c823e25a b/a6/77e717e322d39831569972fbd09466c823e25a deleted file mode 100644 index d717a75..000 --- a/a6/77e717e322d39831569972fbd09466c823e25a +++ /dev/null @@ -1 +0,0 @@ -split repo tag: impress_LIBREOFFICE_CREATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/worksheethelper.cxx | 14 +++--- 1 file changed, 3 insertions(+), 11 deletions(-) New commits: commit a95b5d3256a0a01a94b9fa18c5ab986d91273268 Author: Noel Power noel.po...@novell.com Date: Thu Jun 7 17:27:33 2012 +0100 get rid of unecessary loop and change comment followup to 764752f5d85cb7c86ad21340dfdda4b62754790c Change-Id: I8607c9884d8fc376d74b708f38dcfb71361ea9b0 diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 48dc7d6..f7f46ac 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1223,17 +1223,9 @@ void WorksheetGlobals::convertRows( OutlineLevelVec orRowLevels, sal_Int32 nHeight = getUnitConverter().scaleToMm100( fHeight, UNIT_POINT ); if( nHeight 0 ) { -/* Get all rows that have custom height inside the passed row model. -If the model has the custom height flag set, all its rows have -custom height, otherwise get all rows specified in the class member -maManualRowHeights that are inside the passed row model. */ -ValueRangeVector aManualRows; -aManualRows.push_back( rRowRange ); -for( ValueRangeVector::const_iterator aIt = aManualRows.begin(), aEnd = aManualRows.end(); aIt != aEnd; ++aIt ) -{ -PropertySet aPropSet( getRows( *aIt ) ); -aPropSet.setProperty( PROP_Height, nHeight ); -} +/* always import the row height, ensures better layout */ +PropertySet aPropSet( getRows( *aIt ) ); +aPropSet.setProperty( PROP_Height, nHeight ); } // hidden rows: TODO: #108683# hide rows later? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/notes/commits' - 2 commits - 02/4a388c2a3b5bf9c2fcc6f5a195c76b59372a63 f0/f0cf70be165f5248df366c74ef81c8bbaef280
02/4a388c2a3b5bf9c2fcc6f5a195c76b59372a63 |1 - f0/f0cf70be165f5248df366c74ef81c8bbaef280 |1 + 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 873d755a0a5632a4d7ad828ffe81a19b6ad83a6d Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:32:50 2012 +0200 Notes added by 'git notes edit' diff --git a/f0/f0cf70be165f5248df366c74ef81c8bbaef280 b/f0/f0cf70be165f5248df366c74ef81c8bbaef280 new file mode 100644 index 000..eff35df --- /dev/null +++ b/f0/f0cf70be165f5248df366c74ef81c8bbaef280 @@ -0,0 +1 @@ +split repo tag: libs-core_LIBREOFFICE_CREATE commit 02d96e691c0d9b114b3e3c547c3f2ccc6a1eadcd Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:32:30 2012 +0200 Notes removed by 'git notes edit' diff --git a/02/4a388c2a3b5bf9c2fcc6f5a195c76b59372a63 b/02/4a388c2a3b5bf9c2fcc6f5a195c76b59372a63 deleted file mode 100644 index eff35df..000 --- a/02/4a388c2a3b5bf9c2fcc6f5a195c76b59372a63 +++ /dev/null @@ -1 +0,0 @@ -split repo tag: libs-core_LIBREOFFICE_CREATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/notes/commits' - 2 commits - 9a/2e4d94a80f93803defe3a1af0ff0cb8bf812a1 af/c5c0c4402ac15a0c54f8c83bea9aae6f53b685
9a/2e4d94a80f93803defe3a1af0ff0cb8bf812a1 |1 + af/c5c0c4402ac15a0c54f8c83bea9aae6f53b685 |1 - 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit f9a019d0ddd35b626f90ec7a36a0402cba55a474 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:52:28 2012 +0200 Notes added by 'git notes edit' diff --git a/9a/2e4d94a80f93803defe3a1af0ff0cb8bf812a1 b/9a/2e4d94a80f93803defe3a1af0ff0cb8bf812a1 new file mode 100644 index 000..62d5a33 --- /dev/null +++ b/9a/2e4d94a80f93803defe3a1af0ff0cb8bf812a1 @@ -0,0 +1 @@ +split repo tag: ure_LIBREOFFICE_CREATE commit 124c5ad26dd8dcac35ca9f09a870b7064fbeeda1 Author: Miklos Vajna vmik...@suse.cz Date: Thu Jun 7 18:52:10 2012 +0200 Notes removed by 'git notes edit' diff --git a/af/c5c0c4402ac15a0c54f8c83bea9aae6f53b685 b/af/c5c0c4402ac15a0c54f8c83bea9aae6f53b685 deleted file mode 100644 index 62d5a33..000 --- a/af/c5c0c4402ac15a0c54f8c83bea9aae6f53b685 +++ /dev/null @@ -1 +0,0 @@ -split repo tag: ure_LIBREOFFICE_CREATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits