[Libreoffice-commits] core.git: sc/source

[Jochen Nitschke]

 sc/source/core/tool/interpr4.cxx |   70 ++-
 1 file changed, 34 insertions(+), 36 deletions(-)

New commits:
commit f53fc22f04ccd799035acbec718c42176a4554c9
Author: Jochen Nitschke 
Date:   Tue Mar 15 09:25:14 2016 +0100

sc: replace define with helper

Change-Id: I79915d5449e64c9eb46ff91ce3279ce27af12fec
Reviewed-on: https://gerrit.libreoffice.org/23257
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 2869133..027a253 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3565,8 +3565,37 @@ double applyImplicitIntersection(const sc::RangeMatrix& 
rMat, const ScAddress& r
 return fVal;
 }
 
+// Test for Functions that evaluate an error code and directly set 
nGlobalError to 0
+bool IsErrFunc(OpCode oc)
+{
+switch (oc)
+{
+case ocCount :
+case ocCount2 :
+case ocErrorType :
+case ocIsEmpty :
+case ocIsErr :
+case ocIsError :
+case ocIsFormula :
+case ocIsLogical :
+case ocIsNA :
+case ocIsNonString :
+case ocIsRef :
+case ocIsString :
+case ocIsValue :
+case ocN :
+case ocType :
+case ocIfError :
+case ocIfNA :
+case ocErrorType_ODF :
+return true;
+default:
+return false;
+}
 }
 
+} //namespace
+
 StackVar ScInterpreter::Interpret()
 {
 short nRetTypeExpr = css::util::NumberFormat::UNDEFINED;
@@ -4132,48 +4161,17 @@ StackVar ScInterpreter::Interpret()
 pJumpMatrix = nullptr;
 } while ( bGotResult );
 
-// Functions that evaluate an error code and directly set nGlobalError to 0,
-// usage: switch( OpCode ) { CASE_OCERRFUNC statements; }
-#define CASE_OCERRFUNC \
-case ocCount : \
-case ocCount2 : \
-case ocErrorType : \
-case ocIsEmpty : \
-case ocIsErr : \
-case ocIsError : \
-case ocIsFormula : \
-case ocIsLogical : \
-case ocIsNA : \
-case ocIsNonString : \
-case ocIsRef : \
-case ocIsString : \
-case ocIsValue : \
-case ocN : \
-case ocType : \
-case ocIfError : \
-case ocIfNA : \
-case ocErrorType_ODF :
-
-switch ( eOp )
-{
-CASE_OCERRFUNC
- ++ nErrorFunction;
-default:
-;   // nothing
-}
+if( IsErrFunc(eOp) )
+++nErrorFunction;
+
 if ( nGlobalError )
 {
 if ( !nErrorFunctionCount )
 {   // count of errorcode functions in formula
 for ( FormulaToken* t = rArr.FirstRPN(); t; t = rArr.NextRPN() 
)
 {
-switch ( t->GetOpCode() )
-{
-CASE_OCERRFUNC
- ++nErrorFunctionCount;
-default:
-;   // nothing
-}
+if ( IsErrFunc(t->GetOpCode()) )
+++nErrorFunctionCount;
 }
 }
 if ( nErrorFunction >= nErrorFunctionCount )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - rat-excludes solenv/inc sysui/desktop toolkit/src2xml

[Pedro Giffuni]

 rat-excludes   |   50 ++---
 solenv/inc/os2gcci.mk  |1 
 sysui/desktop/debian/postinst  |1 
 sysui/desktop/redhat/redhat-menus.spec |1 
 sysui/desktop/solaris/mailcap  |1 
 toolkit/src2xml/include.lst|1 
 6 files changed, 22 insertions(+), 33 deletions(-)

New commits:
commit 81cff162a70c4b56e40beccca38df591fc5ae4f7
Author: Pedro Giffuni 
Date:   Wed Mar 16 04:01:39 2016 +

writerperfect is no more.

diff --git a/rat-excludes b/rat-excludes
index 4ecd4f2..807e6b4 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -28,34 +28,6 @@ main/swext/mediawiki/src/filter/odt2mediawiki.xsl
 main/testautomation/writer/optional/input/clipboard/dummy.txt
 main/ure/source/THIRDPARTYLICENSEREADME.html
 
-main/writerperfect/source/filter/DocumentCollector.cxx
-main/writerperfect/source/filter/DocumentCollector.hxx
-main/writerperfect/source/filter/DocumentElement.cxx
-main/writerperfect/source/filter/DocumentElement.hxx
-main/writerperfect/source/filter/DocumentHandler.cxx
-main/writerperfect/source/filter/FilterInternal.hxx
-main/writerperfect/source/filter/FontStyle.cxx
-main/writerperfect/source/filter/FontStyle.hxx
-main/writerperfect/source/filter/ListStyle.cxx
-main/writerperfect/source/filter/ListStyle.hxx
-main/writerperfect/source/filter/PageSpan.cxx
-main/writerperfect/source/filter/PageSpan.hxx
-main/writerperfect/source/filter/SectionStyle.cxx
-main/writerperfect/source/filter/SectionStyle.hxx
-main/writerperfect/source/filter/Style.hxx
-main/writerperfect/source/filter/TableStyle.cxx
-main/writerperfect/source/filter/TableStyle.hxx
-main/writerperfect/source/filter/TextRunStyle.cxx
-main/writerperfect/source/filter/TextRunStyle.hxx
-main/writerperfect/source/filter/WriterProperties.hxx
-main/writerperfect/source/stream/WPXSvStream.cxx
-main/writerperfect/source/stream/WPXSvStream.h
-main/writerperfect/source/wpdimp/WordPerfectCollector.cxx
-main/writerperfect/source/wpdimp/WordPerfectCollector.hxx
-main/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
-main/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
-
-
 ##
 #
 # small files with no creative content
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index fc9aaeb..0c078a4 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -163,7 +163,6 @@ MODULES_WITH_WARNINGS := \
 starmath \
 svx \
 sw \
-writerperfect \
 xmlsecurity
 
 
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index c2879d2..025a4cf 100644
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -162,7 +162,6 @@ application/vnd.stardivision.draw; %PREFIX -view %s
 application/x-stardraw; %PREFIX -view %s
 application/vnd.oasis.opendocument.database; %PREFIX -view %s
 application/vnd.sun.xml.base; %PREFIX -view %s
-application/vnd.writerperfect; %PREFIX -view %s
 application/wordperfect5.1; %PREFIX -view %s
 application/x-wordperfect; %PREFIX -view %s
 application/wordperfect; %PREFIX -view %s
diff --git a/sysui/desktop/redhat/redhat-menus.spec 
b/sysui/desktop/redhat/redhat-menus.spec
index d2b95d4..df001e0 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -233,7 +233,6 @@ application/vnd.stardivision.draw; %unixfilename -view %s
 application/x-stardraw; %unixfilename -view %s
 application/vnd.oasis.opendocument.database; %unixfilename -view %s
 application/vnd.sun.xml.base; %unixfilename -view %s
-application/vnd.writerperfect; %unixfilename -view %s
 application/wordperfect5.1; %unixfilename -view %s
 application/x-wordperfect; %unixfilename -view %s
 application/wordperfect; %unixfilename -view %s
diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap
index c6b21eb..9042162 100644
--- a/sysui/desktop/solaris/mailcap
+++ b/sysui/desktop/solaris/mailcap
@@ -84,7 +84,6 @@ application/vnd.stardivision.draw; %PREFIX -view %s
 application/x-stardraw; %PREFIX -view %s
 application/vnd.sun.xml.base; %PREFIX -view %s
 application/vnd.oasis.opendocument.database; %PREFIX -view %s
-application/vnd.writerperfect; %PREFIX -view %s
 application/wordperfect5.1; %PREFIX -view %s
 application/x-wordperfect; %PREFIX -view %s
 application/wordperfect; %PREFIX -view %s
diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst
index 0706e35..965192c 100644
--- a/toolkit/src2xml/include.lst
+++ b/toolkit/src2xml/include.lst
@@ -194,7 +194,6 @@
 ../../filter/inc
 ../../filter/unxlngi6.pro/inc
 ../../extras/unxlngi6.pro/inc
-../../writerperfect/unxlngi6.pro/inc
 ../../toolkit/inc
 ../../toolkit/unxlngi6.pro/inc
 ../../officecfg/unxlngi6.pro/inc
commit 8558945567b7e7976d2fed2eeb9e7be41092a573
Author: Pedro Giffuni 
Date:   Wed Mar 16 03:48:37 2016 +

Revert r1735107:

Duh ... this was wrong.

diff --git a/rat-excludes b/rat-e

GSOC aspirant implement epub export filter

[Pratishta Sharma]

Hi everyone!
I am Pratishta Sharma, a 3rd year engineering student and I am interested in 
the project: Implement epub export filter for GSOC 2016. I'm not sure if the 
program requires me to come up with this on my own, but I am unable to 
understand how would the uno model will be converted to librevenge model.
Please help me or give me a hint as to how to work it out. The project is 
really interesting, so I really want to work on this.
Regards,
Pratishta Sharma,
pratishtasha...@yahoo.com
Irc: nonu18

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Gerrit wish list :-)

[Norbert Thiebaud]

On Tue, Mar 15, 2016 at 9:53 PM, jan iversen
 wrote:
>
>> what do you mean by 'issue number' ?
>>
> "Change 23005" (looking at https://gerrit.libreoffice.org/#/c/23005

in your settings/preferences:
 x Show Change Number In Changes Table

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Gerrit wish list :-)

[jan iversen]

> what do you mean by 'issue number' ?
> 
"Change 23005" (looking at https://gerrit.libreoffice.org/#/c/23005 

E.g in All/Open and All/Merged for columns are "Subject", "Status" 
I would like to have
"Change", "Subject", "Status" ...
(thought issue was the right word)

> if it is customizable you can create what-ever view you want in the 'My' tab.
> I, for example, have a view to filter 'Verified' changeset:
> See profile/preference, My Menu
> 
> #/q/is:open+label:Verified>0
Yes this is a filter, and does not add a column in the list generated.

I read in the doc. (maybe wrongly) that admins can change the columns of the 
lists generated, and users can change filtering

rgds
jan i.

> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-2' - .gitreview

[Jan Iversen]

 .gitreview |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a41b4325fc9ccd8c5d0f95ea669e543553712eaf
Author: Jan Iversen 
Date:   Wed Mar 16 03:21:51 2016 +0100

Bump .gitreview branch 5-1-2

Change-Id: I96e47ab8cc548ecf3312f26d7a5d971d30800602

diff --git a/.gitreview b/.gitreview
index 1e3c488..4ce469a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-5-1
+defaultbranch=libreoffice-5-1-2
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.1.2.1-buildfix1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1-buildfix1' created by Jan Iversen 
 at 2016-03-16 02:37 -0700

Tag libreoffice-5.1.2.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6LjjAAoJEPQ0oe+v7q6jDc0P/jbOmVn6YaGqFDSNt4MRV2aD
nfo7/y0XZCcfwjzfVm2Ys4dzEfjok/EwFJ+lfdMu4Ez9rPkeGRO2/ahjli7m6u2O
aumQNHiXzGEF/r9QmaifNTofSUPRWrMDGT5vOt3H7bEIecOI0hegWWOogNcBbLs0
g959fJqF9G3F7WjHEcr2E2JhgVW71BlY+M8zBwNlPccNZjfAtbCsYlyE89fBwj7W
Rpld94qMU5TEciDFjH21IdzJ1o7Y9eN5NKWFMlgFhGIsRXIsPAMazLla/daYOO9H
l5frAU1+HY+W2xJ8TVm3HGCS6ItH9VmV/RVYiven2YP1m1FfwrpOYk6HsvqGqsA0
f1pcSSffRZr+HktZGwPQmEYmJH0kMAp29mqBZByPenbOpxzYlHYIYj+0DI1F6f2Y
VJC5zJGnQT5HQC3ONKZ/mICM3OWGSqUYvGtNLNhzpxLcaxDsWbrHq91iPljj1TLJ
1w1LkkO6yfVhqeG+ldqvWdTThW5P3W9sHTbNGTum327V+7xJcVe5JRKanZwbdD8o
JzSwny7sQod5u8yqyJVU0iE+ICO8uN3rhQRyPRVaiqiJ7tsFQGg7QdCzLlnSneob
uzlen3VbYA4gkmIoqVNgm1g4ozXmRHHX+B6LVaGmrrDwfPs2iFClHY/WK4qb0wVo
xohwZTLIoXIdvOu87VW4
=trzL
-END PGP SIGNATURE-

Changes since libreoffice-5.1.2.1:
Jan Iversen (1):
  Version 5.1.2.1, tag libreoffice-5.1.2.1-buildfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.1.2.1-buildfix1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1-buildfix1' created by Jan Iversen 
 at 2016-03-16 02:35 -0700

Tag libreoffice-5.1.2.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6LhoAAoJEPQ0oe+v7q6jJekQAKeZrA1DzxbtkwwO3SC93ioM
HuHme8u+vD7wjfHYUHs1vFLu8MWAaWAj/y5YvU3abE8fPncLn+pzG90BlthFJQQl
83VlcbbZunH6FGAMb2CbvHGbUduNP4nizMIt/WoOHVsI9qmc4hA1dOg03lZOgW8h
CxmPlLmoCjNX+Fhgg5JPWZOqLEM9dih7Y9ta0KUVWJVdnzE7jN87nz2BpxIva3kt
0E4jzrXsqMTiLY6rlsh64DrllocMB9r+1S49K+I1Gru/VBtDEnJSElKgcUebT0V6
rwQNOaFToBSrU/uQZQbyj3LnLdscrZc4X1yRmxsBxvPj/IvZct6CaIx+P3dOYY/9
qUzXnXpoVuwNHUjkUCtZpVneeZE1ff4NJw4I/vDf2ugOpQs2Tw/YbOu3hD7B3Tg+
jlyZi9ADFIG2a8LsHxZm3cAjAAnhcI6aVNTlyrKRJF0+6zI62DPh+hyM6MjCme8e
w6rpnxmiI5aTZuK28Qq90A/10JL5H8cqfVAXq361uDSiAO9vf77ym2Y6CO/JEAuA
UIWW8EaXzWNoqD41t+srhFTP2rlv7asbb/84mq8M+iWfhmYYmTDbnq6u8HWSVCEd
Wy2XTL3xIuJZzjoNZhDsOP0Gb0fPS3Ds0hzZ0OqmA2pKZA3892jMYXjycf5litVH
XEUZqlWSoKV/togafAQE
=yyqC
-END PGP SIGNATURE-

Changes since libreoffice-5.1.2.1-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.1.2.1-buildfix1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1-buildfix1' created by Jan Iversen 
 at 2016-03-16 02:37 -0700

Tag libreoffice-5.1.2.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6LjQAAoJEPQ0oe+v7q6jQdIQAMfI+z46Y71Qw0qHCAXVM0vv
EiBv+WwqlQaKtcrYuAhCrWgutPILryahsB7Tc7Pj+QdmWTVpBpoHY+TOdKXAeHQS
2vLHl0DbwxOX7OstYDF6nyWVPCcSYFdEAn35JVFd/MIMir2KFIKsoiIuytWRPZ0O
glL2OLWtTQw8pHeEpehj1yS2VMrEGWpvcQN6IXonWVUpnB1mR3dL9+jteqVFJ6pz
SEAYqKZXuqLMh6FLBVGwNJ92NlnP0MyeWdbEpO0+SyfXlyEQk9WivPxr5D9xIvz4
2u4H293/0MwuVAfdLkmDW5itOl2+MLpgiGHBoGvsjdhPT5F/Mo9j5OohEQU/5Phs
huwG88Ekhad1svfe8oVtJqsHqnRSPe/78EbuK4YWBZkj5vWl+ZzjsVDCtkTDFMJU
uaA6M8CvXT7ZJvYOIntF2clrFPiwYoOS9RJO73Zj0r0akzycMTi4ZxZTOJv7HYiK
KI93a+VJe7K2q9G9YHLPa/5SqsPmfcJBIpHz4YOv2NIN+6ND5yoFRRrHUAbWmDuv
oO+pYK/VZ+OUuboyvJjGBrE2ixjGBfXoVQw35IKGSZ5AOcQ9DwE8inXC7p5WrJs6
JHBysoxEMBLbHMaZgvUveiAmQQDyxfAig3HkZoK+xN4RGYz/9jw2chISnyXPCZf8
XsYFUBt0t7XRlhVgDCeF
=KYZQ
-END PGP SIGNATURE-

Changes since libreoffice-5.1.2.1:
Jan Iversen (1):
  Version 5.1.2.1, tag libreoffice-5.1.2.1-buildfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.1.2.1-buildfix1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1-buildfix1' created by Jan Iversen 
 at 2016-03-16 02:37 -0700

Tag libreoffice-5.1.2.1-buildfix1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6Lj0AAoJEPQ0oe+v7q6jJdwQAKUVaCmlBgMaxxXq+6R4nmGQ
znYVvgroI2r3RlGZXZeemagSQvPApgsdkkFIaxuvYjmOMHFvTiG+m9oB2cVZJpA+
9NgUuagoDx8t4jWgksx+uDsh3CaEvwIcsexhXhm93bncZUbOiQIe6FngB2kKIRZn
IO3on73IedGpV2RJ6LY9eKvu5XPR1XMGmMdzQhNXdPFJRdzKJqFq1W138Jdh08ij
cyn567iIVsRxy3fc8jsbYABJP6Hc6PZovYTrZPY5GPQgOTLO2r5y0JozJwbjcXhB
Hblaz5Ubul7Fa1rCZeK5SyX46chHlbe/nE4EGvpUBc6zYPMkiF+4N7AiY0BCrd3d
Id2ivyfjjH/nDqFmFhWB1qEHZo//NNZ9fEP8AG5c1RQY1efV/sU4HiXtZUyMTgqj
72GRXhhRNs9DEGHGU+2ZpdE/21Sv5xHuombM7+isnjrhID+DRtjROMIaGX+YPZFR
4prUD/GI3Qabw0obbNT6rISsb6AesY7W+U9E5i510XXV69r0ceKvb5P+h4A+hhVd
88oCP6IoxDElLUVfO3gSJ2UYjfMX0K9hjdZAucjteJ1vRmEqwswJp5UGKYEWzH7z
X3UTts7ikDjBvLLIDw+d82xNKTWPWFd/GP7/0Sy6fEUKPrr/qeYveTDSXbIqOjzo
MIqm7miB0YZch2vgxmGr
=6UnS
-END PGP SIGNATURE-

Changes since libreoffice-5.1.2.1:
Jan Iversen (1):
  Version 5.1.2.1, tag libreoffice-5.1.2.1-buildfix1

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.1.2.1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1' created by Jan Iversen  
at 2016-03-16 01:57 -0700

Tag libreoffice-5.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6K9qAAoJEPQ0oe+v7q6jWIYP/2x+x4VGkWCofZgLUZbEHoKm
uLBt89Ayoaewt8qadqrfGNAUlTTJwh1ULVocCuu7W6p2rdZ+FGX0IEMW9J4MAAgk
9Z6dweZ7HZP/PzYJCK/vniayDlObox45Fa+fh7Qa7VI+8yaoPMvys2ZXIm/Kf8Qy
GFPXFDIzQxUISTwyuEE1J5X+MM+MkspULxNbPhp5EyEYkIyBN5qEcJ1AqbCj5quW
tZOaHQZqQ7xaaO3UVEvGd/2nZSjTGHIYqh1AcpGe4ctEYGnM9gxWcGTLmoa0iCoE
1ku64G5VMkVgzzpbrIkYtawiKqlf4pB3SVZCL5IVK3Kfd7XeWgMUBQKTP5Ymnl5I
zf7wGt+zUBA08cE0BkGgpq/ejwggM4rH8MTWoVhqtAbuMxYumguZ4H/JW2RRDrLS
BBDvFZheb6OozOwdc1mdS9grxpKMGoXviy9aaTciWlRSWHaBEezUtFRKl8sZHi7+
OIp/ks/T17pPKZVo5wY6lxDzbo+5gDK5wZu95yauLk6t95yqRv6WlU7+ZpFtsRr3
I8Gkj4d8Wa4qOp4lFfFWDmk4XA8L4sVTz5fFNMszxMRi0TOFhi4W1viuNghIGQV+
2xrsROEeE9kDNzfqJf326Pq/WvC3W1NMxv6amzjVMpcTiTpYD7LQSURlFWIJ2Oid
rkhc0O60OqsrPlRwkFE6
=O+PR
-END PGP SIGNATURE-

Changes since libreoffice-5-1-branch-point-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.1.2.1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1' created by Jan Iversen  
at 2016-03-16 01:58 -0700

Tag libreoffice-5.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6K/HAAoJEPQ0oe+v7q6jt30P/io+dq4KYnF3EmujTXo735uu
HT84sWrVaoZDUUhcgTxCKNIPJVJEWj+OFC2BRT8SAnAnTH8S9HKbWWNaeAs1t8e1
+av3DvOkcrykm4VsSFTkISGQ28jJS7RMGfvWWOCZR/uZ3nDYfx2fGt/VOLpLXosK
3TA2ZUsY2jok9BY5x0lvEAUuMkwnpUbP0V7lM4h4uPUaeUOpx31mA11AIFTEIRGQ
UqaiSM/yXfGgGxU/jC9fAIZE/XxUgfMp3EEqbEfHtSjNJLvjJf8KjfoXAQF/+srn
BNTo1q9nFdB+PPJr1twHvTJ94rn3FgiGF76OcbbcXb2Fr+i3bsiygcQ/MtKEdqgF
bsQ9bRyVXqKE0eOITFij2ewkv+BEQyjZ9+FjqStC/TpVwqnlwNXTYixW6AB6Xjoz
4q5a23WafI4hqfHXE2TkYACyQFinmXZhge2qzQrTwXV6lSMm0rxOdj5IdPMHL+LY
8GR/f190b8Y4iHJcUJcASFI1MPLERkb2+BHkpAq5sOYTNAKFuVX4zRWGqmr5CBC8
EAC+KuOltVZaOa7QhEtHdWjPSBxmyIQFrQDdyu1QJjoT5HSjnqW4xeJ4U1I/AsCQ
3fesekt/VBjIluCEc/Cl7lbqU52nRuspeIjWXXczPUgaTUR7LDKiOibkDQzqz0wW
Bo3lByiY55oc8+Fppnrk
=BJFl
-END PGP SIGNATURE-

Changes since libreoffice-5.1.0.0.beta2-798:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.1.2.1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1' created by Jan Iversen  
at 2016-03-16 01:54 -0700

Tag libreoffice-5.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6K7KAAoJEPQ0oe+v7q6j1JgQAJLBvjaZAHFvLnoXtE2aWPrL
JEz/cq/CE6NTQby4EYbIEo8RiXaNxoXRykIZIIyT62e++k7muE5sbLaYmnLNOJzA
YHGbFHLzrO+JMElHflQdG0TP0eHrk9RODfvKjA0M5CCv5fW5BUy84oiF/dTBgPdM
GAGvN2jWqCZXSB09SHei8Y7py83KmTnYm9ib9cLlKka54qVbABygR1POiQnZAHam
/Ef8xTnXvaeVXeHHC7V6fnauYhYnAEbqck/958nPKyx/3Kl8zqS5/0ZBIXIpNs3U
80PYtWeqduMwJtdhNJGobnVUW28+fQLTonKfSpKz7jzR5+ggQE/Og0CEg6hVz70x
AILo5aQWbig2O14zSNykw/86HJEin65/vYhMgSjiSvKrMDO71e/bmq8qGOf2hq0/
yNhRYF6o/fhDr0GtUo3oZAWXwXsBAqwpATcJYYtcMBfbzHzI+jKB2u/mw+nt1rqc
acUL+ellmEbQbPu1KsEUeOXZCIHf0NNNd78i9dEsTYnxW9xcpYmv6hgkCISU6vJM
XUqCNDDYR3oJuvDwtL+tZjVrNzEInj3Ykxv6nSUkb4fhoo0T68Qlns6N6MD4bWfI
rHugb95n1Y7ayrfSzBtnaZVKtCIFkiUSR5SUQ9Cd1cOS0DpRxIfHpd8Vn0ud3wA8
IEeshnVH9qcmtbXV91YK
=VICI
-END PGP SIGNATURE-

Changes since libreoffice-5-1-branch-point-8:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.1.2.1'

[Jan Iversen]

Tag 'libreoffice-5.1.2.1' created by Jan Iversen  
at 2016-03-16 01:57 -0700

Tag libreoffice-5.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJW6K+QAAoJEPQ0oe+v7q6jPz4QAKrhgbzCvVFjAa4RELFmXBLU
L7kHDnGN9cVEL3ehECUdEyFGh3TY81i8TZTsVKIvFwOJb2xVkGp7YINJNZIg8Q+1
Hqziq/45AfyPGA+Zu9PAIXdWPqSuOnn1rTUoohnVtdCfkIn8rfs1Rh3lDFqGr5GE
AHc/D053AnGb2KKnKcxu0ZLH5F1BxJgn6CURVQ3/76zq3LYdhuJYfjM50urfcpVG
JDUC2HLH1DA0tlDSRadXJK56T0o9n0RDrHCWLpp/LhNvSp6tjsC4/XzSsm0mYpsn
GE4TtFv2zVXEa81/YPVHZkN66JwmyhefsdCEt3JZemSdJnc/oI3LU3CYsDpiX14L
Rcxlg+JqpEZo1CQo7AkE41X09qP5DakccK6fMZ2+eQm8YTx5EDEWpx/pMODM0gIe
HhkhWE8b/3XHC2S/5ymsbc/eYywsskibkH77AYJYTPvIO53FSZ/XH/GqKY6ZY3D/
nPqMELNH10/V+XMWp8jjBKTUlLcpw1rVhC4yg8j6rGYHr95yhwFamUBNfWhyAzjv
C1Yf+GTE/jnLYLCBRo/XZtLHz8fIbIyNkXEJ+B+kKftZPFuv7bXWMA1IBsvs7m3b
MOLtjTzUk6p1KfF9EvnAxxG27TQ6FcYwMryTOfIuJlTTfuJUl2oCQoLnWsLpmIvg
X+vw3SDjt8jKaz56kATF
=ttGq
-END PGP SIGNATURE-

Changes since libreoffice-5-1-branch-point-21:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-2' - configure.ac

[Jan Iversen]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f7875f0af7d7586b463995e923843ca7e9962d5
Author: Jan Iversen 
Date:   Wed Mar 16 02:01:17 2016 +0100

bump product version to 5.1.2.1

Change-Id: I48272da18321ba4424c826f13b47250ef02b7997

diff --git a/configure.ac b/configure.ac
index 2163957..f028c03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.1.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.1.2.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - .gitreview

[Jan Iversen]

 .gitreview |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99ab65e9139d60542344041a96ab8d3a4dc39bdb
Author: Jan Iversen 
Date:   Wed Mar 16 01:28:00 2016 +0100

undo bump of .gitreview

Change-Id: I2f08f8da3b42ce3048d2d3fac4bbf23c9ca6c0c4

diff --git a/.gitreview b/.gitreview
index 4ce469a..1e3c488 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-5-1-2
+defaultbranch=libreoffice-5-1
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - configure.ac .gitreview

[Jan Iversen]

 .gitreview   |2 +-
 configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd2b6d6b9f117eb33e224e0a59e30ed6ecd0e71a
Author: Jan Iversen 
Date:   Wed Mar 16 01:12:04 2016 +0100

bump product version to 5-1-2

Change-Id: Ibd678f3367a9f3552e8196dd737d72a04953fde4

diff --git a/.gitreview b/.gitreview
index 1e3c488..4ce469a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-5-1
+defaultbranch=libreoffice-5-1-2
 
commit 095a0ce3813a037000d8f46fc6542339224f454f
Author: Jan Iversen 
Date:   Wed Mar 16 01:10:20 2016 +0100

bump product version to 5-1-2

Change-Id: I59ca17b983c73088afe10587c75726fc0c5fa5f3

diff --git a/configure.ac b/configure.ac
index 2163957..91645f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.1.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.1.3.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-5-1-2'

[Jan Iversen]

New branch 'libreoffice-5-1-2' available with the following commits:
commit 42b6438788d9f9f36526845d85a6f05fe28b279a
Author: Jan Iversen 
Date:   Wed Mar 16 00:58:27 2016 +0100

Branch libreoffice-5-1-2

This is 'libreoffice-5-1-2' - the stable branch for the 5.1.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I5fa01b71cc1e4210fdea78b02c79aa4b8bcfbcbf

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-1-2'

[Jan Iversen]

New branch 'libreoffice-5-1-2' available with the following commits:
commit a6b70d0d122e0be5f52de3c4d0fe779514d5a893
Author: Jan Iversen 
Date:   Wed Mar 16 00:54:38 2016 +0100

Branch libreoffice-5-1-2

This is 'libreoffice-5-1-2' - the stable branch for the 5.1.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3ea95bd371532179bd2e9a2163230d54d1dea59d

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-5-1-2'

[Jan Iversen]

New branch 'libreoffice-5-1-2' available with the following commits:
commit 5215695e5607db25f4ac1957395c27d00f63f409
Author: Jan Iversen 
Date:   Wed Mar 16 00:54:38 2016 +0100

Branch libreoffice-5-1-2

This is 'libreoffice-5-1-2' - the stable branch for the 5.1.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I1191657ac2af2cd648ffc00fb90e768c2b6f3318

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-1-2'

[Jan Iversen]

New branch 'libreoffice-5-1-2' available with the following commits:
commit 3454d8d3b5c2dfe48371ced0f55540a04b56a3db
Author: Jan Iversen 
Date:   Wed Mar 16 00:54:38 2016 +0100

Branch libreoffice-5-1-2

This is 'libreoffice-5-1-2' - the stable branch for the 5.1.2 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.1.x release,
please use the 'libreoffice-5-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I979e3c4b6bce9f95a94f476a8abd16e89192fa81

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit wish list :-)

[Norbert Thiebaud]

On Tue, Mar 15, 2016 at 5:17 PM, jan iversen
 wrote:
> Hi.
>
> The different lists in Gerrit are very practical and have a good layout. 
> However I keep missing the issue number.

what do you mean by 'issue number' ?

>
> We refer to the issue number in most conversations and lesser to the subject. 
> I for one use the lists on a daily basis, and find it a time waste to open 
> issues just to see the number.
>
> Would anybody be against such a change ?

if it is customizable you can create what-ever view you want in the 'My' tab.
I, for example, have a view to filter 'Verified' changeset:
See profile/preference, My Menu

#/q/is:open+label:Verified>0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/qa vcl/source

[Chris Sherlock]

 vcl/qa/cppunit/wmf/wmfimporttest.cxx |   24 
 vcl/source/filter/wmf/enhwmf.cxx |   26 --
 vcl/source/filter/wmf/winmtf.cxx |   15 +++
 vcl/source/filter/wmf/winmtf.hxx |2 +-
 vcl/source/filter/wmf/winwmf.cxx |   11 +--
 5 files changed, 29 insertions(+), 49 deletions(-)

New commits:
commit a05f5238fc3811cf2c56f343a3015d5a58180677
Author: Chris Sherlock 
Date:   Thu Mar 3 21:52:49 2016 +1100

tdf#79679 vcl: dashed lines show as solid lines when importing EMF files

Backported to 5.1

Issue is a regression in commit 09c722873b2d378d2d155f5f1dd7d8f3fb2012e9.
(EMF/WMF: fix rendering of pen styles (dash, dot, dashdot, dashdotdot).

I've looked at how the latest version of Word on the Mac works, and it
turns out that the spacings for the PenStyle enumerations in the LogPen
objects for all the create pen EMF records are as follows:

* PS_DOT   - ■ □ ■ □ ■ □ ■ □ ■ □ ■
* PS_DASHDOT   - ■ ■ ■ □ ■ □ ■ ■ ■ □ ■
* PS_DASHDOTDOT- ■ ■ ■ □ ■ □ ■ □ ■ ■ ■

(where ■ is the actual filled in area, and □ is the space between the
filled in areas)

In other words, each dash fills in the space of three dots, and there
is the one dot worth of empty space between the dashes and dots. Each
"dot" has a width and height equal to the width specified in the pen.

So basically, we seem to be arbitrarily setting the dot, dash and
distance lengths arbitrarily, which were reasonable guesses but tended
to produce very odd lines at different zoom levels.

Change-Id: Ie8b5fa396e4fb0f480cb3594c8129a59f472c1b8
Reviewed-on: https://gerrit.libreoffice.org/22886
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 
Reviewed-on: https://gerrit.libreoffice.org/22923
Reviewed-by: jan iversen 
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx 
b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 2c6a6e3..855c427 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -146,36 +146,36 @@ void WmfTest::testEmfLineStyles()
 assertXPath(pDoc, "/metafile/linecolor[5]", "color", "#ff");
 
 assertXPath(pDoc, "/metafile/line[1]", "style", "dash");
-assertXPath(pDoc, "/metafile/line[1]", "dashlen", "225");
+assertXPath(pDoc, "/metafile/line[1]", "dashlen", "528");
 assertXPath(pDoc, "/metafile/line[1]", "dashcount", "1");
-assertXPath(pDoc, "/metafile/line[1]", "dotlen", "0");
+assertXPath(pDoc, "/metafile/line[1]", "dotlen", "176");
 assertXPath(pDoc, "/metafile/line[1]", "dotcount", "0");
-assertXPath(pDoc, "/metafile/line[1]", "distance", "100");
+assertXPath(pDoc, "/metafile/line[1]", "distance", "176");
 assertXPath(pDoc, "/metafile/line[1]", "join", "miter");
 assertXPath(pDoc, "/metafile/line[1]", "cap", "butt");
 
 assertXPath(pDoc, "/metafile/line[2]", "style", "dash");
-assertXPath(pDoc, "/metafile/line[2]", "dashlen", "0");
+assertXPath(pDoc, "/metafile/line[2]", "dashlen", "528");
 assertXPath(pDoc, "/metafile/line[2]", "dashcount", "0");
-assertXPath(pDoc, "/metafile/line[2]", "dotlen", "30");
+assertXPath(pDoc, "/metafile/line[2]", "dotlen", "176");
 assertXPath(pDoc, "/metafile/line[2]", "dotcount", "1");
-assertXPath(pDoc, "/metafile/line[2]", "distance", "50");
+assertXPath(pDoc, "/metafile/line[2]", "distance", "176");
 assertXPath(pDoc, "/metafile/line[2]", "join", "miter");
 assertXPath(pDoc, "/metafile/line[2]", "cap", "butt");
 
 assertXPath(pDoc, "/metafile/line[3]", "style", "dash");
-assertXPath(pDoc, "/metafile/line[3]", "dashlen", "150");
+assertXPath(pDoc, "/metafile/line[3]", "dashlen", "528");
 assertXPath(pDoc, "/metafile/line[3]", "dashcount", "1");
-assertXPath(pDoc, "/metafile/line[3]", "dotlen", "30");
+assertXPath(pDoc, "/metafile/line[3]", "dotlen", "176");
 assertXPath(pDoc, "/metafile/line[3]", "dotcount", "1");
-assertXPath(pDoc, "/metafile/line[3]", "distance", "90");
+assertXPath(pDoc, "/metafile/line[3]", "distance", "176");
 
 assertXPath(pDoc, "/metafile/line[4]", "style", "dash");
-assertXPath(pDoc, "/metafile/line[4]", "dashlen", "150");
+assertXPath(pDoc, "/metafile/line[4]", "dashlen", "528");
 assertXPath(pDoc, "/metafile/line[4]", "dashcount", "1");
-assertXPath(pDoc, "/metafile/line[4]", "dotlen", "30");
+assertXPath(pDoc, "/metafile/line[4]", "dotlen", "176");
 assertXPath(pDoc, "/metafile/line[4]", "dotcount", "2");
-assertXPath(pDoc, "/metafile/line[4]", "distance", "50");
+assertXPath(pDoc, "/metafile/line[4]", "distance", "176");
 assertXPath(pDoc, "/metafile/line[4]", "join", "miter");
 assertXPath(pDoc, "/metafile/line[4]", "cap", "butt");
 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/win

[Christian Lohmaier]

 vcl/win/source/gdi/winlayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d4c3ea133850ee6b3add03d157c7ab78ea74da9a
Author: Christian Lohmaier 
Date:   Tue Mar 15 23:38:33 2016 +0100

fix windows build

34a7b51ea482d4487d4fb8e61cde18aa1ff9b8ff (for 5-1) auto → size_t made
32bit happy, but win64bit still failed with:
error C2784: ´_Ty std::min(std::initializer_list<_Elem>,_Pr)´ : could
not deduce template argument for ´std::initializer_list<_Elem>´ from
´__int64´

(cherry picked from commit 53f645a9c959d93bde9230862c415c4ab2e3817b)

Change-Id: Ib44840f692f1bcdea90decfe443c6eb72806002a
Reviewed-on: https://gerrit.libreoffice.org/23288
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 9d0e9a4..2e83894 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -3907,8 +3907,8 @@ bool D2DWriteTextOutRenderer::DrawGlyphs(const Point & 
origin, uint16_t * pGid,
 DWRITE_GLYPH_OFFSET glyphOffsets[MAX_GLYPHS] = { { 0.0f, 0.0f }, };
 
 mpRT->BeginDraw();
-for (size_t nGlyphs = std::min(pGidEnd - pGid, MAX_GLYPHS); pGid != 
pGidEnd;
-pGid += nGlyphs, nGlyphs = std::min(pGidEnd - pGid, 
MAX_GLYPHS))
+for (size_t nGlyphs = std::min(static_cast(pGidEnd - pGid), 
MAX_GLYPHS); pGid != pGidEnd;
+pGid += nGlyphs, nGlyphs = 
std::min(static_cast(pGidEnd - pGid), MAX_GLYPHS))
 {
 std::copy(pGid, pGidEnd, glyphIndices);
 std::copy_n(pAdvances, nGlyphs, glyphAdvances);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/discovery.xml loolwsd/LOOLWSD.cpp

[Henry Castro]

 loolwsd/LOOLWSD.cpp   |4 +++-
 loolwsd/discovery.xml |2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit bda64dbf2bef7efebceda9bdd6a1395b2b49879a
Author: Henry Castro 
Date:   Tue Mar 15 19:13:23 2016 -0400

loolwsd: fix get host from request

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index fcb7da6..499391b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -633,11 +633,13 @@ private:
 {
 DOMParser parser;
 DOMWriter writer;
+URI uri("http", request.getHost(), request.getURI());
+
 const std::string discoveryPath = 
Path(Application::instance().commandPath()).parent().toString() + 
"discovery.xml";
 const std::string mediaType = "text/xml";
 const std::string action = "action";
 const std::string urlsrc = "urlsrc";
-const std::string uriValue = "http://"; + request.getHost() + 
LOLEAFLET_PATH;
+const std::string uriValue = "http://"; + uri.getHost() + 
LOLEAFLET_PATH;
 
 InputSource inputSrc(discoveryPath);
 AutoPtr docXML = parser.parse(&inputSrc);
diff --git a/loolwsd/discovery.xml b/loolwsd/discovery.xml
index ac78c20..8eabc7a 100755
--- a/loolwsd/discovery.xml
+++ b/loolwsd/discovery.xml
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

3 new defect(s) introduced to LibreOffice found with Coverity Scan.
7 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)


** CID 1356339:  Uninitialized members  (UNINIT_CTOR)
/sc/source/ui/inc/checklistmenu.hxx: 254 in 
ScSearchEdit::ScSearchEdit(vcl::Window *)()



*** CID 1356339:  Uninitialized members  (UNINIT_CTOR)
/sc/source/ui/inc/checklistmenu.hxx: 254 in 
ScSearchEdit::ScSearchEdit(vcl::Window *)()
248 
249 class ScSearchEdit : public Edit
250 {
251 private:
252 ScTabStops* mpTabStops;
253 public:
>>> CID 1356339:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "mpTabStops" is not initialized in this 
>>> constructor nor in any functions that it calls.
254 ScSearchEdit(Window* pParent) : Edit(pParent) {}
255 virtual ~ScSearchEdit() {}
256 
257 virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
258 void SetTabStopsContainer( ScTabStops* pTabStops )  { mpTabStops = 
pTabStops; }
259 };

** CID 1356338:(RESOURCE_LEAK)
/solenv/bin/concat-deps.c: 1097 in process()
/solenv/bin/concat-deps.c: 1097 in process()
/solenv/bin/concat-deps.c: 1097 in process()



*** CID 1356338:(RESOURCE_LEAK)
/solenv/bin/concat-deps.c: 1097 in process()
1091 /* Note: yes we are going to leak 'buffer'
1092  * this is on purpose, to avoid cloning the 'key' out of it and 
our special
1093  * 'hash' just store the pointer to the key inside of buffer, 
hence it need
1094  * to remain allocated
1095  * coverity[leaked_storage] - this is on purpose
1096  */
>>> CID 1356338:(RESOURCE_LEAK)
>>> Variable "buffer" going out of scope leaks the storage it points to.
1097 return rc;
1098 }
1099 
1100 static void usage(void)
1101 {
1102 fputs("Usage: concat-deps \n", 
stderr);
/solenv/bin/concat-deps.c: 1097 in process()
1091 /* Note: yes we are going to leak 'buffer'
1092  * this is on purpose, to avoid cloning the 'key' out of it and 
our special
1093  * 'hash' just store the pointer to the key inside of buffer, 
hence it need
1094  * to remain allocated
1095  * coverity[leaked_storage] - this is on purpose
1096  */
>>> CID 1356338:(RESOURCE_LEAK)
>>> Variable "buffer" going out of scope leaks the storage it points to.
1097 return rc;
1098 }
1099 
1100 static void usage(void)
1101 {
1102 fputs("Usage: concat-deps \n", 
stderr);
/solenv/bin/concat-deps.c: 1097 in process()
1091 /* Note: yes we are going to leak 'buffer'
1092  * this is on purpose, to avoid cloning the 'key' out of it and 
our special
1093  * 'hash' just store the pointer to the key inside of buffer, 
hence it need
1094  * to remain allocated
1095  * coverity[leaked_storage] - this is on purpose
1096  */
>>> CID 1356338:(RESOURCE_LEAK)
>>> Variable "buffer" going out of scope leaks the storage it points to.
1097 return rc;
1098 }
1099 
1100 static void usage(void)
1101 {
1102 fputs("Usage: concat-deps \n", 
stderr);

** CID 1356337:  Resource leaks  (RESOURCE_LEAK)
/sd/source/core/drawdoc3.cxx: 270 in SdDrawDocument::OpenBookmarkDoc(const 
rtl::OUString &)()



*** CID 1356337:  Resource leaks  (RESOURCE_LEAK)
/sd/source/core/drawdoc3.cxx: 270 in SdDrawDocument::OpenBookmarkDoc(const 
rtl::OUString &)()
264 SdDrawDocument* pBookmarkDoc = nullptr;
265 
266 if (!rBookmarkFile.isEmpty() && maBookmarkFile != rBookmarkFile)
267 {
268 SfxMedium* pMedium = new SfxMedium( rBookmarkFile, 
StreamMode::READ );
269 pBookmarkDoc = OpenBookmarkDoc(*pMedium);
>>> CID 1356337:  Resource leaks  (RESOURCE_LEAK)
>>> Variable "pMedium" going out of scope leaks the storage it points to.
270 }
271 else if (mxBookmarkDocShRef.Is())
272 {
273 pBookmarkDoc = mxBookmarkDocShRef->GetDoc();
274 }
275 



To view the defects in Coverity Scan visit, 
https://scan.coverity.com/projects/libreoffice?tab=overview

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://scan.coverity.com/subscriptions/edit?email=libreoffice

[Libreoffice-commits] core.git: vcl/win

[Christian Lohmaier]

 vcl/win/gdi/winlayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 53f645a9c959d93bde9230862c415c4ab2e3817b
Author: Christian Lohmaier 
Date:   Tue Mar 15 23:38:33 2016 +0100

fix windows build

34a7b51ea482d4487d4fb8e61cde18aa1ff9b8ff (for 5-1) auto → size_t made
32bit happy, but win64bit still failed with:
error C2784: ´_Ty std::min(std::initializer_list<_Elem>,_Pr)´ : could
not deduce template argument for ´std::initializer_list<_Elem>´ from
´__int64´

Change-Id: Ib44840f692f1bcdea90decfe443c6eb72806002a

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index a5ca8e5..fa16339 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3955,8 +3955,8 @@ bool D2DWriteTextOutRenderer::DrawGlyphs(const Point & 
origin, uint16_t * pGid,
 DWRITE_GLYPH_OFFSET glyphOffsets[MAX_GLYPHS] = { { 0.0f, 0.0f }, };
 
 mpRT->BeginDraw();
-for (auto nGlyphs = std::min(pGidEnd - pGid, MAX_GLYPHS); pGid != 
pGidEnd;
-pGid += nGlyphs, nGlyphs = std::min(pGidEnd - pGid, 
MAX_GLYPHS))
+for (size_t nGlyphs = std::min(static_cast(pGidEnd - pGid), 
MAX_GLYPHS); pGid != pGidEnd;
+pGid += nGlyphs, nGlyphs = 
std::min(static_cast(pGidEnd - pGid), MAX_GLYPHS))
 {
 std::copy(pGid, pGidEnd, glyphIndices);
 std::copy_n(pAdvances, nGlyphs, glyphAdvances);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Gerrit wish list :-)

[jan iversen]

Hi.

The different lists in Gerrit are very practical and have a good layout. 
However I keep missing the issue number.

We refer to the issue number in most conversations and lesser to the subject. I 
for one use the lists on a daily basis, and find it a time waste to open issues 
just to see the number.

Would anybody be against such a change ?

rgds
jan i.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Jose Mendez - License Statement

[José Méndez]

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.   
  ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

[Eike Rathke]

 sc/source/core/data/formulacell.cxx |   48 +---
 1 file changed, 29 insertions(+), 19 deletions(-)

New commits:
commit b14cc2f16d00c103cf415a54e163d54764d0a86b
Author: Eike Rathke 
Date:   Tue Mar 15 17:39:03 2016 +0100

Resolves: tdf#93196 add RecursionCounter guard also to 
InterpretFormulaGroup()

... same as for ScFormulaCell::InterpretTail()

Change-Id: I444f259fe4e86ed0638a04f1b5d9272edd182e2e
(cherry picked from commit 29ee431c1cf859c3d5a5041cff5cb04b89db27a0)
Reviewed-on: https://gerrit.libreoffice.org/23280
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 36c64e1..b34261b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1438,6 +1438,28 @@ bool ScFormulaCell::MarkUsedExternalReferences()
 return pCode && pDocument->MarkUsedExternalReferences(*pCode, aPos);
 }
 
+namespace {
+class RecursionCounter
+{
+ScRecursionHelper&  rRec;
+boolbStackedInIteration;
+public:
+RecursionCounter( ScRecursionHelper& r, ScFormulaCell* p ) : rRec(r)
+{
+bStackedInIteration = rRec.IsDoingIteration();
+if (bStackedInIteration)
+rRec.GetRecursionInIterationStack().push( p);
+rRec.IncRecursionCount();
+}
+~RecursionCounter()
+{
+rRec.DecRecursionCount();
+if (bStackedInIteration)
+rRec.GetRecursionInIterationStack().pop();
+}
+};
+}
+
 void ScFormulaCell::Interpret()
 {
 if (!IsDirtyOrInTableOpDirty() || 
pDocument->GetRecursionHelper().IsInReturn())
@@ -1680,25 +1702,7 @@ void ScFormulaCell::Interpret()
 
 void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
 {
-class RecursionCounter
-{
-ScRecursionHelper&  rRec;
-boolbStackedInIteration;
-public:
-RecursionCounter( ScRecursionHelper& r, ScFormulaCell* p ) : rRec(r)
-{
-bStackedInIteration = rRec.IsDoingIteration();
-if (bStackedInIteration)
-rRec.GetRecursionInIterationStack().push( p);
-rRec.IncRecursionCount();
-}
-~RecursionCounter()
-{
-rRec.DecRecursionCount();
-if (bStackedInIteration)
-rRec.GetRecursionInIterationStack().pop();
-}
-} aRecursionCounter( pDocument->GetRecursionHelper(), this);
+RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this);
 nSeenInIteration = pDocument->GetRecursionHelper().GetIteration();
 if( !pCode->GetCodeLen() && !pCode->GetCodeError() )
 {
@@ -3844,6 +3848,12 @@ bool ScFormulaCell::InterpretFormulaGroup()
 if (!officecfg::Office::Common::Misc::UseOpenCL::get())
 return false;
 
+// Guard against endless recursion of Interpret() calls, for this to work
+// ScFormulaCell::InterpretFormulaGroup() must never be called through
+// anything else than ScFormulaCell::Interpret(), same as
+// ScFormulaCell::InterpretTail()
+RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this);
+
 // TODO : Disable invariant formula group interpretation for now in order
 // to get implicit intersection to work.
 if (mxGroup->mbInvariant && false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/d40d8217d2d1fa325f4bc41dd109bb6184aaeb

[Caolán McNamara]

 69/d40d8217d2d1fa325f4bc41dd109bb6184aaeb |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 52203cf95d78ce24a102500ce35a7b47cd41b0d4
Author: Caolán McNamara 
Date:   Tue Mar 15 21:07:30 2016 +

Notes added by 'git notes add'

diff --git a/69/d40d8217d2d1fa325f4bc41dd109bb6184aaeb 
b/69/d40d8217d2d1fa325f4bc41dd109bb6184aaeb
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/69/d40d8217d2d1fa325f4bc41dd109bb6184aaeb
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/text/porfld.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 367f13fd584d5b67cbc3a7787892f12655a65d6c
Author: Caolán McNamara 
Date:   Tue Mar 15 21:06:21 2016 +

crashtesting: Related tdf#91291 assert on indexing into empty string

Change-Id: I157389607d2a54349c54ebdb3e283deee126ca67

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index d8f8a75..6322a2f 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -375,7 +375,8 @@ bool SwFieldPortion::Format( SwTextFormatInfo &rInf )
 
 // These characters should not be contained in the follow
 // field portion. They are handled via the HookChar mechanism.
-switch( aNew[0] )
+const sal_Unicode nNew = !aNew.isEmpty() ? aNew[0] : 0;
+switch (nNew)
 {
 case CH_BREAK  : bFull = true;
 // no break
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/PROBLEMS

[Tor Lillqvist]

 loolwsd/PROBLEMS |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 8fda553844fb53308b1dd4dc503dca481ff7ffcd
Author: Tor Lillqvist 
Date:   Tue Mar 15 22:24:58 2016 +0200

The /dev/random and urandom problem was a red herring

I had been using a file system mounted with nodev to test loolwsd.

diff --git a/loolwsd/PROBLEMS b/loolwsd/PROBLEMS
index 86626dd..981e24c 100644
--- a/loolwsd/PROBLEMS
+++ b/loolwsd/PROBLEMS
@@ -1,6 +1,3 @@
-- The /dev/random and /dev/urandom devices created with mknod() in the
-  chroots don't work as they are not chowned to root:root.
-
 - There is way too much of busy waiting for fairly arbitrarily chosen
   timeout periods in the code.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - translations

[Jan Iversen]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3b384f0c6e3effeeb7226798b57020b3a68b20c4
Author: Jan Iversen 
Date:   Tue Mar 15 20:29:57 2016 +0100

Updated core
Project: translations  59e50c8e67bc3434feac5c034d134010537f66c4

pootle update (extract 5-1)

Change-Id: Ie30962d931f386c3c8442a042dc5c542ceb3b8fc

diff --git a/translations b/translations
index fedb9e9..59e50c8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fedb9e91ee37dfef768d50367b31d7537a443d33
+Subproject commit 59e50c8e67bc3434feac5c034d134010537f66c4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - slideshow/opengl slideshow/source

[Emmanuel Gil Peyrot]

 slideshow/opengl/honeycombFragmentShader.glsl|   30 
+-
 slideshow/opengl/honeycombGeometryShader.glsl|   15 +--
 slideshow/opengl/vortexFragmentShader.glsl   |   46 
--
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |   12 +-
 4 files changed, 80 insertions(+), 23 deletions(-)

New commits:
commit 7a3fb01f7ee00443eea719ce0c0a2c89e432c842
Author: Emmanuel Gil Peyrot 
Date:   Wed Feb 24 20:21:13 2016 +

slideshow: Blur the shadows the further they are from the object

Reviewed-on: https://gerrit.libreoffice.org/22678
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

Conflicts:
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx

(cherry-picked from the commit 3ed1e68a79e8dcc623eb9165577e0571cebf4709)

Change-Id: I63f4fda670b86db2ee1ea66d8755d71697fac0c7
Reviewed-on: https://gerrit.libreoffice.org/22812
Tested-by: Jenkins 
Tested-by: jan iversen 
Reviewed-by: jan iversen 

diff --git a/slideshow/opengl/honeycombFragmentShader.glsl 
b/slideshow/opengl/honeycombFragmentShader.glsl
index c207203..e4ce8e3 100644
--- a/slideshow/opengl/honeycombFragmentShader.glsl
+++ b/slideshow/opengl/honeycombFragmentShader.glsl
@@ -29,6 +29,18 @@ bool isBorder(vec2 point)
 
 void main()
 {
+const vec2 samplingPoints[9] = vec2[](
+vec2(0, 0),
+vec2(-1, -1),
+vec2(-1, 0),
+vec2(-1, 1),
+vec2(0, 1),
+vec2(1, 1),
+vec2(1, 0),
+vec2(1, -1),
+vec2(0, -1)
+);
+
 vec4 fragment = vec4(texture(slideTexture, texturePosition).rgb, 1.0);
 vec3 lightVector = vec3(0.0, 0.0, 1.0);
 float light = max(dot(lightVector, normal), 0.0);
@@ -73,13 +85,23 @@ void main()
 fragment.rgb *= actualTime;
 }
 }
+
+// Compute the shadow.
 float visibility = 1.0;
 const float epsilon = 0.0001;
-if (texture(depthShadowTexture, shadowCoordinate.xy).r < 
shadowCoordinate.z - epsilon)
-visibility *= 0.7 + 0.3 * (1.0 - texture(colorShadowTexture, 
shadowCoordinate.xy).a);
+if (selectedTexture < 0.5) {
+float depthShadow = texture(depthShadowTexture, shadowCoordinate.xy).z;
+float shadowRadius = (1.0 / (shadowCoordinate.z - depthShadow)) * 
1000.0;
+// Only the entering slide.
+for (int i = 0; i < 9; ++i) {
+vec2 coordinate = shadowCoordinate.xy + samplingPoints[i] / 
shadowRadius;
+if (depthShadow < shadowCoordinate.z - epsilon) {
+visibility -= 0.05 * texture(colorShadowTexture, coordinate).a;
+}
+}
+}
+
 vec4 black = vec4(0.0, 0.0, 0.0, fragment.a);
-if (fragment.a < 0.001)
-discard;
 gl_FragColor = mix(black, fragment, visibility * light);
 }
 
diff --git a/slideshow/opengl/honeycombGeometryShader.glsl 
b/slideshow/opengl/honeycombGeometryShader.glsl
index 5afaa7b..dedc0df 100644
--- a/slideshow/opengl/honeycombGeometryShader.glsl
+++ b/slideshow/opengl/honeycombGeometryShader.glsl
@@ -67,13 +67,14 @@ void emitHexagonVertex(vec3 center, vec2 translation)
 
 void main()
 {
-vec2 translateVectors[6];
-translateVectors[0] = vec2(-3, -2);
-translateVectors[1] = vec2(0, -4);
-translateVectors[2] = vec2(3, -2);
-translateVectors[3] = vec2(3, 2);
-translateVectors[4] = vec2(0, 4);
-translateVectors[5] = vec2(-3, 2);
+const vec2 translateVectors[6] = vec2[](
+vec2(-3, -2),
+vec2(0, -4),
+vec2(3, -2),
+vec2(3, 2),
+vec2(0, 4),
+vec2(-3, 2)
+);
 
 vec3 center = gl_in[0].gl_Position.xyz;
 
diff --git a/slideshow/opengl/vortexFragmentShader.glsl 
b/slideshow/opengl/vortexFragmentShader.glsl
index a3f8191..6bcdfc5 100644
--- a/slideshow/opengl/vortexFragmentShader.glsl
+++ b/slideshow/opengl/vortexFragmentShader.glsl
@@ -18,15 +18,49 @@ in vec3 v_normal;
 in vec4 shadowCoordinate;
 
 void main() {
+const vec2 samplingPoints[9] = vec2[](
+vec2(0, 0),
+vec2(-1, -1),
+vec2(-1, 0),
+vec2(-1, 1),
+vec2(0, 1),
+vec2(1, 1),
+vec2(1, 0),
+vec2(1, -1),
+vec2(0, -1)
+);
+
+// Compute the shadow...
+float visibility = 1.0;
+const float epsilon = 0.0001;
+
+// for the leaving slide,
+{
+float depthShadow = texture(leavingShadowTexture, shadowCoordinate.xy).r;
+float shadowRadius = (1.0 / (shadowCoordinate.z - depthShadow)) * 1000.0;
+for (int i = 0; i < 9; ++i) {
+vec2 coordinate = shadowCoordinate.xy + samplingPoints[i] / 
shadowRadius;
+if (texture(leavingShadowTexture, coordinate).r < shadowCoordinate.z - 
epsilon) {
+visibility -= 0.05;
+}
+}
+}
+
+// and for entering slide.
+{
+float depthShadow = texture(enteringShadowTexture, shadowCoordinate.xy).r;
+float shadowRadius = (1

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - slideshow/opengl

[Emmanuel Gil Peyrot]

 slideshow/opengl/honeycombFragmentShader.glsl |6 +++---
 slideshow/opengl/honeycombGeometryShader.glsl |2 +-
 slideshow/opengl/vortexFragmentShader.glsl|6 +++---
 slideshow/opengl/vortexVertexShader.glsl  |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bd683e08cd614afdf3be1a8272200e39a38d9d0b
Author: Emmanuel Gil Peyrot 
Date:   Wed Feb 24 20:21:10 2016 +

slideshow: Only use texture() in GLSL 1.50, fixes Intel on Windows

texture2D() is still available, but not in the geometry stage, so
better be consistent everywhere.

(cherry-picked from the commit 1a9b62dc661a26c02db34ab5075b4e209a70b196)

Change-Id: I86bf1921713bcbf32946190525401bfcc633a69f
Reviewed-on: https://gerrit.libreoffice.org/22777
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/slideshow/opengl/honeycombFragmentShader.glsl 
b/slideshow/opengl/honeycombFragmentShader.glsl
index 41b6738..c207203 100644
--- a/slideshow/opengl/honeycombFragmentShader.glsl
+++ b/slideshow/opengl/honeycombFragmentShader.glsl
@@ -29,7 +29,7 @@ bool isBorder(vec2 point)
 
 void main()
 {
-vec4 fragment = vec4(texture2D(slideTexture, texturePosition).rgb, 1.0);
+vec4 fragment = vec4(texture(slideTexture, texturePosition).rgb, 1.0);
 vec3 lightVector = vec3(0.0, 0.0, 1.0);
 float light = max(dot(lightVector, normal), 0.0);
 if (hexagonSize > 1.0) {
@@ -75,8 +75,8 @@ void main()
 }
 float visibility = 1.0;
 const float epsilon = 0.0001;
-if (texture2D(depthShadowTexture, shadowCoordinate.xy).r < 
shadowCoordinate.z - epsilon)
-visibility *= 0.7 + 0.3 * (1.0 - texture2D(colorShadowTexture, 
shadowCoordinate.xy).a);
+if (texture(depthShadowTexture, shadowCoordinate.xy).r < 
shadowCoordinate.z - epsilon)
+visibility *= 0.7 + 0.3 * (1.0 - texture(colorShadowTexture, 
shadowCoordinate.xy).a);
 vec4 black = vec4(0.0, 0.0, 0.0, fragment.a);
 if (fragment.a < 0.001)
 discard;
diff --git a/slideshow/opengl/honeycombGeometryShader.glsl 
b/slideshow/opengl/honeycombGeometryShader.glsl
index 5269fad..5afaa7b 100644
--- a/slideshow/opengl/honeycombGeometryShader.glsl
+++ b/slideshow/opengl/honeycombGeometryShader.glsl
@@ -29,7 +29,7 @@ const float expandFactor = 0.0318;
 
 float snoise(vec2 p)
 {
-return texture2D(permTexture, p).r;
+return texture(permTexture, p).r;
 }
 
 mat4 identityMatrix(void)
diff --git a/slideshow/opengl/vortexFragmentShader.glsl 
b/slideshow/opengl/vortexFragmentShader.glsl
index 3212ebe..a3f8191 100644
--- a/slideshow/opengl/vortexFragmentShader.glsl
+++ b/slideshow/opengl/vortexFragmentShader.glsl
@@ -20,12 +20,12 @@ in vec4 shadowCoordinate;
 void main() {
 vec3 lightVector = vec3(0.0, 0.0, 1.0);
 float light = max(dot(lightVector, v_normal), 0.0);
-vec4 fragment = texture2D(slideTexture, v_texturePosition);
+vec4 fragment = texture(slideTexture, v_texturePosition);
 float visibility = 1.0;
 const float epsilon = 0.0001;
-if (texture2D(leavingShadowTexture, shadowCoordinate.xy).r < 
shadowCoordinate.z - epsilon)
+if (texture(leavingShadowTexture, shadowCoordinate.xy).r < 
shadowCoordinate.z - epsilon)
 visibility *= 0.7;
-if (texture2D(enteringShadowTexture, shadowCoordinate.xy).r < 
shadowCoordinate.z - epsilon)
+if (texture(enteringShadowTexture, shadowCoordinate.xy).r < 
shadowCoordinate.z - epsilon)
 visibility *= 0.7;
 vec4 black = vec4(0.0, 0.0, 0.0, fragment.a);
 gl_FragColor = mix(black, fragment, visibility * light);
diff --git a/slideshow/opengl/vortexVertexShader.glsl 
b/slideshow/opengl/vortexVertexShader.glsl
index 5c6fe23..8d1a67d 100755
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -39,7 +39,7 @@ out float endTime;
 
 float snoise(vec2 p)
 {
-return texture2D(permTexture, p).r;
+return texture(permTexture, p).r;
 }
 
 mat4 identityMatrix(void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/4530bc5079e6830444386bde2d0769a2719aadcd/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

[Eike Rathke]

 sc/source/core/data/formulacell.cxx |   48 +---
 1 file changed, 29 insertions(+), 19 deletions(-)

New commits:
commit c56e92e4ed1f11de5c89b4a5eda6f91de3053941
Author: Eike Rathke 
Date:   Tue Mar 15 17:39:03 2016 +0100

Resolves: tdf#93196 add RecursionCounter guard also to 
InterpretFormulaGroup()

... same as for ScFormulaCell::InterpretTail()

Change-Id: I444f259fe4e86ed0638a04f1b5d9272edd182e2e
(cherry picked from commit 29ee431c1cf859c3d5a5041cff5cb04b89db27a0)
Reviewed-on: https://gerrit.libreoffice.org/23279
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 8b4a727..5fb2c7a 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1499,6 +1499,28 @@ bool ScFormulaCell::MarkUsedExternalReferences()
 return pCode && pDocument->MarkUsedExternalReferences(*pCode, aPos);
 }
 
+namespace {
+class RecursionCounter
+{
+ScRecursionHelper&  rRec;
+boolbStackedInIteration;
+public:
+RecursionCounter( ScRecursionHelper& r, ScFormulaCell* p ) : rRec(r)
+{
+bStackedInIteration = rRec.IsDoingIteration();
+if (bStackedInIteration)
+rRec.GetRecursionInIterationStack().push( p);
+rRec.IncRecursionCount();
+}
+~RecursionCounter()
+{
+rRec.DecRecursionCount();
+if (bStackedInIteration)
+rRec.GetRecursionInIterationStack().pop();
+}
+};
+}
+
 void ScFormulaCell::Interpret()
 {
 #if DEBUG_CALCULATION
@@ -1769,25 +1791,7 @@ void ScFormulaCell::Interpret()
 
 void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
 {
-class RecursionCounter
-{
-ScRecursionHelper&  rRec;
-boolbStackedInIteration;
-public:
-RecursionCounter( ScRecursionHelper& r, ScFormulaCell* p ) : rRec(r)
-{
-bStackedInIteration = rRec.IsDoingIteration();
-if (bStackedInIteration)
-rRec.GetRecursionInIterationStack().push( p);
-rRec.IncRecursionCount();
-}
-~RecursionCounter()
-{
-rRec.DecRecursionCount();
-if (bStackedInIteration)
-rRec.GetRecursionInIterationStack().pop();
-}
-} aRecursionCounter( pDocument->GetRecursionHelper(), this);
+RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this);
 nSeenInIteration = pDocument->GetRecursionHelper().GetIteration();
 if( !pCode->GetCodeLen() && !pCode->GetCodeError() )
 {
@@ -3969,6 +3973,12 @@ bool ScFormulaCell::InterpretFormulaGroup()
 if (!ScCalcConfig::isOpenCLEnabled() && 
!ScCalcConfig::isSwInterpreterEnabled())
 return false;
 
+// Guard against endless recursion of Interpret() calls, for this to work
+// ScFormulaCell::InterpretFormulaGroup() must never be called through
+// anything else than ScFormulaCell::Interpret(), same as
+// ScFormulaCell::InterpretTail()
+RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this);
+
 // TODO : Disable invariant formula group interpretation for now in order
 // to get implicit intersection to work.
 if (mxGroup->mbInvariant && false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless

[jan iversen]

 vcl/headless/svpinst.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 96a0a4384fa95fb9f7bdd5d008eaf05d75151c71
Author: jan iversen 
Date:   Tue Mar 15 19:33:33 2016 +

Revert "fix memory leak in headless backend"

This reverts commit eaaca6eaf26b0976f1c06f583a8aa35ee1c1b857.

Causing tinderbox problems and reverted before making the 5.1.2 tag

Change-Id: I987d1c5c839f020da150753f9a997a6824c1af67
Reviewed-on: https://gerrit.libreoffice.org/23286
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 12ef4e5..0d765c1 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -150,12 +150,8 @@ void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
 std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
 do
 {
-if( it->m_pFrame == pFrame )
+if( it->m_pFrame== pFrame )
 {
-if (it->m_nEvent == SALEVENT_USEREVENT)
-{
-delete static_cast(it->m_pData);
-}
 it = m_aUserEvents.erase( it );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: A question about table indent

[Regina Henschel]

Hi Weike,

thanks for the document. The problem in the last table is, that it has 
got a tblCellMar element. I can reproduce a wrong indent from scratch, 
when I use cell margins in Word. But I don't know, whether your patch is 
correct.


Please write a bug report.

Kind regards
Regina

weike.li...@cs2c.com.cn schrieb:

Hi all,


Sorry for forgetting to attach the document. Please take a look at the
position of the last table.


Best regards,

Weike Liang

​

 转发邮件信息 

主　题:A question about table indent
日　期:Mon, 14 Mar 2016 10:23:29 +0800
发件人:
收件人:libreoffice 


  Hi all,


My colleague from testing department reported a bug about the indent of
the whole table. I looked into the source code and found the position
where the problem may be. In
writerilter/source/dmapper/DomainMapperTableHandler.cxx there exists an
if-else statement that is responsible to calculate and process the table
indent. But after i read the annotation i found the lines in if and else
clauses were wrong. They both should change their positions with each
other. I don't know if it is right. Please review the changes and give
me some suggustions. Thanks.


Best regards,

Weike Liang




___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sd/source

[Chris Sherlock]

 sd/source/ui/animations/CategoryListBox.cxx |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit 89e0a84a82ddb8c22c46f6f2d4d5f466a43c3b8a
Author: Chris Sherlock 
Date:   Wed Mar 16 06:01:43 2016 +1100

sd: add license boilerplate

Change-Id: Iab97ad48b44d2c1bc8c6712dfe9e3d52a974f0a0

diff --git a/sd/source/ui/animations/CategoryListBox.cxx 
b/sd/source/ui/animations/CategoryListBox.cxx
index 1fba845..41a3d6b 100644
--- a/sd/source/ui/animations/CategoryListBox.cxx
+++ b/sd/source/ui/animations/CategoryListBox.cxx
@@ -1,3 +1,22 @@
+/* -*- 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 .
+ */
+
 #include "CategoryListBox.hxx"
 
 namespace sd {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source sd/source sw/source

[Samuel Mehrbrodt]

 sc/source/ui/drawfunc/fupoor.cxx  |3 ++-
 sd/source/ui/func/fupoor.cxx  |3 ++-
 sw/source/uibase/docvw/edtwin.cxx |3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4af2f26a955d172e8b72579c9bc6534e98b9f72b
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 19:22:31 2016 +0100

tdf#97919 Also resize ole objects proportionally by default

Change-Id: I1c3b13aa4cb0127451353f20179f39b6eebe12ec
Reviewed-on: https://gerrit.libreoffice.org/23284
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 29116e2..cdb0ac3 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -298,7 +298,8 @@ bool FuPoor::doConstructOrthogonal() const
 {
 sal_uInt16 aObjIdentifier = 
rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier();
 return aObjIdentifier == OBJ_GRAF ||
-   aObjIdentifier == OBJ_MEDIA;
+   aObjIdentifier == OBJ_MEDIA ||
+   aObjIdentifier == OBJ_OLE2;
 }
 }
 else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON || 
aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL)
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 9b05d71..c1f4989 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -1134,7 +1134,8 @@ bool FuPoor::doConstructOrthogonal() const
 SdrMark* pMark = rMarkList.GetMark(0);
 sal_uInt16 aObjIdentifier = 
pMark->GetMarkedSdrObj()->GetObjIdentifier();
 bIsMediaSelected = aObjIdentifier == OBJ_GRAF ||
-   aObjIdentifier == OBJ_MEDIA;
+   aObjIdentifier == OBJ_MEDIA ||
+   aObjIdentifier == OBJ_OLE2;
 }
 }
 
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 780a853..d7be3c0 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4080,7 +4080,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 break;
 
 bool bIsMediaSelected = rSh.GetSelectionType() & 
nsSelectionType::SEL_GRF ||
-rSh.GetSelectionType() & 
nsSelectionType::SEL_MEDIA;
+rSh.GetSelectionType() & 
nsSelectionType::SEL_MEDIA ||
+rSh.GetSelectionType() & 
nsSelectionType::SEL_OLE;
 bool bisResize = g_eSdrMoveHdl != HDL_MOVE;
 
 if (pSdrView)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 862 commits - accessibility/inc accessibility/source android/Bootstrap apple_remote/Library_AppleRemote.mk apple_remote/source avmedi

[Douglas Mencken]

Rebased ref, commits from common ancestor:
commit d913653fd361ed8f1949dbefe618739d4531b666
Author: Douglas Mencken 
Date:   Tue Mar 15 13:52:08 2016 -0400

uno/check.cxx: really why?

Change-Id: I0f9a48ef01bee4153cd9231bdef4b5a763b6bda2

diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx
index 7fb8b36..d7d07be 100644
--- a/cppu/source/uno/check.cxx
+++ b/cppu/source/uno/check.cxx
@@ -26,17 +26,6 @@
 #include 
 #include 
 
-// Why hardcode like this instead of using the (generated)
-//  ?
-#if (defined(INTEL) \
-&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) ||   \
-  defined(NETBSD) || defined(OPENBSD) ||  \
-  defined(DRAGONFLY) || defined(SOLARIS)) \
-|| defined(MACOSX) )) \
-|| defined(IOS)
-#define MAX_ALIGNMENT_4
-#endif
-
 namespace {
 
 #if defined( SAL_W32)
@@ -161,12 +150,10 @@ static_assert( static_cast(true) == sal_True,
"must be binary compatible" );
 static_assert( static_cast(false) == sal_False,
"must be binary compatible" );
-#ifdef MAX_ALIGNMENT_4
-// max alignment is 4
+#if SAL_TYPES_ALIGNMENT8 == 4
 static_assert(offsetof(AlignSize_Impl, dDouble) == 4, 
"offsetof(AlignSize_Impl, dDouble) != 4");
 static_assert(sizeof(AlignSize_Impl) == 12, "sizeof(AlignSize_Impl) != 12");
-#else
-// max alignment is 8
+#elif SAL_TYPES_ALIGNMENT8 == 8
 static_assert(offsetof(AlignSize_Impl, dDouble) == 8, 
"offsetof(AlignSize_Impl, dDouble) != 8");
 static_assert(sizeof(AlignSize_Impl) == 16, "sizeof(AlignSize_Impl) != 16");
 #endif
@@ -191,9 +178,9 @@ static_assert(sizeof(N) == 12, "sizeof(N) != 12");
 static_assert(sizeof(N2) == 12, "sizeof(N2) != 12");
 
 static_assert(offsetof(N2, p) == 8, "offsetof(N2, p) != 8");
-#ifdef MAX_ALIGNMENT_4
+#if SAL_TYPES_ALIGNMENT8 == 4
 static_assert(sizeof(O) == 20, "sizeof(O) != 20");
-#else
+#elif SAL_TYPES_ALIGNMENT8 == 8
 static_assert(sizeof(O) == 24, "sizeof(O) != 24");
 #endif
 static_assert(sizeof(D) == 8, "sizeof(D) != 8");
@@ -204,14 +191,14 @@ static_assert(offsetof(E, e) == 8, "offsetof(E, e) != 8");
 static_assert(sizeof(C1) == 2, "sizeof(C1) != 2");
 static_assert(sizeof(C2) == 8, "sizeof(C2) != 8");
 
-#ifdef MAX_ALIGNMENT_4
+#if SAL_TYPES_ALIGNMENT8 == 4
 static_assert(sizeof(C3) == 20, "sizeof(C3) != 20");
 static_assert(sizeof(C4) == 32, "sizeof(C4) != 32");
 static_assert(sizeof(C5) == 44, "sizeof(C5) != 44");
 static_assert(sizeof(C6) == 52, "sizeof(C6) != 52");
 
 static_assert(sizeof(O2) == 24, "sizeof(O2) != 24");
-#else
+#elif SAL_TYPES_ALIGNMENT8 == 8
 static_assert(sizeof(C3) == 24, "sizeof(C3) != 24");
 static_assert(sizeof(C4) == 40, "sizeof(C4) != 40");
 static_assert(sizeof(C5) == 56, "sizeof(C5) != 56");
@@ -222,10 +209,10 @@ static_assert(sizeof(O2) == 32, "sizeof(O2) != 32");
 
 static_assert(sizeof(Char3) == 3, "sizeof(Char3) != 3");
 
-#ifdef MAX_ALIGNMENT_4
+#if SAL_TYPES_ALIGNMENT8 == 4
 // max alignment is 4
 static_assert(sizeof(P) == 20, "sizeof(P) != 20");
-#else
+#elif SAL_TYPES_ALIGNMENT8 == 8
 // alignment of P is 8, because of P[] ...
 static_assert(sizeof(P) == 24, "sizeof(P) != 24");
 static_assert(sizeof(second) == sizeof(int), "sizeof(second) != sizeof(int)");
@@ -246,7 +233,7 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
 
 assert(OFFSET_OF(C2, n2) == 4);
 
-#ifdef MAX_ALIGNMENT_4
+#if SAL_TYPES_ALIGNMENT8 == 4
 assert(OFFSET_OF(C3, d3) == 8);
 assert(OFFSET_OF(C3, n3) == 16);
 assert(OFFSET_OF(C4, n4) == 20);
@@ -257,7 +244,7 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
 assert(OFFSET_OF(C6, b6) == 48);
 
 assert(OFFSET_OF(O2, p2) == 20);
-#else
+#elif SAL_TYPES_ALIGNMENT8 == 8
 assert(OFFSET_OF(C3, d3) == 8);
 assert(OFFSET_OF(C3, n3) == 16);
 assert(OFFSET_OF(C4, n4) == 24);
commit daafbba878077dcd4510589cd6160acc2c5aa976
Author: Douglas Mencken 
Date:   Fri Oct 16 16:12:46 2015 -0400

temporarily(?) disable failing unit tests for Mac OS X 10.5

  sw ~ ww8export & ww8import
dbaccess ~ RowSetClones & hsqldb_test
 postprocess ~ services

  • disable files that fail sw_ooxmlexport test
  • textframe-gradient.docx fails sw_ooxmlexport2 test
  • FDO78292.docx & combobox-control.docx & date-control.docx (they fail 
sw_ooxmlexport4 test)
  • sw_ooxmlexport5 is disabled completely
  • disable files which fail sw_ooxmlexport7
  • disable fdo81946.docx from sw_ooxmlfieldexport test
  • parts of sw_ooxmlimport, sw_rtfexport & sw_rtfimport, sw_odfimport
  • failing parts of sw_uiwriter, sw_mailmerge
  • Module_writerfilter: completely disable 
CppunitTest_writerfilter_rtftok
  • disable failing parts of CppunitTest_sd_export_tests

also disable failing parts of
  • ucalc
  • chart2_export
  • sc_subsequent_filters_test
  • sc_subsequent_export_test

besides, reintroduce workarounds for some tests

C

[Libreoffice-commits] core.git: sd/source

[Samuel Mehrbrodt]

 sd/source/ui/func/fudraw.cxx |   22 +-
 sd/source/ui/func/fupoor.cxx |   16 
 sd/source/ui/inc/fudraw.hxx  |1 -
 3 files changed, 17 insertions(+), 22 deletions(-)

New commits:
commit ddff603053051ed674ff267d5b75ddda9076903c
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 16:41:16 2016 +0100

sd image resizing: Small code cleanup

The decision whether to resize proportionally should be made in 
FuPoor::doConstructOrthogonal

Change-Id: I9f27bc377db2933f781f962b0048527ded533b34
Reviewed-on: https://gerrit.libreoffice.org/23281
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 5404dc3..76898a6 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -78,7 +78,6 @@ FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, 
::sd::View* pView,
 , bDragHelpLine(false)
 , nHelpLine(0)
 , bPermanent(false)
-, bIsMediaSelected(false)
 {
 }
 
@@ -155,25 +154,6 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
 bDragHelpLine = false;
 aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
 
-// Check whether a media object is selected
-bIsMediaSelected = false;
-if (mpView->AreObjectsMarked())
-{
-const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
-if (rMarkList.GetMarkCount() == 1)
-{
-SdrMark* pMark = rMarkList.GetMark(0);
-// tdf#89758 Extra check to avoid interactive crop preview from 
being
-// proportionally scaled by default.
-if (mpView->GetDragMode() != SDRDRAG_CROP)
-{
-sal_uInt16 aObjIdentifier = 
pMark->GetMarkedSdrObj()->GetObjIdentifier();
-bIsMediaSelected = aObjIdentifier == OBJ_GRAF ||
-   aObjIdentifier == OBJ_MEDIA;
-}
-}
-}
-
 if ( rMEvt.IsLeft() )
 {
 FrameView* pFrameView = mpViewShell->GetFrameView();
@@ -261,7 +241,7 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt)
 if (mpView->IsAction())
 {
 // #i33136# and fdo#88339
-if(bRestricted && (bIsMediaSelected || doConstructOrthogonal()))
+if(bRestricted && doConstructOrthogonal())
 {
 // Scale proportionally by default:
 // rectangle->quadrat, ellipse->circle, Images etc.
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 34b35ab..9b05d71 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -1123,7 +1123,23 @@ bool FuPoor::cancel()
 // #i33136#
 bool FuPoor::doConstructOrthogonal() const
 {
+// Check whether a media object is selected
+bool bIsMediaSelected = false;
+// tdf#89758 Avoid interactive crop preview from being proportionally 
scaled by default.
+if (mpView->AreObjectsMarked() && mpView->GetDragMode() != SDRDRAG_CROP)
+{
+const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
+if (rMarkList.GetMarkCount() == 1)
+{
+SdrMark* pMark = rMarkList.GetMark(0);
+sal_uInt16 aObjIdentifier = 
pMark->GetMarkedSdrObj()->GetObjIdentifier();
+bIsMediaSelected = aObjIdentifier == OBJ_GRAF ||
+   aObjIdentifier == OBJ_MEDIA;
+}
+}
+
 return (
+bIsMediaSelected ||
 SID_DRAW_XLINE == nSlotId ||
 SID_DRAW_CIRCLEARC == nSlotId ||
 SID_DRAW_SQUARE == nSlotId ||
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index 6a22089..6300064 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -77,7 +77,6 @@ protected:
 boolbDragHelpLine;
 sal_uInt16  nHelpLine;
 boolbPermanent;
-bool bIsMediaSelected;
 
 private:
 void DoModifiers(const MouseEvent& rMEvt, bool bSnapModPressed);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSOC 2016 New Idea: Tabbed LibreOffice Pages

[Samuel Mehrbrodt]

Only that Lotus symphony MDI was a Java thing based on the Eclipse
framework - and that part has not been open sourced.

Doesn't mean that this is impossible to do - but as a newcomer I would
start with some easier task.

Samuel

Am 15.03.2016 um 18:38 schrieb Dennis Roczek:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Hi Esref,
>
> your idea is mentioned on the Crazy Idea page on the wiki since a very
> long time, see
> https://wiki.documentfoundation.org/Development/Crazy_Ideas#Add_Tabs_lik
> e_Lotus_Symphony
>
> As Lotus Symphony had already such an interface (which is now under
> APLv2 in Apache OpenOffice repositories) this is at least possible.
>
> Regards,
>
> Dennis Roczek
>
> Am 15.03.2016 um 14:32 schrieb Esref Ozturk:
>> Hello,
>>
>> I have an idea I want to work on within LibreOffice. I want to share i
> t
>> here and get feedback on whether it is suitable and doable or not. I c
> ould
>> not see my idea in ideas list. I have seen some past discussions on th
> at
>> but it is not clear where the community is at.
>>
>> Simply put,  All LibreOffice applications  on multiple tabs under one
>> window like web browsers. Consider 1 Writer tab, 2 Calc tabs, etc.
>>
>> Since I am not familiar with the codebase of the LibreOffice, I cannot
>> determine if it is doable in 3 months.
>>
>> Any feedback will be appreciated.
>>
>> --
>> Esref Ozturk
>> http://esrefozturk.com
>>
>>
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
> -BEGIN PGP SIGNATURE-
> Version: GnuPG v2
>
> iQIcBAEBCAAGBQJW6BaBAAoJEM4+Qf3OKrbZhfUP/Rd70C9h23ziUK8WXg9HBwX/
> i02Ilhd5HtLkuBY0D+PE7JkjzBg1JyTt6bN4qNWf4a72g1pMXo+nPs7Ooj2VGKUV
> 4/lkCdPcUPaJPlxQZI50diTL/sxpywEufpIkD6+/Qbt2wtf8H+5T+yrAbDW4JCJs
> rf//Hlmg2+9W5gJdf/HTwxyOnkJE3wuhb27T/tifcVpnn4V4kitHSThQVC37moox
> PayXW8xU5WNRk1gpQI4MyTsZ7MqBP6hghQBrWJe9rpdmJm1u+QiNMquIrvuWKz9I
> oCyNDXoDqMA7MZXwx98KI1iqnaFKJKvMakYkZ4aBAHVZxc3ZMP2cw+eDvktFs/Yl
> D+AIRZZW2eHTbABcW5Mp6OFcdoHwpR8azhy42C31IhMMttpU2gFPf4saFNIZCQrZ
> lAVVFtAZGZB2YfZnBMrhhsv5rLGaEAATLtNJwtaAiImbp2FW8YsHWL1qm1D+WSio
> rLLikCSTRJRV8DLsNaP4qBT5Av09r2caKmMIrFOlPE4VoG6/gLXouWIs/woKFVGg
> Fk8oDbnalhBs4GJD9IfdABNtQajg/xxZiOA6ziv7QIyQ26ms7318SuwrHsN3PAyc
> yfXe6yvzP78YA/7WS+NZEiwDVr/V1FXhUTcyZI8sHiocq0RxVx/QG3XrBJaSSv2u
> NLuImgARoJ3daETv6KRr
> =Ajgf
> -END PGP SIGNATURE-
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: GSOC 2016 New Idea: Tabbed LibreOffice Pages

[Pedro]

Esref Ozturk wrote
> I have an idea I want to work on within LibreOffice. I want to share it
> here and get feedback on whether it is suitable and doable or not. I could
> not see my idea in ideas list. I have seen some past discussions on that
> but it is not clear where the community is at.
> 
> Simply put,  All LibreOffice applications  on multiple tabs under one
> window like web browsers. Consider 1 Writer tab, 2 Calc tabs, etc.
> 
> Since I am not familiar with the codebase of the LibreOffice, I cannot
> determine if it is doable in 3 months.

IBM Lotus Symphony 3.0 (based on OpenOffice.org 3.0) already did that back
in 2010
Lotus Symphony on Windows XP
  

According to this Wikipedia page
https://en.wikipedia.org/wiki/IBM_Lotus_Symphony
Apache OpenOffice got the code from IBM.

I believe it would be a great addition to LibreOffice!

Just my 2 (non-dev) cents! :)



--
View this message in context: 
http://nabble.documentfoundation.org/GSOC-2016-New-Idea-Tabbed-LibreOffice-Pages-tp4178598p4178629.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - extras/source

[Jan Iversen]

 extras/source/autocorr/lang/bg/DocumentList.xml|   18 
 extras/source/autocorr/lang/ca/DocumentList.xml|  358 +
 extras/source/autocorr/lang/cs/DocumentList.xml|  571 +
 extras/source/autocorr/lang/da/DocumentList.xml|  623 ++
 extras/source/autocorr/lang/de/DocumentList.xml|  249 
 extras/source/autocorr/lang/en-AU/DocumentList.xml |  826 ++
 extras/source/autocorr/lang/en-GB/DocumentList.xml | 1987 ++
 extras/source/autocorr/lang/en-US/DocumentList.xml |  831 ++
 extras/source/autocorr/lang/en-ZA/DocumentList.xml |  815 ++
 extras/source/autocorr/lang/es/DocumentList.xml|  503 +
 extras/source/autocorr/lang/fa/DocumentList.xml| 6191 +
 extras/source/autocorr/lang/fi/DocumentList.xml|   17 
 extras/source/autocorr/lang/fr/DocumentList.xml|  457 +
 extras/source/autocorr/lang/hr/DocumentList.xml|  543 +
 extras/source/autocorr/lang/hu/DocumentList.xml|  665 ++
 extras/source/autocorr/lang/is/DocumentList.xml|2 
 extras/source/autocorr/lang/it/DocumentList.xml|   89 
 extras/source/autocorr/lang/ja/DocumentList.xml|  816 ++
 extras/source/autocorr/lang/ko/DocumentList.xml|  816 ++
 extras/source/autocorr/lang/lt/DocumentList.xml|   81 
 extras/source/autocorr/lang/mn/DocumentList.xml|  282 
 extras/source/autocorr/lang/nl/DocumentList.xml|  110 
 extras/source/autocorr/lang/pl/DocumentList.xml|  490 +
 extras/source/autocorr/lang/pt-BR/DocumentList.xml | 1832 ++
 extras/source/autocorr/lang/pt/DocumentList.xml|  267 
 extras/source/autocorr/lang/ro/DocumentList.xml|   86 
 extras/source/autocorr/lang/ru/DocumentList.xml|  216 
 extras/source/autocorr/lang/sk/DocumentList.xml|  175 
 extras/source/autocorr/lang/sl/DocumentList.xml|  451 +
 extras/source/autocorr/lang/sv/DocumentList.xml|  111 
 extras/source/autocorr/lang/tr/DocumentList.xml|   96 
 extras/source/autocorr/lang/vi/DocumentList.xml|  871 ++
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |  813 ++
 extras/source/autocorr/lang/zh-TW/DocumentList.xml |  813 ++
 34 files changed, 23071 insertions(+)

New commits:
commit e8d2cf5c251457521a565bf24c784f11f624a995
Author: Jan Iversen 
Date:   Tue Mar 15 18:16:16 2016 +0100

Revert "Pootle extract, manual update of emoji autocorrect files"

This reverts commit fb0f084c1810fa2572e5e63af7fa239bb1b4c363.

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index ef6c576..37c30f6 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -1,3 +1,21 @@
+
+http://openoffice.org/2001/block-list";>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index 5fcf4c9..4085133 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -1,3 +1,361 @@
+
+
+
+http://openoffice.org/2001/block-list";>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index 0799ccd..7d04405 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -1,3 +1,574 @@
+
+http://openoffice.org/2001/block-list";>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

Re: A question about table indent

[weike.liang]

Hi all,

Sorry for forgetting to attach the document. Please take a look
at the position of the last table.

Best regards,

Weike Liang

​


转发邮件信息 

A question about table indent

Mon, 14 Mar 2016
10:23:29 +0800

libreoffice 

 Hi all,

My colleague from testing
department reported a bug about the indent of the whole table. I looked
into the source code and found the position where the problem may be. In
writerilter/source/dmapper/DomainMapperTableHandler.cxx there exists an
if-else statement that is responsible to calculate and process the table
indent. But after i read the annotation i found the lines in if and else
clauses were wrong. They both should change their positions with each
other. I don't know if it is right. Please review the changes and give me
some suggustions. Thanks. 

Best regards,

Weike Liang

diff -uNr old/writerfilter/source/dmapper/DomainMapperTableHandler.cxx new/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
--- old/writerfilter/source/dmapper/DomainMapperTableHandler.cxx	2016-03-14 09:44:46.396913987 +0800
+++ new/writerfilter/source/dmapper/DomainMapperTableHandler.cxx	2016-03-14 09:44:45.036775927 +0800
@@ -554,11 +554,11 @@
 // - nested tables: the goal is to have left-most border starting at table_indent pos
 if (rInfo.nNestLevel > 1)
 {
-m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nLeftMargin - nGapHalf ));
+m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance ));
 }
 else
 {
-m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance ));
+m_aTableProperties->Insert( PROP_LEFT_MARGIN, uno::makeAny( nLeftMargin - nGapHalf ));
 }
 
 m_aTableProperties->getValue( TablePropertyMap::TABLE_WIDTH, nTableWidth );


table_indent.docx
Description: MS-Word 2007 document
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: GSOC 2016 New Idea: Tabbed LibreOffice Pages

[Dennis Roczek]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi Esref,

your idea is mentioned on the Crazy Idea page on the wiki since a very
long time, see
https://wiki.documentfoundation.org/Development/Crazy_Ideas#Add_Tabs_lik
e_Lotus_Symphony

As Lotus Symphony had already such an interface (which is now under
APLv2 in Apache OpenOffice repositories) this is at least possible.

Regards,

Dennis Roczek

Am 15.03.2016 um 14:32 schrieb Esref Ozturk:
> Hello,
> 
> I have an idea I want to work on within LibreOffice. I want to share i
t
> here and get feedback on whether it is suitable and doable or not. I c
ould
> not see my idea in ideas list. I have seen some past discussions on th
at
> but it is not clear where the community is at.
> 
> Simply put,  All LibreOffice applications  on multiple tabs under one
> window like web browsers. Consider 1 Writer tab, 2 Calc tabs, etc.
> 
> Since I am not familiar with the codebase of the LibreOffice, I cannot
> determine if it is doable in 3 months.
> 
> Any feedback will be appreciated.
> 
> --
> Esref Ozturk
> http://esrefozturk.com
> 
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQIcBAEBCAAGBQJW6BaBAAoJEM4+Qf3OKrbZhfUP/Rd70C9h23ziUK8WXg9HBwX/
i02Ilhd5HtLkuBY0D+PE7JkjzBg1JyTt6bN4qNWf4a72g1pMXo+nPs7Ooj2VGKUV
4/lkCdPcUPaJPlxQZI50diTL/sxpywEufpIkD6+/Qbt2wtf8H+5T+yrAbDW4JCJs
rf//Hlmg2+9W5gJdf/HTwxyOnkJE3wuhb27T/tifcVpnn4V4kitHSThQVC37moox
PayXW8xU5WNRk1gpQI4MyTsZ7MqBP6hghQBrWJe9rpdmJm1u+QiNMquIrvuWKz9I
oCyNDXoDqMA7MZXwx98KI1iqnaFKJKvMakYkZ4aBAHVZxc3ZMP2cw+eDvktFs/Yl
D+AIRZZW2eHTbABcW5Mp6OFcdoHwpR8azhy42C31IhMMttpU2gFPf4saFNIZCQrZ
lAVVFtAZGZB2YfZnBMrhhsv5rLGaEAATLtNJwtaAiImbp2FW8YsHWL1qm1D+WSio
rLLikCSTRJRV8DLsNaP4qBT5Av09r2caKmMIrFOlPE4VoG6/gLXouWIs/woKFVGg
Fk8oDbnalhBs4GJD9IfdABNtQajg/xxZiOA6ziv7QIyQ26ms7318SuwrHsN3PAyc
yfXe6yvzP78YA/7WS+NZEiwDVr/V1FXhUTcyZI8sHiocq0RxVx/QG3XrBJaSSv2u
NLuImgARoJ3daETv6KRr
=Ajgf
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Interested in Gsoc 2016

[Jaskaran Singh]

Hello Everyone ,
My name is Jaskaran and I am a 2nd year Electronics Engineering Student
from New Delhi. I am interested in the project "Support ODF styles through
Orcus" .

I have worked for a similar hobby project named  "Pysports". It is a Sport
Scorecard application which fetches xml file from the server , parses xml
data and displays Periodic Sports notification direct to the bubble
notification area of the linux desktop.
https://github.com/jvsg/PySports

At the Time of writing this mail I had submitting 9 patches out of which 6
were merged and 3 pending to be reviewed. Here is a link to my patches.
https://goo.gl/2Kn6tR

I am in touch with the project mentor regarding the Gsoc Project.

Regards,
Email :-   jvsg1...@gmail.com
IRC:-   jvsg
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: extras/source

[Samuel Mehrbrodt]

 extras/source/autocorr/emoji/emoji.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 604021c66f0c409b241eafd89a3d3b43f2632437
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 18:27:32 2016 +0100

tdf#96115 Fix wrong emoji source string

Change-Id: If744655825104c89e077eabef5b1b71a752f2414
Reviewed-on: https://gerrit.libreoffice.org/23282
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/extras/source/autocorr/emoji/emoji.ulf 
b/extras/source/autocorr/emoji/emoji.ulf
index 294d0fa..268ae34 100644
--- a/extras/source/autocorr/emoji/emoji.ulf
+++ b/extras/source/autocorr/emoji/emoji.ulf
@@ -4465,7 +4465,7 @@ en-US = "^B"
 
 [MODIFIER_LETTER_CAPITAL_D]
 x-comment = "á´° (U+01D30), see http://wiki.documentfoundation.org/Emoji";
-en-US = "^C"
+en-US = "^D"
 
 [MODIFIER_LETTER_CAPITAL_E]
 x-comment = "á´± (U+01D31), see http://wiki.documentfoundation.org/Emoji";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - translations

[Jan Iversen]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d827d6c93534d0da4acae0f9d39203c20d18b003
Author: Jan Iversen 
Date:   Tue Mar 15 18:06:23 2016 +0100

Updated core
Project: translations  5d94e35222f8504ec4877c1c15886cad7ebfba2e

Revert "Pootle update"

This reverts commit 1d1073acd5928309e062695fcaa3cb7f64bc1221.

diff --git a/translations b/translations
index 1d1073a..5d94e35 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1d1073acd5928309e062695fcaa3cb7f64bc1221
+Subproject commit 5d94e35222f8504ec4877c1c15886cad7ebfba2e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source sd/source sw/source

[Samuel Mehrbrodt]

 sc/source/ui/drawfunc/fupoor.cxx  |9 -
 sd/source/ui/func/fudraw.cxx  |   12 +++-
 sd/source/ui/inc/fudraw.hxx   |2 +-
 sw/source/uibase/docvw/edtwin.cxx |   11 ++-
 4 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit f669eec43ee902071c8f56a322a6dfb1a4a66e45
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 16:06:05 2016 +0100

tdf#97919 Resize media objects proportionally by default

as we do with images

Change-Id: I5b27b8310736b9dfd5c274614ad4d1e4becb1fa9
Reviewed-on: https://gerrit.libreoffice.org/23277
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index d9cbdf0..29116e2 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -290,16 +290,15 @@ bool FuPoor::doConstructOrthogonal() const
 }
 }
 
-// Detect image and resize proportionally, but don't constrain movement by 
default
+// Detect image/media and resize proportionally, but don't constrain 
movement by default
 if (pView->AreObjectsMarked())
 {
 const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
 if (rMarkList.GetMarkCount() == 1)
 {
-if (rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier() == 
OBJ_GRAF)
-{
-return true;
-}
+sal_uInt16 aObjIdentifier = 
rMarkList.GetMark(0)->GetMarkedSdrObj()->GetObjIdentifier();
+return aObjIdentifier == OBJ_GRAF ||
+   aObjIdentifier == OBJ_MEDIA;
 }
 }
 else if (aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON || 
aSfxRequest.GetSlot() == SID_DRAW_XPOLYGON_NOFILL)
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 9d735c4..5404dc3 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -78,7 +78,7 @@ FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, 
::sd::View* pView,
 , bDragHelpLine(false)
 , nHelpLine(0)
 , bPermanent(false)
-, bIsImageSelected(false)
+, bIsMediaSelected(false)
 {
 }
 
@@ -155,8 +155,8 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
 bDragHelpLine = false;
 aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
 
-// Check whether an image is selected
-bIsImageSelected = false;
+// Check whether a media object is selected
+bIsMediaSelected = false;
 if (mpView->AreObjectsMarked())
 {
 const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
@@ -167,7 +167,9 @@ bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
 // proportionally scaled by default.
 if (mpView->GetDragMode() != SDRDRAG_CROP)
 {
-bIsImageSelected = 
pMark->GetMarkedSdrObj()->GetObjIdentifier() == OBJ_GRAF;
+sal_uInt16 aObjIdentifier = 
pMark->GetMarkedSdrObj()->GetObjIdentifier();
+bIsMediaSelected = aObjIdentifier == OBJ_GRAF ||
+   aObjIdentifier == OBJ_MEDIA;
 }
 }
 }
@@ -259,7 +261,7 @@ bool FuDraw::MouseMove(const MouseEvent& rMEvt)
 if (mpView->IsAction())
 {
 // #i33136# and fdo#88339
-if(bRestricted && (bIsImageSelected || doConstructOrthogonal()))
+if(bRestricted && (bIsMediaSelected || doConstructOrthogonal()))
 {
 // Scale proportionally by default:
 // rectangle->quadrat, ellipse->circle, Images etc.
diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx
index b315e0b..6a22089 100644
--- a/sd/source/ui/inc/fudraw.hxx
+++ b/sd/source/ui/inc/fudraw.hxx
@@ -77,7 +77,7 @@ protected:
 boolbDragHelpLine;
 sal_uInt16  nHelpLine;
 boolbPermanent;
-bool bIsImageSelected;
+bool bIsMediaSelected;
 
 private:
 void DoModifiers(const MouseEvent& rMEvt, bool bSnapModPressed);
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index b8624c3..780a853 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4079,7 +4079,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 if( bIsDocReadOnly )
 break;
 
-bool bIsSelectionGfx = rSh.GetSelectionType() & 
nsSelectionType::SEL_GRF;
+bool bIsMediaSelected = rSh.GetSelectionType() & 
nsSelectionType::SEL_GRF ||
+rSh.GetSelectionType() & 
nsSelectionType::SEL_MEDIA;
 bool bisResize = g_eSdrMoveHdl != HDL_MOVE;
 
 if (pSdrView)
@@ -4089,17 +4090,17 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 
 if (rMEvt.IsShift())
 {
-pSdrView->SetAngleSnapEnabled(!bIsSelectionGfx);
+pSdrView->Se

[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/data/formulacell.cxx |   48 +---
 1 file changed, 29 insertions(+), 19 deletions(-)

New commits:
commit 29ee431c1cf859c3d5a5041cff5cb04b89db27a0
Author: Eike Rathke 
Date:   Tue Mar 15 17:39:03 2016 +0100

Resolves: tdf#93196 add RecursionCounter guard also to 
InterpretFormulaGroup()

... same as for ScFormulaCell::InterpretTail()

Change-Id: I444f259fe4e86ed0638a04f1b5d9272edd182e2e

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 48314dd..d483ef7 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1499,6 +1499,28 @@ bool ScFormulaCell::MarkUsedExternalReferences()
 return pCode && pDocument->MarkUsedExternalReferences(*pCode, aPos);
 }
 
+namespace {
+class RecursionCounter
+{
+ScRecursionHelper&  rRec;
+boolbStackedInIteration;
+public:
+RecursionCounter( ScRecursionHelper& r, ScFormulaCell* p ) : rRec(r)
+{
+bStackedInIteration = rRec.IsDoingIteration();
+if (bStackedInIteration)
+rRec.GetRecursionInIterationStack().push( p);
+rRec.IncRecursionCount();
+}
+~RecursionCounter()
+{
+rRec.DecRecursionCount();
+if (bStackedInIteration)
+rRec.GetRecursionInIterationStack().pop();
+}
+};
+}
+
 void ScFormulaCell::Interpret()
 {
 #if DEBUG_CALCULATION
@@ -1769,25 +1791,7 @@ void ScFormulaCell::Interpret()
 
 void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
 {
-class RecursionCounter
-{
-ScRecursionHelper&  rRec;
-boolbStackedInIteration;
-public:
-RecursionCounter( ScRecursionHelper& r, ScFormulaCell* p ) : rRec(r)
-{
-bStackedInIteration = rRec.IsDoingIteration();
-if (bStackedInIteration)
-rRec.GetRecursionInIterationStack().push( p);
-rRec.IncRecursionCount();
-}
-~RecursionCounter()
-{
-rRec.DecRecursionCount();
-if (bStackedInIteration)
-rRec.GetRecursionInIterationStack().pop();
-}
-} aRecursionCounter( pDocument->GetRecursionHelper(), this);
+RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this);
 nSeenInIteration = pDocument->GetRecursionHelper().GetIteration();
 if( !pCode->GetCodeLen() && !pCode->GetCodeError() )
 {
@@ -3979,6 +3983,12 @@ bool ScFormulaCell::InterpretFormulaGroup()
 if (!ScCalcConfig::isOpenCLEnabled() && 
!ScCalcConfig::isSwInterpreterEnabled())
 return false;
 
+// Guard against endless recursion of Interpret() calls, for this to work
+// ScFormulaCell::InterpretFormulaGroup() must never be called through
+// anything else than ScFormulaCell::Interpret(), same as
+// ScFormulaCell::InterpretTail()
+RecursionCounter aRecursionCounter( pDocument->GetRecursionHelper(), this);
+
 // TODO : Disable invariant formula group interpretation for now in order
 // to get implicit intersection to work.
 if (mxGroup->mbInvariant && false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - extras/source

[Jan Iversen]

 extras/source/autocorr/lang/bg/DocumentList.xml|   18 
 extras/source/autocorr/lang/ca/DocumentList.xml|  358 -
 extras/source/autocorr/lang/cs/DocumentList.xml|  571 -
 extras/source/autocorr/lang/da/DocumentList.xml|  623 --
 extras/source/autocorr/lang/de/DocumentList.xml|  249 
 extras/source/autocorr/lang/en-AU/DocumentList.xml |  826 --
 extras/source/autocorr/lang/en-GB/DocumentList.xml | 1987 --
 extras/source/autocorr/lang/en-US/DocumentList.xml |  831 --
 extras/source/autocorr/lang/en-ZA/DocumentList.xml |  815 --
 extras/source/autocorr/lang/es/DocumentList.xml|  503 -
 extras/source/autocorr/lang/fa/DocumentList.xml| 6191 -
 extras/source/autocorr/lang/fi/DocumentList.xml|   17 
 extras/source/autocorr/lang/fr/DocumentList.xml|  457 -
 extras/source/autocorr/lang/hr/DocumentList.xml|  543 -
 extras/source/autocorr/lang/hu/DocumentList.xml|  665 --
 extras/source/autocorr/lang/is/DocumentList.xml|2 
 extras/source/autocorr/lang/it/DocumentList.xml|   89 
 extras/source/autocorr/lang/ja/DocumentList.xml|  816 --
 extras/source/autocorr/lang/ko/DocumentList.xml|  816 --
 extras/source/autocorr/lang/lt/DocumentList.xml|   81 
 extras/source/autocorr/lang/mn/DocumentList.xml|  282 
 extras/source/autocorr/lang/nl/DocumentList.xml|  110 
 extras/source/autocorr/lang/pl/DocumentList.xml|  490 -
 extras/source/autocorr/lang/pt-BR/DocumentList.xml | 1832 --
 extras/source/autocorr/lang/pt/DocumentList.xml|  267 
 extras/source/autocorr/lang/ro/DocumentList.xml|   86 
 extras/source/autocorr/lang/ru/DocumentList.xml|  216 
 extras/source/autocorr/lang/sk/DocumentList.xml|  175 
 extras/source/autocorr/lang/sl/DocumentList.xml|  451 -
 extras/source/autocorr/lang/sv/DocumentList.xml|  111 
 extras/source/autocorr/lang/tr/DocumentList.xml|   96 
 extras/source/autocorr/lang/vi/DocumentList.xml|  871 --
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |  813 --
 extras/source/autocorr/lang/zh-TW/DocumentList.xml |  813 --
 34 files changed, 23071 deletions(-)

New commits:
commit fb0f084c1810fa2572e5e63af7fa239bb1b4c363
Author: Jan Iversen 
Date:   Tue Mar 15 17:25:37 2016 +0100

Pootle extract, manual update of emoji autocorrect files

As part of the 5.1.2 RC1 prep, the autocorr files was updated

Change-Id: I0c8adfd6534254ac8b0f46ee48d1618402b1f758

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index 37c30f6..ef6c576 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -1,21 +1,3 @@
-
-http://openoffice.org/2001/block-list";>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index 4085133..5fcf4c9 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -1,361 +1,3 @@
-
-
-
-http://openoffice.org/2001/block-list";>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index 7d04405..0799ccd 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -1,574 +1,3 @@
-
-http://openoffice.org/2001/block-list";>
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - slideshow/opengl

[Emmanuel Gil Peyrot]

 slideshow/opengl/honeycombVertexShader.glsl |   41 +---
 slideshow/opengl/vortexVertexShader.glsl|   15 +++---
 2 files changed, 42 insertions(+), 14 deletions(-)

New commits:
commit 750fcdef6551f069badb802649a665e147e69083
Author: Emmanuel Gil Peyrot 
Date:   Wed Feb 24 20:21:12 2016 +

slideshow: Add an ugly workaround for Intel’s matrix multiplication

When more than three multiplications are chained, Intel’s Windows
driver returns a mat4 containing only zeroes, likely due to a
misbehaving optimisation.  This patch prevents it from doing any
optimisation by doing each multiplication in its own uniform block.

(cherry-picked from the commit db9fe1ea4a1e0e33dece63652c2b076fb323ec63)

Change-Id: I0b435d3a5444afd47f78c379f0d2e442d2c2cfc0
Reviewed-on: https://gerrit.libreoffice.org/22776
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/slideshow/opengl/honeycombVertexShader.glsl 
b/slideshow/opengl/honeycombVertexShader.glsl
index 32fdece..c3484d3 100644
--- a/slideshow/opengl/honeycombVertexShader.glsl
+++ b/slideshow/opengl/honeycombVertexShader.glsl
@@ -25,10 +25,21 @@ uniform float shadow;
 uniform mat4 orthoProjectionMatrix;
 uniform mat4 orthoViewMatrix;
 
+// Workaround for Intel's Windows driver, to prevent optimisation breakage.
+uniform float zero;
+
 out mat4 projectionMatrix;
 out mat4 modelViewMatrix;
 out mat4 shadowMatrix;
 
+mat4 identityMatrix(void)
+{
+return mat4(1.0, 0.0, 0.0, 0.0,
+0.0, 1.0, 0.0, 0.0,
+0.0, 0.0, 1.0, 0.0,
+0.0, 0.0, 0.0, 1.0);
+}
+
 mat4 translationMatrix(vec3 axis)
 {
 return mat4(1.0,0.0,0.0,0.0,
@@ -61,25 +72,35 @@ mat4 rotationMatrix(vec3 axis, float angle)
 void main( void )
 {
 mat4 nmodelViewMatrix = u_modelViewMatrix * u_operationsTransformMatrix * 
u_sceneTransformMatrix * u_primitiveTransformMatrix;
-mat4 transformMatrix;
+mat4 transformMatrix = identityMatrix();
 
 // TODO: use the aspect ratio of the slide instead.
 mat4 slideScaleMatrix = scaleMatrix(vec3(0.75, 1, 1));
 mat4 invertSlideScaleMatrix = scaleMatrix(1.0 / vec3(0.75, 1, 1));
 
+// These ugly zero comparisons are a workaround for Intel's Windows driver 
optimisation bug.
 if (selectedTexture > 0.5) {
 // Leaving texture
-transformMatrix = translationMatrix(vec3(0, 0, 6 * time))
-* scaleMatrix(vec3(1 + pow(2 * time, 2.1), 1 + pow(2 * time, 2.1), 
0))
-* slideScaleMatrix
-* rotationMatrix(vec3(0.0, 0.0, 1.0), -pow(time, 3) * M_PI)
-* invertSlideScaleMatrix;
+if (zero < 1.0)
+transformMatrix = invertSlideScaleMatrix * transformMatrix;
+if (zero < 2.0)
+transformMatrix = rotationMatrix(vec3(0.0, 0.0, 1.0), -pow(time, 
3) * M_PI) * transformMatrix;
+if (zero < 3.0)
+transformMatrix = slideScaleMatrix * transformMatrix;
+if (zero < 4.0)
+transformMatrix = scaleMatrix(vec3(1 + pow(2 * time, 2.1), 1 + 
pow(2 * time, 2.1), 0)) * transformMatrix;
+if (zero < 5.0)
+transformMatrix = translationMatrix(vec3(0, 0, 6 * time)) * 
transformMatrix;
 } else {
 // Entering texture
-transformMatrix = translationMatrix(vec3(0, 0, 28 * (sqrt(time) - 1)))
-* slideScaleMatrix
-* rotationMatrix(vec3(0.0, 0.0, 1.0), pow(0.8 * (time - 1.0), 2.0) 
* M_PI)
-* invertSlideScaleMatrix;
+if (zero < 1.0)
+transformMatrix = invertSlideScaleMatrix * transformMatrix;
+if (zero < 2.0)
+transformMatrix = rotationMatrix(vec3(0.0, 0.0, 1.0), pow(0.8 * 
(time - 1.0), 2.0) * M_PI) * transformMatrix;
+if (zero < 3.0)
+transformMatrix = slideScaleMatrix * transformMatrix;
+if (zero < 4.0)
+transformMatrix = translationMatrix(vec3(0, 0, 28 * (sqrt(time) - 
1))) * transformMatrix;
 }
 
 if (shadow < 0.5) {
diff --git a/slideshow/opengl/vortexVertexShader.glsl 
b/slideshow/opengl/vortexVertexShader.glsl
index 3d5838e..5c6fe23 100755
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -26,6 +26,9 @@ uniform ivec2 numTiles;
 uniform sampler2D permTexture;
 uniform float slide;
 
+// Workaround for Intel's Windows driver, to prevent optimisation breakage.
+uniform float zero;
+
 out vec2 g_texturePosition;
 out vec3 g_normal;
 out mat4 modelViewMatrix;
@@ -130,10 +133,14 @@ void main( void )
 vec3 translationVector = vec3(rotationFuzz, 0.0, 0.0);
 
 // Compute the actual rotation matrix.
-transform = translationMatrix(translationVector)
-  * rotationMatrix(vec3(0.0, 1.0, 0.0), clamp(rotation, -1.0, 
1.0) * M_PI)
-  * translationMatrix(-translationVector)
-  * transform;
+
+// Intel's Windows driver gives a wrong matrix when

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - slideshow/opengl

[Emmanuel Gil Peyrot]

 slideshow/opengl/vortexGeometryShader.glsl |   22 ++
 slideshow/opengl/vortexVertexShader.glsl   |   14 --
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 5a7160e21fe17c2697c2b9d71c9e1f4bf65c9352
Author: Emmanuel Gil Peyrot 
Date:   Wed Feb 24 20:21:11 2016 +

slideshow: Move Vortex calculations to the geometry stage, fixes Intel

Their Windows driver was failing due to too many varyings being used
between the vertex and the geometry stages.

(cherry-picked from the commit 06404309026b8e5aeb4c47ea68aea7ef21c6654e)

Change-Id: Iec69a2ef29e6ed4ba5ce6e46c7a5eb7db5098d1b
Reviewed-on: https://gerrit.libreoffice.org/22775
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/slideshow/opengl/vortexGeometryShader.glsl 
b/slideshow/opengl/vortexGeometryShader.glsl
index 312baba..5d64a12 100644
--- a/slideshow/opengl/vortexGeometryShader.glsl
+++ b/slideshow/opengl/vortexGeometryShader.glsl
@@ -12,11 +12,14 @@
 layout(triangles) in;
 layout(triangle_strip, max_vertices=11) out;
 
+uniform float shadow;
+uniform mat4 u_projectionMatrix;
+uniform mat4 orthoProjectionMatrix;
+uniform mat4 orthoViewMatrix;
+
 in vec2 g_texturePosition[];
 in vec3 g_normal[];
-in mat4 projectionMatrix[];
 in mat4 modelViewMatrix[];
-in mat4 shadowMatrix[];
 in mat4 transform[];
 in float nTime[];
 in float startTime[];
@@ -52,6 +55,17 @@ mat4 translationMatrix(vec3 axis)
 
 void emitHexagonVertex(int index, vec3 translation, float fdsq)
 {
+mat4 projectionMatrix;
+mat4 shadowMatrix;
+
+if (shadow < 0.5) {
+projectionMatrix = u_projectionMatrix;
+shadowMatrix = orthoProjectionMatrix * orthoViewMatrix;
+} else {
+projectionMatrix = orthoProjectionMatrix * orthoViewMatrix;
+shadowMatrix = mat4(0.0);
+}
+
 mat4 normalMatrix = transpose(inverse(modelViewMatrix[index]));
 
 vec4 pos = gl_in[index].gl_Position + vec4(translation, 0.0);
@@ -62,8 +76,8 @@ void emitHexagonVertex(int index, vec3 translation, float 
fdsq)
 v_normal = normalize(vec3(normalMatrix * transform[index] * 
vec4(g_normal[index], 0.0)));
 v_normal.z *= fdsq;
 
-gl_Position = projectionMatrix[index] * modelViewMatrix[index] * pos;
-shadowCoordinate = translationMatrix(vec3(0.5, 0.5, 0.5)) * 
scaleMatrix(vec3(0.5, 0.5, 0.5)) * shadowMatrix[index] * modelViewMatrix[index] 
* pos;
+gl_Position = projectionMatrix * modelViewMatrix[index] * pos;
+shadowCoordinate = translationMatrix(vec3(0.5, 0.5, 0.5)) * 
scaleMatrix(vec3(0.5, 0.5, 0.5)) * shadowMatrix * modelViewMatrix[index] * pos;
 v_texturePosition = g_texturePosition[index];
 EmitVertex();
 }
diff --git a/slideshow/opengl/vortexVertexShader.glsl 
b/slideshow/opengl/vortexVertexShader.glsl
index 9bab2d9..3d5838e 100755
--- a/slideshow/opengl/vortexVertexShader.glsl
+++ b/slideshow/opengl/vortexVertexShader.glsl
@@ -16,7 +16,6 @@ in vec3 a_normal;
 in vec2 a_texCoord;
 in float tileInfo;
 
-uniform mat4 u_projectionMatrix;
 uniform mat4 u_modelViewMatrix;
 uniform mat4 u_sceneTransformMatrix;
 uniform mat4 u_primitiveTransformMatrix;
@@ -26,15 +25,10 @@ uniform float time;
 uniform ivec2 numTiles;
 uniform sampler2D permTexture;
 uniform float slide;
-uniform float shadow;
-uniform mat4 orthoProjectionMatrix;
-uniform mat4 orthoViewMatrix;
 
 out vec2 g_texturePosition;
 out vec3 g_normal;
-out mat4 projectionMatrix;
 out mat4 modelViewMatrix;
-out mat4 shadowMatrix;
 out mat4 transform;
 out float nTime;
 out float startTime;
@@ -142,14 +136,6 @@ void main( void )
   * transform;
 }
 
-if (shadow < 0.5) {
-projectionMatrix = u_projectionMatrix;
-shadowMatrix = orthoProjectionMatrix * orthoViewMatrix;
-} else {
-projectionMatrix = orthoProjectionMatrix * orthoViewMatrix;
-shadowMatrix = mat4(0.0);
-}
-
 modelViewMatrix = u_modelViewMatrix * u_operationsTransformMatrix * 
u_sceneTransformMatrix * u_primitiveTransformMatrix;
 gl_Position = vec4(a_position, 1.0);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - slideshow/source

[Emmanuel Gil Peyrot]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |   18 
++
 1 file changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 04d1ff651baac7ce0f851786064736ab7141b6f9
Author: Emmanuel Gil Peyrot 
Date:   Wed Feb 24 20:21:09 2016 +

slideshow: Move Vortex’ tileInfo attribute upload to the first frame

(cherry-picked from the commit 9adeebadd5d1728e9abaec67aa4dd8a0c300c98f)

Change-Id: Ifbc154755d43a085b78740a5a3c97ed2cbe9a905
Reviewed-on: https://gerrit.libreoffice.org/22774
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx 
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 39a68bc..a70c6c5 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -1557,7 +1557,6 @@ public:
 }
 
 private:
-virtual void prepare( double nTime, double SlideWidth, double SlideHeight, 
double DispWidth, double DispHeight ) override;
 virtual void finishTransition() override;
 virtual GLuint makeShader() const override;
 virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 
glEnteringSlideTex ) override;
@@ -1575,19 +1574,6 @@ private:
 std::vector mvTileInfo;
 };
 
-void VortexTransition::prepare( double, double, double, double, double )
-{
-glBindBuffer(GL_ARRAY_BUFFER, mnTileInfoBuffer);
-CHECK_GL_ERROR();
-glEnableVertexAttribArray(mnTileInfoLocation);
-CHECK_GL_ERROR();
-glVertexAttribPointer(mnTileInfoLocation, 1, GL_FLOAT, GL_FALSE, 0, 
nullptr);
-CHECK_GL_ERROR();
-
-glBindBuffer(GL_ARRAY_BUFFER, 0);
-CHECK_GL_ERROR();
-}
-
 void VortexTransition::finishTransition()
 {
 PermTextureTransition::finishTransition();
@@ -1669,6 +1655,10 @@ void VortexTransition::prepareTransition( sal_Int32 
glLeavingSlideTex, sal_Int32
 
 glBindBuffer(GL_ARRAY_BUFFER, mnTileInfoBuffer);
 CHECK_GL_ERROR();
+glEnableVertexAttribArray(mnTileInfoLocation);
+CHECK_GL_ERROR();
+glVertexAttribPointer(mnTileInfoLocation, 1, GL_FLOAT, GL_FALSE, 0, 
nullptr);
+CHECK_GL_ERROR();
 glBufferData(GL_ARRAY_BUFFER, mvTileInfo.size()*sizeof(GLfloat), 
mvTileInfo.data(), GL_STATIC_DRAW);
 CHECK_GL_ERROR();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rat-excludes

[Pedro Giffuni]

 rat-excludes |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit 69d40d8217d2d1fa325f4bc41dd109bb6184aaeb
Author: Pedro Giffuni 
Date:   Tue Mar 15 15:25:30 2016 +

No need to exclude from RAT scans code that has been cleaned out.

writerfilter is no more.

diff --git a/rat-excludes b/rat-excludes
index 4ecd4f2..3e72473 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -126,10 +126,6 @@ main/NOTICE_aggregated
 # Contains a list of labels used for printing; no header possible
 main/testautomation/framework/optional/input/extras_formats/Labels_en-US.txt
 
-# Used in writerfilter/source/doctok/xmigen.el (1), part of the SGA
-# XEmacs List (config file), comments possible (using ';' at each line start), 
ALv2 could be added
-main/writerfilter/source/doctok/xmigen.el
-
 # Used in main/extras/source/misc_config/autotbl.fmt (1), part of SGA
 # Excel format file, binary
 main/extras/source/misc_config/autotbl.fmt
@@ -146,10 +142,6 @@ main/scripting/java/org/openoffice/netbeans/editor/OOo.jcb
 # binary, file type not clear
 main/scripting/java/org/openoffice/netbeans/editor/OOo.jcs
 
-# main/writerfilter/qa/cppunittests/doctok/doctok.job (1), part of SGA
-# ascii, one line, support of comments not clear
-main/writerfilter/qa/cppunittests/doctok/doctok.job
-
 # used in main/officecfg/registry/schema/oo-common.ldif (1), part of SGA
 # ascii, included in makefiles, ALv2 might be added
 main/officecfg/registry/schema/oo-common.ldif
@@ -198,10 +190,6 @@ 
main/testautomation/writer/optional/input/import/amipro3.sam
 # AOO specific OpenSymbol source file, (S)ource(F)orge(D)ata, recently called 
(S)pline(F)ont(D)ata
 main/extras/source/truetype/symbol/OpenSymbol.sfd
 
-# used in main/writerfilter/source/rtftok/RTFScanner.skl (1), part of SGA 
-# binary file (?)
-main/writerfilter/source/rtftok/RTFScanner.skl
-
 # used in 
main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk (1), 
part of SGA 
 # SYLK spreadsheet, ascii. Comments possible (see in file), ALv2 may be added 
here
 main/testautomation/spreadsheet/optional/input/loadsave/microsoft/sylk.slk
@@ -971,15 +959,6 @@ main/wizards/source/template/delzip
 main/wizards/source/tools/delzip
 main/wizards/source/tutorials/delzip
 main/wizards/source/webwizard/delzip
-main/writerfilter/source/doctok/qnametostrfooter
-main/writerfilter/source/ooxml/modelcleanup
-main/writerfilter/source/ooxml/rngtocxx
-main/writerfilter/source/ooxml/tokenxmlfooter
-main/writerfilter/source/ooxml/tokenxmlheader
-main/writerfilter/source/resourcemodel/analyzerfooter
-main/writerfilter/source/resourcemodel/qnametostrfooter
-main/writerfilter/source/resourcemodel/setdebugflags
-main/writerfilter/source/resourcemodel/sprmcodetostrfooter
 main/xmerge/source/activesync/XMergeFactory.h
 main/xmerge/source/activesync/XMergeFilter.h
 main/xmerge/source/activesync/XMergeSync.h
@@ -1201,7 +1180,6 @@ 
main/testautomation/writer/optional/input/number/format44.txt
 main/testautomation/writer/optional/input/number/format46.txt
 main/testautomation/writer/optional/input/number/format49.txt
 main/testautomation/writer/optional/input/number/format86.txt
-main/writerfilter/documentation/sprms.txt
 main/xmerge/source/activesync/guids.txt
 main/xmerge/source/bridge/antcall.txt
 main/xmlsecurity/test_docs/CAs/Root_1/demoCA/index.txt
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Xisco Fauli]

 sw/source/core/frmedt/fecopy.cxx |   15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

New commits:
commit c0c41a27dde5779af9d2737e6871d82015aa6395
Author: Xisco Fauli 
Date:   Thu Feb 4 22:50:47 2016 +0100

tdf#97429: Fix crash on print selected area

Regression from 9eb61489ee03486a7147acdf923eaf5e3f355183
Use DelFlyInRange to iterate over nodes' range

Change-Id: I219c7ec83eaa69990340d423dc34546131bb372c
Reviewed-on: https://gerrit.libreoffice.org/22129
Tested-by: Jenkins 
Reviewed-by: Xisco Faulí 
(cherry picked from commit 3f7a0f7dba759ed3763c900112b5eeb7ccfdd84d)
Reviewed-on: https://gerrit.libreoffice.org/22426
Reviewed-by: jan iversen 

diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 55ece42..2092fe8 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -90,6 +90,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* 
pNewClpText )
 
 // delete content if ClpDocument contains content
 SwNodeIndex aSttIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
+SwNodeIndex aEndNdIdx( *aSttIdx.GetNode().EndOfSectionNode() );
 SwTextNode* pTextNd = aSttIdx.GetNode().GetTextNode();
 if (!pTextNd || !pTextNd->GetText().isEmpty() ||
 aSttIdx.GetIndex()+1 != 
pClpDoc->GetNodes().GetEndOfContent().GetIndex() )
@@ -102,11 +103,19 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString* 
pNewClpText )
 }
 
 // also delete surrounding FlyFrames if any
-for( auto pFormat : *pClpDoc->GetSpzFrameFormats() )
+for( const auto pFly : *pClpDoc->GetSpzFrameFormats() )
 {
-SwFlyFrameFormat* pFly = static_cast(pFormat);
-pClpDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
+SwFormatAnchor const*const pAnchor = &pFly->GetAnchor();
+SwPosition const*const pAPos = pAnchor->GetContentAnchor();
+if (pAPos &&
+((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
+ (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
+aSttIdx <= pAPos->nNode && pAPos->nNode <= aEndNdIdx )
+{
+pClpDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
+}
 }
+
 pClpDoc->GetDocumentFieldsManager().GCFieldTypes();// delete the 
FieldTypes
 
 // if a string was passed, copy it to the clipboard-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svgio/inc svgio/source

[Xisco Fauli]

 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |5 +++--
 svgio/source/svgreader/svgstyleattributes.cxx|   23 ++-
 2 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit a27ba3413a6ee46451041ccdfefb4f75913adf01
Author: Xisco Fauli 
Date:   Sat Feb 6 17:04:41 2016 +0100

tdf#97543 SVGIO: Rework getVisibility()

Change-Id: Idb3eaa27e3e8ec177ebd2bad81f53c4d3da9d241
Reviewed-on: https://gerrit.libreoffice.org/22169
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
(cherry picked from commit 842313c23ec96aeb99b68f28e7d48cc9e263a0a8)
Reviewed-on: https://gerrit.libreoffice.org/22198
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx 
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index e138eb5..828bfb1 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -155,6 +155,7 @@ namespace svgio
 
 enum Visibility
 {
+Visibility_notset,
 Visibility_visible,
 Visibility_hidden,
 Visibility_collapse,
@@ -412,8 +413,8 @@ namespace svgio
 void setOpacity(const SvgNumber& rOpacity = SvgNumber()) { 
maOpacity = rOpacity; }
 
 /// Visibility
-Visibility getVisibility() const { return maVisibility; }
-void setVisibility(Visibility eVisibility) { maVisibility = 
eVisibility; }
+Visibility getVisibility() const;
+void setVisibility(const Visibility aVisibility = 
Visibility_notset) { maVisibility = aVisibility; }
 
 // Title content
 const OUString& getTitle() const { return maTitle; }
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 5d557ac..765f8f8 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1216,7 +1216,7 @@ namespace svgio
 maTextAnchor(TextAnchor_notset),
 maColor(),
 maOpacity(),
-maVisibility(Visibility_visible),
+maVisibility(Visibility_notset),
 maTitle(),
 maDesc(),
 maClipPathXLink(),
@@ -1242,10 +1242,6 @@ namespace svgio
 mbIsClipPathContent = pParentStyle->mbIsClipPathContent;
 }
 }
-if(pParentStyle)
-{
-maVisibility = pParentStyle->maVisibility;
-}
 }
 
 SvgStyleAttributes::~SvgStyleAttributes()
@@ -2144,6 +2140,23 @@ namespace svgio
 return SvgNumber(1.0);
 }
 
+Visibility SvgStyleAttributes::getVisibility() const
+{
+if(Visibility_notset == maVisibility || Visibility_inherit == 
maVisibility)
+{
+const SvgStyleAttributes* pSvgStyleAttributes = 
getParentStyle();
+
+if(pSvgStyleAttributes)
+{
+return pSvgStyleAttributes->getVisibility();
+}
+//default is Visible
+return Visibility_visible;
+}
+
+return maVisibility;
+}
+
 FillRule SvgStyleAttributes::getFillRule() const
 {
 if(FillRule_notset != maFillRule)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - dbaccess/source sw/source

[pasqualm]

 dbaccess/source/ui/dlg/ConnectionHelper.cxx |4 ++--
 sw/source/ui/dbui/dbui.src  |4 ++--
 sw/source/uibase/dbui/dbmgr.cxx |8 
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ebcea9815b634ce19c0180ac4f6d9236f69b1a32
Author: pasqualm 
Date:   Sun Mar 6 20:44:01 2016 +0100

tdf#97978: add support for opening mde and accde files in base

This patch modifies the base 'open existing database' wizard so accde and 
mde files
can be chosen as targets for access and access 2007 databases. Both file 
types are
the runtime-only equivalents to accdb and mdb files so base can use them in 
the
same way as does with the former

Change-Id: I5b6002089a2d3c19498ff6e05bae3facc5a4e2d0
Reviewed-on: https://gerrit.libreoffice.org/22957
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
Reviewed-on: https://gerrit.libreoffice.org/23178
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index e1eec6b..5744db9 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -230,7 +230,7 @@ namespace dbaui
 break;
 case  ::dbaccess::DST_MSACCESS:
 {
-const OUString sExt("*.mdb");
+const OUString sExt("*.mdb;*.mde");
 OUString sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
 ::sfx2::FileDialogHelper aFileDlg(
 
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
@@ -242,7 +242,7 @@ namespace dbaui
 break;
 case  ::dbaccess::DST_MSACCESS_2007:
 {
-const OUString sAccdb("*.accdb");
+const OUString sAccdb("*.accdb;*.accde");
 OUString sFilterName2(ModuleRes 
(STR_MSACCESS_2007_FILTERNAME));
 ::sfx2::FileDialogHelper aFileDlg(
 
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src
index 0124bc7..3962a25 100644
--- a/sw/source/ui/dbui/dbui.src
+++ b/sw/source/ui/dbui/dbui.src
@@ -78,11 +78,11 @@ String STR_FILTER_CSV
 };
 String STR_FILTER_MDB
 {
-Text [ en-US ] = "Microsoft Access (*.mdb)" ;
+Text [ en-US ] = "Microsoft Access (*.mdb;*.mde)" ;
 };
 String STR_FILTER_ACCDB
 {
-Text [ en-US ] = "Microsoft Access 2007 (*.accdb)" ;
+Text [ en-US ] = "Microsoft Access 2007 (*.accdb,*.accde)" ;
 };
 
 String  ST_SAVESTART
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 3932b11..f86a5ee 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2506,8 +2506,8 @@ OUString 
SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
 xFltMgr->appendFilter( sFilterTXT, "*.txt" );
 xFltMgr->appendFilter( sFilterCSV, "*.csv" );
 #ifdef WNT
-xFltMgr->appendFilter( sFilterMDB, "*.mdb" );
-xFltMgr->appendFilter( sFilterACCDB, "*.accdb" );
+xFltMgr->appendFilter( sFilterMDB, "*.mdb;*.mde" );
+xFltMgr->appendFilter( sFilterACCDB, "*.accdb;*.accde" );
 #endif
 
 xFltMgr->setCurrentFilter( sFilterAll ) ;
@@ -2570,14 +2570,14 @@ SwDBManager::DBConnURITypes 
SwDBManager::GetDBunoURI(const OUString &rURI, uno::
 type = DBCONN_FLAT;
 }
 #ifdef WNT
-else if(sExt.equalsIgnoreAsciiCase("mdb"))
+else if (sExt.equalsIgnoreAsciiCase("mdb") || 
sExt.equalsIgnoreAsciiCase("mde"))
 {
 OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA 
SOURCE=");
 sDBURL += aURL.PathToFileName();
 aURLAny <<= sDBURL;
 type = DBCONN_MSJET;
 }
-else if(sExt.equalsIgnoreAsciiCase("accdb"))
+else if (sExt.equalsIgnoreAsciiCase("accdb") || 
sExt.equalsIgnoreAsciiCase("accde"))
 {
 OUString sDBURL("sdbc:ado:PROVIDER=Microsoft.ACE.OLEDB.12.0;DATA 
SOURCE=");
 sDBURL += aURL.PathToFileName();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - scp2/source

[Christian Lohmaier]

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbfc39e6a9ed2acb89af0e62962e634b5ae53c75
Author: Christian Lohmaier 
Date:   Tue Mar 15 14:31:28 2016 +0100

Update-check: optional reporting of H/W and OS info also for installsets

expands 56a9594649872f4076b6891f917138d2b1e8d028 to also apply to
installation sets, not only instdir

Change-Id: I962b63feac02ac6dd06c77be660dd74d876c985e
(cherry picked from commit ce08a8e24edb9a9371642d666ae9a983b16d02bd)
Reviewed-on: https://gerrit.libreoffice.org/23270
Tested-by: Jenkins 
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8ee6d1c..ff674f4 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -921,7 +921,7 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
 Section = "Version";
 Order = 17;
 Key = "UpdateUserAgent";
-Value = " (${buildid}; ${_OS}; ${_ARCH})";
+Value = " (${buildid}; ${_OS}; ${_ARCH}; )";
 End
 
 ProfileItem gid_Brand_Profileitem_Version_Vendor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Common.hpp loolwsd/discovery.xml loolwsd/LOOLWSD.cpp

[Henry Castro]

 loolwsd/Common.hpp|1 
 loolwsd/LOOLWSD.cpp   |   54 --
 loolwsd/discovery.xml |   44 
 3 files changed, 97 insertions(+), 2 deletions(-)

New commits:
commit 8a2bd1127b025bd8b8713b3b5b38db511c7589e6
Author: Henry Castro 
Date:   Tue Mar 15 11:35:59 2016 -0400

loolwsd: WOPI, handle request discovery

diff --git a/loolwsd/Common.hpp b/loolwsd/Common.hpp
index d6b7b3f..053ce94 100644
--- a/loolwsd/Common.hpp
+++ b/loolwsd/Common.hpp
@@ -36,6 +36,7 @@ constexpr int SMALL_MESSAGE_SIZE = READ_BUFFER_SIZE / 2;
 
 static const std::string JailedDocumentRoot = "/user/docs/";
 static const std::string CHILD_URI = "/loolws/child?";
+static const std::string LOLEAFLET_PATH = "/loleaflet/dist/loleaflet.html?";
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index f98429b..fcb7da6 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -92,6 +92,13 @@ DEALINGS IN THE SOFTWARE.
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include "Admin.hpp"
 #include "Auth.hpp"
@@ -148,6 +155,13 @@ using Poco::Util::MissingOptionException;
 using Poco::Util::Option;
 using Poco::Util::OptionSet;
 using Poco::Util::ServerApplication;
+using Poco::XML::InputSource;
+using Poco::XML::AutoPtr;
+using Poco::XML::DOMParser;
+using Poco::XML::DOMWriter;
+using Poco::XML::Node;
+using Poco::XML::NodeList;
+using Poco::XML::Element;
 
 std::map> LOOLWSD::DocBrokers;
 std::mutex LOOLWSD::DocBrokersMutex;
@@ -329,7 +343,7 @@ private:
 
 void handlePostRequest(HTTPServerRequest& request, HTTPServerResponse& 
response, const std::string& id)
 {
-Log::info("Post request: " + request.getURI() + "]");
+Log::info("Post request: [" + request.getURI() + "]");
 StringTokenizer tokens(request.getURI(), "/?");
 if (tokens.count() >= 2 && tokens[1] == "convert-to")
 {
@@ -615,6 +629,37 @@ private:
 }
 }
 
+void handleGetDiscovery(HTTPServerRequest& request, HTTPServerResponse& 
response)
+{
+DOMParser parser;
+DOMWriter writer;
+const std::string discoveryPath = 
Path(Application::instance().commandPath()).parent().toString() + 
"discovery.xml";
+const std::string mediaType = "text/xml";
+const std::string action = "action";
+const std::string urlsrc = "urlsrc";
+const std::string uriValue = "http://"; + request.getHost() + 
LOLEAFLET_PATH;
+
+InputSource inputSrc(discoveryPath);
+AutoPtr docXML = parser.parse(&inputSrc);
+AutoPtr listNodes = docXML->getElementsByTagName(action);
+
+for (unsigned long it = 0; it < listNodes->length(); it++)
+{
+static_cast(listNodes->item(it))->setAttribute(urlsrc, 
uriValue);
+}
+
+std::ostringstream ostrXML;
+writer.writeNode(ostrXML, docXML);
+
+response.set("User-Agent", "LOOLWSD WOPI Agent");
+response.setContentLength(ostrXML.str().length());
+response.setContentType(mediaType);
+response.setChunkedTransferEncoding(false);
+
+std::ostream& ostr = response.send();
+ostr << ostrXML.str();
+}
+
 public:
 
 void handleRequest(HTTPServerRequest& request, HTTPServerResponse& 
response) override
@@ -629,7 +674,12 @@ public:
 
 try
 {
-if (!(request.find("Upgrade") != request.end() && 
Poco::icompare(request["Upgrade"], "websocket") == 0))
+if (request.getMethod() == HTTPRequest::HTTP_GET && 
request.getURI() == "/hosting/discovery")
+{
+// http://server/hosting/discovery
+handleGetDiscovery(request, response);
+}
+else if (!(request.find("Upgrade") != request.end() && 
Poco::icompare(request["Upgrade"], "websocket") == 0))
 {
 handlePostRequest(request, response, id);
 }
diff --git a/loolwsd/discovery.xml b/loolwsd/discovery.xml
new file mode 100755
index 000..ac78c20
--- /dev/null
+++ b/loolwsd/discovery.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2766 ++--
 1 file changed, 1418 insertions(+), 1348 deletions(-)

New commits:
commit 96a3261aae5c38cbb303a7c63a7631f13be898a3
Author: Christian Lohmaier 
Date:   Tue Mar 15 16:25:44 2016 +0100

update credits

Change-Id: I7ea667687d4a11c026d69382d9e62533bc0db4ea
(cherry picked from commit b4d9ba8aa9c63c5e527bf640f136c77990eb6747)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index d3e2d29..9beebfc 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.0.3$Linux_X86_64
 
LibreOffice_project/5e3e00a007d9b3b6efb6797a8b8e57b51ab1f7372012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.1.3$Linux_X86_64
 
LibreOffice_project/89f508ef3ecebd2cfb8e1def0f0ba9a803b88a6d2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   580
+   527
501
-   41197
+   50220
22518
true
true
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 580
- 41697
- 23096
+ 527
+ 50719
+ 23043
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4894571
+   4996803
false
false
false
@@ -320,15 +320,15 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -392,24 +392,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1032,7 +1032,7 @@

   
  Credits
-1132 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-02-29 19:28:01.
+1140 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-03-15 13:32:11.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1059,10 +1059,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19169Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19259Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 11337Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 11547Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1070,35 +1070,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7292Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7332Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
5426Joined: 2011-12-12
+   *Noel GrandinCommits: 
5522Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5420Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5490Joined: 
2010-07-29
   
   
-   Kohei 
YoshidaCommits: 5365Joined: 
2009-06-19
+

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/nss

[Christian Lohmaier]

 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss-winXP-sdk.patch.1  |9 +
 2 files changed, 11 insertions(+)

New commits:
commit 8b25d46246f7fa5fa1a97fa9ac6f9df379e5652f
Author: Christian Lohmaier 
Date:   Tue Mar 15 15:09:45 2016 +0100

fix nss build when targeting windows XP (using 7.1A SDK)

otherwise build fails because of macro redefinitions warnings (that are
now fatal because of warnings=errors)

Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7
(cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51)
Reviewed-on: https://gerrit.libreoffice.org/23271
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 0e2f20c..4ea8941 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -31,6 +31,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.cygwin64.in32bit.patch) \
$(if $(filter WNTMSC,$(OS)$(COM)), \
external/nss/nss.vs2015.pdb.patch) \
+$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
+external/nss/nss-winXP-sdk.patch.1) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss-winXP-sdk.patch.1 
b/external/nss/nss-winXP-sdk.patch.1
new file mode 100644
index 000..2c81892
--- /dev/null
+++ b/external/nss/nss-winXP-sdk.patch.1
@@ -0,0 +1,9 @@
+diff -ur nss.org/nss/coreconf/config.mk nss/nss/coreconf/config.mk
+--- nss.org/nss/coreconf/config.mk 2016-03-15 14:52:19.706093300 +0100
 nss/nss/coreconf/config.mk 2016-03-15 14:56:51.549914800 +0100
+@@ -188,3 +188,5 @@
+ 
+ # Hide old, deprecated, TLS cipher suite names when building NSS
+ DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
++# build with 7.1A SDK for winXP compatibility
++DEFINES += -D_USING_V110_SDK71_
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-1' - translations

[Jan Iversen]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1bee61df30142b4336f20b1fcfef7f1b0a93a0ca
Author: Jan Iversen 
Date:   Tue Mar 15 11:55:28 2016 +0100

Updated core
Project: translations  1d1073acd5928309e062695fcaa3cb7f64bc1221

Pootle update

This is first step of making 5.1.2 RC1

Change-Id: I21946ef29fe48a7ec1d79446ea85251799ac8405

diff --git a/translations b/translations
index be28237..1d1073a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit be28237e4b22dfbd4521e47d3e3f34a9f7948b13
+Subproject commit 1d1073acd5928309e062695fcaa3cb7f64bc1221
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2766 ++--
 1 file changed, 1418 insertions(+), 1348 deletions(-)

New commits:
commit 5318c2828fb24b9465634cfcbc734fe4ec9591e1
Author: Christian Lohmaier 
Date:   Tue Mar 15 16:25:44 2016 +0100

update credits

Change-Id: I7ea667687d4a11c026d69382d9e62533bc0db4ea
(cherry picked from commit b4d9ba8aa9c63c5e527bf640f136c77990eb6747)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index d3e2d29..9beebfc 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.0.3$Linux_X86_64
 
LibreOffice_project/5e3e00a007d9b3b6efb6797a8b8e57b51ab1f7372012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.1.3$Linux_X86_64
 
LibreOffice_project/89f508ef3ecebd2cfb8e1def0f0ba9a803b88a6d2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   580
+   527
501
-   41197
+   50220
22518
true
true
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 580
- 41697
- 23096
+ 527
+ 50719
+ 23043
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4894571
+   4996803
false
false
false
@@ -320,15 +320,15 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -392,24 +392,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1032,7 +1032,7 @@

   
  Credits
-1132 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-02-29 19:28:01.
+1140 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-03-15 13:32:11.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1059,10 +1059,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19169Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19259Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 11337Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 11547Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1070,35 +1070,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7292Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7332Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
5426Joined: 2011-12-12
+   *Noel GrandinCommits: 
5522Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5420Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5490Joined: 
2010-07-29
   
   
-   Kohei 
YoshidaCommits: 5365Joined: 
2009-06-19
+

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2766 ++--
 1 file changed, 1418 insertions(+), 1348 deletions(-)

New commits:
commit b4d9ba8aa9c63c5e527bf640f136c77990eb6747
Author: Christian Lohmaier 
Date:   Tue Mar 15 16:25:44 2016 +0100

update credits

Change-Id: I7ea667687d4a11c026d69382d9e62533bc0db4ea

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index d3e2d29..9beebfc 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,12 +1,12 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.0.3$Linux_X86_64
 
LibreOffice_project/5e3e00a007d9b3b6efb6797a8b8e57b51ab1f7372012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.1.3$Linux_X86_64
 
LibreOffice_project/89f508ef3ecebd2cfb8e1def0f0ba9a803b88a6d2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   580
+   527
501
-   41197
+   50220
22518
true
true
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 580
- 41697
- 23096
+ 527
+ 50719
+ 23043
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4894571
+   4996803
false
false
false
@@ -320,15 +320,15 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -392,24 +392,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1032,7 +1032,7 @@

   
  Credits
-1132 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-02-29 19:28:01.
+1140 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-03-15 13:32:11.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1059,10 +1059,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19169Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19259Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 11337Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 11547Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1070,35 +1070,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7292Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7332Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
5426Joined: 2011-12-12
+   *Noel GrandinCommits: 
5522Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5420Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5490Joined: 
2010-07-29
   
   
-   Kohei 
YoshidaCommits: 5365Joined: 
2009-06-19
+   Kohei 
YoshidaCommits: 5367Joined: 
2009-06-19
   
  
  
 

[Libreoffice-commits] online.git: loolwsd/configure.ac

[Henry Castro]

 loolwsd/configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac09d8950550ce3669193f0d1c235a7fd286da04
Author: Henry Castro 
Date:   Tue Mar 15 11:21:02 2016 -0400

loolwsd: add libPocoXML

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 274cf1c..9c2bf82 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -119,7 +119,7 @@ AS_IF([test `uname -s` = Linux],
 AS_IF([test "$enable_tests" != "no"],
   [PKG_CHECK_MODULES([CPPUNIT], [cppunit])])
 
-LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} 
-lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX}"
+LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} 
-lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} 
-lPocoXML${POCO_DEBUG_SUFFIX}"
 
 AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],
  [],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSOC 2016 New Idea: Tabbed LibreOffice Pages

[jan iversen]

Hi

Maybe more importantly, if you want to work with that under the GSoC umbrella, 
you need to find a mentor.

rgds
jan i.


> On 15 Mar 2016, at 15:35, toki  wrote:
> 
>> On 15/03/2016 13:32, Esref Ozturk wrote:
>> 
>> Since I am not familiar with the codebase of the LibreOffice, I cannot 
>> determine if it is doable in 3 months.
> 
> Back when OOo 2.4 was the latest version of OOo, there was an extension
> that added tabs to OOo Write.  Both the extension, and a description of
> what it did can be found at
> https://wiki.openoffice.org/wiki/Framework/WorkInProgress/Tabbed_Windows_Extension.
> 
> 
> As the web page points out, the extension did not work on OOo 3.0.
> 
> Given the number of differences between the OOo 2.4 code base, and LibO
> 5.2 code base, I don't know if it would be easier to utilize that
> extension as a starting point, or completely ignore its existence.
> 
> FWIW, Using  much easier than the mouse clicks the extension
> required.
> 
> 
> jonathon
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sd/source

[Samuel Mehrbrodt]

 sd/source/ui/inc/DrawViewShell.hxx |   20 
 sd/source/ui/inc/ViewShell.hxx |   21 -
 2 files changed, 41 deletions(-)

New commits:
commit 5d03194b056bc7f5b5f16c03a06a7d6697980c19
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 13:32:11 2016 +0100

DrawViewShell: Remove unused code

Change-Id: I288f8793a649b8c672821a39c6d9f1238a104b7e
Reviewed-on: https://gerrit.libreoffice.org/23275
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sd/source/ui/inc/DrawViewShell.hxx 
b/sd/source/ui/inc/DrawViewShell.hxx
index 1fb1219..7450a3a 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -100,26 +100,6 @@ public:
 void PrePaint() override;
 virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) override;
 
-/** Set the position and size of the area which contains the GUI
-elements like rulers, sliders, and buttons as well as the document
-view.  Both size and position are expected to be in pixel
-coordinates.  The positions and sizes of the mentioned GUI elements
-are updated as well.
-
- This method is implemented by first setting copying the given
-values to internal variables and then calling the
-ArrangeGUIElements method which performs the actual
-work of sizeing and arranging the UI elements accordingly.
-@param rPos
-The position of the enclosing window relative to the document
-window.  This is only interesting if a Draw/Impress document
-view is embedded as OLE object into another document view.  For
-normal documents this position is (0,0).
-@param rSize
-The new size in pixel.
-*/
-//  virtual voidAdjustPosSizePixel(const Point &rPos, const Size 
&rSize);
-
 /** Arrange and resize the GUI elements like rulers, sliders, and
 buttons as well as the actual document view according to the size of
 the enclosing window and current sizes of buttons, rulers, and
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 730d682..21ccfde 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -329,27 +329,6 @@ public:
 */
 virtual void Resize();
 
-/** Set the position and size of the area which contains the GUI
-elements like rulers, sliders, and buttons as well as the document
-view.  Both size and position are expected to be in pixel
-coordinates.  The positions and sizes of the mentioned GUI elements
-are updated as well.
-
- This method is implemented by first setting copying the given
-values to internal variables and then calling the
-ArrangeGUIElements method which performs the actual
-work of sizeing and arranging the UI elements accordingly.
-@param rPos
-The position of the enclosing window relative to the document
-window.  This is only interesting if a Draw/Impress document
-view is embedded as OLE object into another document view.  For
-normal documents this position is (0,0).
-@param rSize
-The new size in pixel.
-*/
-// This is to be replaced by Resize.
-//  virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize);
-
 /** Set position and size of the GUI elements that are controlled by
 the view shell like rulers and scroll bars as well as the actual
 document view according to the position and size that were given
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Samuel Mehrbrodt]

 sd/source/ui/inc/DrawViewShell.hxx |   24 +++-
 1 file changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 0b14ea0fb39bba3ae33fc8aa6d020e3f0c233643
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 13:26:31 2016 +0100

DrawViewShell: Fix indentation

Change-Id: Iedeb9d36c20b6d9038990dc5b03ce9b560becac7
Reviewed-on: https://gerrit.libreoffice.org/23274
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sd/source/ui/inc/DrawViewShell.hxx 
b/sd/source/ui/inc/DrawViewShell.hxx
index 6fdf9d8..1fb1219 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -125,7 +125,7 @@ public:
 the enclosing window and current sizes of buttons, rulers, and
 sliders.
 */
-virtual void ArrangeGUIElements() override;
+virtual voidArrangeGUIElements() override;
 
 voidHidePage();
 
@@ -135,11 +135,11 @@ public:
 virtual voidMouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* 
pWin) override;
 virtual voidCommand(const CommandEvent& rCEvt, ::sd::Window* pWin) 
override;
 
-virtual void Resize() override;
+virtual voidResize() override;
 
 voidShowMousePosInfo(const Rectangle& rRect, ::sd::Window* 
pWin);
 
-virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive);
+virtual voidChangeEditMode (EditMode eMode, bool bIsLayerModeActive);
 
 virtual voidSetZoom( long nZoom ) override;
 virtual voidSetZoomRect( const Rectangle& rZoomRect ) override;
@@ -157,8 +157,8 @@ public:
 virtual voidDeactivate(bool IsMDIActivate) override;
 virtual voidUIActivating( SfxInPlaceClient* ) override;
 virtual voidUIDeactivated( SfxInPlaceClient* ) override;
-OUString GetSelectionText( bool bCompleteWords = false );
-boolHasSelection( bool bText = true ) const;
+OUStringGetSelectionText( bool bCompleteWords = false );
+boolHasSelection( bool bText = true ) const;
 
 //If we are editing an PRESOBJ_OUTLINE return the Outliner and fill rSel
 //with the current selection
@@ -174,7 +174,7 @@ public:
 This function also sets the states of the mode buttons
 (those at the upper right corner) accordingly.
 */
-void GetModeSwitchingMenuState (SfxItemSet &rSet);
+voidGetModeSwitchingMenuState (SfxItemSet &rSet);
 voidGetAttrState(SfxItemSet& rSet);
 voidGetSnapItemState(SfxItemSet& rSet);
 
@@ -199,7 +199,7 @@ public:
 voidExecNavigatorWin(SfxRequest& rReq);
 voidGetNavigatorWinState(SfxItemSet& rSet);
 
-void ExecutePropPanelAttr (SfxRequest& rReq);
+voidExecutePropPanelAttr (SfxRequest& rReq);
 voidGetStatePropPanelAttr(SfxItemSet& rSet);
 
 voidExecEffectWin(SfxRequest& rReq);
@@ -242,9 +242,7 @@ public:
 voidExecuteAnnotation (SfxRequest& rRequest);
 voidGetAnnotationState (SfxItemSet& rItemSet);
 
-void StartRulerDrag (
-const Ruler& rRuler,
-const MouseEvent& rMEvt);
+voidStartRulerDrag (const Ruler& rRuler, const MouseEvent& 
rMEvt);
 
 virtual boolPrepareClose( bool bUI = true ) override;
 
@@ -289,17 +287,17 @@ public:
 voidUnlockInput();
 boolIsInputLocked() const { return mnLockCount > 0UL; }
 
-sal_uInt16  GetCurPageId() { return maTabControl->GetCurPageId(); }
+sal_uInt16  GetCurPageId() { return maTabControl->GetCurPageId(); }
 
 /** Show controls of the UI or hide them, depending on the given flag.
 Do not call this method directly.  Call the method at ViewShellBase
 instead.
 */
-virtual void ShowUIControls (bool bVisible = true) override;
+virtual voidShowUIControls (bool bVisible = true) override;
 
 voidScannerEvent( const css::lang::EventObject& rEventObject );
 
-bool IsLayerModeActive() const { return mbIsLayerModeActive;}
+boolIsLayerModeActive() const { return mbIsLayerModeActive;}
 
 virtual sal_Int8AcceptDrop( const AcceptDropEvent& rEvt, 
DropTargetHelper& rTargetHelper,
 ::sd::Window* pTargetWindow, sal_uInt16 
nPage, sal_uInt16 nLayer ) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Samuel Mehrbrodt]

 sc/source/ui/drawfunc/fupoor.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit aabb7c09d10c832b904189beade07fdc21214e57
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 15:33:19 2016 +0100

Remove nonsense comment

Change-Id: Ied26d086379a890202c3c5ad0b17ef808ea52b44
Reviewed-on: https://gerrit.libreoffice.org/23276
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 6cdc50e..d9cbdf0 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -155,14 +155,6 @@ bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
 
 /*
 |*
-|* String in Applikations-Statuszeile ausgeben
-|*
-\/
-
-//  WriteStatus gibt's nicht mehr
-
-/*
-|*
 |* Tastaturereignisse bearbeiten
 |*
 |* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Samuel Mehrbrodt]

 sc/source/ui/view/spelldialog.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 940e65304437362f7926042a1eac385802ab3eb9
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 13:08:03 2016 +0100

tdf#79312 sc: Don't close the spellchecker when finished

This has been done for Writer and Impress, but not for Calc.

Change-Id: I16e4f3ef41233a6cb135a66b70aa0c710fee9dfe
Reviewed-on: https://gerrit.libreoffice.org/23268
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sc/source/ui/view/spelldialog.cxx 
b/sc/source/ui/view/spelldialog.cxx
index 5ee00f9..db43544 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -85,10 +85,6 @@ svx::SpellPortions 
ScSpellDialogChildWindow::GetNextWrongSentence( bool /*bReche
 }
 while( mbNeedNextObj );
 }
-
-// finished? - close the spelling dialog
-if( mxEngine->IsFinished() )
-GetBindings().GetDispatcher()->Execute( SID_SPELL_DIALOG, 
SfxCallMode::ASYNCHRON );
 }
 return aPortions;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless

[Markus Mohrhard]

 vcl/headless/svpinst.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit eaaca6eaf26b0976f1c06f583a8aa35ee1c1b857
Author: Markus Mohrhard 
Date:   Mon Mar 14 18:01:15 2016 +0100

fix memory leak in headless backend

Reviewed-on: https://gerrit.libreoffice.org/23248
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit c62afab9d4138583eb22afe46608b323f902f095)

Change-Id: I90282c86b45845fc35b23b275301be24a2f18a4d
Reviewed-on: https://gerrit.libreoffice.org/23261
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 0d765c1..12ef4e5 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -150,8 +150,12 @@ void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
 std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
 do
 {
-if( it->m_pFrame== pFrame )
+if( it->m_pFrame == pFrame )
 {
+if (it->m_nEvent == SALEVENT_USEREVENT)
+{
+delete static_cast(it->m_pData);
+}
 it = m_aUserEvents.erase( it );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSOC 2016 New Idea: Tabbed LibreOffice Pages

[toki]

On 15/03/2016 13:32, Esref Ozturk wrote:

> Since I am not familiar with the codebase of the LibreOffice, I cannot 
> determine if it is doable in 3 months.

Back when OOo 2.4 was the latest version of OOo, there was an extension
that added tabs to OOo Write.  Both the extension, and a description of
what it did can be found at
https://wiki.openoffice.org/wiki/Framework/WorkInProgress/Tabbed_Windows_Extension.


As the web page points out, the extension did not work on OOo 3.0.

Given the number of differences between the OOo 2.4 code base, and LibO
5.2 code base, I don't know if it would be easier to utilize that
extension as a starting point, or completely ignore its existence.

FWIW, Using  much easier than the mouse clicks the extension
required.


jonathon
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: external/nss

[Christian Lohmaier]

 external/nss/UnpackedTarball_nss.mk |2 ++
 external/nss/nss-winXP-sdk.patch.1  |9 +
 2 files changed, 11 insertions(+)

New commits:
commit 09e201fcf2813152335d50588dae0c38adc88d51
Author: Christian Lohmaier 
Date:   Tue Mar 15 15:09:45 2016 +0100

fix nss build when targeting windows XP (using 7.1A SDK)

otherwise build fails because of macro redefinitions warnings (that are
now fatal because of warnings=errors)

Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 75b1f84..4640e54 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.cygwin64.in32bit.patch) \
$(if $(filter WNTMSC,$(OS)$(COM)), \
external/nss/nss.vs2015.pdb.patch) \
+$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
+external/nss/nss-winXP-sdk.patch.1) \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/nss-winXP-sdk.patch.1 
b/external/nss/nss-winXP-sdk.patch.1
new file mode 100644
index 000..2c81892
--- /dev/null
+++ b/external/nss/nss-winXP-sdk.patch.1
@@ -0,0 +1,9 @@
+diff -ur nss.org/nss/coreconf/config.mk nss/nss/coreconf/config.mk
+--- nss.org/nss/coreconf/config.mk 2016-03-15 14:52:19.706093300 +0100
 nss/nss/coreconf/config.mk 2016-03-15 14:56:51.549914800 +0100
+@@ -188,3 +188,5 @@
+ 
+ # Hide old, deprecated, TLS cipher suite names when building NSS
+ DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
++# build with 7.1A SDK for winXP compatibility
++DEFINES += -D_USING_V110_SDK71_
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source

[Christian Lohmaier]

 scp2/source/ooo/common_brand.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce08a8e24edb9a9371642d666ae9a983b16d02bd
Author: Christian Lohmaier 
Date:   Tue Mar 15 14:31:28 2016 +0100

Update-check: optional reporting of H/W and OS info also for installsets

expands 56a9594649872f4076b6891f917138d2b1e8d028 to also apply to
installation sets, not only instdir

Change-Id: I962b63feac02ac6dd06c77be660dd74d876c985e

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1097950..3bf3c91 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -921,7 +921,7 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
 Section = "Version";
 Order = 17;
 Key = "UpdateUserAgent";
-Value = " (${buildid}; ${_OS}; ${_ARCH})";
+Value = " (${buildid}; ${_OS}; ${_ARCH}; )";
 End
 
 ProfileItem gid_Brand_Profileitem_Version_Vendor
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSOC 2016 New Idea: Tabbed LibreOffice Pages

[Esref Ozturk]

Hello,

I have an idea I want to work on within LibreOffice. I want to share it
here and get feedback on whether it is suitable and doable or not. I could
not see my idea in ideas list. I have seen some past discussions on that
but it is not clear where the community is at.

Simply put,  All LibreOffice applications  on multiple tabs under one
window like web browsers. Consider 1 Writer tab, 2 Calc tabs, etc.

Since I am not familiar with the codebase of the LibreOffice, I cannot
determine if it is doable in 3 months.

Any feedback will be appreciated.

--
Esref Ozturk
http://esrefozturk.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loleaflet/src

[Jan Holesovsky]

 loleaflet/src/layer/tile/TileLayer.js |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0e33e3cf5ce7bc517ccc3402ec77027717217a02
Author: Jan Holesovsky 
Date:   Tue Mar 15 14:00:53 2016 +0100

loleaflet bccu#1524: Ignore fit-width-zoom in spereadsheet.

It has no use there, nobody wants to see a huge spreadsheet zoomed out to 
fit
the screen.

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 09f4bea..202fb0d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1173,8 +1173,9 @@ L.TileLayer = L.GridLayer.extend({
var size = e ? e.newSize : this._map.getSize();
var widthTwips = size.x * this._map.options.tileWidthTwips / 
this._tileSize;
maxZoom = maxZoom ? maxZoom : this._map.options.zoom;
-   if (this._docType !== 'spreadsheet' || !e) {
-   // If it's not a spreadsheet or the method has been 
invoked manually
+
+   // 'fit width zoom' has no use in spreadsheets, ignore it there
+   if (this._docType !== 'spreadsheet') {
var crsScale = this._map.options.crs.scale(1);
if (this._docWidthTwips > 0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loleaflet/src

[Jan Holesovsky]

 loleaflet/src/layer/tile/TileLayer.js |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 358fb77aab879d5efa5520f7b292fb2a5f82aa7a
Author: Jan Holesovsky 
Date:   Tue Mar 15 14:00:53 2016 +0100

loleaflet bccu#1524: Ignore fit-width-zoom in spereadsheet.

It has no use there, nobody wants to see a huge spreadsheet zoomed out to 
fit
the screen.

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 63e944d..572a444 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1171,8 +1171,9 @@ L.TileLayer = L.GridLayer.extend({
var size = e ? e.newSize : this._map.getSize();
var widthTwips = size.x * this._map.options.tileWidthTwips / 
this._tileSize;
maxZoom = maxZoom ? maxZoom : this._map.options.zoom;
-   if (this._docType !== 'spreadsheet' || !e) {
-   // If it's not a spreadsheet or the method has been 
invoked manually
+
+   // 'fit width zoom' has no use in spreadsheets, ignore it there
+   if (this._docType !== 'spreadsheet') {
var crsScale = this._map.options.crs.scale(1);
if (this._docWidthTwips > 0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/unotools unotools/source xmloff/source

[Eike Rathke]

 include/unotools/saveopt.hxx   |   20 
 unotools/source/config/saveopt.cxx |6 ++
 xmloff/source/core/xmlexp.cxx  |2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

New commits:
commit 4d857425e0a149f88d3036bdb19b72c7f267efa4
Author: Eike Rathke 
Date:   Tue Mar 15 13:34:42 2016 +0100

define ODFSVER_LATEST at a central place

It's already enough to have to adapt the
SvtSaveOptions::GetODFSaneDefaultVersion() mapping for new
ODFDefaultVersion values, get rid of the
SvXMLExport::getSaneDefaultVersion() place.

In the hope that DO NOT USE is taken seriously..

Change-Id: I1eeae698249f68cc375b22cc4cc799107bc14e41

diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index c9d793d..5567773 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -74,14 +74,18 @@ public:
 /// Enums that allow a sane comparison of versions, without LATEST.
 enum ODFSaneDefaultVersion
 {
-ODFSVER_EXTENDED = 1,   // bit designating extensions are allowed
-ODFSVER_010 = 2,// ODF 1.0
-ODFSVER_011 = 4,// ODF 1.1
-ODFSVER_012 = 6,// ODF 1.2
-ODFSVER_012_EXT_COMPAT = 9, // ODF 1.2 extended, but with 
compatibility fallbacks
-ODFSVER_012_EXTENDED = 11,  // ODF 1.2 extended
-ODFSVER_013 = 12,   // ODF 1.3
-ODFSVER_013_EXTENDED = 13   // ODF 1.3 extended
+ODFSVER_EXTENDED = 1,   ///< bit designating extensions are allowed
+ODFSVER_010 = 2,///< ODF 1.0
+ODFSVER_011 = 4,///< ODF 1.1
+ODFSVER_012 = 6,///< ODF 1.2
+ODFSVER_012_EXT_COMPAT = 9, ///< ODF 1.2 extended, but with 
compatibility fallbacks
+ODFSVER_012_EXTENDED = 11,  ///< ODF 1.2 extended
+ODFSVER_013 = 12,   ///< ODF 1.3
+ODFSVER_013_EXTENDED = 13,  ///< ODF 1.3 extended
+
+// The latest defined standard. Adapt when a new one is published.
+ODFSVER_LATEST = ODFSVER_012,   ///< 
@internal DO NOT USE in comparisons
+ODFSVER_LATEST_EXTENDED = ODFSVER_LATEST | ODFSVER_EXTENDED ///< 
@internal DO NOT USE in comparisons
 };
 
 SvtSaveOptions();
diff --git a/unotools/source/config/saveopt.cxx 
b/unotools/source/config/saveopt.cxx
index 809522f..0b4f7a7 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -1017,8 +1017,6 @@ SvtSaveOptions::ODFDefaultVersion 
SvtSaveOptions::GetODFDefaultVersion() const
 
 SvtSaveOptions::ODFSaneDefaultVersion 
SvtSaveOptions::GetODFSaneDefaultVersion() const
 {
-const ODFSaneDefaultVersion NOW_CURRENT_LATEST = ODFSVER_012_EXTENDED;
-
 switch (pImp->pSaveOpt->GetODFDefaultVersion())
 {
 default:
@@ -1026,7 +1024,7 @@ SvtSaveOptions::ODFSaneDefaultVersion 
SvtSaveOptions::GetODFSaneDefaultVersion()
 break;
 case ODFVER_UNKNOWN:
 case ODFVER_LATEST:
-return NOW_CURRENT_LATEST;
+return ODFSVER_LATEST_EXTENDED;
 case ODFVER_010:
 return ODFSVER_010;
 case ODFVER_011:
@@ -1036,7 +1034,7 @@ SvtSaveOptions::ODFSaneDefaultVersion 
SvtSaveOptions::GetODFSaneDefaultVersion()
 case ODFVER_012_EXT_COMPAT:
 return ODFSVER_012_EXT_COMPAT;
 }
-return NOW_CURRENT_LATEST;
+return ODFSVER_LATEST_EXTENDED;
 }
 
 bool SvtSaveOptions::IsUseSHA1InODF12() const
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 12f4a14..81f0656 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2370,7 +2370,7 @@ SvtSaveOptions::ODFSaneDefaultVersion 
SvXMLExport::getSaneDefaultVersion() const
 return mpImpl->maSaveOptions.GetODFSaneDefaultVersion();
 
 // fatal error, use current version as default
-return SvtSaveOptions::ODFSVER_012;
+return SvtSaveOptions::ODFSVER_LATEST;
 }
 
 OUString SvXMLExport::GetStreamName() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/basebmp

[Caolán McNamara]

 include/basebmp/polypolygonrenderer.hxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 93772371096b4caf542146e673a44d8d346a09ab
Author: Caolán McNamara 
Date:   Fri Mar 11 16:15:16 2016 +

Resolves: tdf#94392 huge negative Y causes length exception

because this rendering stuff is deleted in later versions
of LibreOffice and replaced with cairo rendering, just bodge
this case to give up and go home.

Change-Id: I4e60184b0919dc719edfe223ebb2d8ef684608e8
Reviewed-on: https://gerrit.libreoffice.org/23154
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/include/basebmp/polypolygonrenderer.hxx 
b/include/basebmp/polypolygonrenderer.hxx
index 88963ae..3f65365 100644
--- a/include/basebmp/polypolygonrenderer.hxx
+++ b/include/basebmp/polypolygonrenderer.hxx
@@ -161,7 +161,14 @@ namespace basebmp
 return; // really, nothing to do then.
 
 detail::VectorOfVectorOfVertices aGET; // the Global Edge Table
-aGET.resize( nMaxY - nMinY + 1 );
+try
+{
+aGET.resize( nMaxY - nMinY + 1 );
+}
+catch (...)
+{
+return;
+}
 
 sal_uInt32 const nVertexCount(
 detail::setupGlobalEdgeTable( aGET, rPoly, nMinY ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/Makefile.am

[Andras Timar]

 loolwsd/Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 213e6781932f60e463e64079393f526275527779
Author: Andras Timar 
Date:   Tue Mar 15 13:24:51 2016 +0100

loolwsd: add DocumentBroker.hpp to dist

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 75c4a9f..c7ffb5d 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -29,7 +29,7 @@ loolmap_SOURCES = loolmap.c
 
 noinst_HEADERS = LOKitHelper.hpp LOOLProtocol.hpp LOOLSession.hpp 
MasterProcessSession.hpp ChildProcessSession.hpp \
  LOOLWSD.hpp LoadTest.hpp MessageQueue.hpp TileCache.hpp 
Util.hpp Png.hpp Common.hpp Capabilities.hpp \
- Rectangle.hpp QueueHandler.hpp Admin.hpp Auth.hpp Storage.hpp 
AdminModel.hpp \
+ Rectangle.hpp QueueHandler.hpp Admin.hpp Auth.hpp Storage.hpp 
AdminModel.hpp DocumentBroker.hpp \
  bundled/include/LibreOfficeKit/LibreOfficeKit.h 
bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h \
  bundled/include/LibreOfficeKit/LibreOfficeKitInit.h 
bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Caolán McNamara]

 sw/source/core/view/pagepreviewlayout.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 416843f69cf62d2f01e2a25f03bda0fdec949cb8
Author: Caolán McNamara 
Date:   Wed Mar 9 15:51:41 2016 +

Resolves: tdf#82781 avoid dereferencing invalid iterators

when using print preview with cursor on 2nd page which consists solely of
hidden text with show hiddle text enabled.

inner mrParentViewShell.Paint can invalidate iterators, as later
detected with the mbNewLayoutDuringPaint flag but we dereference
for the purposes of drawing the shadow before we get there.

easiest thing seems to be to just grab the bits of info we want before the
inner paint occurs.

(cherry picked from commit 4eb5f363ed9a3181a817f12d5ec49eede13b9c9c)

Change-Id: I09c9b06449db440b7beba7de9e71c239ee64f6ca
Reviewed-on: https://gerrit.libreoffice.org/23094
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sw/source/core/view/pagepreviewlayout.cxx 
b/sw/source/core/view/pagepreviewlayout.cxx
index 26ff858..5e7f234 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1090,7 +1090,9 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& 
rRenderContext, const Rectan
 Rectangle aPxPaintRect = pOutputDev->LogicToPixel( aPageRect );
 if ( aPxOutRect.IsOver( aPxPaintRect) )
 {
-if ( (*aPageIter)->pPage->IsEmptyPage() )
+const SwPageFrm* pPage = (*aPageIter)->pPage;
+
+if (pPage->IsEmptyPage())
 {
 const Color aRetouche( 
mrParentViewShell.Imp()->GetRetoucheColor() );
 if( pOutputDev->GetFillColor() != aRetouche )
@@ -1118,16 +1120,20 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& 
rRenderContext, const Rectan
 }
 else
 {
+const bool bIsLeftShadowed = pPage->IsLeftShadowNeeded();
+const bool bIsRightShadowed = pPage->IsRightShadowNeeded();
+
 mrParentViewShell.maVisArea = aPageRect;
 aPxPaintRect.Intersection( aPxOutRect );
 Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect 
);
 mrParentViewShell.Paint(rRenderContext, aPaintRect);
+
 // --> OD 2007-08-15 #i80691#
 // paint page border and shadow
 {
 SwRect aPageBorderRect;
 SwPageFrm::GetBorderAndShadowBoundRect( SwRect( aPageRect 
), &mrParentViewShell, &rRenderContext, aPageBorderRect,
-(*aPageIter)->pPage->IsLeftShadowNeeded(), 
(*aPageIter)->pPage->IsRightShadowNeeded(), true );
+bIsLeftShadowed, bIsRightShadowed, true );
 const vcl::Region aDLRegion(aPageBorderRect.SVRect());
 mrParentViewShell.DLPrePaint2(aDLRegion);
 SwPageFrm::PaintBorderAndShadow( aPageRect, 
&mrParentViewShell, true, false, true );
@@ -1142,11 +1148,10 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& 
rRenderContext, const Rectan
 break;
 }
 
-if ( (*aPageIter)->pPage->GetPhyPageNum() == mnSelectedPageNum )
+if (pPage->GetPhyPageNum() == mnSelectedPageNum)
 {
 _PaintSelectMarkAtPage(rRenderContext, *aPageIter);
 }
-
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Samuel Mehrbrodt]

 sw/source/uibase/utlui/content.cxx |   30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

New commits:
commit b78fa03d34734925167112d8ceb6a8b53d6d7735
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 12:30:26 2016 +0100

SwNavigator: Small code cleanup

Change-Id: Iebc0bd9c136205030c80a49c9453e2d57aaed33e
Reviewed-on: https://gerrit.libreoffice.org/23267
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 2e226c6..8fe42eb 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -467,12 +467,12 @@ const SwContent* SwContentType::GetMember(size_t nIndex)
 return nullptr;
 }
 
-voidSwContentType::Invalidate()
+void SwContentType::Invalidate()
 {
 bDataValid = false;
 }
 
-voidSwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
+void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
 {
 SwContentArr*   pOldMember = nullptr;
 size_t nOldMemberCount = 0;
@@ -1281,7 +1281,7 @@ sal_IntPtr SwContentTree::GetTabPos( SvTreeListEntry* 
pEntry, SvLBoxTab* pTab)
 
 // Content will be integrated into the Box only on demand.
 
-void  SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
+void SwContentTree::RequestingChildren( SvTreeListEntry* pParent )
 {
 // Is this a content type?
 if(lcl_IsContentType(pParent))
@@ -2327,8 +2327,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool 
bModifier)
 pEntry = Prev(pEntry);
 if(pEntry &&
 (nActLevel >= 
static_cast(pEntry->GetUserData())->GetOutlineLevel()||
- CTYPE_CNT !=
-
static_cast(pEntry->GetUserData())->GetTypeId()))
+ CTYPE_CNT != 
static_cast(pEntry->GetUserData())->GetTypeId()))
 {
 break;
 }
@@ -2374,7 +2373,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool 
bModifier)
 }
 }
 
-voidSwContentTree::ShowTree()
+void SwContentTree::ShowTree()
 {
 SvTreeListBox::Show();
 }
@@ -2388,7 +2387,7 @@ void SwContentTree::Paint( vcl::RenderContext& 
rRenderContext,
 SvTreeListBox::Paint( rRenderContext, rRect );
 }
 
-voidSwContentTree::HideTree()
+void SwContentTree::HideTree()
 {
 m_aUpdTimer.Stop();
 SvTreeListBox::Hide();
@@ -2447,8 +2446,8 @@ DragDropMode SwContentTree::NotifyStartDrag(
 {
 DragDropMode eMode = (DragDropMode)0;
 if( m_bIsActive && m_nRootType == ContentTypeId::OUTLINE &&
-GetModel()->GetAbsPos( pEntry ) > 0
-&& !GetWrtShell()->GetView().GetDocShell()->IsReadOnly())
+GetModel()->GetAbsPos( pEntry ) > 0
+&& !GetWrtShell()->GetView().GetDocShell()->IsReadOnly())
 eMode = GetDragDropMode();
 else if(!m_bIsActive && GetWrtShell()->GetView().GetDocShell()->HasName())
 eMode = DragDropMode::APP_COPY;
@@ -2542,7 +2541,7 @@ bool  SwContentTree::NotifyAcceptDrop( SvTreeListEntry* 
pEntry)
 // If a Ctrl + DoubleClick are executed in an open area,
 // then the base function of the control is to be called.
 
-void  SwContentTree::MouseButtonDown( const MouseEvent& rMEvt )
+void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt )
 {
 Point aPos( rMEvt.GetPosPixel());
 SvTreeListEntry* pEntry = GetEntry( aPos, true );
@@ -2554,7 +2553,7 @@ void  SwContentTree::MouseButtonDown( const MouseEvent& 
rMEvt )
 
 // Update immediately
 
-void  SwContentTree::GetFocus()
+void SwContentTree::GetFocus()
 {
 SwView* pActView = GetParentWindow()->GetCreateView();
 if(pActView)
@@ -2578,7 +2577,7 @@ void  SwContentTree::GetFocus()
 SvTreeListBox::GetFocus();
 }
 
-void  SwContentTree::KeyInput(const KeyEvent& rEvent)
+void SwContentTree::KeyInput(const KeyEvent& rEvent)
 {
 const vcl::KeyCode aCode = rEvent.GetKeyCode();
 if(aCode.GetCode() == KEY_RETURN)
@@ -2713,8 +2712,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
 }
 if ( !hasObjectMarked )
 {
-SwEditWin& pEditWindow =
-m_pActiveShell->GetView().GetEditWin();
+SwEditWin& pEditWindow = 
m_pActiveShell->GetView().GetEditWin();
 vcl::KeyCode tempKeycode( KEY_ESCAPE );
 KeyEvent rKEvt( 0 , tempKeycode );
 
static_cast(&pEditWindow)->KeyInput( rKEvt );
@@ -2735,7 +2733,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
 
 }
 
-void  SwContentTree::RequestHelp( const HelpEvent& rHEvt )
+void SwContentTree::RequestHelp( const HelpEvent& rHEv

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/basebmp

[Caolán McNamara]

 include/basebmp/packedpixeliterator.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7b56d707440eec27c785368c65feb341048c4b5a
Author: Caolán McNamara 
Date:   Fri Mar 11 16:13:12 2016 +

enable build with gcc 6

Change-Id: I391550d243ae7f773d988cb36f45c482d0c97145
Reviewed-on: https://gerrit.libreoffice.org/23153
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/include/basebmp/packedpixeliterator.hxx 
b/include/basebmp/packedpixeliterator.hxx
index a536cec..1b99bf9 100644
--- a/include/basebmp/packedpixeliterator.hxx
+++ b/include/basebmp/packedpixeliterator.hxx
@@ -78,7 +78,7 @@ public:
 num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
 /** Bit mask for one pixel (least significant bits)
  */
-bit_mask=~(~0 << bits_per_pixel)
+bit_mask=~(~0U << bits_per_pixel)
 };
 
 private:
@@ -248,7 +248,7 @@ public:
 num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
 /** Bit mask for one pixel (least significant bits)
  */
-bit_mask=~(~0 << bits_per_pixel)
+bit_mask=~(~0U << bits_per_pixel)
 };
 
 private:
@@ -501,7 +501,7 @@ public:
 num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
 /** Bit mask for one pixel (least significant bits)
  */
-bit_mask=~(~0 << bits_per_pixel)
+bit_mask=~(~0U << bits_per_pixel)
 };
 
 // TODO(F2): direction of iteration (ImageIterator can be made to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - lotuswordpro/qa lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp |binary
 lotuswordpro/source/filter/lwpfootnote.cxx  |2 +-
 lotuswordpro/source/filter/lwpframelayout.cxx   |4 ++--
 lotuswordpro/source/filter/lwpfribframe.cxx |2 +-
 lotuswordpro/source/filter/lwpnotes.cxx |4 ++--
 lotuswordpro/source/filter/lwpobj.cxx   |1 +
 lotuswordpro/source/filter/lwpobj.hxx   |   14 --
 lotuswordpro/source/filter/lwppagelayout.cxx|4 ++--
 lotuswordpro/source/filter/lwpstory.cxx |8 
 9 files changed, 25 insertions(+), 14 deletions(-)

New commits:
commit 8978c75cb0fdb1a5cddbe25545f0455074afecf6
Author: Caolán McNamara 
Date:   Tue Mar 15 09:21:10 2016 +

recurse protection for XFConvert

Change-Id: Ib6008d4b07159acad26c7baeb775702119c12e3b
(cherry picked from commit 9e0004f2cc64ffa23ecd5c7c82016624eb8a5a20)
Reviewed-on: https://gerrit.libreoffice.org/23259
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp 
b/lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp
new file mode 100644
index 000..f19b0d7
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp 
differ
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 0964eda..8c53f39 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -194,7 +194,7 @@ void LwpFootnote::XFConvert(XFContentContainer * pCont)
 LwpContent* pContent = FindFootnoteContent();
 if(pContent)
 {
-pContent->XFConvert(pCont);
+pContent->DoXFConvert(pCont);
 }
 }
 
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index 5599e85..b9b5712 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -840,7 +840,7 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer* 
pCont, sal_Int32 nStart
 rtl::Reference content = m_Content.obj();
 if (content.is())
 {
-content->XFConvert(pXFFrame);
+content->DoXFConvert(pXFFrame);
 //set frame size according to ole size
 ApplyGraphicSize(pXFFrame);
 }
@@ -1108,7 +1108,7 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* 
pCont, sal_Int32 nStart
 
 while (pLayout && pLayout != this)
 {
-pLayout->XFConvert(pXFFrame);
+pLayout->DoXFConvert(pXFFrame);
 pLayout = 
dynamic_cast(pLayout->GetNext().obj().get());
 }
 
diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx 
b/lotuswordpro/source/filter/lwpfribframe.cxx
index 6b1d5f8..2d7e91c 100644
--- a/lotuswordpro/source/filter/lwpfribframe.cxx
+++ b/lotuswordpro/source/filter/lwpfribframe.cxx
@@ -186,7 +186,7 @@ void LwpFribFrame::XFConvert(XFContentContainer* pCont)
 }
 }
 
-pLayout->XFConvert(pXFContentContainer);
+pLayout->DoXFConvert(pXFContentContainer);
 
 if(m_bRevisionFlag)
 {
diff --git a/lotuswordpro/source/filter/lwpnotes.cxx 
b/lotuswordpro/source/filter/lwpnotes.cxx
index bd16ae9..d85b545 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -184,7 +184,7 @@ void LwpNoteLayout::XFConvert(XFContentContainer * pCont)
 LwpVirtualLayout* pTextLayout = GetTextLayout();
 if(pTextLayout)
 {
-pTextLayout->XFConvert(pCont);
+pTextLayout->DoXFConvert(pCont);
 }
 }
 
@@ -293,7 +293,7 @@ void LwpNoteTextLayout::XFConvert(XFContentContainer * 
pCont)
 rtl::Reference pContent = m_Content.obj();
 if(pContent.is())
 {
-pContent->XFConvert(pCont);
+pContent->DoXFConvert(pCont);
 }
 }
 
diff --git a/lotuswordpro/source/filter/lwpobj.cxx 
b/lotuswordpro/source/filter/lwpobj.cxx
index be9a07f..919e392 100644
--- a/lotuswordpro/source/filter/lwpobj.cxx
+++ b/lotuswordpro/source/filter/lwpobj.cxx
@@ -66,6 +66,7 @@
 LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm)
 : m_ObjHdr(objHdr), m_pObjStrm(nullptr), m_pFoundry(nullptr)
 , m_pStrm(pStrm), m_bRegisteringStyle(false), m_bParsingStyle(false)
+, m_bConvertingContent(false)
 {
 m_pObjStrm = new LwpObjectStream(pStrm, m_ObjHdr.IsCompressed(),
 static_cast(m_ObjHdr.GetSize()) );
diff --git a/lotuswordpro/source/filter/lwpobj.hxx 
b/lotuswordpro/source/filter/lwpobj.hxx
index 978bc49..4b2e7b1 100644
--- a/lotuswordpro/source/filter/lwpobj.hxx
+++ b/lotuswordpro/source/filter/lwpobj.hxx
@@ -96,10 +96,12 @@ protected:
 LwpSvStream* m_pStrm;
 bool m_bRegisteringStyle;
 bool m_bParsingStyle;
+bool m_bConvertingContent;
 protected:
 virtual void Read();
 virtual void RegisterStyle();
 virtual void Parse(IXFStream* pOutputStream);
+virtual void XFConvert(XFC

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/qa lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp |binary
 lotuswordpro/source/filter/lwpfootnote.cxx  |2 +-
 lotuswordpro/source/filter/lwpframelayout.cxx   |4 ++--
 lotuswordpro/source/filter/lwpfribframe.cxx |2 +-
 lotuswordpro/source/filter/lwpnotes.cxx |4 ++--
 lotuswordpro/source/filter/lwpobj.cxx   |1 +
 lotuswordpro/source/filter/lwpobj.hxx   |   14 --
 lotuswordpro/source/filter/lwppagelayout.cxx|4 ++--
 lotuswordpro/source/filter/lwpstory.cxx |8 
 9 files changed, 25 insertions(+), 14 deletions(-)

New commits:
commit 15849b8b66cd2c4e295204200b824bd1d12c48de
Author: Caolán McNamara 
Date:   Tue Mar 15 09:21:10 2016 +

recurse protection for XFConvert

Change-Id: Ib6008d4b07159acad26c7baeb775702119c12e3b
(cherry picked from commit 9e0004f2cc64ffa23ecd5c7c82016624eb8a5a20)
Reviewed-on: https://gerrit.libreoffice.org/23258
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp 
b/lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp
new file mode 100644
index 000..f19b0d7
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/recurse-2.lwp 
differ
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx 
b/lotuswordpro/source/filter/lwpfootnote.cxx
index 408cb48..ecc5e83 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -187,7 +187,7 @@ void LwpFootnote::XFConvert(XFContentContainer * pCont)
 LwpContent* pContent = FindFootnoteContent();
 if(pContent)
 {
-pContent->XFConvert(pCont);
+pContent->DoXFConvert(pCont);
 }
 }
 
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index c209cab..7f593e4 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -835,7 +835,7 @@ void LwpFrameLayout::XFConvertFrame(XFContentContainer* 
pCont, sal_Int32 nStart
 rtl::Reference content = m_Content.obj();
 if (content.is())
 {
-content->XFConvert(pXFFrame);
+content->DoXFConvert(pXFFrame);
 //set frame size according to ole size
 ApplyGraphicSize(pXFFrame);
 }
@@ -1103,7 +1103,7 @@ void LwpGroupLayout::XFConvertFrame(XFContentContainer* 
pCont, sal_Int32 nStart
 
 while (pLayout && pLayout != this)
 {
-pLayout->XFConvert(pXFFrame);
+pLayout->DoXFConvert(pXFFrame);
 pLayout = 
dynamic_cast(pLayout->GetNext().obj().get());
 }
 
diff --git a/lotuswordpro/source/filter/lwpfribframe.cxx 
b/lotuswordpro/source/filter/lwpfribframe.cxx
index 91ee697..a257284 100644
--- a/lotuswordpro/source/filter/lwpfribframe.cxx
+++ b/lotuswordpro/source/filter/lwpfribframe.cxx
@@ -180,7 +180,7 @@ void LwpFribFrame::XFConvert(XFContentContainer* pCont)
 }
 }
 
-pLayout->XFConvert(pXFContentContainer);
+pLayout->DoXFConvert(pXFContentContainer);
 
 if(m_bRevisionFlag)
 {
diff --git a/lotuswordpro/source/filter/lwpnotes.cxx 
b/lotuswordpro/source/filter/lwpnotes.cxx
index 1da5922..09b28ec 100644
--- a/lotuswordpro/source/filter/lwpnotes.cxx
+++ b/lotuswordpro/source/filter/lwpnotes.cxx
@@ -181,7 +181,7 @@ void LwpNoteLayout::XFConvert(XFContentContainer * pCont)
 LwpVirtualLayout* pTextLayout = GetTextLayout();
 if(pTextLayout)
 {
-pTextLayout->XFConvert(pCont);
+pTextLayout->DoXFConvert(pCont);
 }
 }
 
@@ -290,7 +290,7 @@ void LwpNoteTextLayout::XFConvert(XFContentContainer * 
pCont)
 rtl::Reference pContent = m_Content.obj();
 if(pContent.is())
 {
-pContent->XFConvert(pCont);
+pContent->DoXFConvert(pCont);
 }
 }
 
diff --git a/lotuswordpro/source/filter/lwpobj.cxx 
b/lotuswordpro/source/filter/lwpobj.cxx
index 8839702..334c0c1 100644
--- a/lotuswordpro/source/filter/lwpobj.cxx
+++ b/lotuswordpro/source/filter/lwpobj.cxx
@@ -62,6 +62,7 @@
 LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm)
 : m_ObjHdr(objHdr), m_pObjStrm(nullptr), m_pFoundry(nullptr)
 , m_pStrm(pStrm), m_bRegisteringStyle(false), m_bParsingStyle(false)
+, m_bConvertingContent(false)
 {
 m_pObjStrm = new LwpObjectStream(pStrm, m_ObjHdr.IsCompressed(),
 static_cast(m_ObjHdr.GetSize()) );
diff --git a/lotuswordpro/source/filter/lwpobj.hxx 
b/lotuswordpro/source/filter/lwpobj.hxx
index bcd6136..7556a47 100644
--- a/lotuswordpro/source/filter/lwpobj.hxx
+++ b/lotuswordpro/source/filter/lwpobj.hxx
@@ -92,10 +92,12 @@ protected:
 LwpSvStream* m_pStrm;
 bool m_bRegisteringStyle;
 bool m_bParsingStyle;
+bool m_bConvertingContent;
 protected:
 virtual void Read();
 virtual void RegisterStyle();
 virtual void Parse(IXFStream* pOutputStream);
+virtual void XFConvert(XFConten

[Libreoffice-commits] core.git: sw/source

[Samuel Mehrbrodt]

 sw/source/uibase/inc/content.hxx   |   18 +-
 sw/source/uibase/inc/conttree.hxx  |   22 -
 sw/source/uibase/utlui/content.cxx |   47 +
 3 files changed, 35 insertions(+), 52 deletions(-)

New commits:
commit 77db147eeff5643338c678ec73b6ca962b6c162f
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 11:59:23 2016 +0100

Fix some comments

* Format some comments as doxygen comments
* Remove some unnecessary comments

Change-Id: I2a33ee70f73bef565bff662f77e13a15f32df253
Reviewed-on: https://gerrit.libreoffice.org/23266
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 85a20ec..10b547d 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -141,13 +141,15 @@ public:
 
 const SwTOXBase* GetTOXBase() const {return pBase;}
 };
-/*
-class ContentType contains information to one type of content.
-MemberArray is only populated if the content is requested by
-GetMember. It is reloaded after Invalidate() only if the content
-should be read again.
-*/
 
+/**
+ * Content type, knows it's contents and the WrtShell.
+ *
+ * The class ContentType contains information to one type of content.
+ * MemberArray is only populated if the content is requested by
+ * GetMember. It is reloaded after Invalidate() only if the content
+ * should be read again.
+*/
 class SwContentType : public SwTypeNumber
 {
 SwWrtShell* pWrtShell;
@@ -168,10 +170,14 @@ public:
 virtual ~SwContentType();
 
 voidInit(bool* pbInvalidateWindow = nullptr);
+
+/** Fill the List of contents */
 voidFillMemberList(bool* pbLevelChanged = nullptr);
 size_t  GetMemberCount() const
 {return nMemberCount;};
 ContentTypeId   GetType() const {return nContentType;}
+
+/** Deliver content, for that if necessary fill the list */
 const SwContent*GetMember(size_t nIndex);
 const OUString& GetName() {return sContentTypeName;}
 const OUString& GetSingleName() const {return 
sSingleContentTypeName;}
diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index 33cf7dd..2634ea4 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -50,6 +50,7 @@ enum class EditEntryMode
 RENAME= 5,
 };
 
+/** TreeListBox for content indicator */
 class SwContentTree
 : public SvTreeListBox
 , public SfxListener
@@ -101,6 +102,10 @@ class SwContentTree
 boolm_bIsKeySpace;
 Rectangle   m_aOldRectangle;
 
+/**
+ * Before any data will be deleted, the last active entry has to be found.
+ * After this the UserData will be deleted
+ */
 voidFindActiveTypeAndRemoveUserData();
 
 using SvTreeListBox::ExecuteDrop;
@@ -121,6 +126,8 @@ protected:
 
 boolFillTransferData( TransferDataContainer& rTransfer,
 sal_Int8& rDragMode );
+
+/** Check if the displayed content is valid. */
 boolHasContentChanged();
 
 virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
@@ -156,14 +163,24 @@ public:
 OUStringGetEntryLongDescription( SvTreeListEntry* pEntry ) const 
override;
 SdrObject*  GetDrawingObjectsByContent(const SwContent *pCnt);
 
+/** Switch the display to Root */
 voidToggleToRoot();
 voidSetRootType(ContentTypeId nType);
+
+/** Show the file */
 voidDisplay( bool bActiveView );
+/** In the Clear the content types have to be deleted, also. */
 voidClear();
+
+/** After a file is dropped on the Navigator, the new shell will be set */
 voidSetHiddenShell(SwWrtShell* pSh);
 voidShowHiddenShell();
 voidShowActualView();
+
+/** Document change - set new Shell */
 voidSetActiveShell(SwWrtShell* pSh);
+
+/** Set an open view as active. */
 voidSetConstantShell(SwWrtShell* pSh);
 
 SwWrtShell* GetWrtShell()
@@ -176,13 +193,16 @@ public:
 sal_uInt8   GetOutlineLevel()const {return m_nOutlineLevel;}
 voidSetOutlineLevel(sal_uInt8 nSet);
 
+/** Expand - Remember the state for content types */
 virtual boolExpand( SvTreeListEntry* pParent ) override;
-
+/** Collapse - Remember the state for content types. */
 virtual boolCollapse( SvTreeListEntry* pParent ) override;
 
+/** Execute commands of the Navigator */
 voidExecCommand(sal_uInt16 nCmd, bool bModifier);
 
 voidShowTree();
+/** folded together will not be glidled */
 voidHideTree();
 
 bool 

[Libreoffice-commits] core.git: sw/source

[Samuel Mehrbrodt]

 sw/source/ui/utlui/utlui.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c2edd6e7ce5ea479b76ca263a3b6188403b6d7f
Author: Samuel Mehrbrodt 
Date:   Tue Mar 15 10:11:27 2016 +0100

tdf#93562 Navigator: "Draw objects" -> "Drawing objects"

Change-Id: Iebf67e8acea6cf6c1f699fae111c7c244548ebc2
Reviewed-on: https://gerrit.libreoffice.org/23263
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 77098a9..46b9966 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -213,7 +213,7 @@ String STR_CONTENT_TYPE_INDEX
 };
 String STR_CONTENT_TYPE_DRAWOBJECT
 {
-Text [ en-US ] = "Draw objects" ;
+Text [ en-US ] = "Drawing objects" ;
 };
 String STR_CONTENT_TYPE_POSTIT
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/gtk/gtksalmenu.hxx |2 +-
 vcl/unx/gtk/glomenu.cxx|1 +
 vcl/unx/gtk/gtksalmenu.cxx |   24 
 3 files changed, 22 insertions(+), 5 deletions(-)

New commits:
commit 66db55aa84e8401a9eccedb02c67150833a344ba
Author: Caolán McNamara 
Date:   Tue Mar 15 11:15:40 2016 +

Resolves: tdf#98636

On changing a menu item from a non-submenu to a submenu then update
the newly created menu as if it was the first full update of
the entire menu hierarchy.

On changing a menu item from a submenu to a non-submenu its evidentially
not sufficient to unset the G_LO_MENU_ATTRIBUTE_SUBMENU_ACTION attribute
so remove the submenu-item and add a new non-submenu item to force
its new type

Change-Id: I2030d9198d6849643a5991ddfffc1cc3425ba72e

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 8dadcfe..0e1cfd1 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -87,7 +87,7 @@ public:
 boolIsItemVisible( unsigned nPos );
 
 voidNativeSetItemText( unsigned nSection, unsigned 
nItemPos, const OUString& rText );
-voidNativeSetItemCommand( unsigned nSection,
+boolNativeSetItemCommand( unsigned nSection,
   unsigned nItemPos,
   sal_uInt16 nId,
   const gchar* aCommand,
diff --git a/vcl/unx/gtk/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx
index 835e832..e8529e0 100644
--- a/vcl/unx/gtk/glomenu.cxx
+++ b/vcl/unx/gtk/glomenu.cxx
@@ -294,6 +294,7 @@ g_lo_menu_set_action_and_target_value (GLOMenu *menu,
 
 g_lo_menu_set_attribute_value (menu, position, G_MENU_ATTRIBUTE_ACTION, 
action_value);
 g_lo_menu_set_attribute_value (menu, position, G_MENU_ATTRIBUTE_TARGET, 
target_value);
+g_lo_menu_set_attribute_value (menu, position, 
G_LO_MENU_ATTRIBUTE_SUBMENU_ACTION, nullptr);
 
 g_menu_model_items_changed (G_MENU_MODEL (menu), position, 1, 1);
 }
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 91b7f35..48520c2 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -297,7 +297,7 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool 
bRemoveDisabledEntries)
 
 if ( pSubmenu && pSubmenu->GetMenu() )
 {
-NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, 
itemBits, FALSE, TRUE );
+bool bNonMenuChangedToMenu = NativeSetItemCommand( nSection, 
nItemPos, nId, aNativeCommand, itemBits, FALSE, TRUE );
 pNewCommandList = g_list_append( pNewCommandList, g_strdup( 
aNativeCommand ) );
 
 GLOMenu* pSubMenuModel = 
g_lo_menu_get_submenu_from_item_in_section( pLOMenu, nSection, nItemPos );
@@ -310,12 +310,12 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool 
bRemoveDisabledEntries)
 
 g_object_unref( pSubMenuModel );
 
-if ( bRecurse )
+if (bRecurse || bNonMenuChangedToMenu)
 {
 SAL_INFO("vcl.unity", "preparing submenu  " << pSubMenuModel 
<< " to menu model " << G_MENU_MODEL(pSubMenuModel) << " and action group " << 
G_ACTION_GROUP(pActionGroup));
 pSubmenu->SetMenuModel( G_MENU_MODEL( pSubMenuModel ) );
 pSubmenu->SetActionGroup( G_ACTION_GROUP( pActionGroup ) );
-pSubmenu->ImplUpdate(bRecurse, bRemoveDisabledEntries);
+pSubmenu->ImplUpdate(true, bRemoveDisabledEntries);
 }
 }
 
@@ -798,7 +798,7 @@ void GtkSalMenu::NativeSetAccelerator( unsigned nSection, 
unsigned nItemPos, con
 g_free( aCurrentAccel );
 }
 
-void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
+bool GtkSalMenu::NativeSetItemCommand( unsigned nSection,
unsigned nItemPos,
sal_uInt16 nId,
const gchar* aCommand,
@@ -806,6 +806,8 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
gboolean bChecked,
gboolean bIsSubmenu )
 {
+bool bSubMenuAddedOrRemoved = false;
+
 SolarMutexGuard aGuard;
 GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup );
 
@@ -845,6 +847,18 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
 
 if ( aCurrentCommand == nullptr || g_strcmp0( aCurrentCommand, aCommand ) 
!= 0 )
 {
+bool bOldHasSubmenu = 
g_lo_menu_get_submenu_from_item_in_section(pMenu, nSection, nItemPos) != 
nullptr;
+bSubMenuAddedOrRemoved = bOldHasSubmenu != bIsSubmenu;
+if (bSubMenuAddedOrRemoved)
+{
+//tdf#98636 its not good enough to unset the "submenu-action" 
attribute to change something
+  

[Libreoffice-commits] core.git: vcl/win

[Michael Meeks]

 vcl/win/gdi/winlayout.cxx |   30 +++---
 1 file changed, 23 insertions(+), 7 deletions(-)

New commits:
commit 04ce76c7211295865e750a2441f94c267ba2f51c
Author: Michael Meeks 
Date:   Tue Feb 23 15:01:03 2016 +

vcl: improve opengl glyph cache debugging.

Show cutting rectangles, base-lines, and count box widths.

Change-Id: Ic6a08c4c029d6b576ea55479bbf6293accae6f15
Reviewed-on: https://gerrit.libreoffice.org/23251
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 9aa23ac..a5ca8e5 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -280,17 +280,34 @@ void DumpGlyphBitmap(HDC hDC, const 
OpenGLGlyphCacheChunk& rChunk)
 SAL_INFO("vcl.gdi.opengl", "Bitmap " << hBitmap << ": " << aBitmap.bmWidth 
<< "x" << aBitmap.bmHeight << ":");
 
 std::ostringstream sLine("\n", std::ios_base::ate);
+std::ostringstream sScale;
+long nPrintWidth = std::min(125l, aBitmap.bmWidth);
 for (long y = 0; y < aBitmap.bmHeight; y++)
 {
 if (y == rChunk.mnBaselineOffset + rChunk.getExtraOffset())
-sLine << "-";
-else
-sLine << ColorFor(GetPixel(hDC, 0, y));
-for (long x = 1; x < std::min(75l, aBitmap.bmWidth); x++)
+sLine << "--\n";
+long n = 0;
+for (long x = 0; x < nPrintWidth; x++)
+{
+// delimit.
+for (size_t i = 0; i < rChunk.maLocation.size(); ++i)
+{
+if (x == rChunk.maLocation[i].Right())
+{
+n = 0;
+sLine << '|';
+if (y == 0)
+sScale << ' ';
+break;
+}
+}
 sLine << ColorFor(GetPixel(hDC, x, y));
-if (y < aBitmap.bmHeight - 1)
-sLine << "\n";
+if (y == 0)
+sScale << (n++ % 10);
+}
+sLine << "\n";
 }
+sLine << sScale.str();
 SAL_INFO("vcl.gdi.opengl", sLine.str());
 }
 
@@ -565,7 +582,6 @@ bool WinFontInstance::AddChunkOfGlyphs(bool 
bRealGlyphIndices, int nGlyphIndex,
 #ifdef SAL_LOG_INFO
 SAL_INFO("vcl.gdi.opengl", "this=" << this << " now: " << 
maOpenGLGlyphCache);
 DumpGlyphBitmap(aDC.getCompatibleHDC(), aChunk);
-
 {
 std::ostringstream sLine;
 for (int i = 0; i < nCount; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/mailmerge-cleanup' - 2 commits - include/sfx2 sc/source sfx2/source sw/source

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit ec0b712449caddf3cc9286aa89e9f9a9c69a6f2d
Author: Jan-Marek Glogowski 
Date:   Wed Feb 10 19:24:50 2016 +0100

MM: fix debug document dumping

Previously the debug documents were dumped to the temporary mail
merge directory, which is removed at the end of MM. So this dumps
the document to an extra directory.

Also fixes the broken reinterpret_cast "env" => "int" conversation
to get the real number of documents, which work with multi-digit
numbers.

Change-Id: I456b506e9a70cffdfc93cb3eadd39c454a536343

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 642aedd..6f46ef8 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -850,12 +850,27 @@ static void lcl_RemoveSectionLinks( SwWrtShell& 
rWorkShell )
 static void lcl_SaveDebugDoc( SfxObjectShell *xTargetDocShell,
   const char *name, int no = 0 )
 {
+static OUString sTempDirURL;
+if( sTempDirURL.isEmpty() )
+{
+SvtPathOptions aPathOpt;
+utl::TempFile aTempDir( &aPathOpt.GetTempPath(), true );
+if( aTempDir.IsValid() )
+{
+INetURLObject aTempDirURL( aTempDir.GetURL() );
+sTempDirURL = aTempDirURL.GetMainURL( INetURLObject::NO_DECODE );
+SAL_INFO( "sw.mailmerge", "Dump directory: " << sTempDirURL );
+}
+}
+if( sTempDirURL.isEmpty() )
+return;
+
 const OUString sExt( ".odt" );
 OUString basename = OUString::createFromAscii( name );
 if (no > 0)
 basename += OUString::number(no) + "-";
 // aTempFile is not deleted, but that seems to be intentional
-utl::TempFile aTempFile(basename, true, &sExt);
+utl::TempFile aTempFile( basename, true, &sExt, &sTempDirURL );
 INetURLObject aTempFileURL( aTempFile.GetURL() );
 SfxMedium* pDstMed = new SfxMedium(
 aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ),
@@ -1101,7 +1116,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 if (!sMaxDumpDocs)
 sMaxDumpDocs = "";
 else
-nMaxDumpDocs = rtl_ustr_toInt32(reinterpret_cast( sMaxDumpDocs ), 10);
+nMaxDumpDocs = OUString(sMaxDumpDocs, strlen(sMaxDumpDocs), 
osl_getThreadTextEncoding()).toInt32();
 }
 
 ::rtl::Reference< MailDispatcher >  xMailDispatcher;
commit d9d59717f20a8a9dd8ff9eb5bf2d7fb550e91962
Author: Jan-Marek Glogowski 
Date:   Mon Feb 1 22:00:37 2016 +0100

MM: remove lock from saved documents

Actually we have to call DoSaveCompleted to get rid of the locking.
Instead this adds a parameter to skip the recent file registration
used in non bCreateSingleFile modes.

Change-Id: I57151f08ad8d737007da84c4566685cc37612dfb

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 9f2f71a..ccc7213 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -327,7 +327,7 @@ public:
 boolDoSaveObjectAs( SfxMedium &rNewStor, bool 
bCommit );
 
 // TODO/LATER: currently only overridden in Calc, should be made 
non-virtual
-virtual boolDoSaveCompleted( SfxMedium* pNewStor=nullptr );
+virtual boolDoSaveCompleted( SfxMedium* pNewStor=nullptr, 
bool bRegisterRecent=true );
 
 boolLoadOwnFormat( SfxMedium& pMedium );
 virtual boolSaveAsOwnFormat( SfxMedium& pMedium );
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 4c69ed1..b48e46d 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2449,9 +2449,9 @@ bool ScDocShell::SaveCompleted( const uno::Reference < 
embed::XStorage >& xStor
 return SfxObjectShell::SaveCompleted( xStor );
 }
 
-bool ScDocShell::DoSaveCompleted( SfxMedium * pNewStor )
+bool ScDocShell::DoSaveCompleted( SfxMedium * pNewStor, bool bRegisterRecent )
 {
-bool bRet = SfxObjectShell::DoSaveCompleted( pNewStor );
+bool bRet = SfxObjectShell::DoSaveCompleted( pNewStor, bRegisterRecent );
 
 //  SC_HINT_DOC_SAVED for change ReadOnly -> Read/Write
 Broadcast( SfxSimpleHint( SC_HINT_DOC_SAVED ) );
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 23755ba..131a34f 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -203,7 +203,7 @@ public:
 virtual voidLoadStyles( SfxObjectShell &rSource ) override;
 
 virtual boolSaveCompleted( const css::uno::Reference< 
css::embed::XStorage >& ) override;  // SfxInPlaceObject
-virtual boolDoSaveCompleted( SfxMedium * pNewStor) override; // 
SfxObjectShell
+virtual boolDoSaveCompleted( SfxMedium * pNewStor, bool 
bRegisterRecent ) override; // SfxObjectShell
 virtual boolQuerySlotExecutable( sal_uInt16 nSlotId ) override;
 
 virtual voidDraw( OutputDevice *, const JobSetup 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Katarina Behrens]

 sd/source/ui/sidebar/PreviewValueSet.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 71f4f7fc85fbc872cd480613e95530f122f530f8
Author: Katarina Behrens 
Date:   Thu Mar 10 13:16:33 2016 +0100

tdf#94370: Make previews of master pages finally appear

Just force the whole ValueSet to be formatted. Individual rectangles
are already being invalidated (when PREVIEW_CHANGED event comes), but
something naughty must be happening in ValueSet that those changes
don't show.

Change-Id: I4fd8af36e34c3a445d7b16b59e45256f016fd9df
Reviewed-on: https://gerrit.libreoffice.org/23115
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 1b98d7a3c4f1de39226e44e5b27351d8bfbbe6c0)
Reviewed-on: https://gerrit.libreoffice.org/23116
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit 819166500c1b45e4241fdb47f2de6653e4495372)
Reviewed-on: https://gerrit.libreoffice.org/23253

diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx 
b/sd/source/ui/sidebar/PreviewValueSet.cxx
index 7c1145c..55ae2f7 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -78,6 +78,7 @@ void PreviewValueSet::Rearrange (bool /*bForceRequestResize*/)
 GetOutputSizePixel().Width()));
 sal_uInt16 nNewRowCount (CalculateRowCount (nNewColumnCount));
 
+SetFormat();
 SetColCount(nNewColumnCount);
 SetLineCount(nNewRowCount);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - vcl/headless

[Markus Mohrhard]

 vcl/headless/svpinst.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 4b49f9178fdf98ead95d279ac5bb1f1e0a0fbf73
Author: Markus Mohrhard 
Date:   Mon Mar 14 18:01:15 2016 +0100

fix memory leak in headless backend

Reviewed-on: https://gerrit.libreoffice.org/23248
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit c62afab9d4138583eb22afe46608b323f902f095)

Change-Id: I90282c86b45845fc35b23b275301be24a2f18a4d

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 7c94f66..7f45629 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -148,8 +148,12 @@ void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
 std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
 do
 {
-if( it->m_pFrame== pFrame )
+if( it->m_pFrame == pFrame )
 {
+if (it->m_nEvent == SALEVENT_USEREVENT)
+{
+delete static_cast(it->m_pData);
+}
 it = m_aUserEvents.erase( it );
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loleaflet/src loolwsd/LOOLWSD.cpp loolwsd/protocol.txt

[Jan Holesovsky]

 loleaflet/src/core/Socket.js |2 +-
 loolwsd/LOOLWSD.cpp  |5 ++---
 loolwsd/protocol.txt |4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit e63905116affb7012d65ff4fad4d3d696e263f18
Author: Jan Holesovsky 
Date:   Tue Mar 15 11:04:17 2016 +0100

loolwsd, loleaflet: Rename 'connectionclose' to 'disconnect'.

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 110b98e..be3aa71 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -21,7 +21,7 @@ L.Socket = L.Class.extend({
 
close: function () {
// mark this as a deliberate shutdown
-   this.sendMessage('closeconnection');
+   this.sendMessage('disconnect');
 
this.socket.onerror = function () {};
this.socket.onclose = function () {};
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ff3ddbc..74fb7be 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -437,10 +437,9 @@ public:
 std::string firstLine = getFirstLine(buffer, n);
 StringTokenizer tokens(firstLine, " ", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
 
-if (tokens.count() == 1 && tokens[0] == 
"closeconnection")
+if (tokens.count() == 1 && tokens[0] == 
"disconnect")
 normalShutdown = true;
-
-if ((flags & 
WebSocket::FrameFlags::FRAME_FLAG_FIN) != WebSocket::FrameFlags::FRAME_FLAG_FIN)
+else if ((flags & 
WebSocket::FrameFlags::FRAME_FLAG_FIN) != WebSocket::FrameFlags::FRAME_FLAG_FIN)
 {
 // One WS message split into multiple frames.
 std::vector message(buffer, buffer + n);
diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index e09734f..0c3db9b 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -17,13 +17,13 @@ canceltiles
 dropped and will not be handled. There is no guarantee of exactly
 which tile: messages might still be sent back to the client.
 
-closeconnection
+disconnect
 
 The socket is going to be shut down normally.  This is to distinguish
 deliberate shutdown from the case when the connection was lost, or
 the browser was killed etc.
 
-downloadas downloadas name= id= format= 
options=
+downloadas name= id= format= 
options=
 
 Exports the current document to the desired format and returns a download 
URL
 The id identifies the request on the client.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src loolwsd/LOOLWSD.cpp loolwsd/PROBLEMS loolwsd/protocol.txt

[Jan Holesovsky]

 loleaflet/src/core/Socket.js |2 +-
 loolwsd/LOOLWSD.cpp  |5 -
 loolwsd/PROBLEMS |9 +++--
 loolwsd/protocol.txt |2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 6b15dfd552535eeb8bd1ac3e1a6c5afeb1f08873
Author: Jan Holesovsky 
Date:   Tue Mar 15 10:32:28 2016 +0100

loolwsd, loleaflet: Rename 'connectionclose' to 'disconnect'.

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ce953f9..9ca9b53 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -24,7 +24,7 @@ L.Socket = L.Class.extend({
 
close: function () {
// mark this as a deliberate shutdown
-   this.sendMessage('closeconnection');
+   this.sendMessage('disconnect');
 
this.socket.onerror = function () {};
this.socket.onclose = function () {};
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 767f8b0..f98429b 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -577,8 +577,11 @@ private:
 const std::string firstLine = getFirstLine(data, size);
 if (singleLine || firstLine.find("paste") == 0)
 {
-if (firstLine == "closeconnection")
+if (firstLine.compare(0, 10, "disconnect") == 0) // starts 
with "disconnect"
+{
 normalShutdown = true;
+return true;
+}
 
 queue.put(std::string(data, size));
 return true;
diff --git a/loolwsd/PROBLEMS b/loolwsd/PROBLEMS
index 38fc312..86626dd 100644
--- a/loolwsd/PROBLEMS
+++ b/loolwsd/PROBLEMS
@@ -31,8 +31,13 @@
   situations anyway, especially for the socket talking to the
   client. For the internal communication in the process tree,
   "disconnect" messages are barely acceptable, if the code is already
-  written to generate and expect them. But they should never be sent
-  to a client (or expected from it).
+  written to generate and expect them.
+
+  For the moment, we send them from the client too - to distinguish the
+  browser crash or connection loss from a deliberate shutdown.
+  We are saving the document in the case we don't get the explicit
+  'disconnect'.  When we move to actually saving the document all
+  the time automatically, the 'disconnect' message should be removed.
 
 - 'make check' does not work, or fails randomly, unless you have a
   freshly started loolwsd with a --numprespawn option that is big
diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index 3537a64..ae92db0 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -17,7 +17,7 @@ canceltiles
 dropped and will not be handled. There is no guarantee of exactly
 which tile: messages might still be sent back to the client.
 
-closeconnection
+disconnect
 
 The socket is going to be shut down normally.  This is to distinguish
 deliberate shutdown from the case when the connection was lost, or
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/beanshell

[Douglas Mencken]

 external/beanshell/UnpackedTarball_beanshell.mk |5 +
 external/beanshell/beanshell-invoke.patch   |   78 
 2 files changed, 83 insertions(+)

New commits:
commit 841a58da93e10f543876eefca470d8fd4bd96ded
Author: Douglas Mencken 
Date:   Wed Sep 30 12:16:08 2015 -0400

beanshell: improve compatibility for script engine

javax.script.Invocable may contain either
• two `invoke' methods
or
• `invokeMethod' and `invokeFunction'
so let's support any variant

Change-Id: I47196af79cc2de75725ded29992ab1f6f4cd623e
Reviewed-on: https://gerrit.libreoffice.org/23163
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/beanshell/UnpackedTarball_beanshell.mk 
b/external/beanshell/UnpackedTarball_beanshell.mk
index 828e4bd..f35dd7d 100644
--- a/external/beanshell/UnpackedTarball_beanshell.mk
+++ b/external/beanshell/UnpackedTarball_beanshell.mk
@@ -11,8 +11,13 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell))
 
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,beanshell,\
+   engine/src/TestBshScriptEngine.java \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,beanshell,\
external/beanshell/bsh-2.0b1-src.patch \
+   external/beanshell/beanshell-invoke.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/beanshell/beanshell-invoke.patch 
b/external/beanshell/beanshell-invoke.patch
new file mode 100644
index 000..b78f1db
--- /dev/null
+++ b/external/beanshell/beanshell-invoke.patch
@@ -0,0 +1,78 @@
+--- old/beanshell/engine/src/bsh/engine/BshScriptEngine.java
 new/beanshell/engine/src/bsh/engine/BshScriptEngine.java
+@@ -229,6 +229,12 @@
+   }
+   }
+ 
++  public Object invoke( Object thiz, String name, Object... args )
++  throws ScriptException, NoSuchMethodException
++  {
++  return invokeMethod( thiz, name, args );
++  }
++
+   /**
+* Same as invoke(Object, String, Object...) with null as 
the
+* first argument.  Used to call top-level procedures defined in 
scripts.
+@@ -249,6 +255,12 @@
+   return invokeMethod( getGlobal(), name, args );
+   }
+ 
++  public Object invoke( String name, Object... args )
++  throws ScriptException, NoSuchMethodException
++  {
++  return invokeFunction( name, args );
++  }
++
+ /**
+* Returns an implementation of an interface using procedures compiled 
in the
+* interpreter. The methods of the interface may be implemented using 
the
+--- old/beanshell/engine/src/TestBshScriptEngine.java
 new/beanshell/engine/src/TestBshScriptEngine.java
+@@ -2,11 +2,12 @@
+ import java.io.*;
+ import javax.script.*;
+ import static javax.script.ScriptContext.*;
++import java.lang.reflect.*;
+ 
+ public class TestBshScriptEngine
+ {
+   public static void main( String [] args )
+-  throws ScriptException, NoSuchMethodException, IOException
++  throws ScriptException, NoSuchMethodException, 
IllegalAccessException, InvocationTargetException, IOException
+   {
+   ScriptEngineManager manager =
+   new ScriptEngineManager( 
bsh.Interpreter.class.getClassLoader() );
+@@ -39,11 +40,23 @@
+   assertTrue( engine.get("bar").equals("gee") );
+   assertTrue( engine.eval("bar").equals("gee") );
+ 
++  // use reflection to pick available method
++  Method invokeMe = null;
++  try {
++  invokeMe = Invocable.class.getMethod( "invokeFunction", 
String.class, Object[].class );
++  } catch ( Exception e ) { }
++  if (invokeMe == null)
++  {
++  try {
++  invokeMe = Invocable.class.getMethod( "invoke", 
String.class, Object[].class );
++  } catch ( Exception e ) { }
++  }
++
+   // install and invoke a method
+   engine.eval("foo() { return foo+1; }");
+   // invoke a method
+   Invocable invocable = (Invocable) engine;
+-  int foo = (Integer)invocable.invokeFunction( "foo" );
++  int foo = (Integer)invokeMe.invoke( invocable, "foo", (Object) 
new Object[]{} );
+   assertTrue( foo == 43 );
+ 
+   // get interface
+@@ -58,7 +71,7 @@
+   engine.eval(
+   "flag2=false; myObj() { run() { flag2=true; } return 
this; }");
+   assertTrue( (Boolean)engine.get("flag2") == false );
+-  Object scriptedObject = invocable.invokeFunction("myObj");
++  Object scriptedObject = invokeMe.invoke( invocable, "myObj", 
(Object) new Object[]{} );
+   assertTrue( scriptedObject instanceof bsh.This );
+