Re: [PATCH] rtl::OUString to OUString and some questions
Hi, On Fri, Oct 26, 2012 at 11:57:48AM +0200, Lubos Lunak wrote: On Saturday 13 of October 2012, oger000 wrote: Preface: I am a novice in many things. To get familiar with the stringclasses I chose the rtl namespace prefix removal because I have seen some patches of this kind on the mailinglist. My questions: 1) I did not find background info - at least not at https://wiki.documentfoundation.org/Development/String_Classes why the removing of the rtl:: namespace prefix is preferable. Any pointers? - or is it more a cosmetic cleanup? Yes, it is more of a cosmetic cleanup - the classes are already in practice namespaced by the O prefix and so not explicitly adding the rtl:: prefix is avoiding the nuisance of the extra writing and also, since these are very commonly uses classes, makes the code more readable. Well, I do not agree with this, but I do not really care, except one thing: could we at least change _all_ public headers at once, please? Recompilation of half of the project because of a meaningless change in some module's headers is a bother. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: uno, python scripting, macro management window user experience
On Thu, Oct 25, 2012 at 02:41:14PM +0200, Marc Weber wrote: [1] Summary: What I'd like to improve - this requires a wiki which is why I'm asking here cause I need your help. Welcome to LibreOffice contribution! I had the same initial difficulties getting started with Python scripting of LibreOffice, so I recognise the need for the documentation you suggest. I'm very happy you want to do that. If you need a wiki, I suppose the natural choice is some subpage of http://wiki.documentfoundation.org/, in particular see http://wiki.documentfoundation.org/Documentation http://wiki.documentfoundation.org/Documentation/Development Once there is useful content, I'm sure the people in charge of api.libreoffice.org will be happy to put a link. For documentation development, the right contact is documentat...@global.libreoffice.org; this list is for code (developing the actual program). Get in touch with them! -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#42135: Appending a library functionality in Macro Programming missing or misdocumented
Stephan Bergmann píše v Pá 26. 10. 2012 v 17:14 +0200: On 10/26/2012 04:48 PM, Petr Mladek wrote: Either my repo is broken or the steps described at http://wiki.documentfoundation.org/Development/Submodules#What_is_the_impact_for_developers_working_in_the_auxiliary_repositories_.3F are wrong. Well, the line: --- cut --- push things using ./g push ./g push origin my_branch:maste --- cut --- sounds really strange. IMHO, ./g push ./g push is a non-sense. Yeah, by the time I would have got hold of Norbert to ask him what he meant with that, I had already figured out enough of it on my own to get something that looks like it works. For a commit whose content logically just affects helpcontent2, not also core, what I'd do is git submodule # sanity check, should display all submodules w/o leading # '+', '-', or 'U' cd helpcontent2 git am ... # or whatever git push Hmm, I get the following error at this stage: --- cut --- $ git push fatal: You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use git push origin HEAD:name-of-remote-branch --- cut --- I have no idea why the submodules tend to become an unnamed branch instead of master. cd .. git status # should report helpcontent2 as dirty git commit -m 'Updated helpcontent2' helpcontent2 git push (Whether the commit/push in core is really necessary, or whether gerrit would do that automatically I'm not really sure, cf. http://lists.freedesktop.org/archives/libreoffice/2012-October/040204.html [Libreoffice-commits] .: 5 commits [...] However, if it is not necessary, it should be harmless, as the then-necessary git pull -r would collapse the manual commit into gerrit's automatic one.) Norbert, Stefan, I hope that you will somehow sort it out. I still hope that I will not need to read any huge amount of git documentation to be able to commit :-) Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re: uno, python scripting, macro management window user experience
On Thu, Oct 25, 2012 at 07:13:46PM +0200, Marc Weber wrote: http://wiki.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide Great - where is the documentation about python? Here are a few of my bookmarks: http://wiki.openoffice.org/wiki/Python http://wiki.openoffice.org/wiki/Python_as_a_macro_language http://www.openoffice.org/udk/python/scriptingframework/index.html i assumle you already identified this ressource (IDL reference) http://api.libreoffice.org/docs/common/ref/com/sun/star/module-ix.html Now is openoffice still the wiki to be used for libre office? I don't think so; the documentation guys will probably be more knowledgeable about stuff like that. On Wikipedia (or somewhere else) I've read (...) that for licensing reasons its likely that more devs will contribute to libreoffice in the future. That is my/our opinion, yes. Then the first thing I'd made explicit is adding the word LibreOffice to the start page so that everybody knows that its a common wiki for both projects: http://wiki.openoffice.org/wiki/Main_Page It is not a common wiki. That's the wiki of Apache OpenOffice, a competitor project. So where can I find the information about the roadmap - how the libreoffice wants the future to look like? Something like http://wiki.documentfoundation.org/ReleasePlan ? I mean I have to know to which wiki to contribute. I may even consider contributing to the documentation etc. So what would be the way to go? Contribute to both: OO and LO? What is the majority on this list doing in such cases? Well, asking on a LibreOffice mailing list will get you the answer: contribute to the LibreOffice one, that's what we are doing! :) -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Licence statement
Hello Here is a statement about my contributions to the LibreOffice project: All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Regards, Dávid Vastag dave.wwpub...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: .gitmodules
.gitmodules |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 12f7e27917cb014dd78e87c38e9698aa5c148114 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 29 10:39:28 2012 +0100 Revert Use relative submodule URLs This reverts commit 5e48667f6bdd2f5e05b3f41d080fda06bd3d7c16 for now until https://gerrit-review.googlesource.com/#/c/36190/ Expanded submodule subscription support is fixed, as it inadvertently caused gerrit to no longer automatically create corresponding core commits whenever receiving submodule commits (whether or not that is actually a good feature). diff --git a/.gitmodules b/.gitmodules index 06d3c4c..2bba7a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,16 @@ [submodule binfilter] path = binfilter - url = ../binfilter + url = git://gerrit.libreoffice.org/binfilter branch = . [submodule dictionaries] path = dictionaries - url = ../dictionaries + url = git://gerrit.libreoffice.org/dictionaries branch = . [submodule helpcontent2] path = helpcontent2 - url = ../help + url = git://gerrit.libreoffice.org/help branch = . [submodule translations] path = translations - url = ../translations + url = git://gerrit.libreoffice.org/translations branch = . ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#42135: Appending a library functionality in Macro Programming missing or misdocumented
On 10/27/2012 10:14 AM, Norbert Thiebaud wrote: On Fri, Oct 26, 2012 at 6:47 PM, Norbert Thiebaud nthieb...@gmail.com wrote: Ah!! but that also means that the automatic commit in the super module by gerrit will not work anymore... IIRC. Stephan, you may want to revert that... since the hassle of setting up a pushurl once is much less than not being able to manage patch via the review system for submodules... Indeed until the following patch is released, relative path break the auto-managment of submodules by gerrit https://gerrit-review.googlesource.com/#/c/36190/ so http://cgit.freedesktop.org/libreoffice/core/commit/?id=5e48667f6bdd2f5e05b3f41d080fda06bd3d7c16 should be reverted until then... Stephan can you please revert it ? Ah, I hadn't been aware of this strange connection when I did that commit. I'm actually not convinced at all that gerrit's automatic commits are what one generally wants (I at least had at least two situations already where I did /not/ want them), but that's another story and I happily reverted the above now as http://cgit.freedesktop.org/libreoffice/core/commit/?id=12f7e27917cb014dd78e87c38e9698aa5c148114 Revert 'Use relative submodule URLs.' Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#42135: Appending a library functionality in Macro Programming missing or misdocumented
On 10/29/2012 10:15 AM, Petr Mladek wrote: Stephan Bergmann píše v Pá 26. 10. 2012 v 17:14 +0200: Yeah, by the time I would have got hold of Norbert to ask him what he meant with that, I had already figured out enough of it on my own to get something that looks like it works. For a commit whose content logically just affects helpcontent2, not also core, what I'd do is git submodule # sanity check, should display all submodules w/o leading # '+', '-', or 'U' cd helpcontent2 git am ... # or whatever git push Hmm, I get the following error at this stage: --- cut --- $ git push fatal: You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use git push origin HEAD:name-of-remote-branch --- cut --- Ach, this needs to be git push origin HEAD:master (it never works to write down instructions by heart). (Whether the commit/push in core is really necessary, or whether gerrit would do that automatically I'm not really sure, cf. http://lists.freedesktop.org/archives/libreoffice/2012-October/040204.html [Libreoffice-commits] .: 5 commits [...] However, if it is not necessary, it should be harmless, as the then-necessary git pull -r would collapse the manual commit into gerrit's automatic one.) Norbert, Stefan, I hope that you will somehow sort it out. I still hope that I will not need to read any huge amount of git documentation to be able to commit :-) This stop of automatic gerrit core commits was an unexpected side-effect of another commit I reverted now, see my other mail in this thread. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: STRING * n support in StarBasic
Hi Norbert, sorry I am late to this, extra conference, travelling etc. On 25/10/12 13:47, Norbert Thiebaud wrote: On Thu, Oct 25, 2012 at 10:56 AM, Michael Stahl mst...@redhat.com wrote: if we simply replace the existing String uses with OUString we don't have to worry about that any more :) that would be my hope Well, you do need to worry, if you want to enforce the language spec (although these are pretty weak and fuzzy) that's unfortunately typical with MS vba Right know we seems to care about padding of fixed-length String on Init only (Dim)... I have not stumbled upon code that cares about that on assign and other manipulations... iow Dim foo as STRING*10 = dim bar as STRING hello foo = bar what should be foo? hello or hello This is probably not a 'generaly' solvable problem as this notion of fixed-size has been dropped post VB6.0, and now everything is var-len with a max at 2GB. iow old and new spec conflict. So I guess my question is: while migrating to OUString, should we care about the corner-case and other oddities associated with 'fixed' String. I would say no ( otherwise some support for fixed strings would need to be introduced for unknown if any benefit ), in fact a quick test on master and 'Dim bar as STRING hello' doesn't even compile, I would guess this feature has been broken for probably years ( personally never heard of this syntax before ) - need to get some idea how long it is broken though ( I will check soon ) btw for your question what should be foo? hello or hello yeah, I guess if we did things properly imho the latter would be correct ( should again check that with ms vba ) Norbert so for me it seems the best course of action is to just solve this in the limited case ( e.g. just transition to oustring without considering the 'other' string manipulations ) I will try and find out how long this is broken, that should influence whether we decide to even drop this ( most likely not even used ) functionality Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
build problem: missing xslt directory in odk
mkdir -p ../../unxlngx6.pro/bin/odkcommon/settings/ tr -d \015 dk.mk | sed -e 's/@@RELEASE@@/3.7/' -e 's/@@BUILDID@@/370m1(Build:0)/' ../../unxlngx6.pro/bin/odkcommon/settings/dk.mk cp: cp: cannot create regular file `../../ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XXSLTTransformer.idl': No such file or directory cannot create regular file `../../ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XSLTTransformer.idl': No such file or directory dmake: Error code 1, while making '../../ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XXSLTTransformer.idl' Am I the only one who get this? The directory odk/ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt isn't created (odk/ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/ does exist). I didn't notice any change in this area in the code, but probably I've missed something. Creating the directory manually and rebuilding the code ends successfully. Kaplan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: tools/source
tools/source/fsys/urlobj.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cda6b4e991f45ec870a311ab736038bd93227900
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Oct 29 14:19:35 2012 +0400
fdo#56366: INetURLObject::decode: do not clip utf-32 to 16-bit
Change-Id: Iaedc9f5b9f25f43b8b8deaf28129423abbb91672
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 428d4e0..cc33f31 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3702,7 +3702,7 @@ rtl::OUString INetURLObject::decode(sal_Unicode const *
pBegin,
switch (eEscapeType)
{
case ESCAPE_NO:
-aResult.append(sal_Unicode(nUTF32));
+aResult.appendUtf32(nUTF32);
break;
case ESCAPE_OCTET:
@@ -3724,7 +3724,7 @@ rtl::OUString INetURLObject::decode(sal_Unicode const *
pBegin,
appendEscape(aResult, cEscapePrefix, nUTF32);
}
else
-aResult.append(sal_Unicode(nUTF32));
+aResult.appendUtf32(nUTF32);
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: STRING * n support in StarBasic
Noel wrote: Nobert wrote: So I guess my question is: while migrating to OUString, should we care about the corner-case and other oddities associated with 'fixed' String. I would say no ( otherwise some support for fixed strings would need to be introduced for unknown if any benefit ) Agreed; it seems really rather unlikely that combat coders have relied on this 64k limit in such a way that extending it will cause significant problems; and (no doubt) they will report it as/when they do, and then we can think again. No doubt it is/was possible to rely on the old size limited behaviour of our native strings in StarBasic in the same way, but IMHO we should up all those limits anyway as we unify our strings. Good catch with the casts though ! :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: STRING * n support in StarBasic
Hi Noel, FYI, I have taken advantage of a week semi-offline to get rid of String in the whole 'basic' module... I will push that soon in a feature branch to solicit reviews... Most of the changes are cosmetic(*)/trivial... a few places needed some rework to accommodate the change in API/functionality between String/OUString (*) There are more cosmetics changes than strictly needed... but that is because I basically browsed most of the code in 'basic', and I sub-consciously added braces and fixed indentations to be able to read it comfortably. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build problem: missing xslt directory in odk
On 29 October 2012 11:10, Lior Kaplan kaplanl...@gmail.com wrote: mkdir -p ../../unxlngx6.pro/bin/odkcommon/settings/ tr -d \015 dk.mk | sed -e 's/@@RELEASE@@/3.7/' -e 's/@@BUILDID@@/370m1(Build:0)/' ../../unxlngx6.pro/bin/odkcommon/settings/dk.mk cp: cp: cannot create regular file `../../unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XXSLTTransformer.idl': No such file or directory cannot create regular file `../../unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XSLTTransformer.idl': No such file or directory dmake: Error code 1, while making '../../unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XXSLTTransformer.idl' Am I the only one who get this? The directory odk/unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt isn't created (odk/unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/ does exist). I think I've seen this. make odk.clean make odk solved that ? Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #159 from Petr Mladek pmla...@suse.cz --- (In reply to comment #154) I would like to nominate Bug #42134 FORMATTING: Autofit doesn't work properly on long texts as a most annoying bug, it has been around since version 3.3 and I would not think it is too hard to fix? I agree that it is annoying but I do not thing that it belongs here. It is a very old bug and I do not see other duplicates. I think that it is because many other users do not use so long texts. Note that long texts are not ideal for presentations anyway. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ATTENTION] the merge of the submodules feature has been done... now on master
On 10/16/2012 06:32 PM, Norbert Thiebaud wrote: see http://wiki.documentfoundation.org/Development/Submodules for details Mails to libreoffice-comm...@lists.freedesktop.org now contain no information whether they are about commits to core or to one of the submodules. Can that be fixed? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac mythes/ExternalProject_mythes.mk
configure.ac |2 ++
mythes/ExternalProject_mythes.mk |6 ++
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 67a23b6af991d383de5d431db9cc88d18f488b7c
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 29 12:02:36 2012 +0100
move setup of HUNSPELL_CFLAGS etc. to configure
Change-Id: Id50ca2e0804d9e56334c9f7149dc4080a7fee729
diff --git a/configure.ac b/configure.ac
index 276e991..d53c6a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8840,6 +8840,8 @@ if test $with_system_hunspell = yes; then
else
AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO
+HUNSPELL_CFLAGS=-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell
+HUNSPELL_LIBS=-L${OUTDIR}/lib -lhunspell
HUNSPELL_TARBALL=3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
BUILD_TYPE=$BUILD_TYPE HUNSPELL
fi
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 1d2ab7b..b146823 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -21,10 +21,8 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
cd $(EXTERNAL_WORKDIR) \
./configure --disable-shared --with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM) gio_can_sniff=no) \
- $(if $(filter NO,$(SYSTEM_HUNSPELL)), \
- HUNSPELL_CFLAGS=-I$(call
gb_UnpackedTarball_get_dir,hunspell/src/hunspell) \
- HUNSPELL_LIBS=-L$(OUTDIR)/lib -lhunspell \
- ) \
+ HUNSPELL_CFLAGS= $(HUNSPELL_CFLAGS) \
+ HUNSPELL_LIBS= $(HUNSPELL_LIBS) \
$(if $(filter C52U,$(COM)$(CPU)),CFLAGS=-m64) \
$(GNUMAKE) -j$(EXTMAXPROCESS) \
touch $@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 411cc0f12a1f8030978a4b33839c50007bdee0de Author: Miklos Vajna vmik...@suse.cz Date: Mon Oct 29 12:08:19 2012 +0100 import RTF_DPROUNDR See the fdo#42407 bugdoc for a reproducer. Change-Id: Ia683a87215c71a238db322cb60ce5e31309eb7e9 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 1fab293..f350a7f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2295,7 +2295,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) m_aStates.top().aDrawingObject.xShape.set(getModelFactory()-createInstance(com.sun.star.drawing.PolyLineShape), uno::UNO_QUERY); break; case RTF_DPRECT: -nType = ESCHER_ShpInst_Rectangle; + m_aStates.top().aDrawingObject.xShape.set(getModelFactory()-createInstance(com.sun.star.drawing.RectangleShape), uno::UNO_QUERY); break; case RTF_DPELLIPSE: nType = ESCHER_ShpInst_Ellipse; @@ -2423,6 +2423,11 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) case RTF_DPLINEHOLLOW: m_aStates.top().aDrawingObject.nFLine = 0; break; +case RTF_DPROUNDR: +if (m_aStates.top().aDrawingObject.xPropertySet.is()) +// Seems this old syntax has no way to specify a custom radius, and this is the default + m_aStates.top().aDrawingObject.xPropertySet-setPropertyValue(CornerRadius, uno::makeAny(sal_Int32(83))); +break; default: SAL_INFO(writerfilter, OSL_THIS_FUNC : TODO handle flag ' lcl_RtfToString(nKeyword) '); aSkip.setParsed(false); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d72b774bf68085afbc23b9166f27ed77cdda870e Author: Niklas Johansson sleeping.pil...@gmail.com Date: Tue Oct 23 17:22:55 2012 +0200 Updated core Project: help 23d7515757534fca7d50e1201745586adde4b8f6 fdo#42135 Add help for the button export in Macro Organizer diff --git a/helpcontent2 b/helpcontent2 index 50b30c2..23d7515 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 50b30c29041679bbf20ee9c4d2b7558b9b84601c +Subproject commit 23d7515757534fca7d50e1201745586adde4b8f6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: source/text
source/text/sbasic/shared/01030400.xhp | 27 +++ 1 file changed, 27 insertions(+) New commits: commit 23d7515757534fca7d50e1201745586adde4b8f6 Author: Niklas Johansson sleeping.pil...@gmail.com Date: Tue Oct 23 17:22:55 2012 +0200 fdo#42135 Add help for the button export in Macro Organizer Adds a section of the previously undocumented button Export... diff --git a/source/text/sbasic/shared/01030400.xhp b/source/text/sbasic/shared/01030400.xhp index 21d282e..ebe3bde 100644 --- a/source/text/sbasic/shared/01030400.xhp +++ b/source/text/sbasic/shared/01030400.xhp @@ -96,6 +96,33 @@ paragraph role=listitem id=par_id3147004 xml-lang=en-US l10n=U oldref=56Click emphOK/emph to import the library./paragraph /listitem /list +paragraph role=heading id=hd_id3159099 xml-lang=en-US level=3 l10n=U oldref=17Export a Library/paragraph +list type=ordered +listitem +paragraph role=listitem id=par_id3147005 xml-lang=en-US l10n=U oldref=70Choose emphTools - Macros - Organize Macros - %PRODUCTNAME Basic/emph and click emphOrganizer/emph or click the emphSelect Module/emph icon in the Basic IDE to open the emphMacro Organizer/emph dialog./paragraph +/listitem +listitem +paragraph role=listitem id=par_id3147006 xml-lang=en-US l10n=U oldref=71Click the emphLibraries/emph tab./paragraph +/listitem +listitem +paragraph role=listitem id=par_id3147007 xml-lang=en-US l10n=U oldref=72In the emphLocation/emph list you specify where your library is stored. Select the library that you want to export. Note that you cannot export the emphStandard/emph library./paragraph +/listitem +listitem +paragraph role=listitem id=par_id3147008 xml-lang=en-US l10n=U oldref=73Click emphExport.../emph/paragraph +/listitem +listitem +paragraph role=listitem id=par_id3147009 xml-lang=en-US l10n=U oldref=74Choose whether you want to export the library as an extension or as a basic library./paragraph +/listitem +listitem +paragraph role=listitem id=par_id3147010 xml-lang=en-US l10n=U oldref=75Click emphOK/emph./paragraph +/listitem +listitem +paragraph role=listitem id=par_id3147011 xml-lang=en-US l10n=U oldref=76Select where you want your library exported./paragraph +/listitem +listitem +paragraph role=listitem id=par_id3147012 xml-lang=en-US l10n=U oldref=77Click emphSave/emph to export the library./paragraph +/listitem +/list paragraph role=heading id=hd_id3159100 xml-lang=en-US level=3 l10n=U oldref=17Deleting a Library/paragraph list type=ordered listitem ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] fdo#42135: Appending a library functionality in Macro Programming missing or misdocumented
Stephan Bergmann píše v Po 29. 10. 2012 v 10:49 +0100: On 10/29/2012 10:15 AM, Petr Mladek wrote: Stephan Bergmann píše v Pá 26. 10. 2012 v 17:14 +0200: Yeah, by the time I would have got hold of Norbert to ask him what he meant with that, I had already figured out enough of it on my own to get something that looks like it works. For a commit whose content logically just affects helpcontent2, not also core, what I'd do is git submodule # sanity check, should display all submodules w/o leading # '+', '-', or 'U' cd helpcontent2 git am ... # or whatever git push Hmm, I get the following error at this stage: --- cut --- $ git push fatal: You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use git push origin HEAD:name-of-remote-branch --- cut --- Ach, this needs to be git push origin HEAD:master (it never works to write down instructions by heart). Cool, this worked = pushed. (Whether the commit/push in core is really necessary, or whether gerrit would do that automatically I'm not really sure, cf. http://lists.freedesktop.org/archives/libreoffice/2012-October/040204.html [Libreoffice-commits] .: 5 commits [...] However, if it is not necessary, it should be harmless, as the then-necessary git pull -r would collapse the manual commit into gerrit's automatic one.) Norbert, Stefan, I hope that you will somehow sort it out. I still hope that I will not need to read any huge amount of git documentation to be able to commit :-) This stop of automatic gerrit core commits was an unexpected side-effect of another commit I reverted now, see my other mail in this thread. The automatic core commit worked as well now. Thanks a lot for help and improving the stuff. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: where to put icons for the iconset feature?
Hi Markus, On Sat, 2012-10-27 at 20:37 +0200, Markus Mohrhard wrote: I'm currently implementing the icon set support and have no idea where to put the icons. There will be around 50 to 60 icons if we want full compatibility with OOXML. Right. Should they really be put into the galaxy icon set even if they are only used in calc core and are not related to the UI code? Well; of course, we could try dropping them on the disk, but there are big benefits to sharing the same code, path handling, etc. from having them in images.zip. My hope is that (eventually) we get our theming logic sorted out so that unchanged icons are not duplicated across multiple zip files, but that we layer them; so - for now - I'd just whack them into galaxy yes :-) The screenshot looked lovely by the way :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build problem: missing xslt directory in odk
On Mon, Oct 29, 2012 at 12:41 PM, Matúš Kukan matus.ku...@gmail.com wrote: On 29 October 2012 11:10, Lior Kaplan kaplanl...@gmail.com wrote: Am I the only one who get this? The directory odk/unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt isn't created (odk/unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/ does exist). I think I've seen this. make odk.clean make odk solved that ? It does, weird... Thanks, Kaplan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build problem: missing xslt directory in odk
Hi, On Mon, Oct 29, 2012 at 12:10:02PM +0200, Lior Kaplan wrote: mkdir -p ../../unxlngx6.pro/bin/odkcommon/settings/ tr -d \015 dk.mk | sed -e 's/@@RELEASE@@/3.7/' -e 's/@@BUILDID@@/370m1(Build:0)/' ../../unxlngx6.pro/bin/odkcommon/settings/dk.mk cp: cp: cannot create regular file `../../ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XXSLTTransformer.idl': No such file or directory cannot create regular file `../../ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XSLTTransformer.idl': No such file or directory dmake: Error code 1, while making '../../ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt/XXSLTTransformer.idl' Am I the only one who get this? The directory odk/ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/xslt isn't created (odk/ unxlngx6.pro/bin/odkcommon/idl/com/sun/star/xml/ does exist). I didn't notice any change in this area in the code, but probably I've missed something. The change happened in offapi, not in odk. The 'xslt' directory and the files in it were added last week. It is evident that the odk makefilery cannot handle such addition without clean rebuild... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: version 3.6.3RC2 installation on Windows
On Thu, 2012-10-25 at 15:24 +0200, Joop Kiefte wrote: I suppose it is because both use GTK, and LibreOffice has to touch GTK files. We don't use gtk+ on windows at all; though we had some problems around MSI / packing related to erroneously having gtk+ enabled for windows build in the recent past that may be related. Any ideas Andras ? :-) Michael. 2012/10/25 Winfried Donkers w.donk...@dci-electronics.nl: I just installed version 3.6.3RC2 on my Windows machine at work. The installation application asked me to close Outlook and to close gvim. Closing Outlook I kind of understand given the option to mail from LibreOffice and the peculiarities of Windows. But closing GVIM I do not understand (I had and .sql and 2 .vbs files open in gvim, which were totally unrelated to LibreOffice). Could someone explain why this is, or is there something not 100% in the installation package? -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] rtl::OUString to OUString and some questions
On Mon, 2012-10-29 at 07:12 +0100, David Tardon wrote: Well, I do not agree with this, but I do not really care, except one thing: could we at least change _all_ public headers at once, please? Recompilation of half of the project because of a meaningless change in some module's headers is a bother. Blocked by re-basing :-) but yes, changing all re-based files' headers at once would be nice. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: hunspell/ExternalProject_hunspell.mk
hunspell/ExternalProject_hunspell.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6571f071ce98f4066b5213b6c08e8a3eb4043cd2 Author: Tor Lillqvist t...@iki.fi Date: Mon Oct 29 13:49:56 2012 +0200 Pass gb_STDLIBS in LIBS to the hunspell configure Otherwise the executables (that we won't need of course) won't link for Android. Change-Id: I993f404caa77e8ceadd669230eba43469cffc5a1 diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk index a374f13..f2eaf7c 100644 --- a/hunspell/ExternalProject_hunspell.mk +++ b/hunspell/ExternalProject_hunspell.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,hunspell,\ $(call gb_ExternalProject_get_state_target,hunspell,build): cd $(EXTERNAL_WORKDIR) \ -./configure --disable-shared --disable-nls --with-pic \ +LIBS=$(addprefix -l,$(gb_STDLIBS)) $(LIBS) ./configure --disable-shared --disable-nls --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ $(if $(filter AIX,$(OS)),CFLAGS=-D_LINUX_SOURCE_COMPAT) \ $(if $(filter C53,$(COM)),CFLAGS=-xc99=none) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/killsdf' - 2 commits - l10ntools/inc l10ntools/source
l10ntools/inc/propmerge.hxx|2 +-
l10ntools/source/export2.cxx |4
l10ntools/source/propmerge.cxx |6 +++---
3 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 0c7f8e6d0c2a414150c5f77d3419479bb8eeddb0
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Mon Oct 29 12:53:18 2012 +0100
Delete some unneeded checking from export2.cxx
Change-Id: Ib41c81629fbc5a8bd709391091c2777d49f9d9c4
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 64a5b1b..5ef2231 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -95,10 +95,6 @@ bool Export::handleArguments(
int argc, char * argv[], HandledArgs o_aHandledArgs)
{
o_aHandledArgs = HandledArgs();
-if ( argc = 1 )
-{
-return false;
-}
sLanguages = ;
sal_uInt16 nState = STATE_NON;
commit 8f57a9d2a186a2cd5d71ed8bbed106ab927322d4
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Mon Oct 29 11:52:54 2012 +0100
Correct some naming in propex
Change-Id: Id5b17be8155f13529439dd9a46b42f6ffeed79b1
diff --git a/l10ntools/inc/propmerge.hxx b/l10ntools/inc/propmerge.hxx
index 3465635..4f0e327 100644
--- a/l10ntools/inc/propmerge.hxx
+++ b/l10ntools/inc/propmerge.hxx
@@ -30,7 +30,7 @@ public:
bool isInitialized() const { return m_bIsInitialized; }
void Extract(
const OString rSDFFile, const OString rPrj, const OString rRoot );
-void Merge( const OString rSDFFile, const OString rDestinationFile );
+void Merge( const OString rMergeSrc, const OString rDestinationFile );
};
#endif //_PROPMERGE_INCLUDED
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 0f1b20b..6140014 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -168,7 +168,7 @@ void PropParser::Extract(
}
//Merge strings to source file
-void PropParser::Merge( const OString rSDFFile, const OString
rDestinationFile )
+void PropParser::Merge( const OString rMergeSrc, const OString
rDestinationFile )
{
assert( m_bIsInitialized );
std::ofstream aDestination(
@@ -180,14 +180,14 @@ void PropParser::Merge( const OString rSDFFile, const
OString rDestinationFile
return;
}
-MergeDataFile aMergeDataFile( rSDFFile, m_sSource, false );
+MergeDataFile aMergeDataFile( rMergeSrc, m_sSource, false );
if( aMergeDataFile.GetLanguages()[0] != m_sLang )
{
std::cerr
Propex error: given language conflicts with
language of Mergedata file:
- m_sLang.getStr() - rSDFFile.getStr() std::endl;
+ m_sLang.getStr() - rMergeSrc.getStr() std::endl;
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - hunspell/ExternalProject_hunspell.mk mythes/ExternalProject_mythes.mk solenv/gbuild
hunspell/ExternalProject_hunspell.mk |2 +- mythes/ExternalProject_mythes.mk |2 +- solenv/gbuild/platform/android.mk|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit e8768f245a2be0eb8437e392d65e6d4973b4b613 Author: Tor Lillqvist t...@iki.fi Date: Mon Oct 29 14:14:07 2012 +0200 Need gb_STDLIBS for mythes, too Change-Id: I8ee685fa36f922a391802ac0de69f5cab2d69b6c diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk index b146823..392e69d 100644 --- a/mythes/ExternalProject_mythes.mk +++ b/mythes/ExternalProject_mythes.mk @@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,mythes,\ $(call gb_ExternalProject_get_state_target,mythes,build): cd $(EXTERNAL_WORKDIR) \ -./configure --disable-shared --with-pic \ +LIBS=$(gb_STDLIBS) $(LIBS) ./configure --disable-shared --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ HUNSPELL_CFLAGS= $(HUNSPELL_CFLAGS) \ HUNSPELL_LIBS= $(HUNSPELL_LIBS) \ commit 0ac7d3a1da9a573840897eb7dc64cb425a3d2170 Author: Tor Lillqvist t...@iki.fi Date: Mon Oct 29 14:13:46 2012 +0200 gb_STDLIBS already has the -l options Change-Id: Ic498efe935194e95c593c5378d882664b7ad14ef diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk index f2eaf7c..91cf31c 100644 --- a/hunspell/ExternalProject_hunspell.mk +++ b/hunspell/ExternalProject_hunspell.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,hunspell,\ $(call gb_ExternalProject_get_state_target,hunspell,build): cd $(EXTERNAL_WORKDIR) \ -LIBS=$(addprefix -l,$(gb_STDLIBS)) $(LIBS) ./configure --disable-shared --disable-nls --with-pic \ +LIBS=$(gb_STDLIBS) $(LIBS) ./configure --disable-shared --disable-nls --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ $(if $(filter AIX,$(OS)),CFLAGS=-D_LINUX_SOURCE_COMPAT) \ $(if $(filter C53,$(COM)),CFLAGS=-xc99=none) \ commit 87cac6bac2bd2145a5e41a3ce1ec1c2029ca010a Author: Tor Lillqvist t...@iki.fi Date: Mon Oct 29 14:13:15 2012 +0200 gb_STDLIBS should contain -l options for the linking command line Change-Id: Iab93d5dc4b3c19d3661846b16956573078fa4cfd diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 4b88864..804d939 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -10,7 +10,7 @@ ifeq ($(DISABLE_DYNLOADING),TRUE) # Link with -lgnustl_static gb_STDLIBS := \ - gnustl_static + -lgnustl_static gb_Library_PLAINLIBS_NONE := \ android \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - fontconfig/ExternalProject_fontconfig.mk solenv/gbuild
fontconfig/ExternalProject_fontconfig.mk |2 +- solenv/gbuild/platform/android.mk|3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit cbe020b979e841b3bfc6da1b324fd02f1b9390d8 Author: Tor Lillqvist t...@iki.fi Date: Mon Oct 29 14:28:26 2012 +0200 Need -lm for Android for the exectuables that fontconfig builds Said executables will not be used for anything, of course. We can't use gb_STDLIBS, which also contains -lm after my previous commit, as fontconfig is C, not C++, and gb_STDLIBS contains -lgnustl_static, and only our $(CXX), not $(CC), contains the -L that points to where -lgnustl_static is to be found. Change-Id: I40c459580f357d913ddc55eae00e16f90f81d510 diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk index b7d2eb5..90107a1 100644 --- a/fontconfig/ExternalProject_fontconfig.mk +++ b/fontconfig/ExternalProject_fontconfig.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\ $(call gb_ExternalProject_get_state_target,fontconfig,build) : cd $(EXTERNAL_WORKDIR) \ -$(if $(debug),CFLAGS=-g) ./configure \ +$(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS=-lm $(LIBS)) ./configure \ --disable-shared \ --with-arch=arm \ --with-expat-includes=$(OUTDIR)/inc/external \ commit 6db0190b716e36e33dbbef0c9a40750ce53b94dd Author: Tor Lillqvist t...@iki.fi Date: Mon Oct 29 14:28:12 2012 +0200 Use also -lm to be on the safe side Change-Id: I2bee6cc4f985ee47dbe4d2e35acf688042970519 diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 804d939..2c33f1b 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -10,7 +10,8 @@ ifeq ($(DISABLE_DYNLOADING),TRUE) # Link with -lgnustl_static gb_STDLIBS := \ - -lgnustl_static + -lgnustl_static \ + -lm gb_Library_PLAINLIBS_NONE := \ android \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - l10ntools/StaticLibrary_transex.mk solenv/gbuild
l10ntools/StaticLibrary_transex.mk |5 + solenv/gbuild/platform/android.mk | 10 -- 2 files changed, 5 insertions(+), 10 deletions(-) New commits: commit e5eb833917266cd085e4e9fa5c923f8fcc0da985 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 29 13:41:16 2012 +0100 gbuild: gb_Library_PLAINLIBS_NONE zombie cleanup for android Change-Id: I4599c252ba1d37e5377e405ac1a0e7bf4e22086a diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 2c33f1b..526c18c 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -13,10 +13,6 @@ gb_STDLIBS := \ -lgnustl_static \ -lm -gb_Library_PLAINLIBS_NONE := \ - android \ - gnustl_static \ - else # Link almost everything with -lgnustl_shared gb_STDLIBS := \ @@ -72,12 +68,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) -gb_Library_PLAINLIBS_NONE += \ - jpeg \ - m \ - pthread \ - z \ - endif # Prefix UNO library filenames with lib commit e755317aca5487dbcb35f4eabdaa2041de693797 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 29 13:35:24 2012 +0100 l10ntools: add missing dependency on sal headers Change-Id: Iced89d43299767a30d31d1c5e3abf3e8c91f76cc diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index e8c84b7..b437be9 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -32,6 +32,11 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\ $$(INCLUDE) \ )) +$(eval $(call gb_StaticLibrary_use_packages,transex,\ + sal_generated \ + sal_inc \ +)) + $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ l10ntools/source/export2 \ l10ntools/source/merge \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build of master fails somewhere in the end
On Sat, 2012-10-27 at 13:06 +0200, Regina Henschel wrote: I tried to build LO with MSVC on WinXP, but building fails somewhere in the end. I have attached the file build_error.log. ... I find error message in the fetch log: Cloning into helpcontent2... fatal: reference is not a tree: 2cc7764943882fa89e31c96f6e0467c96bda3976 Unable to checkout '2cc7764943882fa89e31c96f6e0467c96bda3976' in submodule path 'helpcontent2' And indeed folder helpcontent2 exists but is empty besides subfolder .git. IMHO - we really need to hard-fail on this instead of having this minor warning 'fatal:', that doesn't cause an abort :-) I had a poke in Makefile.top but didn't manage to unwind how that works - is it a matter of some testing hackery of './g' ? ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build of master fails somewhere in the end
Hi Matúš, Matúš Kukan schrieb: Hi Regina, On 27 October 2012 19:10, Regina Henschel rb.hensc...@t-online.de wrote: Removing src.download was not sufficient. I have deleted the folder helpcontent2 and then I got a checked out '50b30c29041679bbf20ee9c4d2b7558b9b84601c'. ah, nice that it worked in the end But the build still do not finish :( I've attached the next build_error.log When in doubt, check http://tinderbox.libreoffice.org/MASTER/status.html This error was fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=3149d338fc2d766f7e0e974ecf1993b42f32e98d I think. It should be safe to pull again now. Yes, after another pull it has build and installed fine now. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
writerfilter/source/filter/ImportFilter.cxx |1 -
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 68338abfd657ad5511a8a77b431ace8ad465c35e
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Oct 29 14:31:32 2012 +0100
DOCX: w:doNotUseHTMLParagraphAutoSpacing should affect AddParaTableSpacing
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462 unconditionally enabled
AddParaTableSpacing doc setting, which broke the layout of some
documents, e.g. n#778836. Fix this by doing what the WW8 importer does:
enable the setting only in case the w:doNotUseHTMLParagraphAutoSpacing
tag is present.
Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c371723..edf66f5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3667,6 +3667,7 @@ void DomainMapper_Impl::ApplySettingsTable()
xSettings-setPropertyValue(
PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_EMBED_FONTS ),
uno::makeAny(true) );
if( m_pSettingsTable-GetEmbedSystemFonts())
xSettings-setPropertyValue(
PropertyNameSupplier::GetPropertyNameSupplier().GetName(
PROP_EMBED_SYSTEM_FONTS ), uno::makeAny(true) );
+xSettings-setPropertyValue(AddParaTableSpacing,
uno::makeAny(m_pSettingsTable-GetDoNotUseHTMLParagraphAutoSpacing()));
}
catch(const uno::Exception)
{
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index 8d9b244..e482d5b 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -192,7 +192,6 @@ void WriterFilter::setTargetDocument( const uno::Reference
lang::XComponent
xSettings-setPropertyValue(FloattableNomargins, uno::makeAny( sal_True
));
xSettings-setPropertyValue( ClippedPictures, uno::makeAny( sal_True ) );
xSettings-setPropertyValue( BackgroundParaOverDrawings, uno::makeAny(
sal_True ) );
- xSettings-setPropertyValue( AddParaTableSpacing, uno::makeAny( sal_True
) );
}
void WriterFilter::setSourceDocument( const uno::Reference lang::XComponent
xDoc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - libwps/libwps.gcc.warnings.patch libwps/libwps.msvc.warnings.patch libwps/UnpackedTarball_wps.mk
libwps/UnpackedTarball_wps.mk |7 +++
libwps/libwps.gcc.warnings.patch | 15
libwps/libwps.msvc.warnings.patch | 71 ++
3 files changed, 93 insertions(+)
New commits:
commit 573af9266c4d17445f0c75e1a71b629c845b83b8
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 29 14:49:39 2012 +0100
libwps: fix gcc warning too [-Wsign-promo]
Change-Id: I23e32cfc100441530691e0dcdc71eac37b3fbf0d
diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk
index 269adf0..e573928 100644
--- a/libwps/UnpackedTarball_wps.mk
+++ b/libwps/UnpackedTarball_wps.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,wps,1))
$(eval $(call gb_UnpackedTarball_add_patches,wps,\
libwps/libwps.msvc.warnings.patch \
+libwps/libwps.gcc.warnings.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/libwps/libwps.gcc.warnings.patch b/libwps/libwps.gcc.warnings.patch
new file mode 100644
index 000..d9692d4
--- /dev/null
+++ b/libwps/libwps.gcc.warnings.patch
@@ -0,0 +1,15 @@
+warning: passing âlibwps::Justificationâ chooses âintâ over
âunsigned intâ
+
+diff -ru wps.old/src/lib/WPSParagraph.cpp wps/src/lib/WPSParagraph.cpp
+--- wps.old/src/lib/WPSParagraph.cpp 2012-10-29 14:44:09.135977333 +0100
wps/src/lib/WPSParagraph.cpp 2012-10-29 14:44:13.649981497 +0100
+@@ -137,7 +137,8 @@
+ o just=fullAllLines, ;
+ break;
+ default:
+- o just= pp.m_justify , ;
++ assert(false); // unhandled Justification enum value
++ o just= static_castunsigned(pp.m_justify) , ;
+ break;
+ }
+
commit 424bd89ac2a11ba6dd2ede9454c3af90a5ca7f9c
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 29 14:37:01 2012 +0100
libwps: fix sundry MSVC warnings
Change-Id: I4d8ee9e339139716e549000dd22d02ab8b963d9d
diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk
index c5698f7..269adf0 100644
--- a/libwps/UnpackedTarball_wps.mk
+++ b/libwps/UnpackedTarball_wps.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,wps))
$(eval $(call gb_UnpackedTarball_set_tarball,wps,$(WPS_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,wps,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,wps,\
+libwps/libwps.msvc.warnings.patch \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/libwps/libwps.msvc.warnings.patch
b/libwps/libwps.msvc.warnings.patch
new file mode 100644
index 000..5d41d5e
--- /dev/null
+++ b/libwps/libwps.msvc.warnings.patch
@@ -0,0 +1,71 @@
+fix MSVC warnings:
+
+* various C4946 reinterpret_cast between related classes
+* silly C4305 truncation from double to float
+* C4806: no value of type 'bool' promoted to type 'int'
+ can equal the given constant (real bug?)
+* C4701: pot. uninitialized variable 'ucs4Character'
+
+diff -ru wps.old/src/lib/WPS4.cpp wps/src/lib/WPS4.cpp
+--- wps.old/src/lib/WPS4.cpp 2012-05-31 14:14:13.0 +0200
wps/src/lib/WPS4.cpp 2012-10-29 14:13:08.24160 +0100
+@@ -116,7 +116,7 @@
+ return;
+ }
+
+- WPS4Parser *mnParser = reinterpret_castWPS4Parser *(m_parser);
++ WPS4Parser *mnParser = dynamic_castWPS4Parser *(m_parser);
+ mnParser-send(m_entry, subDocumentType);
+ }
+
+diff -ru wps.old/src/lib/WPS4Text.cpp wps/src/lib/WPS4Text.cpp
+--- wps.old/src/lib/WPS4Text.cpp 2012-05-31 14:14:13.0 +0200
wps/src/lib/WPS4Text.cpp 2012-10-29 14:22:16.00440 +0100
+@@ -212,7 +212,7 @@
+ //! operator for font properties
+ std::ostream operator(std::ostream o, Font const ft)
+ {
+- o reinterpret_castWPSFont const (ft) ,;
++ o dynamic_castWPSFont const (ft) ,;
+
+ if (ft.m_special)
+ {
+@@ -822,7 +822,7 @@
+ WPSEntry ent = m_state-m_dosLinkList[id].m_pos;
+ ent.setType(TEXT);
+ ent.setId(WPS4TextInternal::Z_DLink);
+- WPSPosition pos_(Vec2f(),Vec2f(3.0,0.2));
++ WPSPosition pos_(Vec2f(),Vec2f(3.0f,0.2f));
+
pos_.setRelativePosition(WPSPosition::Paragraph, WPSPosition::XCenter);
+ pos_.m_wrapping = WPSPosition::WNone;
+ WPXPropertyList extras;
+@@ -1729,7 +1729,7 @@
+ int underlinePos = libwps::readU8(m_input);
+ if (underlinePos)
+ {
+- if (!what 0x20) f undFl,;
++ if (!(what 0x20)) f undFl,;
+ what = 0xdf;
+ attributes |= WPS_UNDERLINE_BIT;
+ }
+diff -ru wps.old/src/lib/WPS8.cpp wps/src/lib/WPS8.cpp
+--- wps.old/src/lib/WPS8.cpp 2012-05-31 14:14:13.0 +0200
wps/src/lib/WPS8.cpp 2012-10-29 14:19:31.20600 +0100
+@@ -94,7 +94,7 @@
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/ooxml/factoryimpl_ns.xsl |7 --- writerfilter/source/ooxml/model.xml |2 +- 2 files changed, 1 insertion(+), 8 deletions(-) New commits: commit f5d972265a4fec02639bbd68ecb0a6cd4f4253a7 Author: Miklos Vajna vmik...@suse.cz Date: Mon Oct 29 15:39:03 2012 +0100 Revert n#778140 fix import of w:fldSimple character properties This reverts commit 393262b325338b568c86b9183f37fc950cfbf127. It turns out that this hack is not really needed for n#778140, but it causes problems, for example in case of n#775899. Change-Id: I00b9f7112f951935450c683c5942b0d6c2b7fee2 diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl index 407f405..bd913d6 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -494,13 +494,6 @@ CreateElementMapPointer /xsl:text xsl:text pHandler-gt;endField();/xsl:text /xsl:when -xsl:when test=@action='simplefieldend' -xsl:text -pHandler-gt;endField(); -pHandler-gt;startCharacterGroup(); -pHandler-gt;text(); -pHandler-gt;endCharacterGroup();/xsl:text -/xsl:when xsl:when test=@action='printproperty' xsl:text dynamic_castlt;OOXMLFastContextHandlerStream*gt;(pHandler)-gt;sendProperty(/xsl:text diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index bf25aa3..d961f87 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -22153,7 +22153,7 @@ action name=start action=printproperty sendtokenid=ooxml:CT_SimpleField_instr/ action name=start action=endCharacterGroup/ action name=start action=fieldsep/ - action name=end action=simplefieldend/ + action name=end action=fieldend/ /resource resource name=ST_FldCharType resource=List value name=begin tokenid=ooxml:Value_ST_FldCharType_beginbegin/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/inc starmath/source
starmath/inc/document.hxx |4 ++--
starmath/inc/node.hxx |8
starmath/source/accessibility.cxx | 26 ++
starmath/source/document.cxx | 12
starmath/source/node.cxx | 18 +-
5 files changed, 37 insertions(+), 31 deletions(-)
New commits:
commit a3d9253615078a35836c9e79dd694c4540dd5dde
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Oct 29 19:15:56 2012 +0400
String - OUString
Change-Id: I9d86ea5b27e8b8db75bf7a2ea9965621c857adb7
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 4d98b82..6388013 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -96,7 +96,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
String aText;
SmFormataFormat;
SmParseraInterpreter;
-String aAccText;
+OUStringaAccText;
SmNode *pTree;
SfxMenuBarManager *pMenuMgr;
SfxItemPool*pEditEngineItemPool;
@@ -198,7 +198,7 @@ public:
const std::set rtl::OUString GetUsedSymbols() const { return
aUsedSymbols; }
-String GetAccessibleText();
+OUStringGetAccessibleText();
EditEngine GetEditEngine();
SfxItemPoolGetEditEngineItemPool();
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index bfe8902..7a89a7a 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -156,7 +156,7 @@ public:
virtual void Arrange(const OutputDevice rDev, const SmFormat rFormat);
virtual void CreateTextFromNode(String rText);
-virtual voidGetAccessibleText( String rText ) const;
+virtual voidGetAccessibleText( OUStringBuffer rText ) const;
sal_Int32 GetAccessibleIndex() const { return nAccIndex; }
const SmNode * FindNodeWithAccessibleIndex(xub_StrLen nAccIndex) const;
@@ -324,7 +324,7 @@ public:
SmStructureNode operator = ( const SmStructureNode rNode );
-virtual void GetAccessibleText( String rText ) const;
+virtual void GetAccessibleText( OUStringBuffer rText ) const;
void SetSubNode(size_t nIndex, SmNode* pNode)
{
@@ -378,7 +378,7 @@ protected:
public:
-virtual void GetAccessibleText( String rText ) const;
+virtual void GetAccessibleText( OUStringBuffer rText ) const;
};
@@ -490,7 +490,7 @@ public:
virtual void Arrange(const OutputDevice rDev, const SmFormat rFormat);
virtual void CreateTextFromNode(String rText);
-virtual void GetAccessibleText( String rText ) const;
+virtual void GetAccessibleText( OUStringBuffer rText ) const;
void Accept(SmVisitor* pVisitor);
/**
Converts the character from StarMath's private area symbols to a
matching Unicode
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index 331790a..508208c 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -514,10 +514,11 @@ awt::Rectangle SAL_CALL
SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
OSL_ENSURE( nAccIndex = 0, invalid accessible index );
OSL_ENSURE( nIndex = nAccIndex, index out of range );
-StringaNodeText;
-pNode-GetAccessibleText( aNodeText );
+OUStringBuffer aBuf;
+pNode-GetAccessibleText(aBuf);
+OUString aNodeText = aBuf.makeStringAndClear();
sal_Int32 nNodeIndex = nIndex - nAccIndex;
-if (0 = nNodeIndexnNodeIndex aNodeText.Len())
+if (0 = nNodeIndexnNodeIndex aNodeText.getLength())
{
// get appropriate rectangle
Point aOffset(pNode-GetTopLeft() - pTree-GetTopLeft());
@@ -525,9 +526,9 @@ awt::Rectangle SAL_CALL
SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
aTLPos.X() -= 0;
Size aSize (pNode-GetSize());
-sal_Int32 *pXAry = new sal_Int32[ aNodeText.Len() ];
+sal_Int32 *pXAry = new sal_Int32[ aNodeText.getLength() ];
pWin-SetFont( pNode-GetFont() );
-pWin-GetTextArray( aNodeText, pXAry, 0, aNodeText.Len() );
+pWin-GetTextArray( aNodeText, pXAry, 0, aNodeText.getLength()
);
aTLPos.X()+= nNodeIndex 0 ? pXAry[nNodeIndex - 1] : 0;
aSize.Width() = nNodeIndex 0 ? pXAry[nNodeIndex] -
pXAry[nNodeIndex - 1] : pXAry[nNodeIndex];
delete[] pXAry;
@@ -600,22 +601,23 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint(
const awt::Point aPoin
if (aRect.IsInside( aPos ))
{
OSL_ENSURE( pNode-IsVisible(), node is not a leaf );
-String aTxt;
-pNode-GetAccessibleText( aTxt );
-OSL_ENSURE( aTxt.Len(), no accessible text available );
+
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - editeng/source
editeng/source/editeng/impedit3.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 9eac0d367a3933db5c482c79642a141a8670b51c
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Oct 12 17:41:49 2012 +0200
fdo#55931 Fix renderding of subscript/superscript with Autofit Text.
We are using font metrics to compute the stretch ratio for autofit; but that
collides with nPropr property of SvxFont - it is then counted twice, ie. in
the case of nPropr == 25, we actually behave as if it was much less; and
worse, only in the horizontal direction.
Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 87cdda8..a4441c4 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2654,10 +2654,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode,
sal_uInt16 nPos, SvxFont rF
// ugly on the screen!
OutputDevice* pDev = pOut ? pOut : GetRefDevice();
rFont.SetPhysFont( pDev );
-FontMetric aMetric( pDev-GetFontMetric() );
-// For the height do not consider the metrics, because it will go
-// wrong at Superscript/Subscript.
-Size aRealSz( aMetric.GetSize().Width(), rFont.GetSize().Height() );
+Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
if ( aStatus.DoStretch() )
{
if ( nStretchY != 100 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.ac curl/curl-7.26.0_mingw.patch curl/curl-7.26.0_win.patch curl/ExternalPackage_curl.mk curl/ExternalProject_curl.mk curl/Makefile curl/Module_curl
Makefile.top |2 - Module_tail_build.mk |1 RepositoryModule_ooo.mk |1 config_host.mk.in|1 configure.ac |2 + curl/ExternalPackage_curl.mk | 39 + curl/ExternalProject_curl.mk | 56 +++ curl/Makefile|7 + curl/Module_curl.mk | 20 +++ curl/UnpackedTarball_curl.mk | 32 curl/curl-7.26.0_mingw.patch |2 - curl/curl-7.26.0_win.patch | 20 ++- curl/prj/d.lst | 18 - ooo.lst.in |2 - tail_build/prj/build.lst |2 - 15 files changed, 182 insertions(+), 23 deletions(-) New commits: commit 0f075129c95f7aee782bf08b2edbe7c71db1c7b2 Author: Peter Foley pefol...@verizon.net Date: Mon Oct 29 10:50:32 2012 -0400 convert curl to gbuild Change-Id: I8c038a0c59660f4fb672d71c08e6ee0b56c302ee diff --git a/Makefile.top b/Makefile.top index 510b49f..d6a324b 100644 --- a/Makefile.top +++ b/Makefile.top @@ -64,6 +64,7 @@ cppuhelper\ cpputools\ ct2n\ cui\ +curl\ dbaccess\ desktop\ dictionaries \ @@ -215,7 +216,6 @@ binfilter \ cairo\ cppunit\ crashrep\ -curl\ external\ gdk-pixbuf\ gettext\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 1989327..a8a397a 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ cpputools \ $(call gb_Helper_optional,CT2N,ct2n) \ cui \ + $(call gb_Helper_optional,CURL,curl) \ dbaccess \ desktop \ $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index b259392..a0559b6 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ cpputools \ $(call gb_Helper_optional,CT2N,ct2n) \ cui \ + $(call gb_Helper_optional,CURL,curl) \ dbaccess \ desktop \ $(call gb_Helper_optional,DICTIONARIES,dictionaries) \ diff --git a/config_host.mk.in b/config_host.mk.in index 2f4837f..be1fd1b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -84,6 +84,7 @@ export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@ export CPU_FOR_BUILD=@CPU_FOR_BUILD@ export CROSS_COMPILING=@CROSS_COMPILING@ export CT2N_TARBALL=@CT2N_TARBALL@ +export CURL_TARBALL=@CURL_TARBALL@ export CURL_CFLAGS=@CURL_CFLAGS@ export CURL_LIBS=@CURL_LIBS@ export CXX=@CXX@ diff --git a/configure.ac b/configure.ac index d53c6a3..65e3c22 100644 --- a/configure.ac +++ b/configure.ac @@ -7892,9 +7892,11 @@ if test $with_system_curl = yes; then else AC_MSG_RESULT([internal]) SYSTEM_CURL=NO +CURL_TARBALL=3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz BUILD_TYPE=$BUILD_TYPE CURL fi AC_SUBST(SYSTEM_CURL) +AC_SUBST(CURL_TARBALL) AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) AC_SUBST([MINGW_CURL_DLL]) diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk new file mode 100644 index 000..c5852f8 --- /dev/null +++ b/curl/ExternalPackage_curl.mk @@ -0,0 +1,39 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl)) + +$(eval $(call gb_ExternalPackage_use_external_project,curl,curl)) + +ifeq ($(GUI),UNX) + +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/pkgconfig/libcurl.pc,libcurl.pc)) +endif + +ifeq ($(DISABLE_DYNLOADING),TRUE) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a)) +else ifeq ($(OS),ANDROID) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,.libs/libcurl.so)) +else +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) +endif + +else ifeq ($(GUI),WNT) + +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a)) +$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,.libs/libcurl.dll)) +else ifeq ($(COM),WNT) +$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib)) +$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/libcurl.dll)) +endif + +endif +# vim: set noet sw=4 ts=4: diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk new file mode 100644 index 000..beee034 --- /dev/null +++ b/curl/ExternalProject_curl.mk @@ -0,0 +1,56 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the
[Libreoffice-commits] .: binfilter
binfilter |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96f67ece2e51bd62effcb4ab04985b0734ec6c58 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 29 17:28:10 2012 +0100 Updated core Project: binfilter 9e1d8c9cfa1197c4fa5685240549fed3134e4f7c fdo#46808: Adapted to core CalendarWrapper changes diff --git a/binfilter b/binfilter index 93e9d8f..9e1d8c9 16 --- a/binfilter +++ b/binfilter @@ -1 +1 @@ -Subproject commit 93e9d8f14a400a57d251cf24ae76c767803cd5a8 +Subproject commit 9e1d8c9cfa1197c4fa5685240549fed3134e4f7c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bf_sc/source bf_sw/source inc/bf_svtools inc/bf_sw
bf_sc/source/core/data/sc_global.cxx |2 -
bf_sw/source/core/bastyp/sw_init.cxx |4 --
inc/bf_svtools/ondemand.hxx |3 +-
inc/bf_sw/swcalwrp.hxx | 48 ---
4 files changed, 3 insertions(+), 54 deletions(-)
New commits:
commit 9e1d8c9cfa1197c4fa5685240549fed3134e4f7c
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 29 17:28:10 2012 +0100
fdo#46808: Adapted to core CalendarWrapper changes
...and swcalwrp.hxx stuff turns out to be unused, anyway.
diff --git a/bf_sc/source/core/data/sc_global.cxx
b/bf_sc/source/core/data/sc_global.cxx
index bc6a4e3..eabcd55 100644
--- a/bf_sc/source/core/data/sc_global.cxx
+++ b/bf_sc/source/core/data/sc_global.cxx
@@ -396,7 +396,7 @@ void global_InitAppOptions();
/*N*/ pSysLocale = new SvtSysLocale;
/*N*/ pCharClass = pSysLocale-GetCharClassPtr();
/*N*/ pLocaleData = pSysLocale-GetLocaleDataPtr();
-/*N*/ pCalendar = new CalendarWrapper(
::legacy_binfilters::getLegacyProcessServiceFactory() );
+/*N*/ pCalendar = new CalendarWrapper( comphelper::getComponentContext(
::legacy_binfilters::getLegacyProcessServiceFactory() ) );
/*N*/ pCalendar-loadDefaultCalendar( *pLocale );
/*N*/ pCollator = new CollatorWrapper(
::legacy_binfilters::getLegacyProcessServiceFactory() );
/*N*/ pCollator-loadDefaultCollator( *pLocale, SC_COLLATOR_IGNORES );
diff --git a/bf_sw/source/core/bastyp/sw_init.cxx
b/bf_sw/source/core/bastyp/sw_init.cxx
index 1b5506f..e645ab6 100644
--- a/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/bf_sw/source/core/bastyp/sw_init.cxx
@@ -124,7 +124,6 @@
#include breakit.hxx
#include checkit.hxx
-#include swcalwrp.hxx
#include SwStyleNameMapper.hxx
#include legacysmgr/legacy_binfilters_smgr.hxx
namespace binfilter {
@@ -403,7 +402,6 @@ SvPtrarr *pGlobalOLEExcludeList = 0;
SwBreakIt* pBreakIt = 0;
SwCheckIt* pCheckIt = 0;
CharClass* pAppCharClass = 0;
-SwCalendarWrapper* pCalendarWrapper = 0;
CollatorWrapper* pCollator = 0, *pCaseCollator = 0;
::utl::TransliterationWrapper* pTransWrp = 0;
@@ -698,7 +696,6 @@ public:
/*N*/ ::com::sun::star::lang::XMultiServiceFactory xMSF =
/*N*/
::legacy_binfilters::getLegacyProcessServiceFactory();
/*N*/ pAppCharClass = new CharClass( xMSF, rLcl );
-/*N*/ pCalendarWrapper = new SwCalendarWrapper( xMSF );
/*N*/
/*N*/ _FrmInit();
/*N*/ _TextInit();
@@ -726,7 +723,6 @@ public:
/*N*/ delete pBreakIt;
/*M*/ delete pCheckIt;
/*N*/ delete pAppCharClass;
-/*N*/ delete pCalendarWrapper;
/*N*/ delete pCollator;
/*N*/ delete pCaseCollator;
/*N*/
diff --git a/inc/bf_svtools/ondemand.hxx b/inc/bf_svtools/ondemand.hxx
index 3721fe5..007891b 100644
--- a/inc/bf_svtools/ondemand.hxx
+++ b/inc/bf_svtools/ondemand.hxx
@@ -28,6 +28,7 @@
#include unotools/calendarwrapper.hxx
#include unotools/collatorwrapper.hxx
#include com/sun/star/i18n/CollatorOptions.hpp
+#include comphelper/processfactory.hxx
#include unotools/transliterationwrapper.hxx
#include com/sun/star/i18n/TransliterationModules.hpp
#include unotools/nativenumberwrapper.hxx
@@ -226,7 +227,7 @@ public:
if ( !bValid )
{
if ( !pPtr )
-pPtr = new CalendarWrapper(
xSMgr );
+pPtr = new CalendarWrapper(
comphelper::getComponentContext( xSMgr ) );
pPtr-loadDefaultCalendar( aLocale
);
bValid = true;
}
diff --git a/inc/bf_sw/swcalwrp.hxx b/inc/bf_sw/swcalwrp.hxx
deleted file mode 100644
index 8cc4c16..000
--- a/inc/bf_sw/swcalwrp.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SWCALWRP_HXX
-#define _SWCALWRP_HXX
-
-#include i18npool/lang.h
-#include bf_tools/string.hxx
-#include unotools/calendarwrapper.hxx
-namespace binfilter {
-
-class
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/TDefTableHandler.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 69299e517b8f87089339c2b674be174a3f8b69be
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Oct 25 14:45:45 2012 +0200
docx import: handle start/end attribute in tcBorders
Change-Id: I148345485534ae50b616857d971ef1c8b1594f28
Reviewed-on: https://gerrit.libreoffice.org/908
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx
b/writerfilter/source/dmapper/TDefTableHandler.cxx
index dcd000d..79e72b0 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -188,8 +188,10 @@ void TDefTableHandler::lcl_sprm(Sprm rSprm)
{
case NS_ooxml::LN_CT_TcBorders_top:
case NS_ooxml::LN_CT_TcBorders_left:
+case NS_ooxml::LN_CT_TcBorders_start:
case NS_ooxml::LN_CT_TcBorders_bottom:
case NS_ooxml::LN_CT_TcBorders_right:
+case NS_ooxml::LN_CT_TcBorders_end:
case NS_ooxml::LN_CT_TcBorders_insideH:
case NS_ooxml::LN_CT_TcBorders_insideV:
case NS_ooxml::LN_CT_TcBorders_tl2br:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 41 ---
1 file changed, 19 insertions(+), 22 deletions(-)
New commits:
commit 78a5ce35db4cc762bbbc68e39dba1f73367ec520
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Oct 25 14:47:30 2012 +0200
docx export: explicitely use 'none' type for disabled cell borders
Otherwise, the table default borders will be used.
Change-Id: Iebab1204dc40f79e10164e4815bbdbbe054ef144
Reviewed-on: https://gerrit.libreoffice.org/909
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5ccf51d..5a91c43 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1349,7 +1349,7 @@ static void impl_borderLine( FSHelperPtr pSerializer,
sal_Int32 elementToken, co
// thickThinMediumGap, thickThinLargeGap, thickThinSmallGap
// thinThickLargeGap, thinThickMediumGap, thinThickSmallGap
const char* pVal = none;
-if ( !pBorderLine-isEmpty( ) )
+if ( pBorderLine !pBorderLine-isEmpty( ) )
{
switch (pBorderLine-GetBorderLineStyle())
{
@@ -1403,7 +1403,7 @@ static void impl_borderLine( FSHelperPtr pSerializer,
sal_Int32 elementToken, co
pAttr-add( FSNS( XML_w, XML_val ), OString( pVal ) );
-if ( !pBorderLine-isEmpty() )
+if ( pBorderLine !pBorderLine-isEmpty() )
{
// Compute the sz attribute
@@ -1452,32 +1452,29 @@ static void impl_pageBorders( FSHelperPtr pSerializer,
const SvxBoxItem rBox, s
for( int i = 0; i 4; ++i, ++pBrd )
{
const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
-if ( pLn )
+if ( pDefaultBorders pLn )
{
-if ( pDefaultBorders )
-{
-const SvxBorderLine* pRefLn = pDefaultBorders-GetLine( *pBrd
);
+const SvxBorderLine* pRefLn = pDefaultBorders-GetLine( *pBrd );
-// If border is equal to default border: do not output
-if ( pRefLn *pLn == *pRefLn) {
-continue;
-}
+// If border is equal to default border: do not output
+if ( pRefLn *pLn == *pRefLn) {
+continue;
}
+}
-if (!tagWritten bWriteTag) {
-pSerializer-startElementNS( XML_w, tag, FSEND );
-tagWritten = true;
-}
+if (!tagWritten bWriteTag) {
+pSerializer-startElementNS( XML_w, tag, FSEND );
+tagWritten = true;
+}
-impl_borderLine( pSerializer, aXmlElements[i], pLn, 0 );
+impl_borderLine( pSerializer, aXmlElements[i], pLn, 0 );
-// When exporting default borders, we need to export these 2 attr
-if ( pDefaultBorders == 0 ) {
-if ( i == 2 )
-impl_borderLine( pSerializer, XML_insideH, pLn, 0 );
-else if ( i == 3 )
-impl_borderLine( pSerializer, XML_insideV, pLn, 0 );
-}
+// When exporting default borders, we need to export these 2 attr
+if ( pDefaultBorders == 0 ) {
+if ( i == 2 )
+impl_borderLine( pSerializer, XML_insideH, pLn, 0 );
+else if ( i == 3 )
+impl_borderLine( pSerializer, XML_insideV, pLn, 0 );
}
}
if (tagWritten bWriteTag) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlexport/data/table-borders.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 62 +++
2 files changed, 62 insertions(+)
New commits:
commit ec06049af9c40646772a8c8f7c3cf42d776b172d
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Oct 25 14:50:30 2012 +0200
docx export: unit test table/cell borders export
Change-Id: Ibd651c0d027dcf8b63b9208ffdcbcfaee3165b38
Reviewed-on: https://gerrit.libreoffice.org/910
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/qa/extras/ooxmlexport/data/table-borders.docx
b/sw/qa/extras/ooxmlexport/data/table-borders.docx
new file mode 100644
index 000..a18a93e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table-borders.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d45bb00..710f7d8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -64,6 +64,7 @@ public:
void testMathVerticalStacks();
void testTablePosition();
void testFdo47669();
+void testTableBorders();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -99,6 +100,7 @@ void Test::run()
{math-vertical_stacks.docx, Test::testMathVerticalStacks},
{table-position.docx, Test::testTablePosition},
{fdo47669.docx, Test::testFdo47669},
+{table-borders.docx, Test::testTableBorders},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -402,6 +404,66 @@ void Test::testFdo47669()
CPPUNIT_ASSERT_EQUAL(OUString(http://www.google.com/#a;),
getPropertyOUString(getRun(getParagraph(1), 2), HyperLinkURL));
}
+union SingleLineBorders {
+SingleLineBorders(int t=0, int b=0, int l=0, int r=0)
+: top(t), bottom(b), left(l), right(r) {}
+struct {
+sal_Int16 top, bottom, left, right;
+};
+sal_Int16 sizes[4];
+};
+void Test::testTableBorders() {
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(1, xTables-getCount());
+uno::Referencetext::XTextTable xTextTable (xTables-getByIndex(0),
uno::UNO_QUERY);
+
+std::mapOUString, SingleLineBorders cellBorders;
+cellBorders[OUString(A1)] = SingleLineBorders(106, 106, 106, 106);
+cellBorders[OUString(B1)] = SingleLineBorders(106, 0, 106, 35);
+cellBorders[OUString(C1)] = SingleLineBorders(106, 106, 35, 106);
+cellBorders[OUString(A2)] = SingleLineBorders(106, 35, 106, 0);
+cellBorders[OUString(B2)] = SingleLineBorders(0, 0, 0, 0);
+cellBorders[OUString(C2)] = SingleLineBorders(106, 106, 0, 106);
+cellBorders[OUString(A3)] = SingleLineBorders(35, 35, 106, 106);
+cellBorders[OUString(B3)] = SingleLineBorders(0, 106, 106, 106);
+cellBorders[OUString(C3)] = SingleLineBorders(106, 106, 106, 106);
+cellBorders[OUString(A4)] = SingleLineBorders(35, 106, 106, 35);
+cellBorders[OUString(B4)] = SingleLineBorders(106, 106, 35, 106);
+cellBorders[OUString(C4)] = SingleLineBorders(106, 106, 106, 106);
+
+const OUString borderNames[] = {
+OUString(TopBorder),
+OUString(BottomBorder),
+OUString(LeftBorder),
+OUString(RightBorder),
+};
+
+uno::SequenceOUString const cells = xTextTable-getCellNames();
+sal_Int32 nLength = cells.getLength();
+CPPUNIT_ASSERT_EQUAL((sal_Int32)cellBorders.size(), nLength);
+
+for (sal_Int32 i = 0; i nLength; ++i)
+{
+uno::Referencetable::XCell xCell =
xTextTable-getCellByName(cells[i]);
+uno::Reference beans::XPropertySet xPropSet(xCell,
uno::UNO_QUERY_THROW);
+const SingleLineBorders borders = cellBorders[cells[i]];
+
+for (sal_Int32 j = 0; j 4; ++j)
+{
+uno::Any aBorder = xPropSet-getPropertyValue(borderNames[j]);
+table::BorderLine aBorderLine;
+if (aBorder = aBorderLine)
+{
+std::stringstream message;
+message cells[i] 's borderNames[j] is
incorrect;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(message.str(), borders.sizes[j],
aBorderLine.OuterLineWidth);
+}
+}
+}
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] docx export: unit test table/cell borders export
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/910 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/910 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd651c0d027dcf8b63b9208ffdcbcfaee3165b38 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] docx import: handle start/end attribute in tcBorders
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/908 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/908 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I148345485534ae50b616857d971ef1c8b1594f28 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] docx export: explicitely use 'none' type for disabled cell b...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/909 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/909 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iebab1204dc40f79e10164e4815bbdbbe054ef144 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/source
oox/source/drawingml/textbodypropertiescontext.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 91d057474682c52e978e1ea93d05655622cc5914 Author: Muthu Subramanian sumu...@suse.com Date: Thu Oct 25 16:12:16 2012 +0530 n#773048: Adjust rotate in relation to fix for n#783433 diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index 4cd0cfe..8c66aa7 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -104,7 +104,7 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler rParent, bool bRtl = aAttribs.getBool( XML_rtl, false ); sal_Int32 tVert = mrTextBodyProp.moVert.get( XML_horz ); if( tVert == XML_vert || tVert == XML_eaVert || tVert == XML_vert270 || tVert == XML_mongolianVert ) -mrTextBodyProp.moRotation = 540*(tVert==XML_vert270?3:1); +mrTextBodyProp.moRotation = -540*(tVert==XML_vert270?3:1); else mrTextBodyProp.maPropertyMap[ PROP_TextWritingMode ] = ( bRtl ? WritingMode_RL_TB : WritingMode_LR_TB ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/ww8/wrtww8.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 58ac5a4b305dd74df04df69351fb0e354a2e4b6a
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 26 16:51:20 2012 +0100
Resolves: fdo#35991 rowspan is of size sal_Int32, not size long
Change-Id: I347672a2175cf7a0304cf5d6c0f8f3f6afa92cd4
(cherry picked from commit 8bd3bf0ff20fc18a0a6358e36b3f8a7e3b34a2bb)
Reviewed-on: https://gerrit.libreoffice.org/921
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c5b7afb..073cac8 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1864,7 +1864,7 @@ void WW8AttributeOutput::TableInfoRow(
ww8::WW8TableNodeInfoInner::Pointer_t pTa
}
}
-static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, long nRowSpan)
+static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, sal_Int32 nRowSpan)
{
sal_uInt16 nFlags = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/wrtww8.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit efbb187ffcfaac962d6a5efe2a70c2b69d4590b5
Author: Caolán McNamara caol...@redhat.com
Date: Fri Oct 26 16:51:20 2012 +0100
Resolves: fdo#35991 rowspan is of size sal_Int32, not size long
Change-Id: I347672a2175cf7a0304cf5d6c0f8f3f6afa92cd4
(cherry picked from commit 8bd3bf0ff20fc18a0a6358e36b3f8a7e3b34a2bb)
Reviewed-on: https://gerrit.libreoffice.org/919
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 28e8c29..e0bacc4 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1856,7 +1856,7 @@ void WW8AttributeOutput::TableInfoRow(
ww8::WW8TableNodeInfoInner::Pointer_t pTa
}
}
-static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, long nRowSpan)
+static sal_uInt16 lcl_TCFlags(const SwTableBox * pBox, sal_Int32 nRowSpan)
{
sal_uInt16 nFlags = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: Resolves: fdo#35991 rowspan is of size sal_Int32, not size l...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/919 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/919 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I347672a2175cf7a0304cf5d6c0f8f3f6afa92cd4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 485498d3d94c5536178a653fa0c8384ff93dbceb
Author: Miklos Vajna vmik...@suse.cz
Date: Mon Oct 29 20:16:20 2012 +0100
sw/qa: fix build in ooxmlexport
Change-Id: I22d94cf0584be892da6ba17aadabf45f47809252
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 710f7d8..816c8d0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -416,7 +416,7 @@ void Test::testTableBorders() {
uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(1, xTables-getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables-getCount());
uno::Referencetext::XTextTable xTextTable (xTables-getByIndex(0),
uno::UNO_QUERY);
std::mapOUString, SingleLineBorders cellBorders;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/core/docnode/ndtbl.cxx | 51 ++-
1 file changed, 24 insertions(+), 27 deletions(-)
New commits:
commit 75bfe93856a2316874a09dcac1ba204ef48d134a
Author: Michael Stahl mst...@redhat.com
Date: Thu Oct 4 19:17:56 2012 +0200
rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash:
The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus.
Only vertically merged boxes result in dummy boxes with negative span,
while horizontally merged boxes result in different numbers of boxes per
line. So instead of inserting boxes, adjust the width of the last box
in rows that are missing boxes, such that all lines have the same width.
(cherry picked from commit 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4)
Conflicts:
sw/source/core/docnode/ndtbl.cxx
Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e
Reviewed-on: https://gerrit.libreoffice.org/764
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index ea1f4e4..0b97807 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1261,6 +1261,29 @@ SwNodeRange * SwNodes::ExpandRangeForTableBox(const
SwNodeRange rRange)
return pResult;
}
+static void
+lcl_SetTableBoxWidths2(SwTable rTable, size_t const nMaxBoxes,
+SwTableBoxFmt rBoxFmt, SwDoc rDoc)
+{
+// rhbz#820283, fdo#55462: set default box widths so table width is covered
+SwTableLines rLines = rTable.GetTabLines();
+for (size_t nTmpLine = 0; nTmpLine rLines.Count(); ++nTmpLine)
+{
+SwTableBoxes rBoxes = rLines[nTmpLine]-GetTabBoxes();
+size_t const nMissing = nMaxBoxes - rBoxes.size();
+if (nMissing)
+{
+// default width for box at the end of an incomplete line
+SwTableBoxFmt *const pNewFmt = rDoc.MakeTableBoxFmt();
+pNewFmt-SetFmtAttr( SwFmtFrmSize(ATT_VAR_SIZE,
+(USHRT_MAX / nMaxBoxes) * (nMissing + 1)) );
+pNewFmt-Add(rBoxes.back());
+}
+}
+// default width for all boxes not at the end of an incomplete line
+rBoxFmt.SetFmtAttr(SwFmtFrmSize(ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes));
+}
+
SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t rTableNodes,
SwTableFmt* pTblFmt,
SwTableLineFmt* pLineFmt,
@@ -1372,33 +1395,7 @@ SwTableNode* SwNodes::TextToTable( const
SwNodes::TableRanges_t rTableNodes,
nMaxBoxes = nBoxes;
}
-// die Tabelle ausgleichen, leere Sections einfuegen
-sal_uInt16 n;
-
-if( !aPosArr.empty() )
-{
-SwTableLines rLns = pTable-GetTabLines();
-sal_uInt16 nLastPos = 0;
-for( n = 0; n aPosArr.size(); ++n )
-{
-SwTableBoxFmt *pNewFmt = pDoc-MakeTableBoxFmt();
-pNewFmt-SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
-aPosArr[ n ] - nLastPos ));
-for( sal_uInt16 nLines2 = 0; nLines2 rLns.Count(); ++nLines2 )
-//JP 24.06.98: hier muss ein Add erfolgen, da das BoxFormat
-// von der rufenden Methode noch gebraucht wird!
-pNewFmt-Add( rLns[ nLines2 ]-GetTabBoxes()[ n ] );
-
-nLastPos = aPosArr[ n ];
-}
-
-// damit die Tabelle die richtige Groesse bekommt, im BoxFormat die
-// Groesse nach oben transportieren.
-OSL_ENSURE( !pBoxFmt-GetDepends(), wer ist in dem Format noch
angemeldet );
-pBoxFmt-SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nLastPos ));
-}
-else
-pBoxFmt-SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX / nMaxBoxes
));
+lcl_SetTableBoxWidths2(*pTable, nMaxBoxes, *pBoxFmt, *pDoc);
// das wars doch wohl ??
return pTblNd;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[TRIAGE] Weeklyish Update
Since last week we're up 10 bugs on our 30 day project. I haven't put in much time, I expect to put in a lot more this week. We have started a new QA page with stats, currently only one set but feel free to add more, much easier to keep track of and report on our progress :) http://wiki.documentfoundation.org/QA_Stats#Unconfirmed_Bugs_Reported_More_Than_30_Days_Ago Best Regards, Joel -- *Joel Madero* LibO QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: curl/ExternalPackage_curl.mk curl/ExternalProject_curl.mk RepositoryExternal.mk
RepositoryExternal.mk|4 curl/ExternalPackage_curl.mk |9 + curl/ExternalProject_curl.mk | 17 + 3 files changed, 18 insertions(+), 12 deletions(-) New commits: commit 9f3a3ab69ac8969805724c6c80b755dcb81af079 Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Oct 29 22:57:34 2012 +0100 tweak curl gbuildification Change-Id: I17eae5612b88c3f57842a8ae50b1d062acf94765 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d58b27b..ab76d7d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1621,6 +1621,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,curl/include) \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_libraries,$(1),\ curl \ ) diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk index c5852f8..e8e7e65 100644 --- a/curl/ExternalPackage_curl.mk +++ b/curl/ExternalPackage_curl.mk @@ -25,15 +25,16 @@ else $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0)) endif -else ifeq ($(GUI),WNT) +else ifeq ($(OS)$(COM),WNTGCC) -ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,.libs/libcurl.a)) $(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,.libs/libcurl.dll)) -else ifeq ($(COM),WNT) + +else ifeq ($(COM),MSC) + $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib)) $(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/libcurl.dll)) -endif endif + # vim: set noet sw=4 ts=4: diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk index beee034..1005094 100644 --- a/curl/ExternalProject_curl.mk +++ b/curl/ExternalProject_curl.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,curl,\ )) ifeq ($(GUI),UNX) + $(call gb_ExternalProject_get_state_target,curl,build): cd $(EXTERNAL_WORKDIR) \ ./configure --with-nss --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ @@ -25,10 +26,11 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \ $(if $(SYSBASE),CPPFLAGS=-I$(SYSBASE)/usr/include LDFLAGS=-L$(SYSBASE)/usr/lib) \ cd lib \ -$(GNUMAKE) -j$(EXTMAXPROCESS) \ +$(MAKE) \ touch $@ -else ifeq ($(GUI),WNT) -ifeq ($(COM),GCC) + +else ifeq ($(OS)$(COM),WNTGCC) + $(call gb_ExternalProject_get_state_target,curl,build): cd $(EXTERNAL_WORKDIR) \ ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \ @@ -39,17 +41,16 @@ $(call gb_ExternalProject_get_state_target,curl,build): LDFLAGS=$(patsubst ;, -L,$(ILIB)) \ CPPFLAGS=$(INCLUDE) OBJDUMP=objdump \ cd lib \ -$(GNUMAKE) -j$(EXTMAXPROCESS) \ +$(MAKE) \ touch $@ else ifeq ($(COM),MSC) + $(call gb_ExternalProject_get_state_target,curl,build): cd $(EXTERNAL_WORKDIR)/lib \ -unset MAKEFLAGS \ -export LIB=$(ILIB) \ -nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE $(SOLARINC) $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ +MAKEFLAGS= LIB=$(ILIB) nmake -f Makefile.vc9 cfg=release-dll \ + EXCFLAGS=/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE $(SOLARINC) $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ touch $@ -endif endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/basmgr/basicmanagerrepository.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ee582e991af816baa1c7d784126114bcb8d005c6 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 29 23:07:24 2012 +0100 Missing #include Change-Id: I63e68bd37b46f339d09d97a6bf6edfeaa6a7df1d diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 1bfb2f2..63015fa 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -41,6 +41,7 @@ #include unotools/eventlisteneradapter.hxx #include rtl/instance.hxx +#include rtl/strbuf.hxx #include map ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit 7a030393a022622ab2179034332b55da0eb4783b Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Oct 29 23:29:37 2012 +0100 add more missing use_unpacked Change-Id: I92395d5883ce862f1dca7b88aa4291a9608c1a52 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ab76d7d..23f14ad 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -357,9 +357,10 @@ define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ -DHUNSPELL_STATIC \ ) +$(call gb_LinkTarget_use_unpacked,$(1),hunspell) $(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\ + $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ hunspell \ @@ -661,6 +662,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ )) define gb_LinkTarget__use_neon +$(call gb_LinkTarget_use_unpacked,$(1),neon) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,neon/src) \ $$(INCLUDE) \ @@ -832,6 +834,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ graphite \ )) define gb_LinkTarget__use_graphite +$(call gb_LinkTarget_use_unpacked,$(1),graphite) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,graphite/include) \ $$(INCLUDE) \ @@ -1621,6 +1624,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) define gb_LinkTarget__use_curl +$(call gb_LinkTarget_use_unpacked,$(1),curl) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,curl/include) \ $$(INCLUDE) \ @@ -1807,14 +1811,12 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ )) define gb_LinkTarget__use_openldap - +$(call gb_LinkTarget_use_unpacked,$(1),openldap) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include) \ $$(INCLUDE) \ ) - $(call gb_LinkTarget_use_package,$(1),openldap) - $(call gb_LinkTarget_use_static_libraries,$(1),\ ldap \ lber \ @@ -2181,6 +2183,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ )) define gb_LinkTarget__use_orcus +$(call gb_LinkTarget_use_unpacked,$(1),orcus) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,orcus/include) \ $$(INCLUDE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - libwps/Module_libwps.mk libwps/StaticLibrary_wps.mk libwps/UnpackedTarball_wps.mk solenv/bin solenv/gbuild
libwps/Module_libwps.mk | 21 libwps/StaticLibrary_wps.mk | 20 libwps/UnpackedTarball_wps.mk | 25 ++ solenv/bin/concat-deps.c| 75 +--- solenv/gbuild/TargetLocations.mk|1 solenv/gbuild/platform/IOS_ARM_GCC.mk |1 solenv/gbuild/platform/WNT_INTEL_GCC.mk |1 solenv/gbuild/platform/macosx.mk|1 solenv/gbuild/platform/solaris.mk |1 solenv/gbuild/platform/unxgcc.mk|1 10 files changed, 113 insertions(+), 34 deletions(-) New commits: commit 1f62a036155b7559703c08fcbc8204498ed7343c Author: Michael Stahl mst...@redhat.com Date: Mon Oct 29 23:30:04 2012 +0100 gbuild: remove .a file before AR invocations: Solves 2 problems: 1. it can happen that AR decides not to write to the .a file at all, because no input file is newer than the archive content; then the timestamp of the .a file does not get updated 2. if an object file is removed from the makefile the .a file would still contain it after an incremental build Change-Id: I30737c6454dc06c89ccf233e06d430d2ddc5bc33 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 9f2f54e..5ef325b 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -169,6 +169,7 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ + rm -f $(1) \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index ae1e785..c54a710 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -167,6 +167,7 @@ endef define gb_LinkTarget__command_staticlinklibrary $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ + rm -f $(1) \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 59f6c56..f6a75b6 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -219,6 +219,7 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ + rm -f $(1) \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 31e8e05..52c7a0f 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -204,6 +204,7 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ + rm -f $(1) \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 843ec18..87e57a8 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -209,6 +209,7 @@ endef define gb_LinkTarget__command_staticlink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) \ + rm -f $(1) \ $(gb_AR) -rsu $(1) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \ commit 3f0f07c748375ec9165ea3a3d1751f84d3528972 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 29 23:25:46 2012 +0100 gbuild: solve the UnpackedTarball header problem in concat-deps: Mangle all included files in the UnpackedTarball directory in the generated dependency files to point to the target of the UnpackedTarball instead. This will cause all files that include them to be rebuilt on every unpack, which is sound and much easier to maintain than manually enumerating all internal header files somewhere. Change-Id: Iaaa9b27450549d26b40d32ae0f740c2d5ef0edc5 diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index 50e9a98..6db6e71 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -714,7 +714,9 @@ static inline void eat_space(char ** token) * Prune LibreOffice specific duplicate dependencies to improve * gnumake startup time, and shrink
[Libreoffice-commits] .: 3 commits - Makefile.top solenv/bin
Makefile.top |7 +++
solenv/bin/linkoo | 12 ++--
2 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit edc761452e8478c50e49350b8a7b426a865eeac4
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Oct 29 17:38:44 2012 +0100
new toplevel make target dev-update to update non-symliked dev-install
Should be especially useful on Windows (e.g. 'make sw dev-update').
Change-Id: Ie80b7f1caae0fc1edc7cf791494c7648ca7b8d82
diff --git a/Makefile.top b/Makefile.top
index d6a324b..715a7a8 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -477,6 +477,13 @@ endif
dev-install-nocheck : export SKIP_TESTS := YES
dev-install-nocheck : dev-install
+dev-update:
+ifeq ($(DISABLE_LINKOO),TRUE)
+ @linkoo --copy $(DEVINSTALLDIR)/opt $(SRCDIR)
+else
+ @linkoo $(DEVINSTALLDIR)/opt $(SRCDIR)
+endif
+
install-tb:
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
commit e922d0ce1081bb90da30735c2cb22b6ce2ca7220
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Oct 29 23:39:00 2012 +0100
fix absolute path test in linkoo
Change-Id: I0ac41af09ac6582c3f75239f2163c895665cd572
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index e8eff52..c97df91 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -106,8 +106,8 @@ if ($usage || !defined $OOO_INSTALL || !defined $OOO_BUILD)
{
exit (1);
}
-substr ($OOO_INSTALL, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_INSTALL does not qualify);
-substr ($OOO_BUILD, 0, 1) eq '/' || die linkoo requires absolute paths
($OOO_BUILD does not qualify);
+File::Spec-file_name_is_absolute($OOO_INSTALL) || die linkoo requires
absolute paths ($OOO_INSTALL does not qualify);
+File::Spec-file_name_is_absolute($OOO_BUILD) || die linkoo requires absolute
paths ($OOO_BUILD does not qualify);
-d $OOO_INSTALL || die No such directory $OOO_INSTALL;
-w $OOO_INSTALL || die You need write access to $OOO_INSTALL;
commit a6ec2349fa866c9af18feb7d13873a19e81449e0
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Oct 29 23:38:22 2012 +0100
fix windows detection in linkoo
Change-Id: I18d1dbdc9d7ed6027969424a196532084537fe87
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index c6e6a2b..e8eff52 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -73,10 +73,6 @@ if ($ENV{'OS'} eq 'MACOSX') {
print FIXME: linkoo currently does not work on Mac OS X\n;
exit(0);
}
-if ($TARGET eq 'wntgcci.pro') {
-$windows = 1;
-$copy = 1;
-}
# process options
for my $a (@ARGV) {
@@ -119,6 +115,10 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die linkoo requires
absolute paths ($OOO_
($TARGET, $LIBVER, $LANG) = sniff_target ($OOO_BUILD);
+if ($TARGET =~ /^wntgcci/ || $TARGET =~ /^wntmsci[0-9]+/) {
+$windows = 1;
+$copy = 1;
+}
# setup global variables
my $brand_program_dir = 'program';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - libwps/Module_libwps.mk libwps/StaticLibrary_wps.mk libwps/UnpackedTarball_wps.mk
libwps/Module_libwps.mk | 21 - libwps/StaticLibrary_wps.mk | 20 +++- libwps/UnpackedTarball_wps.mk | 25 - 3 files changed, 19 insertions(+), 47 deletions(-) New commits: commit 22b055914f5f1726d45a9802143cff7ada9ededb Author: Michael Stahl mst...@redhat.com Date: Mon Oct 29 23:41:45 2012 +0100 Revert libwps: ensure that generated cxx files get built after unpack This reverts commit 7963c0952823affb8045817cba677ed7b6e4051c. Should be obsoleted by 3f0f07c748375ec9165ea3a3d1751f84d3528972 diff --git a/libwps/Module_libwps.mk b/libwps/Module_libwps.mk index c84dcbe..a903fa9 100644 --- a/libwps/Module_libwps.mk +++ b/libwps/Module_libwps.mk @@ -11,27 +11,6 @@ $(eval $(call gb_Module_Module,libwps)) ifeq ($(SYSTEM_LIBWPS),NO) -libwps_SOURCEFILES := \ - src/lib/libwps_internal \ - src/lib/libwps_tools_win \ - src/lib/WPS4 \ - src/lib/WPS4Graph \ - src/lib/WPS4Text \ - src/lib/WPS8 \ - src/lib/WPSCell \ - src/lib/WPSContentListener \ - src/lib/WPSDebug \ - src/lib/WPSDocument \ - src/lib/WPSHeader \ - src/lib/WPSList \ - src/lib/WPSOLEParser \ - src/lib/WPSOLEStream \ - src/lib/WPSPageSpan \ - src/lib/WPSParagraph \ - src/lib/WPSParser \ - src/lib/WPSSubDocument \ - src/lib/WPSTable \ - $(eval $(call gb_Module_add_targets,libwps,\ ExternalPackage_libwps \ StaticLibrary_wps \ diff --git a/libwps/StaticLibrary_wps.mk b/libwps/StaticLibrary_wps.mk index 51d89b0..b18b583 100644 --- a/libwps/StaticLibrary_wps.mk +++ b/libwps/StaticLibrary_wps.mk @@ -22,7 +22,25 @@ $(eval $(call gb_StaticLibrary_use_externals,wpslib,\ $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpslib,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\ - $(addprefix UnpackedTarball/wps/,$(libwps_SOURCEFILES)) \ + UnpackedTarball/wps/src/lib/libwps_internal \ + UnpackedTarball/wps/src/lib/libwps_tools_win \ + UnpackedTarball/wps/src/lib/WPS4 \ + UnpackedTarball/wps/src/lib/WPS4Graph \ + UnpackedTarball/wps/src/lib/WPS4Text \ + UnpackedTarball/wps/src/lib/WPS8 \ + UnpackedTarball/wps/src/lib/WPSCell \ + UnpackedTarball/wps/src/lib/WPSContentListener \ + UnpackedTarball/wps/src/lib/WPSDebug \ + UnpackedTarball/wps/src/lib/WPSDocument \ + UnpackedTarball/wps/src/lib/WPSHeader \ + UnpackedTarball/wps/src/lib/WPSList \ + UnpackedTarball/wps/src/lib/WPSOLEParser \ + UnpackedTarball/wps/src/lib/WPSOLEStream \ + UnpackedTarball/wps/src/lib/WPSPageSpan \ + UnpackedTarball/wps/src/lib/WPSParagraph \ + UnpackedTarball/wps/src/lib/WPSParser \ + UnpackedTarball/wps/src/lib/WPSSubDocument \ + UnpackedTarball/wps/src/lib/WPSTable \ )) # vim: set noet sw=4 ts=4: diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk index 0a9521c..e573928 100644 --- a/libwps/UnpackedTarball_wps.mk +++ b/libwps/UnpackedTarball_wps.mk @@ -18,8 +18,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,wps,\ libwps/libwps.gcc.warnings.patch \ )) -$(eval $(call gb_UnpackedTarball_mark_output_files,wps,\ - $(addsuffix .cpp,$(libwps_SOURCEFILES)) \ -)) - # vim: set noet sw=4 ts=4: commit 6fcc7d5848c46e8abbcd86085f5a55f8d25607a3 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 29 23:41:16 2012 +0100 Revert libwps: need to depend on unpacked private headers: This reverts commit 45c7a7f5dc3057b283513e4516b7b59f21e46fde. Should be obsoleted by 3f0f07c748375ec9165ea3a3d1751f84d3528972 diff --git a/libwps/UnpackedTarball_wps.mk b/libwps/UnpackedTarball_wps.mk index 6a2bf3a..0a9521c 100644 --- a/libwps/UnpackedTarball_wps.mk +++ b/libwps/UnpackedTarball_wps.mk @@ -20,27 +20,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,wps,\ $(eval $(call gb_UnpackedTarball_mark_output_files,wps,\ $(addsuffix .cpp,$(libwps_SOURCEFILES)) \ - src/lib/libwps_internal.h \ - src/lib/libwps_tools_win.h \ - src/lib/WPS4Graph.h \ - src/lib/WPS4.h \ - src/lib/WPS4Text.h \ - src/lib/WPS8.h \ - src/lib/WPSCell.h \ - src/lib/WPSContentListener.h \ - src/lib/WPSDebug.h \ - src/lib/WPSEntry.h \ - src/lib/WPS.h \ - src/lib/WPSHeader.h \ - src/lib/WPSList.h \ - src/lib/WPSOLEParser.h \ - src/lib/WPSOLEStream.h \ - src/lib/WPSPageSpan.h \ - src/lib/WPSParagraph.h \ - src/lib/WPSParser.h \ - src/lib/WPSPosition.h \ - src/lib/WPSSubDocument.h \ - src/lib/WPSTable.h \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] Bug 51309 - Names of DatabaseRanges should not be case sensitive
Hey Mathieu, 2012/10/26 Mathieu D. call.protec...@gmail.com: Hi, I submitted a patch for the bug 51309 - Names of DatabaseRanges should not be case sensitive : https://bugs.freedesktop.org/show_bug.cgi?id=51309 You will the diff file attached and on the bug's page. https://bugs.freedesktop.org/page.cgi?id=splinter.htmlbug=51309attachment=69115 Changes : - ScDBData::less::operator() is modified to compare upper strings - All the calls to NamedDBs::findByName() are now NamedDBs::findByUpperName(). - In case of a call to findByUpperName by an argument, the function ScGlobal::pCharClass-uppercase(aName) was used to ensure upper case. - The definitions of FindByName() are deleted. The patch looks good. Could you please create the patch with git commit -a git format-patch HEAD~1 so that it includes you correctly as author. And please could you send a licence statement like: All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. to the Mailing so list so that we can keep track of it at http://wiki.documentfoundation.org/Development/Developers Thanks a lot for your great contribution. Are there any areas that interest you? Are you interested in more calc hacking? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 6 commits - icon-themes/classic icon-themes/galaxy sc/AllLangResTarget_sc.mk sc/inc sc/source
icon-themes/classic/classic_images.tar.gz |binary
icon-themes/galaxy/sc/res/black_circle_1_4th.png |binary
icon-themes/galaxy/sc/res/black_circle_3_4th.png |binary
icon-themes/galaxy/sc/res/black_circle_empty.png |binary
icon-themes/galaxy/sc/res/black_circle_full.png |binary
icon-themes/galaxy/sc/res/black_circle_half.png |binary
icon-themes/galaxy/sc/res/cancel.png |binary
icon-themes/galaxy/sc/res/exclamation_mark.png|binary
icon-themes/galaxy/sc/res/green_arrow_up.png |binary
icon-themes/galaxy/sc/res/green_circle.png|binary
icon-themes/galaxy/sc/res/minus_black.png |binary
icon-themes/galaxy/sc/res/red_arrow_down.png |binary
icon-themes/galaxy/sc/res/red_circle.png |binary
icon-themes/galaxy/sc/res/sign.png|binary
icon-themes/galaxy/sc/res/triangle_down_red.png |binary
icon-themes/galaxy/sc/res/triangle_up_green.png |binary
icon-themes/galaxy/sc/res/yellow_arrow_down_right.png |binary
icon-themes/galaxy/sc/res/yellow_arrow_right.png |binary
icon-themes/galaxy/sc/res/yellow_arrow_up_right.png |binary
icon-themes/galaxy/sc/res/yellow_circle.png |binary
sc/AllLangResTarget_sc.mk |1
sc/inc/colorscale.hxx | 75 ++
sc/inc/conditio.hxx |8
sc/inc/fillinfo.hxx | 12 -
sc/inc/globstr.hrc| 16 -
sc/source/core/data/colorscale.cxx| 210 ++
sc/source/core/data/conditio.cxx |5
sc/source/core/data/fillinfo.cxx | 10
sc/source/filter/excel/xecontent.cxx | 59 +
sc/source/filter/inc/condformatbuffer.hxx | 19 +
sc/source/filter/inc/condformatcontext.hxx| 11
sc/source/filter/inc/xecontent.hxx| 14 +
sc/source/filter/oox/condformatbuffer.cxx | 134 +++
sc/source/filter/oox/condformatcontext.cxx| 40 +++
sc/source/ui/condformat/condformatdlg.cxx |2
sc/source/ui/condformat/condformathelper.cxx |5
sc/source/ui/inc/condformathelper.hxx |1
sc/source/ui/inc/iconsets.hrc | 31 ++
sc/source/ui/src/globstr.src |4
sc/source/ui/src/iconsets.src | 90 +++
sc/source/ui/view/output.cxx | 125 ++
41 files changed, 807 insertions(+), 65 deletions(-)
New commits:
commit ce26903f7037c44a723716dfb38766ab9611c224
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Oct 30 00:57:57 2012 +0100
export icon set data into OOXML
missing are still the Excel2010 extLst entries
Change-Id: Ic0c728613b1ee48482cbd9cef2aeccd0e0f25f72
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 685fde1..5907c6e 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -316,10 +316,6 @@ struct ScIconSetFormatData
class SC_DLLPUBLIC ScIconSetFormat : public ScColorFormat
{
-private:
-typedef boost::ptr_vectorScColorScaleEntry::iterator iterator;
-typedef boost::ptr_vectorScColorScaleEntry::const_iterator
const_iterator;
-
public:
ScIconSetFormat(ScDocument* pDoc);
ScIconSetFormat(ScDocument* pDoc, const ScIconSetFormat rFormat);
@@ -340,15 +336,19 @@ public:
static ScIconSetMap* getIconSetMap();
-#if DUMP_FORMAT_INFO
-virtual void dumpInfo(rtl::OUStringBuffer rBuf) const;
-#endif
-private:
+typedef boost::ptr_vectorScColorScaleEntry::iterator iterator;
+typedef boost::ptr_vectorScColorScaleEntry::const_iterator
const_iterator;
+
iterator begin();
const_iterator begin() const;
iterator end();
const_iterator end() const;
+#if DUMP_FORMAT_INFO
+virtual void dumpInfo(rtl::OUStringBuffer rBuf) const;
+#endif
+private:
+
double GetMinValue() const;
double GetMaxValue() const;
double CalcValue(double nMin, double nMax,
ScIconSetFormat::const_iterator itr) const;
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 219bbb8..91bd918 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -988,6 +988,8 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot rRoot,
const ScConditionalFormat
maCFList.AppendNewRecord( new XclExpColorScale( GetRoot(),
static_castconst ScColorScaleFormat(*pFormatEntry), nIndex ) );
else if(pFormatEntry-GetType() == condformat::DATABAR)
maCFList.AppendNewRecord( new XclExpDataBar( GetRoot(),
static_castconst ScDataBarFormat(*pFormatEntry), nIndex, xExtLst ) );
+else if(pFormatEntry-GetType() ==
[Libreoffice-commits] .: basctl/source basic/source drawinglayer/source editeng/source svl/inc svl/source svtools/source sw/source vcl/source xmloff/source
basctl/source/basicide/baside2.cxx |9 ++-
basic/source/runtime/methods.cxx | 24 +-
basic/source/runtime/step0.cxx | 28 ++--
basic/source/runtime/step2.cxx |8 ++-
drawinglayer/source/processor2d/vclprocessor2d.cxx |8 ++-
editeng/source/editeng/impedit3.cxx|7 +--
svl/inc/svl/zformat.hxx| 11 ++--
svl/source/numbers/zformat.cxx | 49 +++--
svtools/source/control/fmtfield.cxx|7 +--
sw/source/core/crsr/crstrvl.cxx| 20 +++-
sw/source/core/fields/authfld.cxx |7 +--
sw/source/core/text/porglue.cxx|7 +--
sw/source/filter/ww8/ww8graf.cxx |8 +--
sw/source/filter/ww8/ww8par2.cxx |5 +-
sw/source/ui/uiview/srcview.cxx|7 +--
vcl/source/control/edit.cxx|6 +-
xmloff/source/style/xmlnumfe.cxx | 10 ++--
xmloff/source/style/xmlnumfi.cxx |6 +-
18 files changed, 119 insertions(+), 108 deletions(-)
New commits:
commit 4a11a47103fcbd7646234fc9565a409b8055507e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 30 00:00:51 2012 +
trivial empty-init String::Fill - comphelper::padToLength
Change-Id: I6c41b8f4d3ad739eff545063bd1f8fe8f4fba65e
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index 657182d..fa9d50e 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -37,6 +37,7 @@
#include com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp
#include com/sun/star/ui/dialogs/XFilterManager.hpp
#include comphelper/processfactory.hxx
+#include comphelper/string.hxx
#include sfx2/dinfdlg.hxx
#include sfx2/dispatch.hxx
#include sfx2/docfile.hxx
@@ -164,13 +165,13 @@ void lcl_ConvertTabsToSpaces( String rLine )
if ( rLine.GetChar( nPos ) == '\t' )
{
// not 4 Blanks, but at 4 TabPos:
-String aBlanker;
-aBlanker.Fill( ( 4 - ( nPos % 4 ) ), ' ' );
+rtl::OUStringBuffer aBlanker;
+string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) ), ' ');
rLine.Erase( nPos, 1 );
-rLine.Insert( aBlanker, nPos );
+rLine.Insert( aBlanker.makeStringAndClear(), nPos );
nMax = rLine.Len();
}
-nPos++;
+++nPos;
}
}
}
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 054de26..8c510e4 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1138,7 +1138,7 @@ RTLFUNC(LTrim)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
-rtl::OUString
aStr(comphelper::string::stripStart(rPar.Get(1)-GetString(), ' '));
+rtl::OUString aStr(string::stripStart(rPar.Get(1)-GetString(), ' '));
rPar.Get(0)-PutString(aStr);
}
}
@@ -1387,7 +1387,7 @@ RTLFUNC(RTrim)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
-rtl::OUString
aStr(comphelper::string::stripEnd(rPar.Get(1)-GetString(), ' '));
+rtl::OUString aStr(string::stripEnd(rPar.Get(1)-GetString(), ' '));
rPar.Get(0)-PutString(aStr);
}
}
@@ -1420,9 +1420,9 @@ RTLFUNC(Space)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
-String aStr;
-aStr.Fill( (sal_uInt16)(rPar.Get(1)-GetLong() ));
-rPar.Get(0)-PutString( aStr );
+rtl::OUStringBuffer aBuf;
+string::padToLength(aBuf, rPar.Get(1)-GetLong(), ' ');
+rPar.Get(0)-PutString(aBuf.makeStringAndClear());
}
}
@@ -1435,9 +1435,9 @@ RTLFUNC(Spc)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
-String aStr;
-aStr.Fill( (sal_uInt16)(rPar.Get(1)-GetLong() ));
-rPar.Get(0)-PutString( aStr );
+rtl::OUStringBuffer aBuf;
+string::padToLength(aBuf, rPar.Get(1)-GetLong(), ' ');
+rPar.Get(0)-PutString(aBuf.makeStringAndClear());
}
}
@@ -1578,7 +1578,6 @@ RTLFUNC(String)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
-String aStr;
sal_Unicode aFiller;
sal_Int32 lCount = rPar.Get(1)-GetLong();
if( lCount 0 || lCount 0x )
@@ -1591,8 +1590,9 @@ RTLFUNC(String)
const String rStr = rPar.Get(2)-GetString();
aFiller = rStr.GetBuffer()[0];
}
-aStr.Fill( nCount, aFiller );
-rPar.Get(0)-PutString( aStr );
+rtl::OUStringBuffer aBuf;
+string::padToLength(aBuf, nCount, aFiller);
+rPar.Get(0)-PutString(aBuf.makeStringAndClear());
}
}
@@ -2372,7 +2372,7 @@ String implSetupWildcard( const String rFileParam,
SbiRTLData*
[Libreoffice-commits] .: svtools/source
svtools/source/contnr/treelist.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 04f4a0c1366d1863b93d7d84a8534791696b7477
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Oct 29 21:55:06 2012 -0400
Somehow this change was lost during git rebase.
Change-Id: Ic20584b5da2920dc8f2761b7f2c65c58713c5895
diff --git a/svtools/source/contnr/treelist.cxx
b/svtools/source/contnr/treelist.cxx
index 9714697..a97c02b 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1378,8 +1378,7 @@ SvTreeList::GetChildIterators(const SvTreeListEntry*
pParent) const
{
typedef std::pairSvTreeListEntries::const_iterator,
SvTreeListEntries::const_iterator IteratorPair;
-static const SvTreeEntryList dummy; // prevent singular iterator asserts
-IteratorPair aRet(dummy.begin(), dummy.end());
+IteratorPair aRet;
if (!pParent)
pParent = pRootItem;
@@ -1399,8 +1398,7 @@ std::pairSvTreeListEntries::iterator,
SvTreeListEntries::iterator
{
typedef std::pairSvTreeListEntries::iterator,
SvTreeListEntries::iterator IteratorPair;
-static SvTreeEntryList dummy; // prevent singular iterator asserts
-IteratorPair aRet(dummy.begin(), dummy.end());
+IteratorPair aRet;
if (!pParent)
pParent = pRootItem;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] [bjoern.michael...@canonical.com: minutes of the QA Call tomorrow, Tuesday 1300UTC]
Hi Sophie, On Sat, Oct 27, 2012 at 11:34:44PM +0200, Sophie Gautier wrote: https://otrs.documentfoundation.org and how do I log on this marvelous tool ;-) I feel your pain. You need an account created by the infrastructure guys. We really should document that more -- there is only one (mostly irrelevant) notion of otrs on the wiki and searching the website list only shows two obscure references. That should definitely change. But even if you have an account, you likely would not see how to use it until you have a mail queue setup. I can't see any way where I can request an account. Also, where is it already in use, is it in the QA project ? Not yet in QA. The help email address for gerrit is on OTRS (ger...@otrs.documentfoundation.org). I also proposed once one could use it for i...@documentfoundation.org/i...@libreoffice.org, but we did not go for that yet. Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [bjoern.michael...@canonical.com: minutes of the QA Call tomorrow, Tuesday 1300UTC]
On Mon, Oct 29, 2012 at 12:19:51PM +0100, Florian Effenberger wrote: OTRS indeed lacks some documentation, but was up to now mostly used internally by the admins. A little bit of advertising (e.g. by documentation) sure cant hurt. And it might also make people realize it to be a good solution for their problems and prevents reinventing the wheel in other teams -- which we should absolutely avoid. ;) Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of the QA Call tomorrow, Tuesday 1300UTC
HI all, On 23/10/2012 21:50, bfo wrote: Bjoern Michaelsen wrote - in theory, it is possible to make the BSA file bugs without the reporter registering (Petr/Bjoern) - without keeping the original reporter in the loop, bug report quality will only get worse Hi. Anonymous bug reports would be more or less useless, unless you are thinking about implementing crash platforms like https://crash-stats.mozilla.com where anonymous reports are processed and users can check current status of their reports along with assigned bug numbers (about:crashes in Firefox for instance). Already some bug reports need heavy QA involvement (lots of time and e-mail judo skills) to be polished and prepared for interested developers. To be honest, with a current backlog, a lot of them should be RESOLVED INVALIDated and not babysitted. I just can't imagine what would happen when we could be flooded by anonymous fillings... Bjoern Michaelsen wrote - the idea to create to send the bug to a mailing list for review instead of blindly creating a bug is interesting (Bjoern) In some way DUPS are good (see 3.6 release) - properly DUPED bugs will become hot issues in an instant at Most Frequently Reported Bugs for LibreOffice page. But please, no more alternative bug reports channels! I would like to see all bugs in Bugzilla and not have to search for bugs scattered through dozens of MLs or wiki pages. I recently have found that some users are already lost with BSA (https://www.libreoffice.org/get-help/bug/) and Bugzilla (https://bugs.freedesktop.org). Just reviewed few incomplete, invalid, duplicate, with strange comments (a person is writing in the bug that he do not know what he has written and is writing it once again, differently, in the same, initial bug (?)). Seems people do not recognize what BSA is all about and by adding a bug there are creating Bugzilla account and adding a bug to Bugzilla itself (some do not understand that fact). I really would like to see BSA as build-in in bugs.freedesktop.org, than as a seperate product (best as this example template adapted - https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOfficeformat=guided). Please remember that already LibreOffice as a product has a lot of bug trackers out there... For information, we already have a QA team used to report bugs on our qa@fr list in order to check it on different plateform and LibO version with a test document. Once done, the bug is commented on BZ if it already exists or created by one member of the team able to speak enough English. So alternative report channels already exist but are transparent for you. The proposal made by Bjoern is to make it even more transparent for people working directly on BZ. Bjoern Michaelsen wrote we could do a testdrive of this with those l10n communities that have enough manpower to handle the incoming native language reports: - portuguese/brazil - french - german Bug reports not in English are a problem - I think that getting people ready to translate the bug and chat with the reporter in his native language is a great idea. But only when a good summary comment is added to original bug report in Bugzilla. In English. I would CC such people asking for help now and then. I've discussed the process with our FR team and they are ok to handle it. I've not been able to see if OTRS would be of some help, but we are used to work together on bugs and deal with them asap. The moderation is still an issue. What we need also is a place to get the test/example documents (they are not allowed as mailing list attachment and Nabble is not always the best to deal with). We have to make sure that the bug filled on BZ will be tagged as already managed by our team (nobody to search on duplicates again or tests on other OS, version etc.) and that they will marked as confirmed or even assigned to somebody. I should be able to attend the next QA call. Let me know if you need more from me in the meantime. Kind regards Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [bjoern.michael...@canonical.com: minutes of the QA Call tomorrow, Tuesday 1300UTC]
Hi all, On 29/10/2012 12:19, Florian Effenberger wrote: Hi, Bjoern Michaelsen wrote on 2012-10-29 08:51: We really should document that more -- there is only one (mostly irrelevant) notion of otrs on the wiki and searching the website list only shows two obscure references. That should definitely change. But even if you have an account, you likely would not see how to use it until you have a mail queue setup. OTRS indeed lacks some documentation, but was up to now mostly used internally by the admins. No worries, however, from my side to opening it up to a wider audience. I'm not sure we really need it. I know that the mails coming the the QA list will be managed quiet quickly by our team members. But what we need is: - no moderation - the possibility to allow attachments (test/example documents) to the list. Robert is in charge and knows how to create accounts. So Robert, could you please create an account for me. Using sophie as a login would be ok for me. Thanks in advance Kind regards Sophie ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] [bjoern.michael...@canonical.com: minutes of the QA Call tomorrow, Tuesday 1300UTC]
Hi, Sophie Gautier wrote on 2012-10-29 17:21: I'm not sure we really need it. I know that the mails coming the the QA list will be managed quiet quickly by our team members. But what we need is: - no moderation - the possibility to allow attachments (test/example documents) to the list. from a gut feeling I'd say, that sounds more like a mailing list, but... So Robert, could you please create an account for me. Using sophie as a login would be ok for me. Thanks in advance ...why not just test it out, indeed. :) Florian -- Florian Effenberger, Chairman of the Board (Vorstandsvorsitzender) Tel: +49 8341 99660880 | Mobile: +49 151 14424108 The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of the QA Call tomorrow, Tuesday 1300UTC
Sophie Gautier wrote I've discussed the process with our FR team and they are ok to handle it. Hi! Great to hear that! All we need now is a list of people, by language, who can be cc'ed to work on the bug when it has non English summary and seems to be a valid report at first sight. Sophie Gautier wrote We have to make sure that the bug filled on BZ will be tagged as already managed by our team (nobody to search on duplicates again or tests on other OS, version etc.) and that they will marked as confirmed or even assigned to somebody. I would propose to use QA Contact field for this purpose, at least when in the processing (translation, gathering more details) phase. Best regards. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-QA-Call-tomorrow-Tuesday-1300UTC-tp4014857p4015886.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 56457] allow (document related) locale setting for 'Insert - External Data'
https://bugs.freedesktop.org/show_bug.cgi?id=56457 --- Comment #6 from Rainer Bielefeld libreoff...@bielefeldundbuss.de --- I also think that document related settings might cover most applications (but see my odf concerns), but of course it also might be that someone needs sheet related or even table related settings. Does anybody know applications with such needs? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56509] New: PRINTING: LibO Calc crash
https://bugs.freedesktop.org/show_bug.cgi?id=56509 Priority: medium Bug ID: 56509 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: PRINTING: LibO Calc crash Severity: normal Classification: Unclassified OS: All Reporter: frank.stutzenst...@web.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 3.6.2.2 release Component: Spreadsheet Product: LibreOffice Problem description: If I install an additional .OXT (Link http://www.deutschepost.de/downloadServlet?target=/mlm.nf/dpag/technische_downloads/update_internetmarke/ep_oo_writer_addin_v_1_0.oxt) LibO crash while try to print a sheet. The .OXT is for OpenOffice, but I thoeght LibO is the better Oo ;-) The .OXT is use for print electronic stamps into a letter (have normally nothing to do with Calc, just with writer. Steps to reproduce: 1. Install .OXT 2. Open Calc 3. File - Print 4. LibO close automaticlly 5. After start LibO, the programm try to recover the file (successfully). Current behavior: Expected behavior: Platform (if different from the browser): Browser: Opera/12.02 Br Frank -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56270] FILESAVE [FILEOPEN]: Loss formulas (ver. MSO-2003) for re-export DOCX-files
https://bugs.freedesktop.org/show_bug.cgi?id=56270 --- Comment #4 from ape os...@yandex.ru --- Hmm, Import’s error already fixed in versions for Windows. But OLE objects of any types will be lost when you export this ODT file in DOCX format. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56270] FILESAVE: ODT file’s OLE objects are lost when you export to DOCX format
https://bugs.freedesktop.org/show_bug.cgi?id=56270 ape os...@yandex.ru changed: What|Removed |Added Summary|FILESAVE [FILEOPEN]: Loss |FILESAVE: ODT file’s OLE |formulas (ver. MSO-2003)|objects are lost when you |for re-export DOCX-files|export to DOCX format -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39946] different appearance while printing or exporting to pdf
https://bugs.freedesktop.org/show_bug.cgi?id=39946 --- Comment #20 from sea...@gmail.com --- Hi to all!!! I've found the solution. Let me remember you that the problem takes place with some TTF fonts only. So. For the first I removed all the Europe fonts (TTF) from the system (I have Gentoo hosted). Next I converted PFB/PFM fonts to OTF ones using the FontForge application. After I've install the OTF fonts instead of the TTF's the problem has gone. HALF-SOLVED? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 42709] Animated GIFs not displaying correctly.
https://bugs.freedesktop.org/show_bug.cgi?id=42709 sasha.libreoff...@gmail.com changed: What|Removed |Added Attachment #69201|text/plain |application/vnd.oasis.opend mime type||ocument.text -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 42709] Animated GIFs not displaying correctly.
https://bugs.freedesktop.org/show_bug.cgi?id=42709 --- Comment #47 from sasha.libreoff...@gmail.com --- reproduced in 3.6.2 on RFR 17 64bit, installed from rpms from libreoffice.org -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 38090] Incorrect Viewing of Thai characters after certain characters
https://bugs.freedesktop.org/show_bug.cgi?id=38090 sasha.libreoff...@gmail.com changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #9 from sasha.libreoff...@gmail.com --- reproduced in 3.5.7 (from Fedora repo) and 3.6.2 (rpm from libreoffice.org) on RFR 17 64 bit but not reproduced in 3.6.2 on Windows XP 32 bit -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46400] : Wrong generated HTML: Hyperlink on image contaminates the following text
https://bugs.freedesktop.org/show_bug.cgi?id=46400 --- Comment #5 from sasha.libreoff...@gmail.com --- reproduced in 3.6.2 (installed from rpm from libreoffice.org) on RFR 17 64 bit Steps to reporduce: 0. Open second attachment in Writer 1. File-Save as, select HTML as file type 2. Open resulting html with Web-browser Expected: text after picture seen as text Actually: text becomes link to google.fr -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56511] New: Server-side file descriptor leak per UNO connection resulting in a segmentation fault
https://bugs.freedesktop.org/show_bug.cgi?id=56511 Priority: medium Bug ID: 56511 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Server-side file descriptor leak per UNO connection resulting in a segmentation fault Severity: critical Classification: Unclassified OS: Linux (All) Reporter: horst.reite...@fabasoft.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 3.6.2.2 release Component: sdk Product: LibreOffice With LibreOffice 3.6, the server-side leaks one file descriptor per UNO connection. As soon as the process hits the process file descriptor limit, the leak results in a segmentation fault. The behavior can be reproduced with the SimpleBootstrap_cpp sample from the SDK. Executing the following command line results in a new file descriptor (UNIX domain socket in this case) that is not closed as a result of a client disconnect. With 3.5, this leak does not exist. make SimpleBootstrap_cpp.run lsof |grep soffice |grep unix soffice.b 21355 root 106u unix 0x8800121789c0 0t0 175533617 /tmp/OSL_PIPE_0_uno8144101731931881471711676210311892102186 soffice.b 21355 root 109u unix 0x8800121786c0 0t0 175534325 /tmp/OSL_PIPE_0_uno14212312385238112349061101221822759490 soffice.b 21355 root 112u unix 0x8800121783c0 0t0 175534820 /tmp/OSL_PIPE_0_uno164254124824523314314123319913623117099183168 soffice.b 21355 root 115u unix 0x8800121780c0 0t0 175535743 /tmp/OSL_PIPE_0_uno1831181191871451201971802186036181212243198 As a result of this leak, production use of LibreOffice 3.6 as an UNO server is out of the question. A workaround is to re-trigger an environment on the client side, interestingly this workaround is only effective in non-SMP environments. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56512] New: Hebrew looks grabled in Word95 RTF file import
https://bugs.freedesktop.org/show_bug.cgi?id=56512 Priority: medium Bug ID: 56512 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Hebrew looks grabled in Word95 RTF file import Severity: normal Classification: Unclassified OS: All Reporter: kaplanl...@gmail.com Hardware: Other Status: NEW Version: 3.7.0.0.alpha0+ Master Component: Writer Depends on: 42407 Product: LibreOffice This is a follow up to Bug 42407, which fixed a lot of the word95 rtf import, but still has problems with importing text in Hebrew. The test document from the previous bug is still relevant: https://bugs.freedesktop.org/attachment.cgi?id=52928 And how it looks in Word: https://bugs.freedesktop.org/attachment.cgi?id=54562 Notice Hebrew is showed correctly in the screenshot (on the top right side, near the string 510817018), which isn't the case for LibO (3.7/master). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56512] Hebrew looks garbled in Word95 RTF file import
https://bugs.freedesktop.org/show_bug.cgi?id=56512 Lior Kaplan kaplanl...@gmail.com changed: What|Removed |Added Summary|Hebrew looks grabled in |Hebrew looks garbled in |Word95 RTF file import |Word95 RTF file import -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56512] Hebrew looks garbled in Word95 RTF file import
https://bugs.freedesktop.org/show_bug.cgi?id=56512 Lior Kaplan kaplanl...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |vmik...@suse.cz |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56512] Hebrew looks garbled in Word95 RTF file import
https://bugs.freedesktop.org/show_bug.cgi?id=56512 --- Comment #1 from Lior Kaplan kaplanl...@gmail.com --- Created attachment 69208 -- https://bugs.freedesktop.org/attachment.cgi?id=69208action=edit RTF import with grabled hebrew -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56513] New: Different header on first page of section lost during FILESAVE as .doc
https://bugs.freedesktop.org/show_bug.cgi?id=56513 Priority: medium Bug ID: 56513 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Different header on first page of section lost during FILESAVE as .doc Severity: normal Classification: Unclassified OS: All Reporter: l...@deller.id.au Hardware: All Status: UNCONFIRMED Version: 3.5.0 release Component: Writer Product: LibreOffice Created attachment 69209 -- https://bugs.freedesktop.org/attachment.cgi?id=69209action=edit sample to reproduce issue A section can have different headers/footers on the first page of the section vs subsequent pages of the section. (This is a section option in MS Word, and maps to a corresponding chain of page styles in LibreOffice). When saving as .doc, the headers/footers of the first page of the section become the headers/footers for *all* pages of the section. This problem does not seem to arise for the very first section of a document. Attached is a simple sample document to demonstrate the issue. It has two sections, and the second section has different header/footer on the first page. It opens correctly in LibreOffice showing: - page 1 header: This is the header of the first section - page 2 header: This is the first page header of the second section - page 3 header: This is the non-first page header of the second section To reproduce: 1. File-Save As another .doc file 2. File-Close 3. Open the new .doc file (in LibreOffice or MS Word) 4. Observe that the third page header is now wrong: - page 1 header: This is the header of the first section - page 2 header: This is the first page header of the second section - page 3 header: This is the first page header of the second section I have tested this sample on the following builds: - Windows OpenOffice 3.2.1: works correctly - Windows LibreOffice 3.4.5: works correctly - Windows LibreOffice 3.5.0: fails - Windows LibreOffice 3.5.7: fails - Windows LibreOffice 3.6.1: fails - (on OpenSUSE Linux) LibreOffice built from latest git 2012-10-28: fails -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46400] : Wrong generated HTML: Hyperlink on image contaminates the following text
https://bugs.freedesktop.org/show_bug.cgi?id=46400 --- Comment #6 from Julien Nabet serval2...@yahoo.fr --- Created attachment 69210 -- https://bugs.freedesktop.org/attachment.cgi?id=69210action=edit result of the test with 3.6 branch Sasha: perhaps the fix is only on 3.6 branch so it'll be only on 3.6.4 but would you mind trying prerelease 3.6.3? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56171] TDF Site: [es] (Español): Outdated or wrong Contents
https://bugs.freedesktop.org/show_bug.cgi?id=56171 --- Comment #1 from Marc Pare m...@marcpare.com --- I have fixed the Pootle correction and sent a note to the ES team. Cheers, Marc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56287] FILEOPEN CRASH when opening particular .ods
https://bugs.freedesktop.org/show_bug.cgi?id=56287 --- Comment #9 from TuxMario jmrcc.ne...@orange.fr --- Hello Julien I made some requested analysis and tests I had not lo-menubar package installed. I installed LibrO 3.6.3 (Version 3.6.3.1 (Build ID: f8fce0b)) pre release and then the miracle ! The file in error now opens properly without any problem ! I notice the new format of buttons and some changed icones Thanks for your analysis and solution Bye : TuxMario PS : How to installe English (GB) dictionary compatible with 3.6.1 release ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56515] New: gerrit theming should him at developer IRC channel
https://bugs.freedesktop.org/show_bug.cgi?id=56515 Priority: medium Bug ID: 56515 CC: webs...@global.libreoffice.org Assignee: libreoffice-bugs@lists.freedesktop.org Summary: gerrit theming should him at developer IRC channel Severity: normal Classification: Unclassified OS: All Reporter: bjoern.michael...@canonical.com Hardware: Other Status: UNCONFIRMED Version: unspecified Component: WWW Product: LibreOffice As discussed on: https://plus.google.com/101094190333184858950/posts/H886dGcr3hS it would be great to invite people on gerrit to the #libreoffice-dev channel on freenode. Can we add a line to the header or footer saying: If you need help with your patch or want to discuss it, do not hesitate to join #libreoffice-dev on freenode IRC (irc://chat.freenode.net/libreoffice-dev). If you need help with gerrit itself, please send a email to ger...@otrs.documentfoundation.org. That would be awesome! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56515] gerrit theming should him at developer IRC channel
https://bugs.freedesktop.org/show_bug.cgi?id=56515 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Whiteboard||EasyHack SkillInfra ||DifficultyBeginner Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56366] Titlebar clips Unicode characters from file name to 16 bits
https://bugs.freedesktop.org/show_bug.cgi?id=56366 Ivan Timofeev timofeev@gmail.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #7 from Ivan Timofeev timofeev@gmail.com --- I found (at least one) place where characters get clipped: TitleHelper::impl_convertURL2Title http://opengrok.libreoffice.org/xref/core/framework/source/fwe/helper/titlehelper.cxx#impl_convertURL2Title which uses INetURLObject, and it clips to 16bit, in our case it is line 3727: aResult.append(sal_Unicode(nUTF32)); http://opengrok.libreoffice.org/xref/core/tools/source/fsys/urlobj.cxx#3727 So, if I change it to use the proper conversion: aResult.append(OUString(nUTF32, 1)); the title is alright. Stephan, it that OK to teach INetURLObject::decode the full UTF-16 support? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56457] allow (document related) locale setting for 'Insert - External Data'
https://bugs.freedesktop.org/show_bug.cgi?id=56457 --- Comment #7 from satlin...@aim.com --- There might be a need for paragraph dependend language settings in documents with two languages like dictionaries or translations. But these special cases are not covered by the current LO version too. Websites with two languages are a horror for any webmaster because google spiders don't want to index them. I don't know the restrictions of the open document format, I'm not familiar with this. Rainer, perhaps you can put this Bug or Enhancement in the right category? It's more than an import problem, it's dealing with fundamental language treatment. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56515] gerrit theming should him at developer IRC channel
https://bugs.freedesktop.org/show_bug.cgi?id=56515 DavidO d.ostrov...@gmx.de changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |d.ostrov...@gmx.de |desktop.org | CC||nthieb...@gmail.com, ||r.einsle@documentfoundation ||.org --- Comment #1 from DavidO d.ostrov...@gmx.de --- that would be trivially. Guess the footer would be more natural place for that. Will add it on my test site and let you know. It is still open where all our customized gerrit stuff lives? Some of them is in dev-tools git repository, some on my root server (logerritbot) and some only in production (Kendy's latest mail template adjustments). And Robert working on puppet plugin for gerrit. We should put all puzzle parts together and set up a testbed (Norbert talked already to admins) on a new VM under say gerrit-dev.libreoffice.org to play with (upgrades, finalize and polish gerrit-buildbot plugin, etc). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45675] Crash after edit field value; connected to IBM DB2 via ODBC
https://bugs.freedesktop.org/show_bug.cgi?id=45675 --- Comment #34 from Lionel Elie Mamane lio...@mamane.lu --- (In reply to comment #33) I have looked at fixpacks and there is no fixpack 1 available for DB2 Express-C version 10.1. You are probably using DB2 Express which is NOT! the same edition as I am using. I don't think I am. I didn't pay for DB2, so it must be the C edition. The tarball I downloaded is called db2_v101_linuxx64_expc.tar.gz You can't install fixpacks on DB2 Express-C edition. Fixpacks are only available for paid versions. OK, not for the server, but you can install fixpacks for the ODBC driver. I downloaded v10.1fp1_linuxx64_odbc_cli.tar.gz and v10.1fp1_nt32_dsdriver_EN.exe, and that's what I was testing with as an ODBC driver. (I couldn't get v10.1fp1_nt32_odbc_cli.zip to properly register with the Microsoft ODBC driver manager.) I'm *guessing* that this may be why it does not crash for me, but then also maybe not. shrug I have looked at fixpack 1 bug fix list: http://www-01.ibm.com/support/docview.wss?uid=swg21610653 and I can't see any real fix for ODBC, It mentions a few crashes in the ODBC driver; most of them look unrelated but maybe IC839402[IBM][DB2.NET] SQL0902 AN UNEXPECTED EXCEPTION HAS OCCURRED IN PROCESS. CLI DRIVER CRASHES IN CLI_CSIPOSTCONNECT Or then, maybe not. We won't know until you try or give me a reproduction case that crashes for me, too :) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56366] Titlebar clips Unicode characters from file name to 16 bits
https://bugs.freedesktop.org/show_bug.cgi?id=56366 --- Comment #8 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #7) I found (at least one) place where characters get clipped: TitleHelper::impl_convertURL2Title http://opengrok.libreoffice.org/xref/core/framework/source/fwe/helper/ titlehelper.cxx#impl_convertURL2Title which uses INetURLObject, and it clips to 16bit, in our case it is line 3727: aResult.append(sal_Unicode(nUTF32)); http://opengrok.libreoffice.org/xref/core/tools/source/fsys/urlobj.cxx#3727 So, if I change it to use the proper conversion: aResult.append(OUString(nUTF32, 1)); the title is alright. Stephan, it that OK to teach INetURLObject::decode the full UTF-16 support? That looks like a bug indeed. There is OUStringBuffer.appendUtf32, so the best fix appears to be to change both occurrences of aResult.append(sal_Unicode(nUTF32)); in INetURLObject::decode with aResult.appendUtf32(nUTF32); -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56287] FILEOPEN CRASH when opening particular .ods
https://bugs.freedesktop.org/show_bug.cgi?id=56287 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|NEEDINFO|RESOLVED Whiteboard||target:3.6.3 Resolution|--- |WORKSFORME --- Comment #10 from Julien Nabet serval2...@yahoo.fr --- TuxMario: Thank you for your feedback, put it to WFM -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54383] : About dialog causing immediate crash
https://bugs.freedesktop.org/show_bug.cgi?id=54383 Robert Nagy rob...@openbsd.org changed: What|Removed |Added OS|Linux (All) |All Version|3.6.1.2 release |3.6.3.2 rc --- Comment #3 from Robert Nagy rob...@openbsd.org --- I've managed to reproduce this issue on OpenBSD as well, where LO has been installed on a virgin system. The issue happens with java and without java as well. (as in disabled java at compile time). According to my debugging there are no libraries missing. The user profile has also been cleaned up each time I tried and there are no specific extensions installed at all. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46400] : Wrong generated HTML: Hyperlink on image contaminates the following text
https://bugs.freedesktop.org/show_bug.cgi?id=46400 --- Comment #7 from sasha.libreoff...@gmail.com --- but would you mind trying prerelease 3.6.3? No, sorry. Will wait until release 3.6.3. I hope it will appear in next week. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56427] UI Cell 'Background Colour' button retains colour of 'last picked' when 'No Fill' is selected
https://bugs.freedesktop.org/show_bug.cgi?id=56427 David Clayton dcclay...@bataltd.co.uk changed: What|Removed |Added Version|3.6.2.2 release |3.6.3.2 rc --- Comment #3 from David Clayton dcclay...@bataltd.co.uk --- Tested and confirm that behaviour exists in 3.6.3.2 on Windows 7x32. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56518] New: Copying sheet with named areas fails
https://bugs.freedesktop.org/show_bug.cgi?id=56518 Priority: medium Bug ID: 56518 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Copying sheet with named areas fails Severity: critical Classification: Unclassified OS: Windows (All) Reporter: j...@tdcspace.dk Hardware: x86 (IA32) Status: UNCONFIRMED Version: 3.6.2.2 release Component: Spreadsheet Product: LibreOffice -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
