On 10 May 2013, at 21:00, libreoffice-request@lists.freedesktop.org wrote:
Send LibreOffice mailing list submissions to
libreoffice@lists.freedesktop.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.freedesktop.org/mailman/listinfo/libreoffice
or, via email, send a message with subject or body 'help' to
libreoffice-request@lists.freedesktop.org
You can reach the person managing the list at
libreoffice-owner@lists.freedesktop.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of LibreOffice digest..."
Today's Topics:
1. [PUSHED] Related fdo#35546: Cosmetic fixes for Photo Album
Dialog (Andras Timar (via Code Review))
2. License Statement (Yohei Yukawa)
3. Build problem on OS X 10.6.8 (Brian Parker)
4. Re: RES: Problem Trying call LibreOffice from Java
(Stephan Bergmann)
5. [PATCH libreoffice-4-0] fdo#64382 replace lt to lt-LT
(Andras Timar (via Code Review))
6. [PATCH libreoffice-4-0] lt: bump version number to force
update of user profile (Andras Timar (via Code Review))
7. [PATCH] Solve fdo#64406 Missing right closing parenthesis
(Joren De Cuyper (via Code Review))
8. [ABANDONED] Solve fdo#64359 Duplicate template in list when
overwriting ... (Joren De Cuyper (via Code Review))
9. Ultra-slow JunitTest_sc_unoapi (Stephan Bergmann)
10. [PATCH] resolved fdo#35756 import more than 64k HTML table
cells (Eike Rathke (via Code Review))
11. [PATCH] Enhancements to VCL metafile handling
(Chris Sherlock (via Code Review))
12. Missing VCL Equivalent to GtkToolbar? (Samuel Mehrbrodt)
13. [PUSHED libreoffice-4-0] fdo#64382 replace lt to lt-LT
(David Tardon (via Code Review))
14. [PUSHED libreoffice-4-0] lt: bump version number to force
update of user profile (David Tardon (via Code Review))
15. [PUSHED] Solve fdo#64406 Missing right closing parenthesis
(David Tardon (via Code Review))
16. [PATCH libreoffice-4-0] Solve fdo#64406 Missing right closing
parenthesis (Joren De Cuyper (via Code Review))
17. [PUSHED libreoffice-4-0] Solve fdo#64406 Missing right
closing parenthesis (David Tardon (via Code Review))
18. [PUSHED] Enhancements to VCL metafile handling
(David Tardon (via Code Review))
19. Re: Ultra-slow JunitTest_sc_unoapi (Kohei Yoshida)
20. [PATCH] Use clock_gettime instead of gettimeofday to have
more preci... (Arnaud Versini (via Code Review))
21. [PATCH] Fix: change to std::dec after having used std::hex
(Chris Sherlock (via Code Review))
22. [PATCH] Potty mouth (Chris Sherlock (via Code Review))
23. [PUSHED] Fix: change to std::dec after having used std::hex
(David Tardon (via Code Review))
24. [PUSHED] Potty mouth (David Tardon (via Code Review))
25. [PATCH] solve fdo#63033 update Dutch dictionary OpenTaal to
version ... (Thomas van der meulen (via Code Review))
26. [PUSHED] don't override TMPDIR with /tmp on cygwin, cleanup
TMPDIR/TM... (David Tardon (via Code Review))
27. [PATCH libreoffice-4-0] fdo#64205 escape '' in help text with
<nowiki> tag (Andras Timar (via Code Review))
28. Re: should we drop DEFAULT_TO_ENGLISH_FOR_PACKING? (David Tardon)
29. Re: should we drop DEFAULT_TO_ENGLISH_FOR_PACKING? (David Tardon)
30. [PUSHED] resolved fdo#35756 import more than 64k HTML table
cells (Eike Rathke (via Code Review))
31. Re: Wizard Integration (Stephan Bergmann)
32. Re: Missing VCL Equivalent to GtkToolbar? (Caol?n McNamara)
33. [PUSHED] solve fdo#63033 update Dutch dictionary OpenTaal to
version ... (Andras Timar (via Code Review))
34. [PATCH] [coretext] Fix drawing fallback fonts
(Khaled Hosny (via Code Review))
35. Re: master start a JRE 7 even if the default JRE is 6
(Stephan Bergmann)
36. Re: [PATCH] Fix: change to std::dec after having used
std::hex (Stephan Bergmann)
37. [PUSHED] gbuild: gcc platforms: link with C compiler if no
C++ files (Michael Stahl (via Code Review))
38. [PUSHED] [coretext] Fix drawing fallback fonts
(Tor Lillqvist (via Code Review))
39. [PATCH libreoffice-4-0] resolved fdo#64384 check subtotal row
filtered also for sing... (Eike Rathke (via Code Review))
40. [PATCH libreoffice-3-6] resolved fdo#64384 check subtotal row
filtered also for sing... (Eike Rathke (via Code Review))
41. Re: Ultra-slow JunitTest_sc_unoapi (Kohei Yoshida)
----------------------------------------------------------------------
Message: 1
Date: Thu, 9 May 2013 19:29:35 +0000
From: "Andras Timar (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] Related fdo#35546: Cosmetic fixes for Photo Album
Dialog
Message-ID: <20130509192937.B0EC33EE098F@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3834
Approvals:
Andras Timar: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3834
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c5d3d54b7e21063628c4cdb4a92f534ec4a3088
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Gerrit-Reviewer: Andras Timar <atimar@suse.com>
Gerrit-Reviewer: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
------------------------------
Message: 2
Date: Fri, 10 May 2013 07:17:26 +0900
From: Yohei Yukawa <yukawa@google.com>
To: libreoffice@lists.freedesktop.org
Subject: License Statement
Message-ID:
<CAGWWAmR8yC-0GB4=tw-0hHn-hQJG_U7eDpkCMv-R8V54awRLRg@mail.gmail.com>
Content-Type: text/plain; charset="iso-8859-1"
All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
This includes my patch submitted in
https://bugs.freedesktop.org/show_bug.cgi?id=64298
Yohei Yukawa, Google Inc.
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.freedesktop.org/archives/libreoffice/attachments/20130510/b8c50a4f/attachment-0001.html>
------------------------------
Message: 3
Date: Fri, 10 May 2013 16:54:21 +1000
From: Brian Parker <brian.bj.parker99@gmail.com>
To: libreoffice@lists.freedesktop.org
Subject: Build problem on OS X 10.6.8
Message-ID:
<CAKGxhE71D_OSQhJQ7b9DqnH8FHU5TLyT8eb58jd5qbRW6T2oRw@mail.gmail.com>
Content-Type: text/plain; charset="iso-8859-1"
Hi,
I am attempting to build the OS X version (10.6.8) of the git master
branch, following the instructions on the wiki.
I am using the xcode (version 4.02) sdk and am not using fink or macports
to install custom devl tools (although did use brew to set up a new perl, I
have removed all non-standard paths from my $PATH).
gcc --version is i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc.
build 5666) (dot 3).
The build stops with the following error:
[build CXX] sw/source/ui/vba/vbacells.cxx
ld: bad codegen, pointer diff in
WPXSvInputStreamImpl::WPXSvInputStreamImpl(com::sun::star::uno::Reference<com::sun::star::io::XInputStream>)to
global weak symbol vtable for WPXInputStreamfor architecture i386
collect2: ld returned 1 exit status
make[1]: *** [/Users/brianparker/lo/core/workdir/
unxmacxi.pro/LinkTarget/Library/libwpftdrawlo.dylib] Error 1
A check on stackoverflow suggests that this is due to hidden symbols not
being consistent across libraries.
Has anyone else seen this issue, or have some suggestions?
Thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.freedesktop.org/archives/libreoffice/attachments/20130510/1038804b/attachment-0001.html>
------------------------------
Message: 4
Date: Fri, 10 May 2013 09:04:42 +0200
From: Stephan Bergmann <sbergman@redhat.com>
To: Fernando Digitaldoc <fernando@digitaldoc.com.br>
Cc: libreoffice@lists.freedesktop.org
Subject: Re: RES: Problem Trying call LibreOffice from Java
Message-ID: <518C9C0A.7040708@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
On 05/09/2013 01:35 AM, Fernando Digitaldoc wrote:
We will make another example. (have some problems with officebean.dll and
officebean.so .. , we are solving for the example)
But now , we are trying to make more tests.
The most critical issue now is the call from Ubuntu.
KDE on Windows or Linux, we can run, but in Ubuntu, after calling the main
screen soffice when we execute the call:
"aBean.startOOoConnection (" uno: socket, host = 127.0.0.1, port = 8100;
urp; StarOffice.ServiceManager ");"
He says that the libreoffice.so not find or run libjawt.so
" java.lang.UnsatisfiedLinkError:
/home/gha/myapp/lib/libofficebean.so: libjawt.so: cannot open shared object
file: No such file or directory"
"/home/gha/myapp/lib/libofficebean.so " - is path were we download that lib
and load that in the applet..
What I can try to solve UnsatisfiedLinkError ?
Such problems are hard to diagnose "into the blue," without a complete
(yet minimal), working example (with instructions how to produce from
source). If you can give us that, somebody with a Ubuntu box might have
a look,
Stephan
------------------------------
Message: 5
Date: Fri, 10 May 2013 09:38:21 +0000
From: "Andras Timar (via Code Review)" <gerrit@gerrit.libreoffice.org>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH libreoffice-4-0] fdo#64382 replace lt to lt-LT
Message-ID:
<gerrit.1368178701080.Ibf480fd79e664f2d6d9b4aeb166c72ee6b28ddb5@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3835
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/35/3835/1
fdo#64382 replace lt to lt-LT
Change-Id: Ibf480fd79e664f2d6d9b4aeb166c72ee6b28ddb5
---
M lt_LT/dictionaries.xcu
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lt_LT/dictionaries.xcu b/lt_LT/dictionaries.xcu
index 74bc180..484fec5 100644
--- a/lt_LT/dictionaries.xcu
+++ b/lt_LT/dictionaries.xcu
@@ -10,7 +10,7 @@
<value>DICT_SPELL</value>
</prop>
<prop oor:name="Locales" oor:type="oor:string-list">
- <value>lt</value>
+ <value>lt-LT</value>
</prop>
</node>
<node oor:name="HyphDic_lt" oor:op="fuse">
@@ -21,7 +21,7 @@
<value>DICT_HYPH</value>
</prop>
<prop oor:name="Locales" oor:type="oor:string-list">
- <value>lt</value>
+ <value>lt-LT</value>
</prop>
</node>
</node>
--
To view, visit https://gerrit.libreoffice.org/3835
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf480fd79e664f2d6d9b4aeb166c72ee6b28ddb5
Gerrit-PatchSet: 1
Gerrit-Project: dictionaries
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>
------------------------------
Message: 6
Date: Fri, 10 May 2013 10:06:16 +0000
From: "Andras Timar (via Code Review)" <gerrit@gerrit.libreoffice.org>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH libreoffice-4-0] lt: bump version number to force
update of user profile
Message-ID:
<gerrit.1368180376117.I5ca0425c0f5bf746da64f17d796e1a6e27e6d171@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3836
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/36/3836/1
lt: bump version number to force update of user profile
Change-Id: I5ca0425c0f5bf746da64f17d796e1a6e27e6d171
---
M lt_LT/description.xml
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lt_LT/description.xml b/lt_LT/description.xml
index ddfcd2e..96cc3d0 100644
--- a/lt_LT/description.xml
+++ b/lt_LT/description.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<description xmlns="http://openoffice.org/extensions/description/2006";
xmlns:d="http://openoffice.org/extensions/description/2006";
xmlns:xlink="http://www.w3.org/1999/xlink";>
- <version value="1.3" />
+ <version value="1.3.1" />
<identifier value="org.openoffice.lt.hunspell.dictionaries" />
<display-name>
<name lang="en-US">Lithuanian spelling dictionary, and hyphenation rules</name>
--
To view, visit https://gerrit.libreoffice.org/3836
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ca0425c0f5bf746da64f17d796e1a6e27e6d171
Gerrit-PatchSet: 1
Gerrit-Project: dictionaries
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>
------------------------------
Message: 7
Date: Fri, 10 May 2013 10:38:57 +0000
From: "Joren De Cuyper (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH] Solve fdo#64406 Missing right closing parenthesis
Message-ID:
<gerrit.1368182337462.I3812b60f097b1daf554bf2d337b126e8a8067573@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3837
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/3837/1
Solve fdo#64406 Missing right closing parenthesis
Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573
---
M wizards/source/tools/Strings.xba
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba
index 5ff7ca2..f91b8f4 100644
--- a/wizards/source/tools/Strings.xba
+++ b/wizards/source/tools/Strings.xba
@@ -26,7 +26,7 @@
Function ElimChar(ByVal BigString as String, ElimArray() as String)
Dim i% ,n%
For i = 0 to Ubound(ElimArray)
- BigString = DeleteStr(BigString,ElimArray(i)
+ BigString = DeleteStr(BigString,ElimArray(i))
Next
ElimChar = BigString
End Function
@@ -466,4 +466,4 @@
End If
NOERR:
End Function
-</script:module>
\ No newline at end of file
+</script:module>
--
To view, visit https://gerrit.libreoffice.org/3837
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper <joren.libreoffice@telenet.be>
------------------------------
Message: 8
Date: Fri, 10 May 2013 10:41:09 +0000
From: "Joren De Cuyper (via Code Review)"
<gerrit@gerrit.libreoffice.org>
Cc: Bosdonnat Cedric <cedric.bosdonnat@free.fr>, LibreOffice Developer
List <libreoffice@lists.freedesktop.org>
Subject: [ABANDONED] Solve fdo#64359 Duplicate template in list when
overwriting ...
Message-ID: <20130510104111.6FCC43EE098F@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Joren De Cuyper has abandoned this change.
Change subject: Solve fdo#64359 Duplicate template in list when overwriting existing template
......................................................................
Patch Set 1: Abandoned
wrong way to fix this (thanks to Rafael' review)
--
To view, visit https://gerrit.libreoffice.org/3825
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: abandon
Gerrit-Change-Id: Iebe301216f3131db72ff97d2b81003eefc0b0dbf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper <joren.libreoffice@telenet.be>
Gerrit-Reviewer: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Gerrit-Reviewer: Rafael Dominguez <venccsralph@gmail.com>
------------------------------
Message: 9
Date: Fri, 10 May 2013 12:57:04 +0200
From: Stephan Bergmann <sbergman@redhat.com>
To: libreoffice-dev <LibreOffice@lists.freedesktop.org>
Cc: "kohei.yoshida@gmail.com" <kohei.yoshida@gmail.com>
Subject: Ultra-slow JunitTest_sc_unoapi
Message-ID: <518CD280.7010207@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
FYI, at least with my recent master --enable-dbgutil builds (on Fedora
18), JunitTest_sc_unoapi seemingly takes forever (but eventually does
finish). It looks like Java test code calls a ScCellRangeObj::doImport
where that ScCellRangeObj's aRange.aEnd.nRow = 1048575 is pretty large,
leading to ~endless ScDocument::Broadcast work.
Maybe related to some of Kohei's recent work on sc broadcasting?
Stephan
------------------------------
Message: 10
Date: Fri, 10 May 2013 11:28:42 +0000
From: "Eike Rathke (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH] resolved fdo#35756 import more than 64k HTML table
cells
Message-ID:
<gerrit.1368185322066.I62d1b9c399cd709a4f93dbac31b219a61c46ec00@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3838
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3838/1
resolved fdo#35756 import more than 64k HTML table cells
Enhanced EditEngine to be able to hold more than 64k paragraphs. Used
also in RTF import Calc and Writer, so that could benefit as well.
* changed all EditEngine,Outliner,... related paragraph index/count
variables from sal_uInt16 to sal_Int32
* sal_Int32 instead of sal_uInt32 to match accessibility API
* matched some Outliner methods' paragraph parameters from sal_uLong
to sal_Int32
* containers capable to hold size_t nevertheless are limited to a
maximum of sal_Int32
* changed definition of EE_PARA_NOT_FOUND and EE_PARA_ALL to
SAL_MAX_INT32
+ added EE_PARA_MAX_COUNT and EE_TEXTPOS_MAX_COUNT to initialize
ESelection with what previously were hard coded 0xFFFF all over the
place
+ for similar reason added EE_TEXTPOS_ALL corresponding to EE_PARA_ALL
to initialize an ESelection spanning all available text like
aSel(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL)
Change-Id: I62d1b9c399cd709a4f93dbac31b219a61c46ec00
---
M chart2/source/view/axes/VCartesianAxis.cxx
M editeng/source/accessibility/AccessibleEditableTextPara.cxx
M editeng/source/accessibility/AccessibleHyperlink.cxx
M editeng/source/accessibility/AccessibleHyperlink.hxx
M editeng/source/accessibility/AccessibleImageBullet.cxx
M editeng/source/accessibility/AccessibleParaManager.cxx
M editeng/source/accessibility/AccessibleStaticTextBase.cxx
M editeng/source/editeng/editdbg.cxx
M editeng/source/editeng/editdoc.cxx
M editeng/source/editeng/editdoc.hxx
M editeng/source/editeng/editeng.cxx
M editeng/source/editeng/editobj.cxx
M editeng/source/editeng/editobj2.hxx
M editeng/source/editeng/editundo.cxx
M editeng/source/editeng/editundo.hxx
M editeng/source/editeng/editview.cxx
M editeng/source/editeng/edtspell.cxx
M editeng/source/editeng/eehtml.cxx
M editeng/source/editeng/eertfpar.cxx
M editeng/source/editeng/eertfpar.hxx
M editeng/source/editeng/impedit.cxx
M editeng/source/editeng/impedit.hxx
M editeng/source/editeng/impedit2.cxx
M editeng/source/editeng/impedit3.cxx
M editeng/source/editeng/impedit4.cxx
M editeng/source/editeng/impedit5.cxx
M editeng/source/outliner/outleeng.cxx
M editeng/source/outliner/outleeng.hxx
M editeng/source/outliner/outlin2.cxx
M editeng/source/outliner/outliner.cxx
M editeng/source/outliner/outlobj.cxx
M editeng/source/outliner/outlundo.cxx
M editeng/source/outliner/outlundo.hxx
M editeng/source/outliner/outlvw.cxx
M editeng/source/outliner/paralist.cxx
M editeng/source/outliner/paralist.hxx
M editeng/source/rtf/svxrtf.cxx
M editeng/source/uno/unoedhlp.cxx
M editeng/source/uno/unoedprx.cxx
M editeng/source/uno/unofored.cxx
M editeng/source/uno/unoforou.cxx
M editeng/source/uno/unotext.cxx
M editeng/source/uno/unotext2.cxx
M filter/source/msfilter/msdffimp.cxx
M filter/source/msfilter/svdfppt.cxx
M forms/source/richtext/specialdispatchers.cxx
M include/editeng/AccessibleParaManager.hxx
M include/editeng/editdata.hxx
M include/editeng/editeng.hxx
M include/editeng/editobj.hxx
M include/editeng/editview.hxx
M include/editeng/outliner.hxx
M include/editeng/outlobj.hxx
M include/editeng/svxrtf.hxx
M include/editeng/unoedhlp.hxx
M include/editeng/unoedprx.hxx
M include/editeng/unoedsrc.hxx
M include/editeng/unofored.hxx
M include/editeng/unoforou.hxx
M include/editeng/unotext.hxx
M include/svx/svdomeas.hxx
M include/svx/svdotext.hxx
M include/svx/svdoutl.hxx
M sc/inc/editutil.hxx
M sc/qa/unit/subsequent_filters-test.cxx
M sc/source/core/data/attrib.cxx
M sc/source/core/data/cellvalue.cxx
M sc/source/core/data/column2.cxx
M sc/source/core/data/documen8.cxx
M sc/source/core/data/global.cxx
M sc/source/core/data/postit.cxx
M sc/source/core/tool/editutil.cxx
M sc/source/filter/excel/xehelper.cxx
M sc/source/filter/excel/xicontent.cxx
M sc/source/filter/html/htmlexp.cxx
M sc/source/filter/xml/xmlcelli.hxx
M sc/source/ui/app/inputhdl.cxx
M sc/source/ui/app/inputwin.cxx
M sc/source/ui/app/transobj.cxx
M sc/source/ui/docshell/docfunc.cxx
M sc/source/ui/drawfunc/drtxtob.cxx
M sc/source/ui/pagedlg/tphfedit.cxx
M sc/source/ui/unoobj/fielduno.cxx
M sc/source/ui/view/editsh.cxx
M sc/source/ui/view/output2.cxx
M sc/source/ui/view/viewdata.cxx
M sc/source/ui/view/viewfun4.cxx
M sc/source/ui/view/viewfunc.cxx
M sd/source/core/sdpage_animations.cxx
M sd/source/core/text/textapi.cxx
M sd/source/filter/html/htmlex.cxx
M sd/source/filter/html/htmlex.hxx
M sd/source/filter/ppt/pptinanimations.cxx
M sd/source/filter/xml/sdtransform.cxx
M sd/source/ui/annotations/annotationmanager.cxx
M sd/source/ui/annotations/annotationwindow.cxx
M sd/source/ui/app/sdmod2.cxx
M sd/source/ui/dlg/dlgassim.cxx
M sd/source/ui/dlg/headerfooterdlg.cxx
M sd/source/ui/func/fuexpand.cxx
M sd/source/ui/func/fuinsfil.cxx
M sd/source/ui/func/fuprobjs.cxx
M sd/source/ui/func/fusumry.cxx
M sd/source/ui/func/futext.cxx
M sd/source/ui/inc/OutlineView.hxx
M sd/source/ui/unoidl/unosrch.cxx
M sd/source/ui/view/DocumentRenderer.cxx
M sd/source/ui/view/Outliner.cxx
M sd/source/ui/view/drawview.cxx
M sd/source/ui/view/drtxtob.cxx
M sd/source/ui/view/drtxtob1.cxx
M sd/source/ui/view/outlnvs2.cxx
M sd/source/ui/view/outlnvsh.cxx
M sd/source/ui/view/outlview.cxx
M sd/source/ui/view/sdview.cxx
M sd/source/ui/view/sdview2.cxx
M starmath/inc/edit.hxx
M starmath/source/accessibility.cxx
M starmath/source/accessibility.hxx
M starmath/source/cursor.cxx
M starmath/source/edit.cxx
M starmath/source/view.cxx
M svx/source/accessibility/AccessibleEmptyEditSource.cxx
M svx/source/accessibility/AccessibleTextHelper.cxx
M svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
M svx/source/sdr/properties/textproperties.cxx
M svx/source/svdraw/svdedxv.cxx
M svx/source/svdraw/svdomeas.cxx
M svx/source/svdraw/svdotext.cxx
M svx/source/svdraw/svdotextpathdecomposition.cxx
M svx/source/svdraw/svdotxat.cxx
M svx/source/svdraw/svdotxed.cxx
M svx/source/svdraw/svdotxfl.cxx
M svx/source/svdraw/svdoutl.cxx
M svx/source/svdraw/svdview.cxx
M svx/source/table/cell.cxx
M svx/source/table/svdotable.cxx
M svx/source/table/tablecontroller.cxx
M svx/source/table/tablertfimporter.cxx
M sw/inc/docufld.hxx
M sw/source/core/fields/docufld.cxx
M sw/source/filter/ww8/docxattributeoutput.cxx
M sw/source/filter/ww8/docxexport.cxx
M sw/source/filter/ww8/rtfsdrexport.cxx
M sw/source/filter/ww8/wrtw8esh.cxx
M sw/source/filter/ww8/wrtww8.hxx
M sw/source/filter/ww8/ww8graf.cxx
M sw/source/ui/docvw/AnnotationWin.cxx
M sw/source/ui/docvw/PostItMgr.cxx
M sw/source/ui/docvw/SidebarWin.cxx
M sw/source/ui/shells/annotsh.cxx
M sw/source/ui/shells/drwtxtsh.cxx
M sw/source/ui/shells/langhelper.cxx
M sw/source/ui/uno/unotxdoc.cxx
154 files changed, 1,848 insertions(+), 1,751 deletions(-)
--
To view, visit https://gerrit.libreoffice.org/3838
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62d1b9c399cd709a4f93dbac31b219a61c46ec00
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke <erack@redhat.com>
------------------------------
Message: 11
Date: Fri, 10 May 2013 11:28:58 +0000
From: "Chris Sherlock (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH] Enhancements to VCL metafile handling
Message-ID:
<gerrit.1368185338876.Id4ed486b2dd0c6e7bdee67cb344aaaf8e8d98f84@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3839
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3839/1
Enhancements to VCL metafile handling
* Remove EMFP_DEBUG with OSL_DEBUG conditional defines and SAL_INFO
* While we are about it, to help with troubleshooting metafile
issues, add another vcl.emf area to log-areas.dox
* Improve error handling when processing an EMF header:
+ replace variable name nsal_uInt32 (!!) with sane variables
to make the code more readable
+ check to ensure that type field is 0x1, which is all it can be
for metafiles
+ check that signature field is set to ASCII-encoded value "FME"
+ loose check of version field to see if it is 0x00010000
+ warn if record count is zero - that really shouldn't be possible
+ check bytes field in header to make sure it correlates to the
actual size of the metafile
* Quite a few more comments in the code to clarify the intended
structure of a metafile, per [MS-EMF] documentation
Change-Id: Id4ed486b2dd0c6e7bdee67cb344aaaf8e8d98f84
---
M include/sal/log-areas.dox
M vcl/source/filter/wmf/enhwmf.cxx
2 files changed, 78 insertions(+), 32 deletions(-)
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 693450b..cf1f1cc 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -260,6 +260,7 @@
@li @c vcl.atsui - ATSUI (obsolete) -using code for Mac OS X
@li @c vcl.control
@li @c vcl.coretext - CoreText-using code for Mac OS X and iOS
+@li @c vcl.emf - EMF/EMF+ processing
@li @c vcl.fonts - font-specific code
@li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
@li @c vcl.gtk - Gtk+ 2/3 plugin
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index cd71a6b..298cd1e 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -151,12 +151,6 @@
#define EMR_SETLINKEDUFIS 119
#define EMR_SETTEXTJUSTIFICATION 120
-#if OSL_DEBUG_LEVEL > 1
-#define EMFP_DEBUG(x) x
-#else
-#define EMFP_DEBUG(x)
-#endif
-
#ifdef OSL_BIGENDIAN
// currently unused
@@ -226,24 +220,27 @@
return bOk;
}
-EMFP_DEBUG(void dumpWords( SvStream& s, int i )
+#if OSL_DEBUG_LEVEL > 1
+void dumpWords( SvStream& s, int i )
{
sal_uInt32 pos = s.Tell();
sal_Int16 data;
for( ; i > 0; i -- ) {
s >> data;
- EMFP_DEBUG(printf ("\t\t\tdata: %04hx\n", data));
+ SAL_INFO("vcl.emf", "\t\t\tdata: " << std::hex << data);
}
s.Seek (pos);
-});
+};
+#endif
void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC)
{
if (!bEMFPlus) {
pOut->PassEMFPlusHeaderInfo();
+#if OSL_DEBUG_LEVEL > 1
// debug code - write the stream to debug file /tmp/emf-stream.emf
- EMFP_DEBUG(int pos = pWMF->Tell();
+ int pos = pWMF->Tell();
pWMF->Seek(0);
SvFileStream file( OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC );
@@ -251,7 +248,9 @@
file.Flush();
file.Close();
- pWMF->Seek( pos );)
+ pWMF->Seek( pos );
+#endif
+
}
bEMFPlus = true;
@@ -265,7 +264,7 @@
OSL_ASSERT(length >= 4);
// reduce by 32bit length itself, skip in SeekRel if
- // impossibly unavailble
+ // impossibly unavailable
sal_uInt32 nRemainder = length >= 4 ? length-4 : length;
const size_t nRequiredHeaderSize = 12;
@@ -277,12 +276,12 @@
*pWMF >> type >> flags >> size >> dataSize;
nRemainder -= nRequiredHeaderSize;
- EMFP_DEBUG(printf ("\t\tEMF+ record type: %d\n", type));
+ SAL_INFO ("vcl.emf", "\t\tEMF+ record type: " << std::hex << type);
// GetDC
if( type == 16388 ) {
bHaveDC = true;
- EMFP_DEBUG(printf ("\t\tEMF+ lock DC (device context)\n"));
+ SAL_INFO ("vcl.emf", "\t\tEMF+ lock DC (device context)");
}
// Get the length of the remaining data of this record based
@@ -454,26 +453,27 @@
if( !aBmpSaveList.empty()
&& ( nRecType != EMR_STRETCHBLT )
&& ( nRecType != EMR_STRETCHDIBITS )
- )
+ ) {
pOut->ResolveBitmapActions( aBmpSaveList );
+ }
bFlag = sal_False;
- EMFP_DEBUG(printf ("0x%04x-0x%04x record type: %d size: %d\n",(unsigned int) (nNextPos -
nRecSize),(unsigned int) nNextPos, (int)nRecType,(int) nRecSize));
+ SAL_INFO ("vcl.emf", "0x" << std::hex << (nNextPos - nRecSize) << "-0x" << nNextPos <<
" record type: " << std::dec << nRecType << " size: " << nRecSize);
if( bEnableEMFPlus && nRecType == EMR_GDICOMMENT ) {
sal_uInt32 length;
*pWMF >> length;
- EMFP_DEBUG(printf ("\tGDI comment\n\t\tlength: %d\n", (int)length));
+ SAL_INFO("vcl.emf", "\tGDI comment\n\t\tlength: " << length);
if( pWMF->good() && length >= 4 ) {
sal_uInt32 id;
*pWMF >> id;
- EMFP_DEBUG(printf ("\t\tbegin %c%c%c%c id: 0x%x\n", (char)(id & 0xff),
(char)((id & 0xff00) >> 8), (char)((id & 0xff0000) >> 16), (char)((id & 0xff000000) >> 24),
(unsigned int)id));
+ SAL_INFO ("vcl.emf", "\t\tbegin " << (char)(id & 0xff) << (char)((id & 0xff00)
8) << (char)((id & 0xff0000) >> 16) << (char)((id & 0xff000000) >> 24) << " id: 0x" <<
std::hex << id);
// EMF+ comment (FIXME: BE?)
if( id == 0x2B464D45 && nRecSize >= 12 )
@@ -482,7 +482,7 @@
else if( id == 0x43494447 && nRecSize >= 12 ) {
// TODO: ReadGDIComment()
} else {
- EMFP_DEBUG(printf ("\t\tunknown id: 0x%x\n",(unsigned int) id));
+ SAL_INFO ("vcl.emf", "\t\tunknown id: 0x" << std::hex << id);
}
}
}
@@ -1341,16 +1341,21 @@
sal_Bool EnhWMFReader::ReadHeader()
{
- sal_uInt32 nsal_uInt32, nHeaderSize, nPalEntries;
+ sal_uInt32 nType, nSignature, nVersion;
+ sal_uInt32 nHeaderSize, nPalEntries;
sal_Int32 nLeft, nTop, nRight, nBottom;
// Spare me the METAFILEHEADER here
- // Reading the METAHEADER
- *pWMF >> nsal_uInt32 >> nHeaderSize;
- if ( nsal_uInt32 != 1 ) // Type
+ // Reading the METAHEADER - EMR_HEADER ([MS-EMF] section 2.3.4.2 EMR_HEADER Record Types)
+ *pWMF >> nType >> nHeaderSize;
+ if ( nType != 1 ) { // per [MS-EMF] 2.3.4.2 EMF Header Record Types, type MUST be 0x00000001
+ SAL_WARN("vcl.emf", "EMF header type is not set to 0x00000001 - possibly corrupted
file?");
return sal_False;
+ }
- // bound size
+ // Start reading the EMR_HEADER Header object
+
+ // bound size (RectL object, see [MS-WMF] section 2.2.2.19)
Rectangle rclBounds; // rectangle in logical units
*pWMF >> nLeft >> nTop >> nRight >> nBottom;
rclBounds.Left() = nLeft;
@@ -1358,7 +1363,7 @@
rclBounds.Right() = nRight;
rclBounds.Bottom() = nBottom;
- // picture frame size
+ // picture frame size (RectL object)
Rectangle rclFrame; // rectangle in device units 1/100th mm
*pWMF >> nLeft >> nTop >> nRight >> nBottom;
rclFrame.Left() = nLeft;
@@ -1366,27 +1371,67 @@
rclFrame.Right() = nRight;
rclFrame.Bottom() = nBottom;
- *pWMF >> nsal_uInt32; // signature
+ *pWMF >> nSignature;
- if ( nsal_uInt32 != 0x464d4520 )
+ // nSignature MUST be the ASCII characters "FME", see [WS-EMF] 2.2.9 Header Object
+ // and 2.1.14 FormatSignature Enumeration
+ if ( nSignature != 0x464d4520 ) {
+ SAL_WARN("vcl.emf", "EMF\t\tSignature is not 0x464d4520 (\"FME\") - possibly corrupted
file?");
return sal_False;
+ }
- *pWMF >> nsal_uInt32; // nVersion
+ *pWMF >> nVersion; // according to [WS-EMF] 2.2.9, this SHOULD be 0x0001000, however
+ // Microsoft note that not even Windows checks this...
+ if ( nVersion != 0x00010000 ) {
+ SAL_WARN("vcl.emf", "EMF\t\tThis really should be 0x00010000, though not absolutely
essential...");
+ }
+
*pWMF >> nEndPos; // size of metafile
nEndPos += nStartPos;
sal_uInt32 nStrmPos = pWMF->Tell(); // checking if nEndPos is valid
pWMF->Seek( STREAM_SEEK_TO_END );
- if ( pWMF->Tell() < nEndPos )
- nEndPos = pWMF->Tell();
+ sal_uInt32 nActualFileSize = pWMF->Tell();
+
+ if ( nActualFileSize < nEndPos ) {
+ SAL_WARN("vcl.emf", "EMF\t\tEMF Header object records number of bytes as " << nEndPos
+ << ", however the file size is actually " << nActualFileSize
+ << " bytes. Possible file corruption?");
+ nEndPos = nActualFileSize;
+ }
pWMF->Seek( nStrmPos );
*pWMF >> nRecordCount;
- if ( !nRecordCount )
+ if ( !nRecordCount ) {
+ SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 0! This shouldn't "
+ "be possible... indicator of possible file corruption?");
return sal_False;
+ }
- pWMF->SeekRel( 0xc );
+ // the number of "handles", or graphics objects used in the metafile
+
+ sal_uInt16 nHandlesCount;
+ *pWMF >> nHandlesCount;
+
+ // the next 2 bytes are reserved, but according to [MS-EMF] section 2.2.9
+ // it MUST be 0x000 and MUST be ignored... the thing is, having such a specific
+ // value is actually pretty useful in checking if there is possible corruption
+
+ sal_uInt16 nReserved;
+ *pWMF >> nReserved;
+
+ if ( nReserved != 0x0000 ) {
+ SAL_WARN("vcl.emf", "EMF\t\tEMF Header object's reserved field is NOT 0x0000... possible
"
+ "corruption?");
+ }
+
+ // The next 4 bytes is specifies the number of characters in the metafile description
+ // the 4 bytes after that specific the offset from this record that contains the
+ // metafile description... zero means no description string.
+ // For now, we ignore it.
+
+ pWMF->SeekRel( 0x8 );
sal_Int32 nPixX, nPixY, nMillX, nMillY;
*pWMF >> nPalEntries >> nPixX >> nPixY >> nMillX >> nMillY;
--
To view, visit https://gerrit.libreoffice.org/3839
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4ed486b2dd0c6e7bdee67cb344aaaf8e8d98f84
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>
------------------------------
Message: 12
Date: Fri, 10 May 2013 13:36:14 +0200
From: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
To: LibreOffice <libreoffice@lists.freedesktop.org>
Cc: Caol?n McNamara <caolanm@redhat.com>
Subject: Missing VCL Equivalent to GtkToolbar?
Message-ID: <518CDBAE.7020202@gmail.com>
Content-Type: text/plain; charset="iso-8859-1"; Format="flowed"
Hi,
while working on the Photo Album Dialog, I wanted create a ToolBar with
some ToolButtons in Glade.
However, when I try to load it, I get the following error:
warn:vcl.layout:9432:1:include/vcl/builder.hxx:246: widget "up_btn" not found in .ui
warn:vcl.layout:9432:1:include/vcl/builder.hxx:248: .ui widget "up_btn" needs to correspond to
vcl type 10PushButton
soffice.bin: /home/samuel/programming/libreoffice/include/vcl/builder.hxx:249: T*
VclBuilder::get(T*&, rtl::OString) [with T = PushButton]: Zusicherung ?w && dynamic_cast<T*>(w)?
nicht erf?llt.
Program received signal SIGABRT, Aborted.
0x00002aaaaba1d425 in raise () from /lib/x86_64-linux-gnu/libc.so.6
Does this not yet have a VCL equivalent?
Attached are my current modifications (see Line 137+)
Samuel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: photoalbum.ui.patch
Type: text/x-patch
Size: 34259 bytes
Desc: not available
URL:
<http://lists.freedesktop.org/archives/libreoffice/attachments/20130510/e3e08eb8/attachment-0001.bin>
------------------------------
Message: 13
Date: Fri, 10 May 2013 11:42:12 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Andras Timar <atimar@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED libreoffice-4-0] fdo#64382 replace lt to lt-LT
Message-ID: <20130510114214.4ABEA3EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3835
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3835
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf480fd79e664f2d6d9b4aeb166c72ee6b28ddb5
Gerrit-PatchSet: 2
Gerrit-Project: dictionaries
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 14
Date: Fri, 10 May 2013 11:42:29 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Andras Timar <atimar@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED libreoffice-4-0] lt: bump version number to force
update of user profile
Message-ID: <20130510114230.F2CE13EE0993@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3836
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3836
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ca0425c0f5bf746da64f17d796e1a6e27e6d171
Gerrit-PatchSet: 2
Gerrit-Project: dictionaries
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 15
Date: Fri, 10 May 2013 11:43:43 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Joren De Cuyper <joren.libreoffice@telenet.be>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] Solve fdo#64406 Missing right closing parenthesis
Message-ID: <20130510114345.DB8553EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3837
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3837
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper <joren.libreoffice@telenet.be>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 16
Date: Fri, 10 May 2013 12:02:59 +0000
From: "Joren De Cuyper (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: David Tardon <dtardon@redhat.com>, Thorsten Behrens
<tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH libreoffice-4-0] Solve fdo#64406 Missing right closing
parenthesis
Message-ID:
<gerrit.1368187379505.I3812b60f097b1daf554bf2d337b126e8a8067573@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3840
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3840/1
Solve fdo#64406 Missing right closing parenthesis
Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573
Reviewed-on: https://gerrit.libreoffice.org/3837
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
---
M wizards/source/tools/Strings.xba
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba
index 5ff7ca2..f91b8f4 100644
--- a/wizards/source/tools/Strings.xba
+++ b/wizards/source/tools/Strings.xba
@@ -26,7 +26,7 @@
Function ElimChar(ByVal BigString as String, ElimArray() as String)
Dim i% ,n%
For i = 0 to Ubound(ElimArray)
- BigString = DeleteStr(BigString,ElimArray(i)
+ BigString = DeleteStr(BigString,ElimArray(i))
Next
ElimChar = BigString
End Function
@@ -466,4 +466,4 @@
End If
NOERR:
End Function
-</script:module>
\ No newline at end of file
+</script:module>
--
To view, visit https://gerrit.libreoffice.org/3840
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper <joren.libreoffice@telenet.be>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 17
Date: Fri, 10 May 2013 12:05:32 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Joren De Cuyper <joren.libreoffice@telenet.be>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED libreoffice-4-0] Solve fdo#64406 Missing right
closing parenthesis
Message-ID: <20130510120534.87DB53EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3840
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3840
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3812b60f097b1daf554bf2d337b126e8a8067573
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper <joren.libreoffice@telenet.be>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 18
Date: Fri, 10 May 2013 12:20:45 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Chris Sherlock <chris.sherlock79@gmail.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] Enhancements to VCL metafile handling
Message-ID: <20130510122047.AF2313EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3839
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3839
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4ed486b2dd0c6e7bdee67cb344aaaf8e8d98f84
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 19
Date: Fri, 10 May 2013 08:30:00 -0400
From: Kohei Yoshida <kohei.yoshida@gmail.com>
To: Stephan Bergmann <sbergman@redhat.com>
Cc: libreoffice-dev <LibreOffice@lists.freedesktop.org>
Subject: Re: Ultra-slow JunitTest_sc_unoapi
Message-ID:
<CAKyzJ7qgrfu4Stt3o9gJVYQ-S0drLzQbUqkUpK4w0TQbpHUZeA@mail.gmail.com>
Content-Type: text/plain; charset="iso-8859-1"
On Fri, May 10, 2013 at 6:57 AM, Stephan Bergmann <sbergman@redhat.com>wrote:
FYI, at least with my recent master --enable-dbgutil builds (on Fedora
18), JunitTest_sc_unoapi seemingly takes forever (but eventually does
finish). It looks like Java test code calls a ScCellRangeObj::doImport
where that ScCellRangeObj's aRange.aEnd.nRow = 1048575 is pretty large,
leading to ~endless ScDocument::Broadcast work.
Maybe related to some of Kohei's recent work on sc broadcasting?
Probably. I'll take a look at it today. I didn't think I'd changed the
previous broadcasting behavior, but obviously something has changed.
Kohei
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.freedesktop.org/archives/libreoffice/attachments/20130510/3a610a23/attachment-0001.html>
------------------------------
Message: 20
Date: Fri, 10 May 2013 12:26:08 +0000
From: "Arnaud Versini (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>,
Arnaud Versini <arnaud.versini@gmail.com>
Subject: [PATCH] Use clock_gettime instead of gettimeofday to have
more preci...
Message-ID:
<gerrit.1368188768405.I8e568368e7626789dee21d4823dbedec6257a231@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3841
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/3841/1
Use clock_gettime instead of gettimeofday to have more precise time
Change-Id: I8e568368e7626789dee21d4823dbedec6257a231
---
M sal/osl/unx/time.c
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index e613248..e499d85 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -22,6 +22,7 @@
#include <osl/diagnose.h>
#include <osl/time.h>
+#include <time.h>
/* FIXME: detection should be done in configure script */
#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
@@ -38,15 +39,20 @@
sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
{
- struct timeval tp;
+ struct timespec tp;
+ int res;
- /* FIXME: use higher resolution */
- gettimeofday(&tp, NULL);
+ res = clock_gettime(CLOCK_REALTIME, &tp);
+
+ if (res != 0)
+ {
+ return sal_False;
+ }
tv->Seconds = tp.tv_sec;
- tv->Nanosec = tp.tv_usec * 1000;
+ tv->Nanosec = tp.tv_nsec;
- return (sal_True);
+ return sal_True;
}
--
To view, visit https://gerrit.libreoffice.org/3841
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e568368e7626789dee21d4823dbedec6257a231
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini <arnaud.versini@gmail.com>
------------------------------
Message: 21
Date: Fri, 10 May 2013 12:34:58 +0000
From: "Chris Sherlock (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH] Fix: change to std::dec after having used std::hex
Message-ID:
<gerrit.1368189298808.Ic0076c63ae6236ae75dcd79d108add27391b2125@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3842
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3842/1
Fix: change to std::dec after having used std::hex
The basefield flag of a stream is persistent, which I didn't realise before.
This fixes commit 256e42646bedbeb9cba900f962f36ba4b1a1cda3
Change-Id: Ic0076c63ae6236ae75dcd79d108add27391b2125
---
M cppcanvas/source/mtfrenderer/emfplus.cxx
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index c17c38e..d74eabe 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -104,7 +104,7 @@
sal_Int16 data;
for (; i > 0; i --) {
s >> data;
- SAL_INFO ("cppcanvas.emf", "EMF+\tdata: " << std::hex << data);
+ SAL_INFO ("cppcanvas.emf", "EMF+\tdata: " << std::hex << data << std::dec);
}
s.Seek (pos);
}
@@ -285,7 +285,7 @@
s >> header >> parts;
SAL_INFO ("cppcanvas.emf", "EMF+\tregion");
- SAL_INFO ("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << " parts:
" << parts);
+ SAL_INFO ("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << " parts:
" << std::dec << parts );
if (parts) {
if( parts<0 || sal_uInt32(parts)>SAL_MAX_INT32/sizeof(sal_Int32) )
@@ -295,12 +295,12 @@
for (int i = 0; i < parts; i ++) {
s >> combineMode [i];
- SAL_INFO ("cppcanvas.emf", "EMF+\tcombine mode [" << i << "]: 0x" <<
std::hex << combineMode [i]);
+ SAL_INFO ("cppcanvas.emf", "EMF+\tcombine mode [" << i << "]: 0x" <<
std::hex << combineMode [i] << std::dec);
}
}
s >> initialState;
- SAL_INFO ("cppcanvas.emf", "EMF+\tinitial state: 0x" << std::hex <<
initialState);
+ SAL_INFO ("cppcanvas.emf", "EMF+\tinitial state: 0x" << std::hex << initialState
<< std::dec);
}
};
@@ -370,7 +370,7 @@
s >> header >> type;
- SAL_INFO ("cppcanvas.emf", "EMF+\tbrush\nEMF+\theader: 0x" << std::hex << header
<< " type: " << type);
+ SAL_INFO ("cppcanvas.emf", "EMF+\tbrush\nEMF+\theader: 0x" << std::hex << header
<< " type: " << std::dec << type );
switch (type) {
case 0:
@@ -379,7 +379,7 @@
s >> color;
solidColor = ::Color (0xff - (color >> 24), (color >> 16) & 0xff, (color
8) & 0xff, color & 0xff);
- SAL_INFO ("cppcanvas.emf", "EMF+\tsolid color: 0x" << std::hex << color);
+ SAL_INFO ("cppcanvas.emf", "EMF+\tsolid color: 0x" << std::hex << color
<< std::dec);
break;
}
@@ -388,13 +388,13 @@
{
s >> additionalFlags >> wrapMode;
- SAL_INFO ("cppcanvas.emf", "EMF+\tpath gradient, additional flags: 0x"
<< std::hex << additionalFlags);
+ SAL_INFO ("cppcanvas.emf", "EMF+\tpath gradient, additional flags: 0x"
<< std::hex << additionalFlags << std::dec);
sal_uInt32 color;
s >> color;
solidColor = ::Color (0xff - (color >> 24), (color >> 16) & 0xff, (color
8) & 0xff, color & 0xff);
- SAL_INFO("cppcanvas.emf", "EMF+\tcenter color: 0x" << std::hex << color);
+ SAL_INFO("cppcanvas.emf", "EMF+\tcenter color: 0x" << std::hex << color
<< std::dec);
s >> areaX >> areaY;
SAL_INFO("cppcanvas.emf", "EMF+\tcenter point: " << areaX << "," <<
areaY);
@@ -411,7 +411,7 @@
surroundColors[i] = ::Color (0xff - (color >> 24), (color >> 16) &
0xff, (color >> 8) & 0xff, color & 0xff);
if (i == 0)
secondColor = surroundColors [0];
- SAL_INFO("cppcanvas.emf", "EMF+\tsurround color[" << i << "]: 0x" <<
std::hex << color);
+ SAL_INFO("cppcanvas.emf", "EMF+\tsurround color[" << i << "]: 0x" <<
std::hex << color << std::dec);
}
if (additionalFlags & 0x01) {
@@ -430,7 +430,7 @@
s >> pathHeader >> pathPoints >> pathFlags;
SAL_INFO("cppcanvas.emf", "EMF+\tpath (brush path gradient)");
- SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex <<
pathHeader << " points: " << pathPoints << " additional flags: 0x" << pathFlags);
+ SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex <<
pathHeader << " points: " << std::dec << pathPoints << " additional flags: 0x" << pathFlags );
path = new EMFPPath (pathPoints);
path->Read (s, pathFlags, rR);
@@ -487,7 +487,7 @@
for (int i=0; i < colorblendPoints; i ++) {
s >> color;
colorblendColors [i] = ::Color (0xff - (color >> 24), (color >>
16) & 0xff, (color >> 8) & 0xff, color & 0xff);
- SAL_INFO("cppcanvas.emf", "EMF+\tcolor[" << i << "]: 0x" <<
std::hex << color);
+ SAL_INFO("cppcanvas.emf", "EMF+\tcolor[" << i << "]: 0x" <<
std::hex << color << std::dec);
}
}
} else {
@@ -502,7 +502,7 @@
{
s >> additionalFlags >> wrapMode;
- SAL_INFO("cppcanvas.emf", "EMF+\tlinear gradient, additional flags: 0x"
<< std::hex << additionalFlags);
+ SAL_INFO("cppcanvas.emf", "EMF+\tlinear gradient, additional flags: 0x"
<< std::hex << additionalFlags << std::dec);
s >> areaX >> areaY >> areaWidth >> areaHeight;
@@ -512,11 +512,11 @@
s >> color;
solidColor = ::Color (0xff - (color >> 24), (color >> 16) & 0xff, (color
8) & 0xff, color & 0xff);
- SAL_INFO("cppcanvas.emf", "EMF+\tfirst color: 0x" << std::hex << color);
+ SAL_INFO("cppcanvas.emf", "EMF+\tfirst color: 0x" << std::hex << color
<< std::dec);
s >> color;
secondColor = ::Color (0xff - (color >> 24), (color >> 16) & 0xff, (color
8) & 0xff, color & 0xff);
- SAL_INFO("cppcanvas.emf", "EMF+\tsecond color: 0x" << std::hex << color);
+ SAL_INFO("cppcanvas.emf", "EMF+\tsecond color: 0x" << std::hex << color
<< std::dec);
// repeated colors, unknown meaning, see
http://www.aces.uiuc.edu/~jhtodd/Metafile/MetafileRecords/ObjectBrush.html
s >> color;
@@ -564,14 +564,14 @@
for (int i=0; i < colorblendPoints; i ++) {
s >> color;
colorblendColors [i] = ::Color (0xff - (color >> 24), (color >>
16) & 0xff, (color >> 8) & 0xff, color & 0xff);
- SAL_INFO("cppcanvas.emf", "EMF+\tcolor[" << i << "]: 0x" <<
std::hex << color);
+ SAL_INFO("cppcanvas.emf", "EMF+\tcolor[" << i << "]: 0x" <<
std::hex << color << std::dec);
}
}
break;
}
default:
- SAL_INFO("cppcanvas.emf", "EMF+\tunhandled brush type: " << std::hex <<
type);
+ SAL_INFO("cppcanvas.emf", "EMF+\tunhandled brush type: " << std::hex << type
<< std::dec);
}
}
};
@@ -618,8 +618,8 @@
s >> header >> unknown >> penFlags >> unknown2 >> width;
- SAL_INFO("cppcanvas.emf", "EMF+\tpen\nEMF+\theader: 0x" << std::hex << header <<
" unknown: 0x" << std::hex << unknown <<
- " additional flags: 0x" << std::hex << penFlags << " unknown: 0x" <<
std::hex << unknown2 << " width: " << width);
+ SAL_INFO("cppcanvas.emf", "EMF+\tpen\nEMF+\theader: 0x" << std::hex << header <<
" unknown: 0x" << unknown <<
+ " additional flags: 0x" << penFlags << " unknown: 0x" << unknown2 <<
" width: " << std::dec << width );
if (penFlags & 1)
s >> transformation;
@@ -724,11 +724,11 @@
s >> header >> type;
- SAL_INFO("cppcanvas.emf", "EMF+\timage\nEMF+\theader: 0x" << std::hex << header
<< " type: " << std::hex << type);
+ SAL_INFO("cppcanvas.emf", "EMF+\timage\nEMF+\theader: 0x" << std::hex << header
<< " type: " << std::dec << type );
if (type == 1) { // bitmap
s >> width >> height >> stride >> pixelFormat >> unknown;
- SAL_INFO("cppcanvas.emf", "EMF+\tbitmap width: " << width << " height: " <<
height << " stride: " << "pixelFormat: 0x" << std::hex << pixelFormat);
+ SAL_INFO("cppcanvas.emf", "EMF+\tbitmap width: " << width << " height: " <<
height << " stride: " << "pixelFormat: 0x" << std::hex << pixelFormat << std::dec);
if (width == 0) { // non native formats
GraphicFilter filter;
@@ -785,8 +785,8 @@
OSL_ASSERT( ( header >> 12 ) == 0xdbc01 );
SAL_INFO("cppcanvas.emf", "EMF+\tfont\n"
- << "EMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x"
<< std::hex << (header & 0x1fff) << " size: " << emSize << " unit: 0x" << std::hex << sizeUnit);
- SAL_INFO("cppcanvas.emf", "EMF+\tflags: 0x" << std::hex << fontFlags << "
reserved: 0x" << std::hex << reserved << " length: 0x" << std::hex << length);
+ << "EMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x"
<< (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << sizeUnit );
+ SAL_INFO("cppcanvas.emf", "EMF+\tflags: 0x" << std::hex << fontFlags << "
reserved: 0x" << reserved << " length: 0x" << length << std::dec);
if( length > 0 && length < 0x4000 ) {
sal_Unicode *chars = (sal_Unicode *) alloca( sizeof( sal_Unicode ) * length );
@@ -887,7 +887,7 @@
ActionSharedPtr pPolyAction;
if (isColor) {
- SAL_INFO("cppcanvas.emf", "EMF+\t\tcolor fill:0x" << std::hex <<
brushIndexOrColor);
+ SAL_INFO("cppcanvas.emf", "EMF+\t\tcolor fill:0x" << std::hex <<
brushIndexOrColor << std::dec);
rState.isFillColorSet = true;
rState.isLineColorSet = false;
@@ -1158,7 +1158,7 @@
rObjectStream >> header >> points >> pathFlags;
SAL_INFO("cppcanvas.emf", "EMF+\tpath");
- SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << " points:
" << points << " additional flags: 0x" << std::hex << pathFlags);
+ SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << " points:
" << std::dec << points << " additional flags: 0x" << pathFlags);
EMFPPath *path;
aObjects [index] = path = new EMFPPath (points);
@@ -1190,7 +1190,7 @@
break;
}
default:
- SAL_INFO("cppcanvas.emf", "EMF+\tObject unhandled flags: 0x" << std::hex <<
(flags & 0xff00));
+ SAL_INFO("cppcanvas.emf", "EMF+\tObject unhandled flags: 0x" << std::hex <<
(flags & 0xff00) << std::dec);
break;
}
}
@@ -1294,7 +1294,7 @@
rMF >> header >> version >> nHDPI >> nVDPI;
SAL_INFO("cppcanvas.emf", "EMF+ Header");
- SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << "
version: " << version << " horizontal DPI: " << nHDPI << " vertical DPI: " << nVDPI << " dual: "
<< (flags & 1));
+ SAL_INFO("cppcanvas.emf", "EMF+\theader: 0x" << std::hex << header << "
version: " << std::dec << version << " horizontal DPI: " << nHDPI << " vertical DPI: " << nVDPI
<< " dual: " << (flags & 1));
break;
case EmfPlusRecordTypeEndOfFile:
@@ -1404,7 +1404,7 @@
rMF >> brushIndexOrColor >> rectangles;
- SAL_INFO("cppcanvas.emf", "EMF+\t" << ((flags & 0x8000) ? "color" :
"brush index") << ": 0x" << std::hex << brushIndexOrColor);
+ SAL_INFO("cppcanvas.emf", "EMF+\t" << ((flags & 0x8000) ? "color" :
"brush index") << ": 0x" << std::hex << brushIndexOrColor << std::dec);
for (int i=0; i < rectangles; i++) {
if (flags & 0x4000) {
@@ -1454,7 +1454,7 @@
rMF >> points;
SAL_INFO("cppcanvas.emf", "EMF+ FillPolygon in slot: " << +index << "
points: " << points);
- SAL_INFO("cppcanvas.emf", "EMF+\t: " << ((flags & 0x8000) ? "color"
: "brush index") << " 0x" << std::hex << brushIndexOrColor);
+ SAL_INFO("cppcanvas.emf", "EMF+\t: " << ((flags & 0x8000) ? "color"
: "brush index") << " 0x" << std::hex << brushIndexOrColor << std::dec);
EMFPPath path (points, true);
path.Read (rMF, flags, *this);
@@ -1839,7 +1839,7 @@
break;
}
case EmfPlusRecordTypeDrawDriverString: {
- SAL_INFO("cppcanvas.emf", "EMF+ DrawDriverString, flags: 0x" << std::hex
<< flags);
+ SAL_INFO("cppcanvas.emf", "EMF+ DrawDriverString, flags: 0x" << std::hex
<< flags << std::dec);
sal_uInt32 brushIndexOrColor;
sal_uInt32 optionFlags;
sal_uInt32 hasMatrix;
@@ -1847,8 +1847,8 @@
rMF >> brushIndexOrColor >> optionFlags >> hasMatrix >> glyphsCount;
- SAL_INFO("cppcanvas.emf", "EMF+\t: " << ((flags & 0x8000) ? "color" :
"brush index") << " 0x" << std::hex << brushIndexOrColor);
- SAL_INFO("cppcanvas.emf", "EMF+\toption flags: 0x" << std::hex <<
optionFlags);
+ SAL_INFO("cppcanvas.emf", "EMF+\t: " << ((flags & 0x8000) ? "color" :
"brush index") << " 0x" << std::hex << brushIndexOrColor << std::dec);
+ SAL_INFO("cppcanvas.emf", "EMF+\toption flags: 0x" << std::hex <<
optionFlags << std::dec);
SAL_INFO("cppcanvas.emf", "EMF+\thas matrix: " << hasMatrix);
SAL_INFO("cppcanvas.emf", "EMF+\tglyphs: " << glyphsCount);
--
To view, visit https://gerrit.libreoffice.org/3842
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0076c63ae6236ae75dcd79d108add27391b2125
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>
------------------------------
Message: 22
Date: Fri, 10 May 2013 12:45:57 +0000
From: "Chris Sherlock (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH] Potty mouth
Message-ID:
<gerrit.1368189957223.I276fa2fa24b5553a748e6e628129d54419e69c9a@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3843
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/3843/1
Potty mouth
Change-Id: I276fa2fa24b5553a748e6e628129d54419e69c9a
---
M dbaccess/source/ui/browser/brwctrlr.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index fc5f6a3..9f284e7 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2560,7 +2560,7 @@
IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pInfo)
{
Reference< ::com::sun::star::sdbcx::XRowLocate > xCursor(getRowSet(), UNO_QUERY);
- OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnFoundData : shit happens. sometimes.
but this is simply impossible !");
+ OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnFoundData : this is simply impossible
!");
// move the cursor
xCursor->moveToBookmark(pInfo->aPosition);
@@ -2601,7 +2601,7 @@
try
{
- OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnCanceledNotFound : shit happens.
sometimes. but this is simply impossible !");
+ OSL_ENSURE(xCursor.is(), "SbaXDataBrowserController::OnCanceledNotFound : this is simply
impossible !");
// move the cursor
xCursor->moveToBookmark(pInfo->aPosition);
}
--
To view, visit https://gerrit.libreoffice.org/3843
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I276fa2fa24b5553a748e6e628129d54419e69c9a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>
------------------------------
Message: 23
Date: Fri, 10 May 2013 13:10:10 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Chris Sherlock <chris.sherlock79@gmail.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] Fix: change to std::dec after having used std::hex
Message-ID: <20130510131016.C927F3EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3842
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3842
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0076c63ae6236ae75dcd79d108add27391b2125
Gerrit-PatchSet: 7
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 24
Date: Fri, 10 May 2013 13:11:33 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Chris Sherlock <chris.sherlock79@gmail.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] Potty mouth
Message-ID: <20130510131136.56F163EE0993@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3843
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3843
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I276fa2fa24b5553a748e6e628129d54419e69c9a
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Chris Sherlock <chris.sherlock79@gmail.com>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 25
Date: Fri, 10 May 2013 13:11:22 +0000
From: "Thomas van der meulen (via Code Review)"
<gerrit@gerrit.libreoffice.org>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH] solve fdo#63033 update Dutch dictionary OpenTaal to
version ...
Message-ID:
<gerrit.1368191482471.Ia4ccb06b0db4cdd976d2ec4491e14b82eefa558b@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3844
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/44/3844/1
solve fdo#63033 update Dutch dictionary OpenTaal to version 2.10g
Change-Id: Ia4ccb06b0db4cdd976d2ec4491e14b82eefa558b
---
M nl_NL/desc_en_US.txt
M nl_NL/desc_nl_NL.txt
M nl_NL/description.xml
M nl_NL/license_en_EN.txt
M nl_NL/licentie_nl_NL.txt
M nl_NL/nl_NL.dic
6 files changed, 159,479 insertions(+), 137,685 deletions(-)
--
To view, visit https://gerrit.libreoffice.org/3844
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4ccb06b0db4cdd976d2ec4491e14b82eefa558b
Gerrit-PatchSet: 1
Gerrit-Project: dictionaries
Gerrit-Branch: master
Gerrit-Owner: Thomas van der meulen <meulenthomas@gmail.com>
------------------------------
Message: 26
Date: Fri, 10 May 2013 13:18:53 +0000
From: "David Tardon (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] don't override TMPDIR with /tmp on cygwin, cleanup
TMPDIR/TM...
Message-ID: <20130510131855.59AF93EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3701
Approvals:
David Tardon: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3701
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8ac3f8d92e5f971c5237b85f66f7c0a58932930
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Gerrit-Reviewer: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Gerrit-Reviewer: David Tardon <dtardon@redhat.com>
------------------------------
Message: 27
Date: Fri, 10 May 2013 13:21:02 +0000
From: "Andras Timar (via Code Review)" <gerrit@gerrit.libreoffice.org>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH libreoffice-4-0] fdo#64205 escape '' in help text with
<nowiki> tag
Message-ID:
<gerrit.1368192062006.I07fed20194bcb4223c1070866fd147388da57ba9@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3845
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/45/3845/1
fdo#64205 escape '' in help text with <nowiki> tag
Change-Id: I07fed20194bcb4223c1070866fd147388da57ba9
---
M to-wiki/wikiconv2.py
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 00d43d2..fb19eae 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -129,7 +129,8 @@
[["$[officename]", "{{ProductName}}"],
["%PRODUCTNAME", "{{ProductName}}"],
["$PRODUCTNAME", "{{ProductName}}"],
- ["font size", u"\u200dfont size"]
+ ["font size", u"\u200dfont size"],
+ ["''","<nowiki>''</nowiki>"]
]
def get_link_filename(link, name):
--
To view, visit https://gerrit.libreoffice.org/3845
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07fed20194bcb4223c1070866fd147388da57ba9
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>
------------------------------
Message: 28
Date: Fri, 10 May 2013 15:25:27 +0200
From: David Tardon <dtardon@redhat.com>
To: libreoffice@lists.freedesktop.org
Subject: Re: should we drop DEFAULT_TO_ENGLISH_FOR_PACKING?
Message-ID: <20130510132526.GA11291@dhcp129-150.brq.redhat.com>
Content-Type: text/plain; charset=us-ascii
Hi,
On Tue, May 07, 2013 at 07:08:16PM +0200, Andras Timar wrote:
Hi,
On Tue, May 7, 2013 at 5:35 PM, David Tardon <dtardon@redhat.com> wrote:
No, I don't think we want install sets without en-US. But we need to
make sure that we don't have runtime problems when a localized file is
missing. Now there is the en-US copy, but after your proposed patch
there will be nothing. Not many language dependent files remained, I
think AutoText files are the only example.
I am not aware of anything else either. But that can easily by verified
by checking the installation log.
D.
------------------------------
Message: 29
Date: Fri, 10 May 2013 15:45:13 +0200
From: David Tardon <dtardon@redhat.com>
To: libreoffice@lists.freedesktop.org
Subject: Re: should we drop DEFAULT_TO_ENGLISH_FOR_PACKING?
Message-ID: <20130510134513.GB11291@dhcp129-150.brq.redhat.com>
Content-Type: text/plain; charset=us-ascii
Hi,
On Fri, May 10, 2013 at 03:25:27PM +0200, David Tardon wrote:
Hi,
On Tue, May 07, 2013 at 07:08:16PM +0200, Andras Timar wrote:
Hi,
On Tue, May 7, 2013 at 5:35 PM, David Tardon <dtardon@redhat.com> wrote:
No, I don't think we want install sets without en-US. But we need to
make sure that we don't have runtime problems when a localized file is
missing. Now there is the en-US copy, but after your proposed patch
there will be nothing. Not many language dependent files remained, I
think AutoText files are the only example.
I am not aware of anything else either. But that can easily by verified
by checking the installation log.
The only replacement warnings I see in the log are for
autotextshare_en-US.filelist, which installs the autotext files.
D.
------------------------------
Message: 30
Date: Fri, 10 May 2013 14:01:44 +0000
From: "Eike Rathke (via Code Review)" <gerrit@gerrit.libreoffice.org>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>,
LibreOffice gerrit bot <gerrit@libreoffice.org>
Subject: [PUSHED] resolved fdo#35756 import more than 64k HTML table
cells
Message-ID: <20130510140146.A3A2F3EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3838
Approvals:
LibreOffice gerrit bot: Verified
Eike Rathke: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3838
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62d1b9c399cd709a4f93dbac31b219a61c46ec00
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eike Rathke <erack@redhat.com>
Gerrit-Reviewer: Eike Rathke <erack@redhat.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit@libreoffice.org>
------------------------------
Message: 31
Date: Fri, 10 May 2013 16:05:53 +0200
From: Stephan Bergmann <sbergman@redhat.com>
To: Jorge Luis Roque Alvarez <jlalvarez@uci.cu>
Cc: libreoffice@lists.freedesktop.org
Subject: Re: Wizard Integration
Message-ID: <518CFEC1.9040206@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
On 05/08/2013 04:19 PM, Jorge Luis Roque Alvarez wrote:
Sorry, iam new on git, what command should i run on the core directory to generate the patch.
The attachment patch was generate with the below command
git git-patch -1
is it correct?
No, that produces a patch of something completely unrelated to your changes.
If you have just some local changes to some existing files that you did
not yet "git add", the simplest way to produce a patch is just "git
diff". However, if you also add new files, you need to "git add" them
so that git knows about them when generating diff output, at which point
you will want to "git add" /all/ your changes, so that "git diff
--cached" shows all of them. In short: you really need to learn more
about git.
Stephan
------------------------------
Message: 32
Date: Fri, 10 May 2013 15:19:25 +0100
From: Caol?n McNamara <caolanm@redhat.com>
To: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Cc: LibreOffice <libreoffice@lists.freedesktop.org>
Subject: Re: Missing VCL Equivalent to GtkToolbar?
Message-ID: <1368195565.10914.6.camel@Brinn>
Content-Type: text/plain; charset="UTF-8"
On Fri, 2013-05-10 at 13:36 +0200, Samuel Mehrbrodt wrote:
Hi,
while working on the Photo Album Dialog, I wanted create a ToolBar with
some ToolButtons in Glade.
Does this not yet have a VCL equivalent?
No, not yet anyway. I've only implemented what I need as I go along. You
might just get away with a buttonbox and normal buttons with icons set
on them instead
C.
------------------------------
Message: 33
Date: Fri, 10 May 2013 14:35:12 +0000
From: "Andras Timar (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Thomas van der meulen <meulenthomas@gmail.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] solve fdo#63033 update Dutch dictionary OpenTaal to
version ...
Message-ID: <20130510143514.63C0B3EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3844
Approvals:
Andras Timar: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3844
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4ccb06b0db4cdd976d2ec4491e14b82eefa558b
Gerrit-PatchSet: 4
Gerrit-Project: dictionaries
Gerrit-Branch: master
Gerrit-Owner: Thomas van der meulen <meulenthomas@gmail.com>
Gerrit-Reviewer: Andras Timar <atimar@suse.com>
------------------------------
Message: 34
Date: Fri, 10 May 2013 15:16:44 +0000
From: "Khaled Hosny (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH] [coretext] Fix drawing fallback fonts
Message-ID:
<gerrit.1368199004958.Id4d7098cb7bd3464cba6abab22be3ac3942c8889@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3846
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3846/1
[coretext] Fix drawing fallback fonts
Core Text will apply its font fallback mechanism when typesetting a
CTLine, and we can't assume that the returned run all use the original
font. This fixes the random glyphs drawn when we hit font fallback.
Change-Id: Id4d7098cb7bd3464cba6abab22be3ac3942c8889
---
M vcl/coretext/salcoretextlayout.cxx
1 file changed, 38 insertions(+), 9 deletions(-)
diff --git a/vcl/coretext/salcoretextlayout.cxx b/vcl/coretext/salcoretextlayout.cxx
index e324ef7..5599747 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -76,6 +76,8 @@
// mutable members since these details are all lazy initialized
mutable int mnGlyphCount;
+ mutable CTFontRef* mpGlyphFonts;
+
mutable CGGlyph* mpGlyphs;
mutable CGFloat* mpCharWidths;
mutable int* mpGlyphs2Chars;
@@ -106,6 +108,7 @@
mpStyle(style),
mnCharCount(-1),
mnGlyphCount(-1),
+ mpGlyphFonts(NULL),
mpGlyphs(NULL),
mpCharWidths(NULL),
mpGlyphs2Chars(NULL),
@@ -182,6 +185,10 @@
void CoreTextLayout::InvalidateMeasurements()
{
+ if( mpGlyphFonts ) {
+ delete[] mpGlyphFonts;
+ mpGlyphFonts = NULL;
+ }
if( mpGlyphs ) {
delete[] mpGlyphs;
mpGlyphs = NULL;
@@ -213,14 +220,7 @@
if( mnCharCount <= 0 || !gr.CheckContext() )
return;
- CGFontRef cg_font = CTFontCopyGraphicsFont(mpStyle->GetFont(), NULL);
- if( !cg_font ) {
- SAL_INFO( "vcl.coretext.layout", "Error cg_font is NULL" );
- return;
- }
CGContextSaveGState( gr.mrContext );
- CGContextSetFont(gr.mrContext, cg_font);
- CGContextSetFontSize(gr.mrContext, CTFontGetSize(mpStyle->GetFont()));
CGContextSetTextDrawingMode(gr.mrContext, kCGTextFill);
CGContextSetShouldAntialias( gr.mrContext, true );
CGContextSetShouldSubpixelPositionFonts( gr.mrContext, false );
@@ -231,7 +231,7 @@
else {
CGContextSetRGBFillColor(gr.mrContext, 0.0, 0.0, 0.0, 1.0);
}
- CFRelease(cg_font);
+
CGContextSetTextMatrix(gr.mrContext, CGAffineTransformMakeScale(1.0, -1.0));
CGContextSetShouldAntialias( gr.mrContext, !gr.mbNonAntialiasedText );
@@ -245,7 +245,30 @@
CGContextTranslateCTM(gr.mrContext, pos.X(), pos.Y());
- CGContextShowGlyphsWithAdvances(gr.mrContext, mpGlyphs, mpGlyphAdvances, mnGlyphCount);
+ int i = 0;
+ while (i < mnGlyphCount)
+ {
+ CTFontRef pCTFont = mpGlyphFonts[i];
+
+ // Find the number of glyphs using the same font
+ int nGlyphs = 1;
+ while ((i + nGlyphs < mnGlyphCount) && CFEqual(mpGlyphFonts[i + nGlyphs], pCTFont))
+ nGlyphs++;
+
+ CGFontRef pCGFont = CTFontCopyGraphicsFont(pCTFont, NULL);
+ if (!pCGFont) {
+ SAL_INFO("vcl.coretext.layout", "Error pCGFont is NULL");
+ return;
+ }
+
+ CGContextSetFont(gr.mrContext, pCGFont);
+ CFRelease(pCGFont);
+ CGContextSetFontSize(gr.mrContext, CTFontGetSize(pCTFont));
+
+ CGContextShowGlyphsWithAdvances(gr.mrContext, &mpGlyphs[i], &mpGlyphAdvances[i],
nGlyphs);
+
+ i += nGlyphs;
+ }
#ifndef IOS
// Request an update of the changed window area. Like in the ATSUI
@@ -572,6 +595,7 @@
{
InvalidateMeasurements();
+ mpGlyphFonts = new CTFontRef[ mnGlyphCount ];
mpGlyphs = new CGGlyph[ mnGlyphCount ];
mpCharWidths = new CGFloat[ mnCharCount ];
mpGlyphs2Chars = new int[ mnGlyphCount ];
@@ -587,6 +611,9 @@
CTRunRef run = (CTRunRef)CFArrayGetValueAtIndex( runs, runIx );
if ( !run )
continue;
+
+ CFDictionaryRef runAttributes = CTRunGetAttributes(run);
+ CTFontRef runFont = (CTFontRef)CFDictionaryGetValue(runAttributes, kCTFontAttributeName);
std::ostringstream glyphPositionInfo;
std::ostringstream glyphAdvancesInfo;
@@ -622,6 +649,8 @@
mpGlyphs2Chars[ lineGlyphIx ] = charIx;
mpCharWidths[ charIx ] = mpGlyphAdvances[ lineGlyphIx ].width;
+
+ mpGlyphFonts[ lineGlyphIx ] = runFont;
}
#ifdef SAL_LOG_INFO
for ( int i = 0; i < runGlyphCount; i++ ) {
--
To view, visit https://gerrit.libreoffice.org/3846
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4d7098cb7bd3464cba6abab22be3ac3942c8889
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Khaled Hosny <khaledhosny@eglug.org>
------------------------------
Message: 35
Date: Fri, 10 May 2013 17:27:03 +0200
From: Stephan Bergmann <sbergman@redhat.com>
To: libreoffice@lists.freedesktop.org
Subject: Re: master start a JRE 7 even if the default JRE is 6
Message-ID: <518D11C7.6030908@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
On 05/09/2013 08:06 PM, Jean-Baptiste Faure wrote:
Le 08/05/2013 11:22, Stephan Bergmann a ?crit :
On 05/06/2013 07:25 AM, Jean-Baptiste Faure wrote:
What is weird, is that my default Java is Java 6 and LO is configured to
use Java 6. I have both OpenJDK 6 and OpenJDK 7 on my PC.
"LO is configured to use Java 6": for building (i.e., as a switch in
your autogen.input) or at runtime (i.e., at "Tools - Options... -
LibreOffice - Advanced - Java options")? The latter is preset via some
code that tries to find the "best" JRE on your machine, so could easily
pick a JRE 7 if you have installed both 6 and 7, even if you configured
your LO build to compile against a JDK 6.
At runtime.
My default Java is OpenJDK 6 (I should probably change that for OpenJDK
7, but LO is currently building ...)
One reason why running "soffice" could result in instantiation of a JVM
7 even if you have a JRE 6 selected at "Tools - Options... - LibreOffice
- Advanced - Java options" could be as follows: oosplash (called from
soffice) calls javaldx to obtain some JRE-specific values to add to
LD_LIBRARY_PATH before exec'ing soffice.bin, and if for some reason
there's something broken between how javaldx and "Tools - Options... -
LibreOffice - Advanced - Java options" determine which JRE you have
selected, it will do a search of a suitable JRE, which can result in
invocation of various "java" instances.
It seems that official builds (LO 4.0.3.3) does not start a JVM at
launch time.
Can depend on what (bundled) extensions are included, for example.
I have default bundled extensions, containing non-linear solver for Calc
which AFAIK is written in Java. I will check again.
Another possibility couldn't be that the official build starts the JVM
with a lower Xmx parameter than my own build so that the JVM does not
crash with ulimit -v set to 2 GB?
Nah, we don't explicitly set any Xmx parameters, neither in official nor
un-official builds.
Stephan
------------------------------
Message: 36
Date: Fri, 10 May 2013 17:47:40 +0200
From: Stephan Bergmann <sbergman@redhat.com>
To: libreoffice@lists.freedesktop.org
Subject: Re: [PATCH] Fix: change to std::dec after having used
std::hex
Message-ID: <518D169C.8030205@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
On 05/10/2013 02:34 PM, Chris Sherlock (via Code Review) wrote:
I have submitted a patch for review:
https://gerrit.libreoffice.org/3842
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3842/1
Fix: change to std::dec after having used std::hex
The basefield flag of a stream is persistent, which I didn't realise before.
This fixes commit 256e42646bedbeb9cba900f962f36ba4b1a1cda3
Change-Id: Ic0076c63ae6236ae75dcd79d108add27391b2125
---
M cppcanvas/source/mtfrenderer/emfplus.cxx
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index c17c38e..d74eabe 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -104,7 +104,7 @@
sal_Int16 data;
for (; i > 0; i --) {
s >> data;
- SAL_INFO ("cppcanvas.emf", "EMF+\tdata: " << std::hex << data);
+ SAL_INFO ("cppcanvas.emf", "EMF+\tdata: " << std::hex << data << std::dec);
...though the stream in question is a stringstream only used to build up
the SAL_INFO output (rather than cerr, say), so in cases like the above
it is harmless (though arguably a maintenance gotcha) if it wouldn't be
reset back to dec at the end.
Stephan
------------------------------
Message: 37
Date: Fri, 10 May 2013 15:58:15 +0000
From: "Michael Stahl (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: Michael Stahl <mstahl@redhat.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>,
Stephan Bergmann <sbergman@redhat.com>
Subject: [PUSHED] gbuild: gcc platforms: link with C compiler if no
C++ files
Message-ID: <20130510155817.876343EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3828
--
To view, visit https://gerrit.libreoffice.org/3828
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I04dce06f796e20047ce7f5eab65e6110c0244445
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl <mstahl@redhat.com>
Gerrit-Reviewer: Stephan Bergmann <sbergman@redhat.com>
------------------------------
Message: 38
Date: Fri, 10 May 2013 16:02:07 +0000
From: "Tor Lillqvist (via Code Review)"
<gerrit@gerrit.libreoffice.org>
To: Khaled Hosny <khaledhosny@eglug.org>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PUSHED] [coretext] Fix drawing fallback fonts
Message-ID: <20130510160209.D22D13EE0992@vm2.documentfoundation.org>
Content-Type: text/plain; charset=UTF-8
Hi,
Thank you for your patch! It has been merged to LibreOffice.
If you are interested in details, please visit
https://gerrit.libreoffice.org/3846
Approvals:
Tor Lillqvist: Verified; Looks good to me, approved
--
To view, visit https://gerrit.libreoffice.org/3846
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4d7098cb7bd3464cba6abab22be3ac3942c8889
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Khaled Hosny <khaledhosny@eglug.org>
Gerrit-Reviewer: Tor Lillqvist <tml@iki.fi>
------------------------------
Message: 39
Date: Fri, 10 May 2013 16:28:46 +0000
From: "Eike Rathke (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH libreoffice-4-0] resolved fdo#64384 check subtotal row
filtered also for sing...
Message-ID:
<gerrit.1368203326865.Ic00b9135021f2c5f76755efbe88fc1f12e655320@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3847
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/3847/1
resolved fdo#64384 check subtotal row filtered also for single reference
(cherry picked from commit 3c2d0acc871057573fe9ab45b8161fce70190e80)
Conflicts:
sc/source/core/tool/interpr1.cxx
Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320
---
M sc/source/core/tool/interpr1.cxx
1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3ed9189..994bc2b 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3990,6 +3990,10 @@
++nCount;
break;
}
+ if (glSubTotal && pDok->RowFiltered( aAdr.Row(), aAdr.Tab()))
+ {
+ break;
+ }
ScBaseCell* pCell = GetCell( aAdr );
if ( pCell )
{
--
To view, visit https://gerrit.libreoffice.org/3847
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke <erack@redhat.com>
------------------------------
Message: 40
Date: Fri, 10 May 2013 16:42:23 +0000
From: "Eike Rathke (via Code Review)" <gerrit@gerrit.libreoffice.org>
To: Thorsten Behrens <tbehrens@suse.com>
Cc: LibreOffice Developer List <libreoffice@lists.freedesktop.org>
Subject: [PATCH libreoffice-3-6] resolved fdo#64384 check subtotal row
filtered also for sing...
Message-ID:
<gerrit.1368204143935.Ic00b9135021f2c5f76755efbe88fc1f12e655320@gerrit.libreoffice.org>
Content-Type: text/plain; charset=UTF-8
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3848
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3848/1
resolved fdo#64384 check subtotal row filtered also for single reference
(cherry picked from commit 3c2d0acc871057573fe9ab45b8161fce70190e80)
Conflicts:
sc/source/core/tool/interpr1.cxx
Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320
---
M sc/source/core/tool/interpr1.cxx
1 file changed, 4 insertions(+), 0 deletions(-)
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f645ec7..32f3a36 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3703,6 +3703,10 @@
++nCount;
break;
}
+ if (glSubTotal && pDok->RowFiltered( aAdr.Row(), aAdr.Tab()))
+ {
+ break;
+ }
ScBaseCell* pCell = GetCell( aAdr );
if ( pCell )
{
--
To view, visit https://gerrit.libreoffice.org/3848
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic00b9135021f2c5f76755efbe88fc1f12e655320
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Eike Rathke <erack@redhat.com>
------------------------------
Message: 41
Date: Fri, 10 May 2013 12:59:31 -0400
From: Kohei Yoshida <kohei.yoshida@suse.de>
Cc: libreoffice-dev <LibreOffice@lists.freedesktop.org>, Stephan
Bergmann <sbergman@redhat.com>
Subject: Re: Ultra-slow JunitTest_sc_unoapi
Message-ID: <518D2773.4040501@suse.de>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Hi Stephan,
On 05/10/2013 08:30 AM, Kohei Yoshida wrote:
On Fri, May 10, 2013 at 6:57 AM, Stephan Bergmann <sbergman@redhat.com
<mailto:sbergman@redhat.com>> wrote:
FYI, at least with my recent master --enable-dbgutil builds (on
Fedora 18), JunitTest_sc_unoapi seemingly takes forever (but
eventually does finish). It looks like Java test code calls a
ScCellRangeObj::doImport where that ScCellRangeObj's
aRange.aEnd.nRow = 1048575 is pretty large, leading to ~endless
ScDocument::Broadcast work.
Maybe related to some of Kohei's recent work on sc broadcasting?
Probably. I'll take a look at it today. I didn't think I'd changed
the previous broadcasting behavior, but obviously something has changed.
This commit should fix it.
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5441e509f87c96ca36913bd443152adbb8ad2c98
We were indeed over-broadcasting on cell range deletions. With this
change, only the deletion of non-empty cells will get broadcasted which
matches the original behavior before my rework.
Thanks for discovering this.
Kohei
--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.
------------------------------
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
End of LibreOffice Digest, Vol 33, Issue 15
*******************************************