date:20160621

[Libreoffice-commits] online.git: Changes to 'refs/tags/1.6.14-1'

2016-06-21 Thread Andras Timar

Tag '1.6.14-1' created by Andras Timar  at 
2016-06-22 06:32 +

1.6.14-1

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

[Libreoffice-commits] online.git: Changes to 'refs/tags/COOL_1.0.1'

2016-06-21 Thread Andras Timar

Tag 'COOL_1.0.1' created by Andras Timar  at 
2016-06-22 06:32 +

COOL_1.0.1

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/Makefile loolwsd/configure.ac

2016-06-21 Thread Andras Timar

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f88abb30cdc6ba32499916ad3ce200ced6d137f7
Author: Andras Timar 
Date:   Wed Jun 22 08:10:32 2016 +0200

Bump version to 1.6.14 before tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index cc4a2ee..f9787e6 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.6.13
+VERSION=1.6.14
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 3a8823a..fc9df88 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.6.13], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.6.14], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Jan Holesovsky

 vcl/source/app/vclevent.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b4861b60b2f6d7ffd9efcd8e028e2578da4b464f
Author: Jan Holesovsky 
Date:   Wed Jun 22 08:24:30 2016 +0200

Simplify dynamic_cast followed by a static_cast.

Change-Id: Iec55b1d2e290e2bcc0286225b6f731314f058625

diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index da87732..4786fd6 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -49,9 +49,9 @@ void VclEventListeners::Call( VclSimpleEvent& rEvent ) const
 std::vector> aCopy( m_aListeners );
 std::vector>::iterator aIter( aCopy.begin() );
 std::vector>::const_iterator aEnd( aCopy.end() 
);
-if( dynamic_cast( &rEvent ) != nullptr )
+if (VclWindowEvent* pWindowEvent = dynamic_cast(&rEvent))
 {
-VclPtr 
xWin((static_cast(&rEvent))->GetWindow());
+VclPtr xWin(pWindowEvent->GetWindow());
 while ( aIter != aEnd && xWin && ! xWin->IsDisposed() )
 {
 Link &rLink = *aIter;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-5-2' - loleaflet/Makefile

2016-06-21 Thread Andras Timar

 loleaflet/Makefile |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ee4ddcab9f9a2d639175c1bb5bbf7b7952c72474
Author: Andras Timar 
Date:   Tue Jun 21 16:44:20 2016 +0200

loleaflet: bccu#1901 Control.RowHeader.js and Control.ColumnHeader.js for 
l10n

(cherry picked from commit 9e7b978f9fe9548e6f238e680feb412cadd04166)

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 45e9a69..7d9c550 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -38,7 +38,9 @@ pot:
src/admin/AdminSocketOverview.js \
src/admin/AdminStrings.js \
src/admin/Util.js \
+   src/control/Control.ColumnHeader.js \
src/control/Control.Menubar.js \
+   src/control/Control.RowHeader.js \
src/control/Control.Tabs.js \
src/control/Toolbar.js \
src/core/Socket.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/Makefile

2016-06-21 Thread Andras Timar

 loleaflet/Makefile |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 797a6ce85d3fdb44b300e1b31a77f7e03ca61d9d
Author: Andras Timar 
Date:   Tue Jun 21 16:44:20 2016 +0200

loleaflet: bccu#1901 Control.RowHeader.js and Control.ColumnHeader.js for 
l10n

(cherry picked from commit 9e7b978f9fe9548e6f238e680feb412cadd04166)

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index b0b009e..cc4a2ee 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -38,7 +38,9 @@ pot:
src/admin/AdminSocketOverview.js \
src/admin/AdminStrings.js \
src/admin/Util.js \
+   src/control/Control.ColumnHeader.js \
src/control/Control.Menubar.js \
+   src/control/Control.RowHeader.js \
src/control/Control.Tabs.js \
src/control/Toolbar.js \
src/core/Socket.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'refs/tags/COOL_1.0.1' - 0 commits -

2016-06-21 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Pushing to LibO-5-2

2016-06-21 Thread Laurent BP

sberg wrote
> All three of the mentioned ;, 
> ;, 
> ; refer to 
> ;

The history of the resolution of this bug is not complete. A first commit
fix it only for polynomial equation, because I wanted to have the smaller
commit (as I thought it was easier for review). This commit was merged to
master before 5-2 branch. 
https://bugs.documentfoundation.org/show_bug.cgi?id=94004#c6
Then it takes some time before the 3 other commits for other equation types
were reviewed, and 5-2 was branched. I thought it would not have been a good
idea to have an incomplete feature (wrapping equations if they are too long,
not for all equation types) in LibO 5.2, and I proposed to backport them in
LibO 5.2 beta.

Was I wrong?

Best regards,

Laurent BP



-
LibreOffice 5.1.4.1
--
View this message in context: 
http://nabble.documentfoundation.org/Pushing-to-LibO-5-2-tp4186528p4186832.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: starmath/source

2016-06-21 Thread Takeshi Abe

 starmath/source/smmod.cxx   |8 
 starmath/source/symbol.cxx  |   14 --
 starmath/source/utility.cxx |7 ---
 3 files changed, 29 deletions(-)

New commits:
commit 336beb8b39c5486afd9b2aaa95ae897de3e13a29
Author: Takeshi Abe 
Date:   Tue Jun 21 19:00:31 2016 +0900

Drop unused #include

Change-Id: Ic0cf4605cc7d02fdd537d05cbaa744c52126e6f1
Reviewed-on: https://gerrit.libreoffice.org/26545
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 02a4526..e394fe6 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -17,17 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
-#include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include "smmod.hxx"
@@ -43,8 +37,6 @@
 #define SmModule
 #include "smslots.hxx"
 
-#include 
-
 
 SmResId::SmResId( sal_uInt16 nId )
 : ResId(nId, *SM_MOD()->GetResMgr())
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 3e6442c..b1b0bb1 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -17,14 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
 #include 
 #include 
 
@@ -37,12 +29,6 @@
 #include "starmath.hrc"
 
 
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::uno;
-
-
-/**/
-
 SmSym::SmSym() :
 m_aName(OUString("unknown")),
 m_aSetName(OUString("unknown")),
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 6983cb4..6072c8f 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -17,20 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
-#include 
 #include 
-#include 
-#include 
-
-#include 
 
 #include "starmath.hrc"
 
 #include "utility.hxx"
 #include "dialog.hxx"
 #include "view.hxx"
-#include "smdll.hxx"
 
 
 // return pointer to active SmViewShell, if this is not possible
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1

2016-06-21 Thread Kay Schenk

 bootstrap.1 |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a4c7ead4ac16db5c3f89cabb62a9727ae48a079e
Author: Kay Schenk 
Date:   Tue Jun 21 21:23:37 2016 +

Output Perl @INC, library locations, to help troubleshoot missing Perl 
modules.

diff --git a/bootstrap.1 b/bootstrap.1
index 572a2e8..0981e5f 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -39,6 +39,8 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 
 # fetch or update external tarballs
 if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
+# check perl include locations
+"$PERL" -e 'print "\nInclude locations: @INC\n\n"';
 "$PERL" "$SOLARENV/bin/download_external_dependencies.pl" 
$SRC_ROOT/external_deps.lst
 if [ "$?" != "0" ]; then
 echo "*** Error downloading external dependencies, please fix the 
previous problems and try again ***"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/accrintm.fods | 1751 +++
 1 file changed, 1751 insertions(+)

New commits:
commit e505ab71991546ce5d9ec9ee2622493193475b9d
Author: ZdenÄk Crhonek 
Date:   Tue Jun 21 18:10:01 2016 +0200

add ACCRINTM test case

Change-Id: Iad85f67c5d395d8c74125e0dcb7ff0a7a29ae0b5
Reviewed-on: https://gerrit.libreoffice.org/26553
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/accrintm.fods 
b/sc/qa/unit/data/functions/fods/accrintm.fods
new file mode 100644
index 000..aed38e9
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/accrintm.fods
@@ -0,0 +1,1751 @@
+
+
+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:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis: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: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:form
 x="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.spreadsheet">
+ 
2016-06-21T18:09:11.793386251P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/131e604073f89e6c1dd54be88b94b7befd881f2e
+ 
+  
+   0
+   0
+   31291
+   13929
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+  
+  
+   4
+   16
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+  
+ 
+ Sheet1
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   
+

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

2016-06-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.1' created by Christian Lohmaier 
 at 2016-06-21 23:09 +

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

iQIcBAABAgAGBQJXack6AAoJEPQ0oe+v7q6j6x4QAL4OBH4qHZ8M1tQDiYFA9Pj0
C/ZWDFVIDHjEhjeNwOSbde6OB50LXaFXcTGag8FgyM95F8H8IVqnSzLFdXCqETQc
OIMx2NJPQ54wkxqYb95n/YRUP9PCqkzv9Bd3CeoLQg7AYAJNhTjpnF8V99B9B4S+
wMTtrfK5NvNt4d3sIyWXgiR0sSHSlp0OA/V6f0zf0bSFltSSDvtnNvEJwLk/kCqL
Pe9n6wOYAhdaDEE7wXbQGE9J1j/ytt472od1MoCOsmg7GOSFTr6Kdf1jiCx0NVJS
IpIXwJc+1tanVRtJlzNZYDjObifxiedNijk0ir3DVL1QV0zsueui3js0Aa9XIayd
Wo2sRQ29OeNgLRQofIb/b0qighyVCYzts4lpwbo6ztqAgU1W4lklouLLUt3V6eof
ZTcE1QA7QyKd2dNp1WQrRdB0OD/KLvi0z38adQnWgChCPCwH/EPsTagT8U6bKTwK
GxxSgky/r5+dz7rA6i0Bm2hPgTMNKVgnJuaIKpPmIXPvwlwGjh+E2bCZcqwHT402
Tm5UaEEEuxPcsJX9m7QdO7LmwermuSfdJvA6CmzUl8KEhdJKREeaLkufLOvNWTrB
eI3QJITKis/Pi5zS3A0jBD0eeFlNjIPq04RXEaqNyKBIS6c62GftQqXnYOoAH+em
TK/x/zUn5tuR1cUvWGsb
=sKgl
-END PGP SIGNATURE-

Changes since libreoffice-5-2-branch-point-18:
---
 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.2.0.1'

2016-06-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.1' created by Christian Lohmaier 
 at 2016-06-21 23:09 +

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

iQIcBAABAgAGBQJXack+AAoJEPQ0oe+v7q6j0XEP/iszBhUfShCva3IdweWl/Bir
gJ5e5fQpWzczUZ/L1C1zKWsZx//AyB9R6fikoTif11yJGAVxhEA7eckTF3DCYg1R
tLuwAz91gACKUpbl6q9rGecB/dCHPuGjulreC1vGwWwGxb/jnClwG2bSzrDD2S+3
BbdAg2zjtque4oz0hM3g3D5WIvFOj6dLj1ADJcbfJphdfkY1WJnDghqlU8BJZDET
fDB6s4P7uFMA15Zqff2/Km3m0c3kGHnjDmBpZ85KTgpFV2ILerxl0oTdNxuUBFRv
Wg08rUWLOKqEz7gN5xX1M3ztHEtjo3Ee5MGOSYXLDy1pAgDIdIgnM9L5olqVUwPc
ZC3ITaWr8Lh7vHkQFp3XbQ8piggPeVWVmjBnCwvbJ3UNmLp8/2GJEtOqVR/cQtm1
Odkot0mH8Xq1nu5Cs2WKvxFKAFdkGoWeZkfEjtwgoZt3LxhyaPkqlwIC2C5aZU/b
AuPxDF1u1JvP81X94h9wSg89P/WvswI4Fp9vFWs2b9u1YzB7frB8t1T2VMRUvgfm
8b8qPPp/0sgJ+Qmz2/+rxUxUeULHZkv7H3vdgs3NgDNafG/B4UdYKSNrgWQy7Lwj
5gO6LjWKpsIb9aXj1W2fih73fLbj7a+bximB/0pVqzQ4t6e/mAai0sSmJ9wmTEH3
HqYLjj3n6fE/YUYb2NeS
=EUuz
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-7:
---
 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.2.0.1'

2016-06-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.1' created by Christian Lohmaier 
 at 2016-06-21 23:09 +

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

iQIcBAABAgAGBQJXack1AAoJEPQ0oe+v7q6jhIcQAKBAucEWmBp52SXsJ85NE7/s
gMDL/DKRUJQsqS7MprZO996xCayaWmvN9Sv6JQE6ryyaGuSPvbI3UKleJEfGUBv2
X8luv3GNk9pU4AHZ3Gzjw7yZjwUl5oxVQBiBq1auA6IsQ6s8vPY7/XR961IuQn+S
yt/Zf0hs1VqXI1fl8DDawpdLlPmQc3DfxfAb5j5T7wFO1v67ZDz3NF2UrsqfARES
XA0UgbT2vO/hbWbVx85ZLcTEmFvZvj8aGsZl+WfJ4y7e4lClUJ8wZwiHxKlHwg0L
F9wn4GPD22QnkzOuc1xQZosSOZ8ZtEzsjftqBBFrDAJwxaeU+0J+1ltZ1MkFGS2O
0ePsQKsjCZ9G698+uByhiTpNXYtJIX+fJDnc4v8z6zkVHASX5oipPKPw8h5rcKdx
yjeVwoMVRsPEHjis38bhrevdO16vOkL+6J+S4DEjjikDt0QKNhIcDTHUxUW0dX7x
W4Xm4K+3qau/39I/LK4XWF1k4NBUU60eZsjZoOuyrVjsMogVWrJruyp76s6OTxjY
CsL0bSY4lWHHBgkQRem+89BQRh/0/V/HLwBPun4XKrza2DD0rd9zoqvaf3CbDK0Z
fOtIUuC1P0u7Sv7wnD3B60h9edVkMPewT+NhtzQgx8oQ2QbMDVtQE0MPHbsR+pQz
P2+6fcThtv2SqiSFMxqk
=jh2U
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-2:
---
 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-2' - configure.ac

2016-06-21 Thread Christian Lohmaier

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

New commits:
commit 7acb934bc6765316b05e31fe56e9ff706c533c33
Author: Christian Lohmaier 
Date:   Wed Jun 22 01:12:31 2016 +0200

bump product version to 5.2.0.1.0+

Change-Id: I928312c9c3ba468d48d2e6e5db65a47db7ed663c

diff --git a/configure.ac b/configure.ac
index e94e376..3041c80 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.2.0.0.beta2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.2.0.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: Changes to 'refs/tags/libreoffice-5.2.0.1'

2016-06-21 Thread Christian Lohmaier

Tag 'libreoffice-5.2.0.1' created by Christian Lohmaier 
 at 2016-06-21 23:09 +

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

iQIcBAABAgAGBQJXaclBAAoJEPQ0oe+v7q6jegYQAKRwSJwe4zIBj18IhYTOP7QN
n3HipIdKgtadqG2Yj0WkGCbuMBc8FGeuUKACfMpoqpEnLWN1jbPB8DDDbl1yeafd
nNmez00QL6RGrN1c7N8RejBOju0imqnrX+5AjnKZjQnnrOD+HI0YOoaqJnunF0uW
loNEBmOcergM4Fc4ivD1A/XjToLALacyoJLR29+RlB5hiMkGx85S3i3z9Monh/uy
Jeu/6Q4gBHdXH4Q8iF2DuaNNe76YsM3bNnxzcfI3uxgEsS5bZUWh8TpZ7nS2IbLN
BcLvN9kPuLia4SPBApJbNlGbNtN52t9Brcu2cwQU9+HTaZURDEfshmBEr1j594eB
wAQflc4mcunET9pqMaa2RJQZtWflboaPsTOG9ARQrQkZj0qsU6zbi7c/kBt7bKHp
zqgIhviF1Szz2HNoh2VHEJLe9LYVOGx9oI1RFJR9a0FSkB2gd8pkfG7TXyz47W1k
DgIaqwukYoW/Pm1dybSngr9uKlfSolhbFcqINy2OvpYaJeZYnwvSGR/OHRG5iuK1
LojzGZyH/fuHscT10W59MF380s9T+d2RiYkpdbvA0RvWdCymHZaMqEsRvfZfIq+f
UPM+L5HBFz0L5d1PMAPmJ9/YgQTQf+8JFn2CbIC15dOJL9iaOvdKpsS8LwXcwjyH
1U+MV+8R223q7FWy9vK9
=A00k
-END PGP SIGNATURE-

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

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

2016-06-21 Thread Mike Kaganski

 loolwsd/test/httpwstest.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 47a17fa8d017b12c6e15f3ec5566fcbff96a3118
Author: Mike Kaganski 
Date:   Tue Jun 21 22:19:13 2016 +1000

testCloseAfterClose: don't hang on bytes==0 && flags==0

At least in some versions of Poco (namely, 1.7.3),
WebSocketImpl::receiveBytes may return both bytes and flags equal
to zero. It makes the HTTPWSTest::testCloseAfterClose() loop
exit condition to never happen, thus test hangs.

According to WebSoket.h, "A return value of 0 means that the peer
has shut down or closed the connection".
Thus, this modification makes this loop robust.

Change-Id: I5dd4f30936dd8246c966f094f2fdae9a45b89ff9
Reviewed-on: https://gerrit.libreoffice.org/26547
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 6b8cb0f..9061641 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -307,7 +307,7 @@ void HTTPWSTest::testCloseAfterClose()
 {
 bytes = socket.receiveFrame(buffer, sizeof(buffer), flags);
 }
-while ((flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != 
Poco::Net::WebSocket::FRAME_OP_CLOSE);
+while (bytes && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != 
Poco::Net::WebSocket::FRAME_OP_CLOSE);
 
 // no more messages is received.
 bytes = socket.receiveFrame(buffer, sizeof(buffer), flags);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-2' - Dictionary_gd.mk

2016-06-21 Thread Aron Budea

 Dictionary_gd.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit efd52e4e0ec6f706560e17f86ec4952f5315f41f
Author: Aron Budea 
Date:   Tue Jun 7 07:57:42 2016 +0200

tdf#90786 Put license file in the right directory

In 5.2 beta1 the license file is now added, but installed
in dict-gd/dictionaries instead of dict-gd

Change-Id: Ifc6e2201b905875d13ce4d3e8e94a55cc2761678
(cherry picked from commit dfa25a44f9a31ebac4e7cbc1db1173929af055a3)
Reviewed-on: https://gerrit.libreoffice.org/26400
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/Dictionary_gd.mk b/Dictionary_gd.mk
index 2e64098..c086bce 100644
--- a/Dictionary_gd.mk
+++ b/Dictionary_gd.mk
@@ -9,11 +9,12 @@
 
 $(eval $(call gb_Dictionary_Dictionary,dict-gd,dictionaries/gd_GB))
 
+$(eval $(call 
gb_Dictionary_add_root_file,dict-gd,dictionaries/gd_GB/LICENSES-en.txt))
+
 $(eval $(call gb_Dictionary_add_files,dict-gd,dictionaries,\
dictionaries/gd_GB/dictionaries/gd_GB.aff \
dictionaries/gd_GB/dictionaries/gd_GB.dic \
dictionaries/gd_GB/dictionaries/README_gd_GB.txt \
-   dictionaries/gd_GB/LICENSES-en.txt \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Aron Budea

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

New commits:
commit 0859235b7731aba1c103cd295967c291db3cfe2f
Author: Aron Budea 
Date:   Tue Jun 7 07:57:42 2016 +0200

Updated core
Project: dictionaries  efd52e4e0ec6f706560e17f86ec4952f5315f41f

tdf#90786 Put license file in the right directory

In 5.2 beta1 the license file is now added, but installed
in dict-gd/dictionaries instead of dict-gd

Change-Id: Ifc6e2201b905875d13ce4d3e8e94a55cc2761678
(cherry picked from commit dfa25a44f9a31ebac4e7cbc1db1173929af055a3)
Reviewed-on: https://gerrit.libreoffice.org/26400
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/dictionaries b/dictionaries
index 7ec3bae..efd52e4 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 7ec3bae0ae0ae4274d3377b5995f13fb155ba6b0
+Subproject commit efd52e4e0ec6f706560e17f86ec4952f5315f41f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-2' - source/sl

2016-06-21 Thread Andras Timar

 source/sl/helpcontent2/source/text/sbasic/shared.po|4 
 source/sl/helpcontent2/source/text/scalc/01.po |  248 
--
 source/sl/helpcontent2/source/text/shared/explorer/database.po |6 
 source/sl/helpcontent2/source/text/shared/guide.po |   16 
 source/sl/helpcontent2/source/text/shared/menu.po  |4 
 source/sl/helpcontent2/source/text/shared/optionen.po  |9 
 source/sl/helpcontent2/source/text/simpress/01.po  |9 
 source/sl/helpcontent2/source/text/swriter.po  |4 
 source/sl/helpcontent2/source/text/swriter/01.po   |9 
 source/sl/helpcontent2/source/text/swriter/04.po   |   10 
 source/sl/helpcontent2/source/text/swriter/menu.po |   10 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |   41 -
 source/sl/sc/uiconfig/scalc/ui.po  |4 
 source/sl/sfx2/source/doc.po   |4 
 source/sl/sfx2/uiconfig/ui.po  |4 
 source/sl/svx/uiconfig/ui.po   |4 
 source/sl/uui/uiconfig/ui.po   |   11 
 17 files changed, 165 insertions(+), 232 deletions(-)

New commits:
commit 37682ce371dcbc328478e1c265d18ef5db8c8b23
Author: Andras Timar 
Date:   Wed Jun 22 00:13:35 2016 +0200

Updated Slovenian translation

Change-Id: I6dfecc1ad5cde08f72a832da1729cc9dfbba1c29

diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po 
b/source/sl/helpcontent2/source/text/sbasic/shared.po
index 714f3a3..e56a674 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.2\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-06-12 16:51+0200\n"
+"POT-Creation-Date: 2016-06-18 13:44+0200\n"
 "PO-Revision-Date: 2016-06-15 12:09+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/scalc/01.po 
b/source/sl/helpcontent2/source/text/scalc/01.po
index ffc9713..d5e8aea 100644
--- a/source/sl/helpcontent2/source/text/scalc/01.po
+++ b/source/sl/helpcontent2/source/text/scalc/01.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 5.2\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-06-12 16:51+0200\n"
-"PO-Revision-Date: 2016-06-15 12:58+0200\n"
+"POT-Creation-Date: 2016-06-18 13:45+0200\n"
+"PO-Revision-Date: 2016-06-21 01:23+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -5673,14 +5673,13 @@ msgid "In %PRODUCT
 msgstr "V %PRODUCTNAME â 
NastavitveOrodja â 
MoÅ¾nosti â $[officename] â 
SploÅ¡no najdete obmoÄje Leto (dvomestno). Tu doloÄite 
obdobje, za katerega velja dvomestna informacija. Spremembe, ki jih naredite 
tu, vplivajo na nekatere od naslednjih funkcij."
 
 #: 04060102.xhp
-#, fuzzy
 msgctxt ""
 "04060102.xhp\n"
 "par_id3150654\n"
 "185\n"
 "help.text"
 msgid "When entering dates as part of formulas, slashes or dashes used as date 
separators are interpreted as arithmetic operators. Therefore, dates entered in 
this format are not recognized as dates and result in erroneous calculations. 
To keep dates from being interpreted as parts of formulas use the DATE 
function, for example, DATE(1954;7;20), or place the date in quotation marks 
and use the ISO 8601 notation, for example, \"1954-07-20\". Avoid using locale 
dependent date formats such as \"07/20/54\", the calculation may produce errors 
if the document is loaded under different locale settings."
-msgstr "Pri vnaÅ¡anju datumov bodo poÅ¡evnice ali pomiÅ¡ljaji, ki jih 
uporabite za loÄevanje datumov, morda pretvorjeni v aritmetiÄne operatorje. 
Zato datumi, vneseni v tej obliki, ne bodo nujno prepoznani kot datumi, kar 
lahko povzroÄi napaÄen izraÄun. Datume zapisujte v narekovajih (npr. 
Â»20.07.54Â«), da ne bodo pomotoma obravnavani kot del formul."
+msgstr "Pri vnaÅ¡anju datumov bodo poÅ¡evnice ali pomiÅ¡ljaji, ki jih 
uporabite za loÄevanje datumov, morda pretvorjeni v aritmetiÄne operatorje. 
Zato datumi, vneseni v tej obliki, ne bodo nujno prepoznani kot datumi, kar 
lahko povzroÄi napaÄen izraÄun. Uporabite funkcijo DATE, npr. 
DATE(1954;7;20), ali pa datume zapisujte v narekovajih in notaciji po standardu

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

2016-06-21 Thread Andras Timar

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

New commits:
commit cb4d90ffb97ae8764991d9f287856c71b65c26a2
Author: Andras Timar 
Date:   Wed Jun 22 00:13:35 2016 +0200

Updated core
Project: translations  37682ce371dcbc328478e1c265d18ef5db8c8b23

Updated Slovenian translation

Change-Id: I6dfecc1ad5cde08f72a832da1729cc9dfbba1c29

diff --git a/translations b/translations
index ce4c754..37682ce 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ce4c754dc6128364a8df43557ff15855e7bbf530
+Subproject commit 37682ce371dcbc328478e1c265d18ef5db8c8b23
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -

2016-06-21 Thread László Németh

 0 files changed

New commits:
commit f5626e2735b0765672e4656d5ef819c20e10ffd6
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Wed Jun 22 00:09:10 2016 +0200

empty commit (repeat)

Change-Id: I4be25f099b5b38c93ad7180869877e0e9bf1bbf9
commit e34a73894e4caba8743458a30a18539cb2d8c2d9
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Wed Jun 22 00:08:39 2016 +0200

empty commit (system restart)

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

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

2016-06-21 Thread Michael Stahl

 sw/inc/unoframe.hxx |   67 +++---
 sw/source/core/unocore/unoframe.cxx |  169 ++--
 sw/source/core/unocore/unotext.cxx  |2 
 3 files changed, 30 insertions(+), 208 deletions(-)

New commits:
commit eca55c4b8d8cb119aa1b8ad8744fa68f8fcc0ac7
Author: Michael Stahl 
Date:   Tue Jun 21 22:06:37 2016 +0200

sw: replace pointless XComponent and XTextContent overrides

... from SwXTextGraphicObject and SwXTextEmbeddedObject.

Change-Id: I22c2937617b84262c124d2504a8f9d889895005b

diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 9c5b7a9..5135a9a 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -46,11 +46,12 @@ class BaseFrameProperties_Impl;
 class SwXFrame : public cppu::WeakImplHelper
 <
 css::lang::XServiceInfo,
+css::lang::XUnoTunnel,
 css::beans::XPropertySet,
 css::beans::XPropertyState,
 css::drawing::XShape,
 css::container::XNamed,
-css::lang::XUnoTunnel
+css::text::XTextContent
 >,
 public SwClient
 {
@@ -124,11 +125,13 @@ public:
 
 //Base implementation
 //XComponent
-virtual void SAL_CALL dispose(  ) throw(css::uno::RuntimeException, 
std::exception);
-virtual void SAL_CALL addEventListener( const css::uno::Reference< 
css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, 
std::exception);
-virtual void SAL_CALL removeEventListener( const css::uno::Reference< 
css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, 
std::exception);
+virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, 
std::exception) override;
+virtual void SAL_CALL addEventListener(const 
css::uno::Reference& xListener) throw 
(css::uno::RuntimeException, std::exception) override;
+virtual void SAL_CALL removeEventListener(const 
css::uno::Reference& xListener) throw 
(css::uno::RuntimeException, std::exception) override;
 
-virtual css::uno::Reference< css::text::XTextRange >  SAL_CALL getAnchor() 
throw( css::uno::RuntimeException, std::exception );
+// XTextContent
+virtual void SAL_CALL attach(const 
css::uno::Reference& xTextRange) throw 
(css::lang::IllegalArgumentException, css::uno::RuntimeException, 
std::exception) override;
+virtual css::uno::Reference  SAL_CALL getAnchor() 
throw (css::uno::RuntimeException, std::exception) override;
 
 //XServiceInfo
 virtual OUString SAL_CALL getImplementationName() throw( 
css::uno::RuntimeException, std::exception ) override;
@@ -136,7 +139,6 @@ public:
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
throw( css::uno::RuntimeException, std::exception ) override;
 
 void attachToRange(const css::uno::Reference< css::text::XTextRange > & 
xTextRange)throw(css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception);
-void attach( const css::uno::Reference< css::text::XTextRange >& 
xTextRange ) throw(css::lang::IllegalArgumentException, 
css::uno::RuntimeException, std::exception);
 
 const SwFrameFormat* GetFrameFormat() const
 {
@@ -239,7 +241,6 @@ public:
 
 typedef cppu::ImplInheritanceHelper
 <   SwXFrame,
-css::text::XTextContent,
 css::document::XEventsSupplier
 >
 SwXTextGraphicObjectBaseClass;
@@ -258,15 +259,6 @@ public:
 static css::uno::Reference
 CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
 
-//XTextContent
-virtual void SAL_CALL attach(const css::uno::Reference< 
css::text::XTextRange > & xTextRange) throw( 
css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception 
) override;
-virtual css::uno::Reference< css::text::XTextRange >  SAL_CALL getAnchor() 
throw( css::uno::RuntimeException, std::exception ) override;
-
-//XComponent
-virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, 
std::exception ) override;
-virtual void SAL_CALL addEventListener(const css::uno::Reference< 
css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, 
std::exception ) override;
-virtual void SAL_CALL removeEventListener(const css::uno::Reference< 
css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException, 
std::exception ) override;
-
 //XServiceInfo
 virtual OUString SAL_CALL getImplementationName() throw( 
css::uno::RuntimeException, std::exception ) override;
 virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 
throw( css::uno::RuntimeException, std::exception ) override;
@@ -274,6 +266,7 @@ public:
 
 // XEventsSupplier
 virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL 
getEvents(  ) throw(css::uno::RuntimeException, std::exception) override;
+
 void * SAL_CALL operator new( size_t ) throw();
 void SAL_CALL operator delete( void * ) throw();
 };
@@ -281,7 +274,6 @@ public:
 class SwOLENode;
 typedef cppu::ImplInheritanceHelper
 <   SwXFrame,
-css::text::XText

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

2016-06-21 Thread Varun Dhall

 sw/qa/extras/uiwriter/uiwriter.cxx |   62 +
 1 file changed, 62 insertions(+)

New commits:
commit b252bbf9355bb4d1dad262f24ad8ceed3ac696fd
Author: Varun Dhall 
Date:   Tue Jun 21 01:36:20 2016 +0530

Added Test for tdf#72788 clear direct formatting

Change-Id: I9732691cb71272d690b800316a87c06b96eb7b05
Reviewed-on: https://gerrit.libreoffice.org/26529
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 57d53fc..81bc762 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -148,6 +148,7 @@ public:
 void testTdf69282WithMirror();
 void testTdf78742();
 void testUnoParagraph();
+void testTdf72788();
 void testTdf60967();
 void testSearchWithTransliterate();
 void testTdf73660();
@@ -249,6 +250,7 @@ public:
 CPPUNIT_TEST(testTdf69282WithMirror);
 CPPUNIT_TEST(testTdf78742);
 CPPUNIT_TEST(testUnoParagraph);
+CPPUNIT_TEST(testTdf72788);
 CPPUNIT_TEST(testTdf60967);
 CPPUNIT_TEST(testSearchWithTransliterate);
 CPPUNIT_TEST(testTdf73660);
@@ -1826,6 +1828,66 @@ void SwUiWriterTest::testUnoParagraph()
 CPPUNIT_ASSERT_EQUAL(OUString("This is modified text in paragraph two"), 
xSecondPara->getString());
 }
 
+void SwUiWriterTest::testTdf72788()
+{
+//Create a new empty Writer document
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
+IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
+//Insert some text - two paragraphs
+rIDCO.InsertString(*pCursor, "this is text");
+//Position of word  9876543210
+//Position of word0123456789
+//Change Paragraph
+pWrtShell->SplitNode();
+//Insert second paragraph
+rIDCO.InsertString(*pCursor, "more text");
+//Position of word012345678
+//Make the following selection *bold*
+//this[is text
+//more] text
+//Move cursor back
+for (int i = 0; i < 5; i++) {
+pCursor->Move(fnMoveBackward);
+}
+//Start selection
+pCursor->SetMark();
+for (int i = 0; i < 12; i++) {
+pCursor->Move(fnMoveBackward);
+}
+//Check the text selection
+CPPUNIT_ASSERT_EQUAL(OUString("is textmore"), pCursor->GetText());
+//Apply a *Bold* attribute to selection
+SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
+rIDCO.InsertPoolItem(*pCursor, aWeightItem);
+SfxItemSet aSet( pDoc->GetAttrPool(), RES_CHRATR_WEIGHT, 
RES_CHRATR_WEIGHT);
+//Add selected text's attributes to aSet
+pCursor->GetNode().GetTextNode()->GetAttr(aSet, 5, 12);
+SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
+//Check that bold is active on the selection and it's in aSet
+CPPUNIT_ASSERT_EQUAL((*pPoolItem == aWeightItem), true);
+//Make selection to remove formatting in first paragraph
+//[this is text
+//]more text
+pWrtShell->SttDoc();
+//Start selection
+pCursor->SetMark();
+for (int i = 0; i < 13; i++) {
+pCursor->Move(fnMoveForward);
+}
+//Clear all the Direct Formatting ( Ctrl + M )
+SwTextNode* pTextNode = pCursor->GetNode().GetTextNode();
+SwIndex aSt( pTextNode, 0 );
+sal_Int32 nEnd = pTextNode->Len();
+pTextNode->RstTextAttr(aSt, nEnd - aSt.GetIndex(), 0, nullptr, false, 
false);
+//Incase of Regression RstTextAttr() call will result to infinite recursion
+//Check that bold is removed in first paragraph
+pTextNode->GetAttr(aSet, 5, 12);
+SfxPoolItem const * pPoolItem2 = aSet.GetItem(RES_CHRATR_WEIGHT);
+CPPUNIT_ASSERT_EQUAL((*pPoolItem2 != aWeightItem), true);
+}
+
 void SwUiWriterTest::testTdf60967()
 {
 SwDoc* pDoc = createDoc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Jan Holesovsky

 xmloff/source/draw/ximppage.cxx |   85 
 1 file changed, 36 insertions(+), 49 deletions(-)

New commits:
commit 63c121129815726d763414533e8b8a91cba38791
Author: Jan Holesovsky 
Date:   Tue Jun 21 23:01:57 2016 +0200

Simplify dynamic_cast followed by a static_cast.

Change-Id: I89fc21757493a42e17d518da585bafdb8f2e303a

diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx
index b5249a8..4dfab9b 100644
--- a/xmloff/source/draw/ximppage.cxx
+++ b/xmloff/source/draw/ximppage.cxx
@@ -361,48 +361,42 @@ void SdXMLGenericPageContext::SetStyle( OUString& 
rStyleName )
 {
 const SvXMLImportContext* pContext = 
GetSdImport().GetShapeImport()->GetAutoStylesContext();
 
-if( pContext && dynamic_cast( 
pContext) != nullptr)
+if (const SdXMLStylesContext* pStyles = dynamic_cast(pContext))
 {
-const SdXMLStylesContext* pStyles = static_cast(pContext);
-if(pStyles)
-{
-const SvXMLStyleContext* pStyle = 
pStyles->FindStyleChildContext(
-XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, rStyleName);
+const SvXMLStyleContext* pStyle = 
pStyles->FindStyleChildContext(
+XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, rStyleName);
 
-if(pStyle && dynamic_cast(pStyle))
+if (const XMLPropStyleContext* pPropStyle = dynamic_cast(pStyle))
+{
+Reference  xPropSet1(mxShapes, 
uno::UNO_QUERY);
+if(xPropSet1.is())
 {
-const XMLPropStyleContext* pPropStyle = 
static_cast(pStyle);
+Reference< beans::XPropertySet > xPropSet( xPropSet1 );
+Reference< beans::XPropertySet > xBackgroundSet;
 
-Reference  xPropSet1(mxShapes, 
uno::UNO_QUERY);
-if(xPropSet1.is())
+const OUString aBackground("Background");
+if( 
xPropSet1->getPropertySetInfo()->hasPropertyByName( aBackground ) )
 {
-Reference< beans::XPropertySet > xPropSet( 
xPropSet1 );
-Reference< beans::XPropertySet > xBackgroundSet;
-
-const OUString aBackground("Background");
-if( 
xPropSet1->getPropertySetInfo()->hasPropertyByName( aBackground ) )
+Reference< beans::XPropertySetInfo > xInfo( 
xPropSet1->getPropertySetInfo() );
+if( xInfo.is() && xInfo->hasPropertyByName( 
aBackground ) )
 {
-Reference< beans::XPropertySetInfo > xInfo( 
xPropSet1->getPropertySetInfo() );
-if( xInfo.is() && xInfo->hasPropertyByName( 
aBackground ) )
+Reference< lang::XMultiServiceFactory > 
xServiceFact(GetSdImport().GetModel(), uno::UNO_QUERY);
+if(xServiceFact.is())
 {
-Reference< lang::XMultiServiceFactory > 
xServiceFact(GetSdImport().GetModel(), uno::UNO_QUERY);
-if(xServiceFact.is())
-{
-
xBackgroundSet.set(xServiceFact->createInstance("com.sun.star.drawing.Background"),
 UNO_QUERY);
-}
+
xBackgroundSet.set(xServiceFact->createInstance("com.sun.star.drawing.Background"),
 UNO_QUERY);
 }
-
-if( xBackgroundSet.is() )
-xPropSet = 
PropertySetMerger_CreateInstance( xPropSet1, xBackgroundSet );
 }
 
-if(xPropSet.is())
-{
-
const_cast(pPropStyle)->FillPropertySet(xPropSet);
+if( xBackgroundSet.is() )
+xPropSet = PropertySetMerger_CreateInstance( 
xPropSet1, xBackgroundSet );
+}
 
-if( xBackgroundSet.is() )
-xPropSet1->setPropertyValue( aBackground, 
uno::makeAny( xBackgroundSet ) );
-}
+if(xPropSet.is())
+{
+
const_cast(pPropStyle)->FillPropertySet(xPropSet);
+
+if( xBackgroundSet.is() )
+xPropSet1->setPropertyValue( aBackground, 
uno::makeAny( xBackgroundSet ) );
 }
 }
 }
@@ -424,21 +418,16 @@ void SdXMLGenericPageContext::SetLayout

[Libreoffice-commits] core.git: helpcontent2

2016-06-21 Thread Andras Timar

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

New commits:
commit 2abea8fda83d641e365fede84edec0e7c02f2c07
Author: Andras Timar 
Date:   Tue Jun 21 22:59:54 2016 +0200

Updated core
Project: help  3a26a9f702b811e7bef168b04696e66993d0b13d

missing paragraph role

Change-Id: I7f3e30a07bbdc8a9dcb8c63519ba1a78c1ada0dc

diff --git a/helpcontent2 b/helpcontent2
index d9e375b..3a26a9f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d9e375bb5271e34a84f176d471ca9d4d15071ccc
+Subproject commit 3a26a9f702b811e7bef168b04696e66993d0b13d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2016-06-21 Thread Andras Timar

 source/text/scalc/01/0510.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a26a9f702b811e7bef168b04696e66993d0b13d
Author: Andras Timar 
Date:   Tue Jun 21 22:59:54 2016 +0200

missing paragraph role

Change-Id: I7f3e30a07bbdc8a9dcb8c63519ba1a78c1ada0dc

diff --git a/source/text/scalc/01/0510.xhp 
b/source/text/scalc/01/0510.xhp
index 8446416..10eb59e 100644
--- a/source/text/scalc/01/0510.xhp
+++ b/source/text/scalc/01/0510.xhp
@@ -125,7 +125,7 @@
 
 
 New 
Style from Selection
-Creates a new style based on the formatting of 
a selected object. Assign a name for the style in the Create Style 
dialog.
+Creates a new style based on the formatting of 
a selected object. Assign a name for the style in the Create Style 
dialog.
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Jan Holesovsky

 xmloff/source/draw/ximpstyl.cxx |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit bd7d74791954f9de709b7595498613d728e5fb6a
Author: Jan Holesovsky 
Date:   Tue Jun 21 22:47:05 2016 +0200

Simplify dynamic_cast followed by a static_cast.

Change-Id: I86e756ce46f6cdb84bddc3faae74782c8b4ad519

diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 890ea69..44c7989 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -868,8 +868,8 @@ void SdXMLMasterPageContext::EndElement()
 if(!msName.isEmpty() && GetSdImport().GetShapeImport()->GetStylesContext())
 {
 SvXMLImportContext* pContext = 
GetSdImport().GetShapeImport()->GetStylesContext();
-if( dynamic_cast(pContext) !=  nullptr )
-
static_cast(pContext)->SetMasterPageStyles(*this);
+if (SdXMLStylesContext* pSdContext = 
dynamic_cast(pContext))
+pSdContext->SetMasterPageStyles(*this);
 }
 
 SdXMLGenericPageContext::EndElement();
@@ -1137,18 +1137,15 @@ void SdXMLStylesContext::EndElement()
 for(sal_uInt32 a(0L); a < GetStyleCount(); a++)
 {
 const SvXMLStyleContext* pStyle = GetStyle(a);
-if(pStyle && dynamic_cast(pStyle) !=  
nullptr)
+if (const XMLShapeStyleContext* pDocStyle = dynamic_cast(pStyle))
 {
-const XMLShapeStyleContext* pDocStyle = static_cast(pStyle);
-
 SvXMLStylesContext* pStylesContext = 
GetSdImport().GetShapeImport()->GetStylesContext();
-if( pStylesContext )
+if (pStylesContext)
 {
 pStyle = 
pStylesContext->FindStyleChildContext(pStyle->GetFamily(), 
pStyle->GetParentName());
 
-if(pStyle && dynamic_cast(pStyle) !=  nullptr)
+if (const XMLShapeStyleContext* pParentStyle = 
dynamic_cast(pStyle))
 {
-const XMLShapeStyleContext* pParentStyle = 
static_cast(pStyle);
 if(pParentStyle->GetStyle().is())
 {
 
const_cast(pDocStyle)->SetStyle(pParentStyle->GetStyle());
@@ -1445,10 +1442,9 @@ uno::Reference< container::XNameAccess > 
SdXMLStylesContext::getPageLayouts() co
 for(sal_uInt32 a(0L); a < GetStyleCount(); a++)
 {
 const SvXMLStyleContext* pStyle = GetStyle(a);
-if(pStyle && dynamic_cast(pStyle) !=  nullptr)
+if (const SdXMLPresentationPageLayoutContext* pContext = 
dynamic_cast(pStyle))
 {
-xLayouts->insertByName( pStyle->GetName(), uno::makeAny(
-(sal_Int32)static_cast(pStyle)->GetTypeId() ) );
+xLayouts->insertByName(pStyle->GetName(), 
uno::makeAny((sal_Int32)pContext->GetTypeId()));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig

2016-06-21 Thread Susobhan Ghosh

 include/svx/sidebar/AreaPropertyPanelBase.hxx |3 
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |  126 +-
 svx/uiconfig/ui/sidebararea.ui|  153 +++---
 3 files changed, 205 insertions(+), 77 deletions(-)

New commits:
commit 1bbf0612ea35c73adf0c2aabedf457f7d85acdc0
Author: Susobhan Ghosh 
Date:   Mon Jun 20 23:24:51 2016 +0530

tdf#90078 Add import bitmap button to Area Panel

Change-Id: I49712f807d38a614fd707d06c9453545360db89f
Reviewed-on: https://gerrit.libreoffice.org/26527
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx 
b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index fc24c92..525199e 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -136,6 +136,8 @@ protected:
 VclPtrmpBTNGradient;
 VclPtrmpMTRAngle;
 VclPtrmpGradientStyle;
+VclPtr mpLbFillBitmap;
+VclPtr mpBmpImport;
 
 std::unique_ptr< XFillStyleItem >   mpStyleItem;
 std::unique_ptr< XFillColorItem >   mpColorItem;
@@ -165,6 +167,7 @@ protected:
 DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void);
 DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void);
 DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void);
+DECL_LINK_TYPED(ClickImportBitmapHdl, Button*, void);
 
 // for transparency gradient
 VclPtr CreateTransparencyGradientControl (PopupContainer* 
pParent);
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 350387b..65be70b 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -39,7 +39,7 @@
 #include 
 #include 
 #include 
-
+#include "sfx2/opengrf.hxx"
 
 using namespace css;
 using namespace css::uno;
@@ -100,6 +100,8 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
 get(mpLbFillGradFrom, "fillgrad1");
 get(mpLbFillGradTo, "fillgrad2");
 get(mpGradientStyle, "gradientstyle");
+get(mpLbFillBitmap, "fillbitmap");
+get(mpBmpImport, "bmpimport");
 
 Initialize();
 }
@@ -124,6 +126,8 @@ void AreaPropertyPanelBase::dispose()
 mpLbFillGradFrom.clear();
 mpLbFillGradTo.clear();
 mpGradientStyle.clear();
+mpLbFillBitmap.clear();
+mpBmpImport.clear();
 
 PanelLayout::dispose();
 }
@@ -161,6 +165,7 @@ void AreaPropertyPanelBase::Initialize()
 mpGradientStyle->SetSelectHdl( aLink );
 mpLbFillGradFrom->SetSelectHdl( aLink );
 mpLbFillGradTo->SetSelectHdl( aLink );
+mpLbFillBitmap->SetSelectHdl( aLink );
 mpMTRAngle->SetModifyHdl(LINK(this,AreaPropertyPanelBase, 
ChangeGradientAngle));
 
 mpLBTransType->SetSelectHdl(LINK(this, AreaPropertyPanelBase, 
ChangeTrgrTypeHdl_Impl));
@@ -176,6 +181,7 @@ void AreaPropertyPanelBase::Initialize()
 mpBTNGradient->SetSelectHdl( aLink2 );
 mpBTNGradient->SetItemImage(nIdGradient,maImgLinear);
 mpBTNGradient->Hide();
+mpBmpImport->SetClickHdl( LINK(this, AreaPropertyPanelBase, 
ClickImportBitmapHdl));
 mpSidebarController = 
sfx2::sidebar::SidebarController::GetSidebarControllerForFrame(mxFrame);
 mpSidebarController->NotifyResize();
 }
@@ -186,6 +192,49 @@ void AreaPropertyPanelBase::SetTransparency(sal_uInt16 
nVal)
 mpMTRTransparent->SetValue(nVal);
 }
 
+IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, 
void)
+{
+SvxOpenGraphicDialog aDlg( "Import" );
+aDlg.EnableLink(false);
+if( aDlg.Execute() == GRFILTER_OK )
+{
+Graphic aGraphic;
+EnterWait();
+int nError = aDlg.GetGraphic( aGraphic );
+LeaveWait();
+if( nError == GRFILTER_OK )
+{
+const SvxBitmapListItem aItem( *static_cast(SfxObjectShell::Current()->GetItem(SID_BITMAP_LIST)));
+XBitmapListRef pList = aItem.GetBitmapList();
+INetURLObject   aURL( aDlg.GetPath() );
+OUString aFileName =  aURL.GetName().getToken( 0, '.' );
+OUString aName = aFileName;
+long j = 1;
+bool bValidBitmapName = false;
+while( !bValidBitmapName )
+{
+bValidBitmapName = true;
+for( long i = 0; i < pList->Count() && bValidBitmapName; i++ )
+{
+if( aName == pList->GetBitmap(i)->GetName() )
+{
+bValidBitmapName = false;
+aName = aFileName + OUString::number(j++);
+}
+}
+}
+
+XBitmapEntry* pEntry = new XBitmapEntry( aGraphic, aName );
+pList->Insert(pEntry);

[Libreoffice-commits] help.git: to-wiki/wikiconv2.py

2016-06-21 Thread Andras Timar

 to-wiki/wikiconv2.py |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d9e375bb5271e34a84f176d471ca9d4d15071ccc
Author: Andras Timar 
Date:   Tue Jun 21 22:29:36 2016 +0200

handle 

Change-Id: Id6b828ffdd45530af5fda09046b85cd9fe21eecb

diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index 456810d..5796ffa 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -991,7 +991,8 @@ class Switch(SwitchInline):
 
 class Item(ElementBase):
 replace_type = \
-{'start':{'input': '',
+{'start':{'code': '',
+  'input': '',
   'keycode': '{{KeyCode|',
   'tasto': '{{KeyCode|',
   'litera': '',
@@ -1002,7 +1003,8 @@ class Item(ElementBase):
   'productname': '',
   'unknown': ''
  },
- 'end':{'input': '',
+ 'end':{'code': '',
+'input': '',
 'keycode': '}}',
 'tasto': '}}',
 'litera': '',
@@ -1013,7 +1015,8 @@ class Item(ElementBase):
 'productname': '',
 'unknown': ''
},
- 'templ':{'input': False,
+ 'templ':{'code': False,
+  'input': False,
   'keycode': True,
   'tasto': True,
   'litera': False,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-06-21 Thread Andras Timar

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

New commits:
commit 1d852cd65709f1d0cbed64f906291b7641f4dde6
Author: Andras Timar 
Date:   Tue Jun 21 22:29:36 2016 +0200

Updated core
Project: help  d9e375bb5271e34a84f176d471ca9d4d15071ccc

handle 

Change-Id: Id6b828ffdd45530af5fda09046b85cd9fe21eecb

diff --git a/helpcontent2 b/helpcontent2
index e84bf12..d9e375b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e84bf1290365b9fd331f06cd1c03bf11c1f4cc1e
+Subproject commit d9e375bb5271e34a84f176d471ca9d4d15071ccc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/connectivity

2016-06-21 Thread Michael Stahl

 include/connectivity/OSubComponent.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cdb4efad0eba9a049d36b20c459fa530636d9c79
Author: Michael Stahl 
Date:   Tue Jun 21 17:55:44 2016 +0200

connectivity: disable connectivity::release() for now

This bizarre thing essentially does the same as
WeakComponentImplHelperBase::release(), except that
1) it forgets to call disposeWeakConnectionPoint()
2) it doesn't catch exceptions from dispose()
3) it restores the m_xParent member after the dispose() call
4) it's racy because the "else" branch may be executed at a time
   when another thread has already concurrently deleted the object

This is rather mysterious and there is no obvious reason why a manual
dispose() call should clear m_xParent (as the users tend to do, by calling
dispose_ChildImpl() from their disposing()), but a dispose() called from
release() should restore m_xParent again.

Let's try to stop doing this madness and see if anything breaks.

Change-Id: I88a60fe1a7eeb625442faf436c9a3deb3c59941c
Reviewed-on: https://gerrit.libreoffice.org/26554
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/include/connectivity/OSubComponent.hxx 
b/include/connectivity/OSubComponent.hxx
index 1aa9d15..8f80e8e 100644
--- a/include/connectivity/OSubComponent.hxx
+++ b/include/connectivity/OSubComponent.hxx
@@ -72,11 +72,13 @@ namespace connectivity
 }
 void relase_ChildImpl()
 {
+#if 0
 ::connectivity::release(m_pDerivedImplementation->m_refCount,
 m_pDerivedImplementation->WEAK::rBHelper,
 m_xParent,
 m_pDerivedImplementation);
 
+#endif
 m_pDerivedImplementation->WEAK::release();
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2016-06-21 Thread Andras Timar

 source/text/shared/guide/chart_insert.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e84bf1290365b9fd331f06cd1c03bf11c1f4cc1e
Author: Andras Timar 
Date:   Tue Jun 21 21:30:31 2016 +0200

tdf#98401 fix wron paragraph role

Change-Id: I7a8ffd79550d6355d59bcb256f09c4a0b785ebd2

diff --git a/source/text/shared/guide/chart_insert.xhp 
b/source/text/shared/guide/chart_insert.xhp
index 9269e6d..dc1fa44 100644
--- a/source/text/shared/guide/chart_insert.xhp
+++ b/source/text/shared/guide/chart_insert.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-   
+
 
 
 
@@ -69,7 +69,7 @@
 
 
 Chart in a Writer text document
-In a Writer document, you can insert a chart based on the values in 
a Writer table. 
+In a Writer document, you can insert a chart based on the values in 
a Writer table. 
 
 
 Click 
inside the Writer table. 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-06-21 Thread Andras Timar

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

New commits:
commit 337b38ab581fbe08cd840c1be70ea1dd5395e3a9
Author: Andras Timar 
Date:   Tue Jun 21 21:30:31 2016 +0200

Updated core
Project: help  e84bf1290365b9fd331f06cd1c03bf11c1f4cc1e

tdf#98401 fix wron paragraph role

Change-Id: I7a8ffd79550d6355d59bcb256f09c4a0b785ebd2

diff --git a/helpcontent2 b/helpcontent2
index 2f6e93f..e84bf12 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2f6e93f728e4c7b278b57479bf1fd8fda3344fff
+Subproject commit e84bf1290365b9fd331f06cd1c03bf11c1f4cc1e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2696 ++--
 1 file changed, 1358 insertions(+), 1338 deletions(-)

New commits:
commit 507966a1b48ba652cc2f53964b834ccdc370ca9f
Author: Christian Lohmaier 
Date:   Tue Jun 21 20:44:47 2016 +0200

update credits

Change-Id: I98c62533785a72b88044fb36bda3edd010aa6bb9
(cherry picked from commit 614d20645065cab2467b7419707a1eda69992cdd)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 7aae36c..7a290ef 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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.3.2$Linux_X86_64
 
LibreOffice_project/644e4637d1d8544fd9f56425bd6cec110e49301b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.3.2$Linux_X86_64
 
LibreOffice_project/644e4637d1d8544fd9f56425bd6cec110e49301b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   554
+   527
501
41197
21645
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 554
+ 527
  41697
- 22197
+ 22170
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   5386755
+   5513013
false
false
false
@@ -312,24 +312,24 @@
  
  
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -393,24 +393,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1033,7 +1033,7 @@

   
  Credits
-1171 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-06-14 19:58:31.
+1172 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-06-21 20:11:38.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1060,10 +1060,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 19539Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 19565Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12208Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12238Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1071,16 +1071,16 @@
  
  
   
-   Tor 
LillqvistCommits: 7422Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7424Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6029Joined: 2011-12-12
+   *Noel GrandinCommits: 
6038Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5663Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5686Joined: 
2010-07-29
   
   
-   Michael 
StahlCommits: 5480Joined: 
2008-

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

2016-06-21 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2696 ++--
 1 file changed, 1358 insertions(+), 1338 deletions(-)

New commits:
commit e4290c5db5aeb324e589a8aa0242b5ce1a47053d
Author: Christian Lohmaier 
Date:   Tue Jun 21 20:44:47 2016 +0200

update credits

Change-Id: I98c62533785a72b88044fb36bda3edd010aa6bb9
(cherry picked from commit 614d20645065cab2467b7419707a1eda69992cdd)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 7aae36c..7a290ef 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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.3.2$Linux_X86_64
 
LibreOffice_project/644e4637d1d8544fd9f56425bd6cec110e49301b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.3.2$Linux_X86_64
 
LibreOffice_project/644e4637d1d8544fd9f56425bd6cec110e49301b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   554
+   527
501
41197
21645
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 554
+ 527
  41697
- 22197
+ 22170
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   5386755
+   5513013
false
false
false
@@ -312,24 +312,24 @@
  
  
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -393,24 +393,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1033,7 +1033,7 @@

   
  Credits
-1171 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-06-14 19:58:31.
+1172 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-06-21 20:11:38.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1060,10 +1060,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 19539Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 19565Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12208Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12238Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1071,16 +1071,16 @@
  
  
   
-   Tor 
LillqvistCommits: 7422Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7424Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6029Joined: 2011-12-12
+   *Noel GrandinCommits: 
6038Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5663Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5686Joined: 
2010-07-29
   
   
-   Michael 
StahlCommits: 5480Joined: 
2008-

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

2016-06-21 Thread Christian Lohmaier

 readlicense_oo/license/CREDITS.fodt | 2696 ++--
 1 file changed, 1358 insertions(+), 1338 deletions(-)

New commits:
commit 614d20645065cab2467b7419707a1eda69992cdd
Author: Christian Lohmaier 
Date:   Tue Jun 21 20:44:47 2016 +0200

update credits

Change-Id: I98c62533785a72b88044fb36bda3edd010aa6bb9

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 7aae36c..7a290ef 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 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.3.2$Linux_X86_64
 
LibreOffice_project/644e4637d1d8544fd9f56425bd6cec110e49301b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits Â» 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.1.3.2$Linux_X86_64
 
LibreOffice_project/644e4637d1d8544fd9f56425bd6cec110e49301b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   554
+   527
501
41197
21645
@@ -16,9 +16,9 @@
  3676
  3471
  501
- 554
+ 527
  41697
- 22197
+ 22170
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   5386755
+   5513013
false
false
false
@@ -312,24 +312,24 @@
  
  
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -393,24 +393,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1033,7 +1033,7 @@

   
  Credits
-1171 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-06-14 19:58:31.
+1172 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-06-21 20:11:38.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1060,10 +1060,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   CaolÃ¡n 
McNamaraCommits: 19539Joined: 
2000-10-10
+   CaolÃ¡n 
McNamaraCommits: 19565Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12208Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12238Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1071,16 +1071,16 @@
  
  
   
-   Tor 
LillqvistCommits: 7422Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7424Joined: 
2010-03-23
   
   
-   *Noel GrandinCommits: 
6029Joined: 2011-12-12
+   *Noel GrandinCommits: 
6038Joined: 2011-12-12
   
   
-   Miklos 
VajnaCommits: 5663Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5686Joined: 
2010-07-29
   
   
-   Michael 
StahlCommits: 5480Joined: 
2008-06-16
+   Michael 
StahlCommits: 5495Joined: 
2008-06-16

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

2016-06-21 Thread Christian Lohmaier

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

New commits:
commit 65561b99efb1bcf7e480ae0acb3d80687ce9312b
Author: Christian Lohmaier 
Date:   Tue Jun 21 20:11:38 2016 +0200

Updated core
Project: translations  ce4c754dc6128364a8df43557ff15855e7bbf530

update translations for 5.2.0 rc1

and force-fix errors using pocheck

Change-Id: I0ddd38b998824a5718c70610f21ac163db83f507
(cherry picked from commit 0027ac636c89b3a606e76291246c0e49b64fe4db)

diff --git a/translations b/translations
index 819d484..ce4c754 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 819d484ea12ac4ca3f1da7875dd29d59576b8830
+Subproject commit ce4c754dc6128364a8df43557ff15855e7bbf530
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

2016-06-21 Thread Christian Lohmaier

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

New commits:
commit 1804a3735e32b09d6ec7521f1a7d32de4a75d071
Author: Christian Lohmaier 
Date:   Tue Jun 21 20:11:38 2016 +0200

Updated core
Project: translations  0027ac636c89b3a606e76291246c0e49b64fe4db

update translations for 5.2.0 rc1

and force-fix errors using pocheck

Change-Id: I0ddd38b998824a5718c70610f21ac163db83f507

diff --git a/translations b/translations
index 5a19b0e..0027ac6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5a19b0e2aace7ae41441a09e9aa31be7350ec18f
+Subproject commit 0027ac636c89b3a606e76291246c0e49b64fe4db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src loolwsd/ClientSession.cpp

2016-06-21 Thread Pranav Kant

 loleaflet/dist/loleaflet.html |2 +-
 loleaflet/src/core/Socket.js  |   12 
 loolwsd/ClientSession.cpp |6 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 8bba9da761af5c2b253174128e380936036dad13
Author: Pranav Kant 
Date:   Tue Jun 21 22:11:33 2016 +0530

Make new version string as a JSON string

... easy to differentiate on client side among various version
info parts, especially for LOKit version information.

Change-Id: I4ba18c60367fb9166462b535bc46953a82a8435d

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 0a1bb9a..501dbc3 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -139,7 +139,7 @@
 
   About LibreOffice Online
   
-  This version of LibreOffice Online is powered 
by
+  This version of LibreOffice Online is powered 
by
   
 LOOLWSD
 
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 08402ab..f8b5564 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -127,16 +127,20 @@ L.Socket = L.Class.extend({
var command = this.parseServerCmd(textMsg);
if (textMsg.startsWith('loolserver ')) {
// This must be the first message, unless we reconnect.
-   var versionStr = textMsg.split(' ');
-   $('#loolwsd-version').text(versionStr[1] + ' ' + 
versionStr[2]);
+   var loolwsdVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
+   $('#loolwsd-version').text(loolwsdVersionObj.Version +
+  ' (git hash: ' + 
loolwsdVersionObj.Hash + ')');
 
// TODO: For now we expect perfect match in protocol 
versions
-   if (versionStr[3] !== this.ProtocolVersionNumber) {
+   if (loolwsdVersionObj.Protocol !== 
this.ProtocolVersionNumber) {
this.fire('error', {msg: _('Unsupported server 
version.')});
}
}
else if (textMsg.startsWith('lokitversion ')) {
-   $('#lokit-version').text(textMsg.substring(13));
+   var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
+   $('#lokit-version').text(lokitVersionObj.ProductName + 
' ' +
+lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension +
+' (git hash: ' + 
lokitVersionObj.BuildId.substring(0, 7) + ')');
}
else if (textMsg.startsWith('error:') && command.errorCmd === 
'load') {
this.close();
diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index ad73943..e23272d 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -81,7 +81,11 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 // Send LOOL version information
 std::string version, hash;
 Util::getVersionInfo(version, hash);
-sendTextFrame("loolserver " + version + " " + hash + " " + 
GetProtocolVersion());
+std::string versionStr =
+"{ \"Version\":  \"" + version + "\", " +
+"\"Hash\": \"" + hash + "\", " +
+"\"Protocol\": \"" + GetProtocolVersion() + "\" }";
+sendTextFrame("loolserver " + versionStr);
 // Send LOKit version information
 sendTextFrame("lokitversion " + LOOLWSD::LOKitVersion);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit

2016-06-21 Thread Pranav Kant

 desktop/source/lib/init.cxx|   10 +-
 include/LibreOfficeKit/LibreOfficeKit.hxx  |9 ++---
 include/LibreOfficeKit/LibreOfficeKitGtk.h |   11 +++
 3 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit d7b45c97b30f109aff0be6602a8fc8103af71e7f
Author: Pranav Kant 
Date:   Tue Jun 21 20:23:13 2016 +0530

lok: Change version string to JSON format

Change-Id: Ie1264fed9964b09006980df2e151e170b48b4082

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2d30a32..ab765dc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2007,7 +2007,15 @@ static void lo_setDocumentPassword(LibreOfficeKit* pThis,
 
 static char* lo_getVersionInfo(LibreOfficeKit* /*pThis*/)
 {
-const OString sVersionStr = 
OUStringToOString(ReplaceStringHookProc("%PRODUCTNAME %PRODUCTVERSION 
%PRODUCTEXTENSION %BUILDID"), RTL_TEXTENCODING_UTF8);
+const OUString sVersionStrTemplate(
+"{ "
+"\"ProductName\": \"%PRODUCTNAME\", "
+"\"ProductVersion\": \"%PRODUCTVERSION\", "
+"\"ProductExtension\": \"%PRODUCTEXTENSION\", "
+"\"BuildId\": \"%BUILDID\" "
+"}"
+);
+const OString sVersionStr = 
OUStringToOString(ReplaceStringHookProc(sVersionStrTemplate), 
RTL_TEXTENCODING_UTF8);
 
 char* pVersion = static_cast(malloc(sVersionStr.getLength() + 1));
 strcpy(pVersion, sVersionStr.getStr());
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 46a5e96..eae43af 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -550,10 +550,13 @@ public:
 /**
  * Get version information of the LOKit process
  *
- * @returns string containing version information in format:
- * PRODUCT_NAME PRODUCT_VERSION PRODUCT_EXTENSION BUILD_ID
+ * @returns JSON string containing version information in format:
+ * {ProductName: <>, ProductVersion: <>, ProductExtension: <>, BuildId: <>}
  *
- * Eg: LibreOffice 5.3 .0.0 alpha0 
+ * Eg: {"ProductName": "LibreOffice",
+ * "ProductVersion": "5.3",
+ * "ProductExtension": ".0.0.alpha0",
+ * "BuildId": ""}
  */
 inline char* getVersionInfo()
 {
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 4b4284e..fc7cec1 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -319,12 +319,15 @@ void
lok_doc_view_set_document_password (LOKDocView*
  * lok_doc_view_get_version_info:
  * @pDocView: The #LOKDocView instance
  *
- * Get version information of underlying LOKit process
+ * Get version information of the LOKit process
  *
- * Returns: string containing version information in format
- * PRODUCT_NAME PRODUCT_VERSION PRODUCT_EXTENSION BUILD_ID
+ * Returns: JSON string containing version information in format:
+ * {ProductName: <>, ProductVersion: <>, ProductExtension: <>, BuildId: <>}
  *
- * Eg: LibreOffice 5.3 .0.0.alpha0 
+ * Eg: {"ProductName": "LibreOffice",
+ * "ProductVersion": "5.3",
+ * "ProductExtension": ".0.0.alpha0",
+ * "BuildId": ""}
  */
 gchar* lok_doc_view_get_version_info   
(LOKDocView* pDocView);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sc/qa

2016-06-21 Thread Katarina Behrens

 sc/qa/unit/screenshots/screenshots.cxx |   39 +
 1 file changed, 39 insertions(+)

New commits:
commit fef68579d9e63c471eb06c6166acf0afc8aa8a6b
Author: Katarina Behrens 
Date:   Tue Jun 21 18:24:52 2016 +0200

Open more sc modal dialogs

Change-Id: Ie0d0bcea3409f99cce0b9dccd4f316d1da3c0d84

diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index fb27cab..9af18fe 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -30,8 +30,10 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
+#include 
 
 using namespace css;
 
@@ -162,6 +164,43 @@ void ScScreenshotTest::testOpeningSomeDialog()
 
 pDlg7->Execute();
 
+// just fake some flags
+sal_uInt16 nFlags = NAME_LEFT | NAME_TOP;
+std::unique_ptr pDlg8( 
pFact->CreateScNameCreateDlg(
+   pViewShell->GetDialogParent(), nFlags));
+CPPUNIT_ASSERT( pDlg8 != nullptr );
+
+pDlg8->Execute();
+
+//FIXME: translatable string here
+const OUString aDefaultSheetName("Sheet1");
+const OString aEmpty("");
+std::unique_ptr pDlg9( 
pFact->CreateScStringInputDlg(
+   pViewShell->GetDialogParent(), OUString(ScResId(SCSTR_APDTABLE)), 
OUString(ScResId(SCSTR_NAME)),
+   aDefaultSheetName, aEmpty, aEmpty));
+CPPUNIT_ASSERT( pDlg9 != nullptr );
+
+pDlg9->Execute();
+
+std::unique_ptr pDlg10( 
pFact->CreateScTabBgColorDlg(
+   pViewShell->GetDialogParent(), 
OUString(ScResId(SCSTR_SET_TAB_BG_COLOR)),
+   OUString(ScResId(SCSTR_NO_TAB_BG_COLOR)), Color(0xff00ff), 
".uno:TabBgColor"));
+CPPUNIT_ASSERT( pDlg10 != nullptr );
+
+pDlg10->Execute();
+
+std::unique_ptr pDlg11( 
pFact->CreateScTextImportOptionsDlg());
+CPPUNIT_ASSERT( pDlg11 != nullptr );
+
+pDlg11->Execute();
+
+//FIXME: looks butt-ugly w/ empty file, move it elsewhere, where
+//we actually have some data
+std::unique_ptr pDlg12( pFact->CreateScDataFormDlg(
+   pViewShell->GetDialogParent(), pViewShell));
+CPPUNIT_ASSERT( pDlg12 != nullptr );
+
+pDlg12->Execute();
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - bridges/source compilerplugins/clang connectivity/source

2016-06-21 Thread Michael Stahl

 bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx |1 
 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx   |   39 +-
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx|   14 +--
 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx   |   37 -
 compilerplugins/clang/reservedid.cxx  |7 -
 connectivity/source/drivers/firebird/Blob.cxx |8 ++
 connectivity/source/drivers/firebird/Connection.cxx   |7 +
 connectivity/source/drivers/firebird/PreparedStatement.cxx|8 ++
 connectivity/source/drivers/firebird/StatementCommonBase.cxx  |6 +
 9 files changed, 77 insertions(+), 50 deletions(-)

New commits:
commit 3fecccad4ab76bd005de8dd541da02b67b08e266
Author: Michael Stahl 
Date:   Mon Jun 20 20:51:14 2016 +0200

connecitivty: [loplugin:nullptr]

Change-Id: Ic717e1d119e1a5b8a87caca263322d9e58fe6c68

diff --git a/connectivity/source/drivers/firebird/Blob.cxx 
b/connectivity/source/drivers/firebird/Blob.cxx
index 922887d..7a7481b 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -33,7 +33,11 @@ Blob::Blob(isc_db_handle* pDatabaseHandle,
 m_pDatabaseHandle(pDatabaseHandle),
 m_pTransactionHandle(pTransactionHandle),
 m_blobID(aBlobID),
+#if SAL_TYPES_SIZEOFPOINTER == 8
 m_blobHandle(0),
+#else
+m_blobHandle(nullptr),
+#endif
 m_bBlobOpened(false),
 m_nBlobLength(0),
 m_nBlobPosition(0)
@@ -103,7 +107,11 @@ void Blob::closeBlob()
 evaluateStatusVector(m_statusVector, "isc_close_blob", *this);
 
 m_bBlobOpened = false;
+#if SAL_TYPES_SIZEOFPOINTER == 8
 m_blobHandle = 0;
+#else
+m_blobHandle = nullptr;
+#endif
 }
 }
 
diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 979c677..61e9836 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -89,8 +89,13 @@ Connection::Connection(FirebirdDriver*_pDriver)
 , m_bIsAutoCommit(false)
 , m_bIsReadOnly(false)
 , m_aTransactionIsolation(TransactionIsolation::REPEATABLE_READ)
+#if SAL_TYPES_SIZEOFPOINTER == 8
 , m_aDBHandle(0)
 , m_aTransactionHandle(0)
+#else
+, m_aDBHandle(nullptr)
+, m_aTransactionHandle(nullptr)
+#endif
 , m_xCatalog(nullptr)
 , m_xMetaData(nullptr)
 , m_aStatements()
@@ -773,7 +778,7 @@ void Connection::disposing()
 isc_rollback_transaction(status, &m_aTransactionHandle);
 }
 
-if (m_aDBHandle != 0)
+if (m_aDBHandle)
 {
 if (isc_detach_database(status, &m_aDBHandle))
 {
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index bce48fb3..007714d 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -485,7 +485,11 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 
nParameterIndex,
 ::osl::MutexGuard aGuard(m_aMutex);
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
+#if SAL_TYPES_SIZEOFPOINTER == 8
 isc_blob_handle aBlobHandle = 0;
+#else
+isc_blob_handle aBlobHandle = nullptr;
+#endif
 ISC_QUAD aBlobId;
 
 openBlobForWriting(aBlobHandle, aBlobId);
@@ -585,7 +589,11 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 
nParameterIndex,
 ::osl::MutexGuard aGuard(m_aMutex);
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
+#if SAL_TYPES_SIZEOFPOINTER == 8
 isc_blob_handle aBlobHandle = 0;
+#else
+isc_blob_handle aBlobHandle = nullptr;
+#endif
 ISC_QUAD aBlobId;
 
 openBlobForWriting(aBlobHandle, aBlobId);
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx 
b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index d1208e8..bd1c4b7 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -47,7 +47,11 @@ OStatementCommonBase::OStatementCommonBase(Connection* 
_pConnection)
 : OStatementCommonBase_Base(m_aMutex),
   OPropertySetHelper(OStatementCommonBase_Base::rBHelper),
   m_pConnection(_pConnection),
-  m_aStatementHandle( 0 )
+#if SAL_TYPES_SIZEOFPOINTER == 8
+  m_aStatementHandle(0)
+#else
+  m_aStatementHandle(nullptr)
+#endif
 {
 }
 
commit 8ad0fb82d41822aedaa3bef8f6602bd9763c97b8
Author: Michael Stahl 
Date:   Mon Jun 20 14:56:59 2016 +0200

bridges: [loplugin:staticanonymous]

Change-Id: I9d2c233c7060ea5c7a6bc028a8146ee8b2fd555b

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 9365f84..579a101 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source

[Libreoffice-commits] core.git: Branch 'feature/fixes25' - vcl/opengl

2016-06-21 Thread Tomaž Vajngerl

 vcl/opengl/salbmp.cxx |   92 +++---
 1 file changed, 66 insertions(+), 26 deletions(-)

New commits:
commit 7fcc432772ea2970a30ec753a91b9d88a5125020
Author: TomaÅ¾ Vajngerl 
Date:   Tue Jun 21 14:34:45 2016 +0800

tdf#100451 convert texture buffer to 1-bit and 4-bit palette buffer

OpenGL doesn't support palettes so when the texture is created,
the bitmap buffer is converted to 24-bit RGB. This works nice for
showing the bitmaps on screen. The problem arises when we want to
read the bitmap buffer back (like in a PDF export) as we have to
convert that back to 1-bit or 4-bit palette bitmap buffer. For 4-bit
this was not implemented yet, on the other hand for 1-bit it was
implemented but it didn't take palette into account so the bitmap
was not correct (inverted).

This commit introduces a ScanlineWriter which handles writing
RGB colors to 1-bit and 4-bit palette scanlines. The class sets
up the masks and shifts needed to place the color information
at the correct place in a byte. It also automatically converts a
RGB to palette index.

Change-Id: Ie66ca8cecff40c1252072ba95196ef65ba787f4c
Reviewed-on: https://gerrit.libreoffice.org/26532
Reviewed-by: TomaÅ¾ Vajngerl 
Tested-by: TomaÅ¾ Vajngerl 

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 87fc542..58909b4 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -412,7 +412,48 @@ void lclInstantiateTexture(OpenGLTexture& rTexture, const 
int nWidth, const int
 rTexture = OpenGLTexture (nWidth, nHeight, nFormat, nType, pData);
 }
 
-}
+// Write color information for 1 and 4 bit palette bitmap scanlines.
+class ScanlineWriter
+{
+BitmapPalette& maPalette;
+sal_uInt8 mnColorsPerByte; // number of colors that are stored in one byte
+sal_uInt8 mnColorBitSize;  // number of bits a color takes
+sal_uInt8 mnColorBitMask;  // bit mask used to isolate the color
+sal_uInt8* mpCurrentScanline;
+long mnX;
+
+public:
+ScanlineWriter(BitmapPalette& aPalette, sal_Int8 nColorsPerByte)
+: maPalette(aPalette)
+, mnColorsPerByte(nColorsPerByte)
+, mnColorBitSize(8 / mnColorsPerByte) // bit size is number of bit in 
a byte divided by number of colors per byte (8 / 2 = 4 for 4-bit)
+, mnColorBitMask((1 << mnColorBitSize) - 1) // calculate the bit mask 
from the bit size
+, mpCurrentScanline(nullptr)
+, mnX(0)
+{}
+
+inline void writeRGB(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB)
+{
+// calculate to which index we will write
+long nScanlineIndex = mnX / mnColorsPerByte;
+
+// calculate the number of shifts to get the color information to the 
right place
+long nShift = (8 - mnColorBitSize) - ((mnX % mnColorsPerByte) * 
mnColorBitSize);
+
+sal_uInt16 nColorIndex = maPalette.GetBestIndex(BitmapColor(nR, nG, 
nB));
+mpCurrentScanline[nScanlineIndex] &= ~(mnColorBitMask << nShift); // 
clear
+mpCurrentScanline[nScanlineIndex] |= (nColorIndex & mnColorBitMask) << 
nShift; // set
+mnX++;
+}
+
+inline void nextLine(sal_uInt8* pScanline)
+{
+mnX = 0;
+mpCurrentScanline = pScanline;
+}
+};
+
+} // end anonymous namespace
 
 Size OpenGLSalBitmap::GetSize() const
 {
@@ -559,43 +600,43 @@ bool OpenGLSalBitmap::ReadTexture()
 #endif
 return true;
 }
-else if (mnBits == 1)
-{   // convert buffers from 24-bit RGB to 1-bit Mask
+else if (mnBits == 1 || mnBits == 4)
+{   // convert buffers from 24-bit RGB to 1 or 4-bit buffer
 std::vector aBuffer(mnWidth * mnHeight * 3);
 
 sal_uInt8* pBuffer = aBuffer.data();
 determineTextureFormat(24, nFormat, nType);
 maTexture.Read(nFormat, nType, pBuffer);
+sal_uInt16 nSourceBytesPerRow = lclBytesPerRow(24, mnWidth);
 
-int nShift = 7;
-size_t nIndex = 0;
-
-sal_uInt8* pCurrent = pBuffer;
+std::unique_ptr pWriter;
+switch(mnBits)
+{
+case 1:
+pWriter.reset(new ScanlineWriter(maPalette, 8));
+break;
+case 4:
+default:
+pWriter.reset(new ScanlineWriter(maPalette, 2));
+break;
+}
 
 for (int y = 0; y < mnHeight; ++y)
 {
+sal_uInt8* pSource = &pBuffer[y * nSourceBytesPerRow];
+sal_uInt8* pDestination = &pData[y * mnBytesPerRow];
+
+pWriter->nextLine(pDestination);
+
 for (int x = 0; x < mnWidth; ++x)
 {
-if (nShift < 0)
-{
-nShift = 7;
-nIndex++;
-pData[nIndex] = 0;
-}
-
-sal_uInt8 nR = *pCurrent++;
-sal_uInt8 nG = *pCurrent++;
-sal_uInt8 nB = *pCurrent++;
+// re

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp

2016-06-21 Thread Andras Timar

 loolwsd/LOOLWSD.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aaa12d7258c1389d211749581f02c486c1e99357
Author: Andras Timar 
Date:   Tue Jun 21 16:15:31 2016 +0200

loolwsd: avoid NotFoundException when per_document.max_concurrency is 
missing (old config)

(cherry picked from commit bc4633a2a13e3608f71cd558fca5625d4cd711b7)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index a37b3f4..1119d55 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1258,7 +1258,7 @@ void LOOLWSD::initialize(Application& self)
 NumPreSpawnedChildren = config().getUInt("num_prespawn_children", 1);
 }
 
-const auto maxConcurrency = 
config().getInt("per_document.max_concurrency");
+const auto maxConcurrency = 
config().getInt("per_document.max_concurrency", 4);
 if (maxConcurrency > 0)
 {
 setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Andras Timar

 loleaflet/Makefile |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9e7b978f9fe9548e6f238e680feb412cadd04166
Author: Andras Timar 
Date:   Tue Jun 21 16:44:20 2016 +0200

loleaflet: bccu#1901 Control.RowHeader.js and Control.ColumnHeader.js for 
l10n

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 45e9a69..7d9c550 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -38,7 +38,9 @@ pot:
src/admin/AdminSocketOverview.js \
src/admin/AdminStrings.js \
src/admin/Util.js \
+   src/control/Control.ColumnHeader.js \
src/control/Control.Menubar.js \
+   src/control/Control.RowHeader.js \
src/control/Control.Tabs.js \
src/control/Toolbar.js \
src/core/Socket.js \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp

2016-06-21 Thread Pranav Kant

 loolwsd/LOOLWSD.cpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2b5600d49972d8d25565efc5c75a755de1ded2fa
Author: Pranav Kant 
Date:   Tue Jun 21 16:06:12 2016 +0530

loolwsd: Handle document URIs with spaces

DocumentBroker stores encoded docKey, when child answers with
dockey in its query params, Poco::URI::getQueryParameter gives
decoded docKey -> mismatch -> document load failed.

Change-Id: I53d7cf9d932b9193f15f56ec74db24e279cf3b94
(cherry picked from commit 31009fa9c10212afa6f29f27b61286ce90bdd140)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1e27187..a37b3f4 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -955,7 +955,8 @@ public:
 }
 else if (param.first == "docKey")
 {
-docKey = param.second;
+// We store encoded docKey in DocumentBroker only
+URI::encode(param.second, "", docKey);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Andras Timar

 loolwsd/LOOLWSD.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc4633a2a13e3608f71cd558fca5625d4cd711b7
Author: Andras Timar 
Date:   Tue Jun 21 16:15:31 2016 +0200

loolwsd: avoid NotFoundException when per_document.max_concurrency is 
missing (old config)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index b194ea2..490176a 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1275,7 +1275,7 @@ void LOOLWSD::initialize(Application& self)
 NumPreSpawnedChildren = config().getUInt("num_prespawn_children", 1);
 }
 
-const auto maxConcurrency = 
config().getInt("per_document.max_concurrency");
+const auto maxConcurrency = 
config().getInt("per_document.max_concurrency", 4);
 if (maxConcurrency > 0)
 {
 setenv("MAX_CONCURRENCY", std::to_string(maxConcurrency).c_str(), 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-5-2' - 2 commits - source/auxiliary source/text

2016-06-21 Thread Christian Lohmaier

 source/auxiliary/sbasic.tree  |4 ++--
 source/text/sbasic/shared/03020405.xhp|4 ++--
 source/text/sbasic/shared/03020408.xhp|4 ++--
 source/text/shared/guide/linestyle_define.xhp |6 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 3f4fadf4e649f0b196c131ecc51e09921e35da85
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:43:38 2016 +0200

remove "-" between FileAttr-Function and FileLen-Function

to be consistent with the rest of the functions
reported via pootle-feedback

Change-Id: I6e95109a8cf4145dc84ab0f3ad699d74ee05d932
(cherry picked from commit 2f6e93f728e4c7b278b57479bf1fd8fda3344fff)

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index fff44e5..7818c21 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -117,11 +117,11 @@
 Error-Handling 
Functions
 Exit Statement 
[Runtime]
 Exp Function 
[Runtime]
-FileAttr-Function 
[Runtime]
+FileAttr Function 
[Runtime]
 FileCopy Statement 
[Runtime]
 FileDateTime Function 
[Runtime]
 FileExists Function 
[Runtime]
-FileLen-Function 
[Runtime]
+FileLen Function 
[Runtime]
 FindObject Function 
[Runtime]
 FindPropertyObject Function 
[Runtime]
 Fix Function 
[Runtime]
diff --git a/source/text/sbasic/shared/03020405.xhp 
b/source/text/sbasic/shared/03020405.xhp
index 5ed9668..c8f128a 100644
--- a/source/text/sbasic/shared/03020405.xhp
+++ b/source/text/sbasic/shared/03020405.xhp
@@ -20,7 +20,7 @@
 
 
   
-FileAttr-Function [Runtime]
+FileAttr Function [Runtime]
 /text/sbasic/shared/03020405.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-FileAttr Function [Runtime]
+FileAttr Function [Runtime]
 Returns the 
access mode or the file access number of a file that was opened with the Open 
statement. The file access number is dependent on the operating system (OSH = 
Operating System Handle).
 
 If you use a 32-Bit 
operating system, you cannot use the FileAttr-Function to determine the file 
access number.
diff --git a/source/text/sbasic/shared/03020408.xhp 
b/source/text/sbasic/shared/03020408.xhp
index 414b562..e4ffbee 100644
--- a/source/text/sbasic/shared/03020408.xhp
+++ b/source/text/sbasic/shared/03020408.xhp
@@ -20,7 +20,7 @@
 
 
   
-FileLen-Function [Runtime]
+FileLen Function [Runtime]
 /text/sbasic/shared/03020408.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-FileLen Function [Runtime]
+FileLen Function [Runtime]
 Returns the 
length of a file in bytes.
 
 
commit 92af59610152664bef466cfd5983fcaff056fedc
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:25:53 2016 +0200

"Drawing Object - " â "Drawing Object - "

(put the - inside the emph)
reported via pootle feedback

Change-Id: Ia8a26116085cf4c1bac6108f175d9b38fc319c78
(cherry picked from commit 909af2a8cb528fd502229eaa08f1eac5d83114cd)

diff --git a/source/text/shared/guide/linestyle_define.xhp 
b/source/text/shared/guide/linestyle_define.xhp
index e58b808..5c03464 100644
--- a/source/text/shared/guide/linestyle_define.xhp
+++ b/source/text/shared/guide/linestyle_define.xhp
@@ -37,11 +37,7 @@
 Select a line drawing object in a document.
 
 
-Choose Format - Drawing Object - 
-Graphic - 
-
-
-Line and click the Line Styles tab.
+Choose 
Format - Drawing Object - Graphic - 
Line and click the Line 
Styles tab.
 
 
 Specify the line options that you want.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Christian Lohmaier

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

New commits:
commit 55a73b0eb6e8c1846bf2eeb7bc4b0bbd63871d36
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:43:38 2016 +0200

Updated core
Project: help  3f4fadf4e649f0b196c131ecc51e09921e35da85

remove "-" between FileAttr-Function and FileLen-Function

to be consistent with the rest of the functions
reported via pootle-feedback

Change-Id: I6e95109a8cf4145dc84ab0f3ad699d74ee05d932
(cherry picked from commit 2f6e93f728e4c7b278b57479bf1fd8fda3344fff)

diff --git a/helpcontent2 b/helpcontent2
index f2eddfe..3f4fadf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f2eddfea1039b1a7db0c38856a61b52aa5a9f821
+Subproject commit 3f4fadf4e649f0b196c131ecc51e09921e35da85
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svx/uiconfig

2016-06-21 Thread Christian Lohmaier

 svx/uiconfig/ui/crashreportdlg.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fcb372d3d5866f6fdb7bdfa620eadcb4ca1a83a
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:56:54 2016 +0200

remaining LibreOffice â %PRODUCTNAME in crash dialog

Change-Id: Ied3f0644e90a05d7d38755c4f42165247edb6b37
(cherry picked from commit 770b650c0548ca4ebb55ffccf14a3cfc907e9c43)

diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index 39c6a34..9dd35f6 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -102,7 +102,7 @@ 
crashreport.libreoffice.org/stats/crash_details/%CRASHID
 False
 Please check the report 
and if no bug report is connected to the crash report yet, open a new bug 
report at bugs.documentfoundation.org.
 Add detailed instructions on how to reproduce the crash and the shown crash ID 
into the crash report field.
-Thank you for your help in improving LibreOffice.
+Thank you for your help in improving %PRODUCTNAME.
 True
   
   
___
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' - configure.ac

2016-06-21 Thread David Tardon

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

New commits:
commit 53d31e56fe0fba6347f2ddc8b2f2451c6f231f7e
Author: David Tardon 
Date:   Tue Jun 21 10:31:57 2016 +0200

tdf#100455 check for minimal dconf version

Change-Id: I8e164bb4afc221cefd93d519569cdefa4486349f
(cherry picked from commit 461e91ca91186c1ed23316127fffe4230e3aacd2)
Reviewed-on: https://gerrit.libreoffice.org/26539
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/configure.ac b/configure.ac
index 1bd9c30..4a8a223 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10530,7 +10530,7 @@ AC_SUBST([COLLADA2GLTF_LIBS])
 AC_SUBST([SYSTEM_COLLADA2GLTF])
 
 if test "$enable_dconf" != no; then
-PKG_CHECK_MODULES([DCONF], [dconf], [], [
+PKG_CHECK_MODULES([DCONF], [dconf >= 0.15.2], [], [
 if test "$enable_dconf" = yes; then
 AC_MSG_ERROR([dconf not found])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/uiconfig

2016-06-21 Thread Christian Lohmaier

 svx/uiconfig/ui/crashreportdlg.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 770b650c0548ca4ebb55ffccf14a3cfc907e9c43
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:56:54 2016 +0200

remaining LibreOffice â %PRODUCTNAME in crash dialog

Change-Id: Ied3f0644e90a05d7d38755c4f42165247edb6b37

diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index 39c6a34..9dd35f6 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -102,7 +102,7 @@ 
crashreport.libreoffice.org/stats/crash_details/%CRASHID
 False
 Please check the report 
and if no bug report is connected to the crash report yet, open a new bug 
report at bugs.documentfoundation.org.
 Add detailed instructions on how to reproduce the crash and the shown crash ID 
into the crash report field.
-Thank you for your help in improving LibreOffice.
+Thank you for your help in improving %PRODUCTNAME.
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - officecfg/registry

2016-06-21 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |8 
 1 file changed, 8 insertions(+)

New commits:
commit 204a2800c8ba3ed35f81ab295e43d9a3e79c7925
Author: Yousuf Philips 
Date:   Sun Jun 12 15:36:00 2016 +0400

tdf#100333 Ctrl + G for Save in Spanish

Change-Id: Iec5c18e32c35d10c4992490d2b039d5106d3f1c6
Reviewed-on: https://gerrit.libreoffice.org/26194
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 3b37ea1648ef6782bebe734b68fb7df6aa490cc0)
Reviewed-on: https://gerrit.libreoffice.org/26551

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index ec657ce..d4d9582 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -349,6 +349,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
   
 
   
@@ -877,6 +878,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
 .uno:Bold
   
 
@@ -2260,6 +2262,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
 .uno:Bold
   
 
@@ -3653,6 +3656,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
 .uno:Bold
   
 
@@ -4426,6 +4430,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
 .uno:Bold
   
 
@@ -5199,6 +5204,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
 .uno:Bold
   
 
@@ -5984,6 +5990,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
 .uno:Bold
   
 
@@ -6775,6 +6782,7 @@
   
 I10N SHORTCUTS - NO 
TRANSLATE
 .uno:RepeatSearch
+.uno:Save
 .uno:Bold
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sfx2/source

2016-06-21 Thread Miklos Vajna

 sfx2/source/view/classificationhelper.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit c9a16da8617634955eacded60083bec7ffd8b58b
Author: Miklos Vajna 
Date:   Tue Jun 21 09:16:26 2016 +0200

tdf#100352 sfx classification: support localized policy files

The example policy is at:

instdir/share/classification/example.xml

If there is a localized version, e.g.:

instdir/share/classification/example_hu-HU.xml

(same syntax as already used for the autocorrect files), then use that
instead of the configured policy.

(cherry picked from commit 1811e656f08ba011a3c2a51cc60e90d2fa58e4c2)

Change-Id: I0369e69f90a633af0676981f0c5760f8477b3c8c
Reviewed-on: https://gerrit.libreoffice.org/26549
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index 0c93e93..8a3bc96 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -355,6 +356,19 @@ void SfxClassificationHelper::Impl::parsePolicy()
 uno::Reference xComponentContext = 
comphelper::getProcessComponentContext();
 SvtPathOptions aOptions;
 OUString aPath = aOptions.GetClassificationPath();
+
+// See if there is a localized variant next to the configured XML.
+OUString aExtension(".xml");
+if (aPath.endsWith(aExtension))
+{
+OUString aBase = aPath.copy(0, aPath.getLength() - 
aExtension.getLength());
+const LanguageTag& rLanguageTag = 
Application::GetSettings().GetLanguageTag();
+// Expected format is "_xx-XX.xml".
+OUString aLocalized = aBase + "_" + rLanguageTag.getBcp47() + 
aExtension;
+if (FStatHelper::IsDocument(aLocalized))
+aPath = aLocalized;
+}
+
 SvStream* pStream = utl::UcbStreamHelper::CreateStream(aPath, 
StreamMode::READ);
 uno::Reference xInputStream(new 
utl::OStreamWrapper(*pStream));
 xml::sax::InputSource aParserInput;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - source/auxiliary source/text

2016-06-21 Thread Christian Lohmaier

 source/auxiliary/sbasic.tree  |4 ++--
 source/text/sbasic/shared/03020405.xhp|4 ++--
 source/text/sbasic/shared/03020408.xhp|4 ++--
 source/text/shared/guide/linestyle_define.xhp |6 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 2f6e93f728e4c7b278b57479bf1fd8fda3344fff
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:43:38 2016 +0200

remove "-" between FileAttr-Function and FileLen-Function

to be consistent with the rest of the functions
reported via pootle-feedback

Change-Id: I6e95109a8cf4145dc84ab0f3ad699d74ee05d932

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index fff44e5..7818c21 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -117,11 +117,11 @@
 Error-Handling 
Functions
 Exit Statement 
[Runtime]
 Exp Function 
[Runtime]
-FileAttr-Function 
[Runtime]
+FileAttr Function 
[Runtime]
 FileCopy Statement 
[Runtime]
 FileDateTime Function 
[Runtime]
 FileExists Function 
[Runtime]
-FileLen-Function 
[Runtime]
+FileLen Function 
[Runtime]
 FindObject Function 
[Runtime]
 FindPropertyObject Function 
[Runtime]
 Fix Function 
[Runtime]
diff --git a/source/text/sbasic/shared/03020405.xhp 
b/source/text/sbasic/shared/03020405.xhp
index 5ed9668..c8f128a 100644
--- a/source/text/sbasic/shared/03020405.xhp
+++ b/source/text/sbasic/shared/03020405.xhp
@@ -20,7 +20,7 @@
 
 
   
-FileAttr-Function [Runtime]
+FileAttr Function [Runtime]
 /text/sbasic/shared/03020405.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-FileAttr Function [Runtime]
+FileAttr Function [Runtime]
 Returns the 
access mode or the file access number of a file that was opened with the Open 
statement. The file access number is dependent on the operating system (OSH = 
Operating System Handle).
 
 If you use a 32-Bit 
operating system, you cannot use the FileAttr-Function to determine the file 
access number.
diff --git a/source/text/sbasic/shared/03020408.xhp 
b/source/text/sbasic/shared/03020408.xhp
index 414b562..e4ffbee 100644
--- a/source/text/sbasic/shared/03020408.xhp
+++ b/source/text/sbasic/shared/03020408.xhp
@@ -20,7 +20,7 @@
 
 
   
-FileLen-Function [Runtime]
+FileLen Function [Runtime]
 /text/sbasic/shared/03020408.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-FileLen Function [Runtime]
+FileLen Function [Runtime]
 Returns the 
length of a file in bytes.
 
 
commit 909af2a8cb528fd502229eaa08f1eac5d83114cd
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:25:53 2016 +0200

"Drawing Object - " â "Drawing Object - "

(put the - inside the emph)
reported via pootle feedback

Change-Id: Ia8a26116085cf4c1bac6108f175d9b38fc319c78

diff --git a/source/text/shared/guide/linestyle_define.xhp 
b/source/text/shared/guide/linestyle_define.xhp
index e58b808..5c03464 100644
--- a/source/text/shared/guide/linestyle_define.xhp
+++ b/source/text/shared/guide/linestyle_define.xhp
@@ -37,11 +37,7 @@
 Select a line drawing object in a document.
 
 
-Choose Format - Drawing Object - 
-Graphic - 
-
-
-Line and click the Line Styles tab.
+Choose 
Format - Drawing Object - Graphic - 
Line and click the Line 
Styles tab.
 
 
 Specify the line options that you want.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-06-21 Thread Christian Lohmaier

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

New commits:
commit 546e63bcbde605d4647441e32d60bd72508fa750
Author: Christian Lohmaier 
Date:   Tue Jun 21 15:43:38 2016 +0200

Updated core
Project: help  2f6e93f728e4c7b278b57479bf1fd8fda3344fff

remove "-" between FileAttr-Function and FileLen-Function

to be consistent with the rest of the functions
reported via pootle-feedback

Change-Id: I6e95109a8cf4145dc84ab0f3ad699d74ee05d932

diff --git a/helpcontent2 b/helpcontent2
index 1abe8b8b..2f6e93f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1abe8b8b3462e7f62e1d5563402672c0b2ae4851
+Subproject commit 2f6e93f728e4c7b278b57479bf1fd8fda3344fff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Pranav Kant

 loleaflet/dist/toolbar/toolbar.js|   16 +---
 loleaflet/src/control/Control.Menubar.js |   25 +
 loleaflet/src/control/Toolbar.js |   27 +++
 3 files changed, 37 insertions(+), 31 deletions(-)

New commits:
commit b460769eedd47cdbe3694db140acdafa61f5d86f
Author: Pranav Kant 
Date:   Tue Jun 21 19:16:20 2016 +0530

loleaflet: 'Keyboard shortcuts' in new 'Help' menubar item

Change-Id: I0a924505970e9ed13ea45ebc85ef14a618646b2d

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 67f7ee3..9417931 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -211,21 +211,7 @@ function onClick(id) {
resizeToolbar();
}
else if (id === 'help') {
-   var w = window.innerWidth / 2;
-   var h = window.innerHeight / 2;
-   $.modal('', {
-   overlayClose:true,
-   opacity: 80,
-   overlayCss: {
-   backgroundColor : '#000'
-   },
-   containerCss: {
-   overflow : 'hidden',
-   backgroundColor : '#fff',
-   padding : '20px',
-   border : '2px solid #000'
-   }
-   });
+   map.showLOKeyboardHelp();
}
else if (id === 'close') {
window.parent.postMessage('close', '*');
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8ac4e25..b62a1a2 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -46,7 +46,8 @@ L.Control.Menubar = L.Control.extend({


{name: _('Cell'), type: 'unocommand', uno: '.uno:EntireCell'}]},

  {name: _('Merge cells'), type: 'unocommand', uno: 
'.uno:MergeCells'}]
},
-   {name: _('Help'), type: 'menu', menu: [{name: 
_('About'), id: 'about', type: 'action'}]
+   {name: _('Help'), type: 'menu', menu: [{name: 
_('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
+  {name: 
_('About'), id: 'about', type: 'action'}]
}
],
 
@@ -90,7 +91,8 @@ L.Control.Menubar = L.Control.extend({

 {type: 'separator'},

 {name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'}]
},
-   {name: _('Help'), type: 'menu', menu: [{name: 
_('About'), id: 'about', type: 'action'}]
+   {name: _('Help'), type: 'menu', menu: [{name: 
_('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
+  {name: 
_('About'), id: 'about', type: 'action'}]
}
],
 
@@ -128,7 +130,8 @@ L.Control.Menubar = L.Control.extend({

 {name: _('Delete row'), type: 'unocommand', uno: 
'.uno:DeleteRows'},

 {name: _('Delete column'), type: 'unocommand', uno: 
'.uno:DeleteColumns'}]
},
-   {name: _('Help'), type: 'menu', menu: [{name: 
_('About'), id: 'about', type: 'action'}]
+   {name: _('Help'), type: 'menu', menu: [{name: 
_('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
+  {name: 
_('About'), id: 'about', type: 'action'}]
}
],
 
@@ -298,19 +301,9 @@ L.Control.Menubar = L.Control.extend({
callback: this._onDeleteSlide
}, this);
} else if (id === 'about') {
-   $('#about-dialog').modal({
-   overlayClose:true,
-   opacity: 80,
-   overlayCss: {
-   backgroundColor : '#000'
-   },
-   containerCss: {
-   overflow : 'hidden',
-

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

2016-06-21 Thread Miklos Vajna

 libreofficekit/source/gtk/lokdocview.cxx   |1 
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   41 +++--
 2 files changed, 38 insertions(+), 4 deletions(-)

New commits:
commit 45182f36ef263d6fd94cc79bb242fbfb5a471c22
Author: Miklos Vajna 
Date:   Tue Jun 21 14:28:08 2016 +0200

sw: add LOK_CALLBACK_TEXT_VIEW_SELECTION testcase

Fails with 9f66db9c474f71f43d7a3667230241fd4fa4183f (sw lok: add
LOK_CALLBACK_TEXT_VIEW_SELECTION, 2016-06-21) reverted.

Change-Id: Ide21167ce2dc4287b1860b5f03a6975dc9edd4c6
Reviewed-on: https://gerrit.libreoffice.org/26550
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 802be93..1d629b9 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1039,7 +1039,6 @@ callback (gpointer pData)
   priv->m_aVisibleCursor.y,
   priv->m_aVisibleCursor.width,
   priv->m_aVisibleCursor.height);
-std::cerr << "debug, LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR: i am " << 
priv->m_nViewId << ", i got " << pCallback->m_aPayload << " for myself" << 
std::endl;
 gtk_widget_queue_draw(GTK_WIDGET(pDocView));
 }
 break;
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index a24042f..240a27c 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -225,7 +225,7 @@ void SwTiledRenderingTest::testSetTextSelection()
 SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
 // Move the cursor into the second word.
 pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 5, 
/*bBasicCall=*/false);
-// Create a selection by on the word.
+// Create a selection on the word.
 pWrtShell->SelWrd();
 SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
 // Did we indeed manage to select the second word?
@@ -548,10 +548,14 @@ class ViewCallback
 public:
 bool m_bOwnCursorInvalidated;
 bool m_bViewCursorInvalidated;
+bool m_bOwnSelectionSet;
+bool m_bViewSelectionSet;
 
 ViewCallback()
 : m_bOwnCursorInvalidated(false),
-  m_bViewCursorInvalidated(false)
+  m_bViewCursorInvalidated(false),
+  m_bOwnSelectionSet(false),
+  m_bViewSelectionSet(false)
 {
 }
 
@@ -574,6 +578,16 @@ public:
 m_bViewCursorInvalidated = true;
 }
 break;
+case LOK_CALLBACK_TEXT_SELECTION:
+{
+m_bOwnSelectionSet = true;
+}
+break;
+case LOK_CALLBACK_TEXT_VIEW_SELECTION:
+{
+m_bViewSelectionSet = true;
+}
+break;
 }
 }
 };
@@ -582,7 +596,7 @@ void SwTiledRenderingTest::testViewCursors()
 {
 comphelper::LibreOfficeKit::setActive();
 
-createDoc("dummy.fodt");
+SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
 ViewCallback aView1;
 
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
 &aView1);
 SfxLokHelper::createView();
@@ -595,6 +609,27 @@ void SwTiledRenderingTest::testViewCursors()
 // it changed.
 CPPUNIT_ASSERT(aView2.m_bViewCursorInvalidated);
 
+// Make sure that aView1 gets a view-only selection notification, while
+// aView2 gets a real selection notification.
+aView1.m_bOwnSelectionSet = false;
+aView1.m_bViewSelectionSet = false;
+aView2.m_bOwnSelectionSet = false;
+aView2.m_bViewSelectionSet = false;
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+// Move the cursor into the second word.
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 5, 
/*bBasicCall=*/false);
+// Create a selection on the word.
+pWrtShell->SelWrd();
+SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+// Did we indeed manage to select the second word?
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCursor->GetText());
+CPPUNIT_ASSERT(!aView1.m_bOwnSelectionSet);
+// This failed, aView1 did not get notification about selection changes in
+// aView2.
+CPPUNIT_ASSERT(aView1.m_bViewSelectionSet);
+CPPUNIT_ASSERT(aView2.m_bOwnSelectionSet);
+CPPUNIT_ASSERT(!aView2.m_bViewSelectionSet);
+
 comphelper::LibreOfficeKit::setActive(false);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/Makefile loolwsd/configure.ac

2016-06-21 Thread Andras Timar

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ec6805697bfdce380fc48ea2c793991ebe3de0f
Author: Andras Timar 
Date:   Tue Jun 21 15:27:06 2016 +0200

Bump version to 1.6.13 after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 6681150..b0b009e 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.6.12
+VERSION=1.6.13
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index dccced3..3a8823a 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.6.12], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.6.13], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Xisco Fauli

 include/svtools/slidesorterbaropt.hxx   |   23 ---
 svtools/source/config/slidesorterbaropt.cxx |   58 
 2 files changed, 28 insertions(+), 53 deletions(-)

New commits:
commit bb6500aa74feabcf884801d7ca9ce70b5449cafb
Author: Xisco Fauli 
Date:   Wed Jun 15 20:46:16 2016 +0200

tdf#89329: use shared_ptr for pImpl in slidesorterbaropt

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

diff --git a/include/svtools/slidesorterbaropt.hxx 
b/include/svtools/slidesorterbaropt.hxx
index e436fe6..d92dd58 100644
--- a/include/svtools/slidesorterbaropt.hxx
+++ b/include/svtools/slidesorterbaropt.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /** forward declaration to our private date container implementation
 
@@ -41,16 +42,6 @@ class SvtSlideSorterBarOptions_Impl;
 class SVT_DLLPUBLIC SvtSlideSorterBarOptions: public utl::detail::Options
 {
 public:
-/** standard constructor and destructor
-
-This will initialize an instance with default values.
-We implement these class with a refcount mechanism! Every instance 
of this class increase it
-at create and decrease it at delete time - but all instances use 
the same data container!
-He is implemented as a static member ...
-
-\samember m_nRefCount
-\samember m_pDataContainer
-*/
 SvtSlideSorterBarOptions();
 virtual ~SvtSlideSorterBarOptions();
 
@@ -79,17 +70,7 @@ class SVT_DLLPUBLIC SvtSlideSorterBarOptions: public 
utl::detail::Options
 SVT_DLLPRIVATE static ::osl::Mutex& GetInitMutex();
 
 private:
-
-/**
-\attention
-Don't initialize these static members in these headers!
-\li Double defined symbols will be detected ...
-\li and unresolved externals exist at linking time.
-Do it in your source only.
-*/
-static SvtSlideSorterBarOptions_Impl* m_pDataContainer;
-static sal_Int32  m_nRefCount ;
-
+std::shared_ptr m_pImpl;
 };
 
 #endif
diff --git a/svtools/source/config/slidesorterbaropt.cxx 
b/svtools/source/config/slidesorterbaropt.cxx
index 49607c0..00028af 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -55,7 +55,7 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem
 public:
 
  SvtSlideSorterBarOptions_Impl();
-virtual ~SvtSlideSorterBarOptions_Impl();
+~SvtSlideSorterBarOptions_Impl() override;
 
 /** called for notify of configmanager
 
@@ -83,7 +83,7 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem
 bool m_bVisibleDrawView;
 
 private:
-virtual void ImplCommit() override;
+virtual void ImplCommit() final override;
 
 /** return list of key names of our configuration management which 
represent oue module tree
 
@@ -193,7 +193,8 @@ 
SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl()
 
 SvtSlideSorterBarOptions_Impl::~SvtSlideSorterBarOptions_Impl()
 {
-assert(!IsModified()); // should have been committed
+if (IsModified())
+Commit();
 }
 
 static int lcl_MapPropertyName( const OUString& rCompare,
@@ -343,20 +344,20 @@ void SvtSlideSorterBarOptions_Impl::SetVisibleViewImpl( 
bool& bVisibleView, bool
 }
 }
 
-//  initialize static member, see definition for further information
-//  DON'T DO IT IN YOUR HEADER!
-SvtSlideSorterBarOptions_Impl* SvtSlideSorterBarOptions::m_pDataContainer= 
nullptr  ;
-sal_Int32  SvtSlideSorterBarOptions::m_nRefCount = 0 ;
+namespace {
+std::weak_ptr g_pSlideSorterBarOptions;
+}
 
 SvtSlideSorterBarOptions::SvtSlideSorterBarOptions()
 {
 // Global access, must be guarded (multithreading!).
 MutexGuard aGuard( GetInitMutex() );
-++m_nRefCount;
-// ... and initialize our data container only if it not already exist!
-if( m_pDataContainer == nullptr )
+
+m_pImpl = g_pSlideSorterBarOptions.lock();
+if( !m_pImpl )
 {
-   m_pDataContainer = new SvtSlideSorterBarOptions_Impl;
+m_pImpl = std::make_shared();
+g_pSlideSorterBarOptions = m_pImpl;
 }
 }
 
@@ -364,75 +365,68 @@ SvtSlideSorterBarOptions::~SvtSlideSorterBarOptions()
 {
 // Global access, must be guarded (multithreading!)
 MutexGuard aGuard( GetInitMutex() );
---m_nRefCount;
-// If last instance was deleted we must destroy our static data container!
-if( m_nRefCount <= 0 )
-{
-if (m_pDataContainer->IsModified())
-m_pDataContainer->Commit();
-delete m_pDataContainer;
-m_pDataContainer = nullptr;
-}
+
+m_pImpl.reset();
 }
 
 bool SvtSlideSorterBarOptions::GetVisibleImpressView() const
 {
-return m_pDataContai

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sd/CppunitTest_sd_dialogs_test.mk sd/qa vcl/source

2016-06-21 Thread Katarina Behrens

 sd/CppunitTest_sd_dialogs_test.mk |2 +-
 sd/qa/unit/dialogs-test.cxx   |8 
 vcl/source/app/settings.cxx   |2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 8f6529df74c1712d3f55e2625312ce288b335b1d
Author: Katarina Behrens 
Date:   Tue Jun 21 14:13:27 2016 +0200

Remove code that worked around pseudo-headless mode

start test with use_vcl_non_headless_with_windows instead

Change-Id: Id6ff9c6f15ec927e1cbe2c599c526857982a76d2

diff --git a/sd/CppunitTest_sd_dialogs_test.mk 
b/sd/CppunitTest_sd_dialogs_test.mk
index d6027e6..04571a2 100644
--- a/sd/CppunitTest_sd_dialogs_test.mk
+++ b/sd/CppunitTest_sd_dialogs_test.mk
@@ -61,7 +61,7 @@ $(eval $(call 
gb_CppunitTest_use_external,sd_dialogs_test,boost_headers))
 $(eval $(call gb_CppunitTest_use_sdk_api,sd_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_ure,sd_dialogs_test))
-$(eval $(call gb_CppunitTest_use_vcl_non_headless,sd_dialogs_test))
+$(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,sd_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_rdb,sd_dialogs_test,services))
 
diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index c5a6d4d..93d3cf0 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -670,14 +670,6 @@ void SdDialogsTest::openAnyDialog()
 
 if (pDlg)
 {
-if (false)
-{
-const Application::DialogCancelMode 
aOriginalDialogCancelMode(Application::GetDialogCancelMode());
-
Application::SetDialogCancelMode(Application::DialogCancelMode::Off);
-pDlg->Execute();
-Application::SetDialogCancelMode(aOriginalDialogCancelMode);
-}
-
 dumpDialogToPath(*pDlg, aTempTargetPath + OUString::number(a));
 delete pDlg;
 }
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 14dea6a..90482c6 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2410,7 +2410,7 @@ ImplMiscData::ImplMiscData()
 // Should we display any windows?
 
 // need to hardly mask here for now, needs to be adapted of course...
-mbPseudoHeadless = false; // getenv("VCL_HIDE_WINDOWS") || 
comphelper::LibreOfficeKit::isActive();
+mbPseudoHeadless = getenv("VCL_HIDE_WINDOWS") || 
comphelper::LibreOfficeKit::isActive();
 }
 
 ImplMiscData::ImplMiscData( const ImplMiscData& rData )
___
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/COOL_1.0.1'

2016-06-21 Thread Andras Timar

Tag 'COOL_1.0.1' created by Andras Timar  at 
2016-06-21 12:39 +

COOL_1.0.1

Changes since COOL_1.0-11:
---
 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/COOL_1.0.1'

2016-06-21 Thread Christian Lohmaier

Tag 'COOL_1.0.1' created by Andras Timar  at 
2016-06-21 12:39 +

COOL_1.0.1

Changes since cp-5.0-18:
Christian Lohmaier (1):
   should not be empty/self-closing element ()

---
 source/text/shared/01/0222.xhp  |2 +-
 source/text/swriter/01/04020100.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
___
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/COOL_1.0.1'

2016-06-21 Thread Christian Lohmaier

Tag 'COOL_1.0.1' created by Andras Timar  at 
2016-06-21 12:39 +

COOL_1.0.1

Changes since cp-5.0-32:
Christian Lohmaier (1):
  update translations for 5.0.6 rc2

---
 source/es/helpcontent2/source/text/sbasic/shared.po   |6 
 source/es/helpcontent2/source/text/scalc/01.po|   20 -
 source/es/helpcontent2/source/text/scalc/guide.po |8 
 source/es/helpcontent2/source/text/sdraw/04.po|   12 
 source/es/helpcontent2/source/text/sdraw/guide.po |8 
 source/es/helpcontent2/source/text/shared/00.po   |   10 
 source/es/helpcontent2/source/text/shared/01.po   |8 
 source/es/helpcontent2/source/text/shared/02.po   |   16 
 source/es/helpcontent2/source/text/shared/04.po   |   10 
 source/es/helpcontent2/source/text/shared/05.po   |8 
 source/es/helpcontent2/source/text/shared/guide.po|   24 -
 source/es/helpcontent2/source/text/shared/optionen.po |6 
 source/es/helpcontent2/source/text/simpress/01.po |6 
 source/es/helpcontent2/source/text/simpress/02.po |6 
 source/es/helpcontent2/source/text/simpress/04.po |8 
 source/es/helpcontent2/source/text/simpress/guide.po  |6 
 source/es/helpcontent2/source/text/swriter/01.po  |   10 
 source/es/helpcontent2/source/text/swriter/guide.po   |   18 
 source/eu/helpcontent2/source/text/scalc/01.po|   18 
 source/lv/officecfg/registry/data/org/openoffice/Office/UI.po |8 
 source/lv/sc/source/ui/src.po |6 
 source/lv/sw/source/ui/docvw.po   |   11 
 source/oc/extensions/uiconfig/sabpilot/ui.po  |9 
 source/oc/formula/source/core/resource.po |6 
 source/oc/officecfg/registry/data/org/openoffice/Office.po|   18 
 source/oc/officecfg/registry/data/org/openoffice/Office/UI.po |   30 -
 source/oc/reportdesign/uiconfig/dbreport/ui.po|6 
 source/oc/sc/source/ui/sidebar.po |   10 
 source/oc/sc/source/ui/src.po |   20 -
 source/oc/svx/source/items.po |   12 
 source/oc/svx/source/stbctrls.po  |   12 
 source/oc/svx/source/tbxctrls.po  |   10 
 source/oc/svx/uiconfig/ui.po  |  183 +-
 source/th/basctl/source/basicide.po   |   12 
 source/th/basic/source/classes.po |   10 
 source/th/editeng/source/items.po |6 
 source/th/librelogo/source/pythonpath.po  |   13 
 source/th/officecfg/registry/data/org/openoffice/Office/UI.po |   12 
 source/th/reportdesign/uiconfig/dbreport/ui.po|   14 
 source/th/sc/source/ui/src.po |   14 
 source/th/sc/source/ui/styleui.po |   10 
 source/th/sc/uiconfig/scalc/ui.po |8 
 source/th/sd/source/ui/app.po |7 
 source/th/sd/uiconfig/simpress/ui.po  |6 
 source/th/sfx2/source/dialog.po   |6 
 source/th/svx/source/form.po  |6 
 source/th/svx/source/items.po |8 
 source/th/svx/source/sidebar/text.po  |   10 
 source/th/svx/source/src.po   |   18 
 source/th/svx/source/svdraw.po|   24 -
 source/th/svx/uiconfig/ui.po  |   10 
 source/th/sw/source/core/undo.po  |   12 
 source/th/sw/source/ui/app.po |6 
 source/th/sw/source/ui/chrdlg.po  |   10 
 source/th/sw/source/ui/fldui.po   |8 
 source/th/sw/source/uibase/utlui.po   |6 
 source/th/sw/uiconfig/swriter/ui.po   |   12 
 source/th/swext/mediawiki/help.po |   14 
 source/th/uui/source.po   |6 
 source/th/wizards/source/formwizard.po|   14 
 60 files changed, 418 insertions(+), 413 deletions(-)
---
___
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/COOL_1.0.1'

2016-06-21 Thread Christian Lohmaier

Tag 'COOL_1.0.1' created by Andras Timar  at 
2016-06-21 12:39 +

COOL_1.0.1

Changes since cp-5.0-30-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/COOL_1.0.1'

2016-06-21 Thread Andras Timar

Tag 'COOL_1.0.1' created by Andras Timar  at 
2016-06-21 12:38 +

COOL_1.0.1

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

[Libreoffice-commits] online.git: Changes to 'refs/tags/1.6.12-1'

2016-06-21 Thread Andras Timar

Tag '1.6.12-1' created by Andras Timar  at 
2016-06-21 12:37 +

1.6.12-1

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/Makefile loolwsd/configure.ac

2016-06-21 Thread Andras Timar

 loleaflet/Makefile   |2 +-
 loolwsd/configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e9dc31e0b192a2e2ca14a0f0d821ddd0c1aacf7a
Author: Andras Timar 
Date:   Tue Jun 21 12:54:43 2016 +0200

Bump version to 1.6.12 before tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index e826fa2..6681150 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.6.11
+VERSION=1.6.12
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 2927fbc..dccced3 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.6.11], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [1.6.12], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -

2016-06-21 Thread László Németh

 0 files changed

New commits:
commit 646f94cac21286bf923719cf7ab319a9b05aa56b
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Tue Jun 21 14:15:54 2016 +0200

empty commit (repeat)

Change-Id: Ie40880548c1a278aaff16947c2c93690bb95287d
commit 594890424b859f85ac094f2ec4320a688906665c
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Tue Jun 21 14:15:01 2016 +0200

empty commit (repeat)

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

Re: Pushing to LibO-5-2

2016-06-21 Thread Stephan Bergmann


On 06/21/2016 01:46 PM, jan iversen wrote:

And as Stephan pointed out: Only bugfixes go in.

And since this is a bugfix it should not be a problem ?


All three of the mentioned , 
, 
 refer to 
 "Trend line 
equation should fit in chart" with "Version (earliest affected)" set to 
"4.2.0.4 release".  So from what I wrote I wouldn't necessarily consider 
that a fix of a recently introduced regression, and personally wouldn't 
bother backporting it (and in doing so risking introducing new regressions).

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

[Libreoffice-commits] core.git: Branch 'feature/fixes25' -

2016-06-21 Thread László Németh

 0 files changed

New commits:
commit 98c988cb5b1629c6a718bb2ace4e28520ec3531d
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Tue Jun 21 14:03:38 2016 +0200

empty commit (orig. text typing)

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

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

2016-06-21 Thread Stephan Bergmann

 stoc/source/corereflection/base.hxx   |7 +-
 stoc/source/corereflection/crefl.cxx  |9 +-
 stoc/source/corereflection/criface.cxx|   25 +++-
 stoc/source/inspect/introspection.cxx |   57 +++---
 stoc/source/invocation/invocation.cxx |6 -
 stoc/source/servicemanager/servicemanager.cxx |   19 ++
 stoc/source/typeconv/convert.cxx  |   80 +-
 7 files changed, 95 insertions(+), 108 deletions(-)

New commits:
commit 9cef658364e4d8441f490e4fe89c3bfa14cd24b3
Author: Stephan Bergmann 
Date:   Tue Jun 21 14:05:17 2016 +0200

Clean up uses of Any::getValue() in stoc

Change-Id: I455b708bfcc9d5aa71bb0ffc21efec205302169e

diff --git a/stoc/source/corereflection/base.hxx 
b/stoc/source/corereflection/base.hxx
index f28a600..cdfcb3f 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -21,6 +21,9 @@
 #ifndef INCLUDED_STOC_SOURCE_COREREFLECTION_BASE_HXX
 #define INCLUDED_STOC_SOURCE_COREREFLECTION_BASE_HXX
 
+#include 
+
+#include 
 #include 
 #include 
 #include 
@@ -366,9 +369,9 @@ inline bool extract(
 reinterpret_cast< uno_AcquireFunc >(css::uno::cpp_acquire),
 reinterpret_cast< uno_ReleaseFunc >(css::uno::cpp_release) );
 }
-else if (rObj.getValueTypeClass() == css::uno::TypeClass_TYPE)
+else if (auto t = o3tl::tryAccess(rObj))
 {
-rDest = pRefl->forType( static_cast< const css::uno::Type * >( 
rObj.getValue() )->getTypeLibType() );
+rDest = pRefl->forType( t->getTypeLibType() );
 return rDest.is();
 }
 }
diff --git a/stoc/source/corereflection/crefl.cxx 
b/stoc/source/corereflection/crefl.cxx
index d9e9007..9275e45 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace css;
@@ -223,8 +224,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forName( 
const OUString & rType
 
 if (aAny.hasValue())
 {
-if (aAny.getValueTypeClass() == TypeClass_INTERFACE)
-xRet = *static_cast 
*>(aAny.getValue());
+aAny >>= xRet;
 }
 else
 {
@@ -254,7 +254,7 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const 
OUString & rName )
 if (aRet.getValueTypeClass() == TypeClass_INTERFACE)
 {
 // type retrieved from tdmgr
-OSL_ASSERT( (*static_cast const 
*>(aRet.getValue()))->queryInterface(
+OSL_ASSERT( 
(*o3tl::forceAccess>(aRet))->queryInterface(
 cppu::UnoType::get()).hasValue() );
 
 css::uno::Reference< css::reflection::XConstantTypeDescription >
@@ -321,8 +321,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( 
typelib_TypeDescriptio
 
 if (aAny.hasValue())
 {
-if (aAny.getValueTypeClass() == TypeClass_INTERFACE)
-xRet = *static_cast 
*>(aAny.getValue());
+aAny >>= xRet;
 }
 else
 {
diff --git a/stoc/source/corereflection/criface.cxx 
b/stoc/source/corereflection/criface.cxx
index 22b12db..91d42ae 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -24,6 +24,7 @@
 #if !(defined(MACOSX) || defined(IOS) || defined(FREEBSD))
 #include 
 #endif
+#include 
 #include 
 #include 
 #include 
@@ -189,9 +190,7 @@ Any IdlAttributeFieldImpl::get( const Any & rObj )
 (*pUnoI->pDispatcher)( pUnoI, getTypeDescr(), pReturn, nullptr, &pExc 
);
 (*pUnoI->release)( pUnoI );
 
-checkException(
-pExc,
-*static_cast< Reference< XInterface > const * >(rObj.getValue()));
+checkException(pExc, *o3tl::doAccess>(rObj));
 Any aRet;
 uno_any_destruct(
 &aRet, reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
@@ -277,17 +276,14 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & 
rValue )
 (*pUnoI->release)( pUnoI );
 
 uno_destructData( pArg, pTD, nullptr );
-checkException(
-pExc,
-*static_cast< Reference< XInterface > const * >(
-rObj.getValue()));
+checkException(pExc, *o3tl::doAccess>(rObj));
 return;
 }
 (*pUnoI->release)( pUnoI );
 
 throw IllegalArgumentException(
 "illegal value given!",
-*static_cast *>(rObj.getValue()), 1 
);
+*o3tl::doAccess>(rObj), 1 );
 }
 throw IllegalArgumentException(
 "illegal destination object given!",
@@ -575,19 +571,20 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & 
rObj, Sequence< Any > &
   css::reflection::InvocationTargetException,
   css::uno::RuntimeException, std::exception)
 {
-if (rObj.getValueTypeClass() == TypeClass_INTERFACE)
+if (auto ifc = o3tl::tryAccess>(
+

Re: Pushing to LibO-5-2

2016-06-21 Thread Christian Lohmaier

On Tue, Jun 21, 2016 at 1:46 PM, jan iversen
 wrote:
> On 21 Jun 2016, at 13:03, Christian Lohmaier 
> wrote:
>
> Only in beta phase does a x-y branch not require review. after that it
> needs one review.
>
> Maybe the text should be corrected in our wiki:
>
> No review required until the last beta
>

Just read that one along with the next bullet-point...

> which I read as no extra review is needed for a X-Y branch.

"until last beta"

> And as Stephan pointed out: Only bugfixes go in.
>
> And since this is a bugfix it should not be a problem ?

No idea what "this" is, as that wasn't part of the mail thread...

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

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

2016-06-21 Thread Noel Grandin

 vcl/source/window/menuitemlist.cxx |4 
 vcl/source/window/menuitemlist.hxx |6 --
 2 files changed, 10 deletions(-)

New commits:
commit 7669bf3884ac053baca04e09d7c9994870983a4a
Author: Noel Grandin 
Date:   Tue Jun 21 13:51:50 2016 +0200

bMirrorMode and nItemImageAngle are unused

Change-Id: I87da73db3a58b2e94b3bdda2cea5874701303a18

diff --git a/vcl/source/window/menuitemlist.cxx 
b/vcl/source/window/menuitemlist.cxx
index 07a2645..a1c1fa2 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -73,8 +73,6 @@ MenuItemData* MenuItemList::Insert(
 pData->bEnabled = true;
 pData->bVisible = true;
 pData->bIsTemporary = false;
-pData->bMirrorMode  = false;
-pData->nItemImageAngle  = 0;
 
 SalItemParams aSalMIData;
 aSalMIData.nId = nId;
@@ -109,8 +107,6 @@ void MenuItemList::InsertSeparator(const OString &rIdent, 
size_t nPos)
 pData->bEnabled = true;
 pData->bVisible = true;
 pData->bIsTemporary = false;
-pData->bMirrorMode  = false;
-pData->nItemImageAngle  = 0;
 
 SalItemParams aSalMIData;
 aSalMIData.nId = 0;
diff --git a/vcl/source/window/menuitemlist.hxx 
b/vcl/source/window/menuitemlist.hxx
index f4b9deb..ce5ba36 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -50,8 +50,6 @@ struct MenuItemData
 boolbEnabled;   // Enabled
 boolbVisible;   // Visible (note: this flag will 
not override MenuFlags::HideDisabledEntries when true)
 boolbIsTemporary;   // Temporary inserted ('No 
selection possible')
-boolbMirrorMode;
-longnItemImageAngle;
 SizeaSz;// only temporarily valid
 OUStringaAccessibleName;// accessible name
 
@@ -69,8 +67,6 @@ struct MenuItemData
 , bEnabled(false)
 , bVisible(false)
 , bIsTemporary(false)
-, bMirrorMode(false)
-, nItemImageAngle(0)
 , pSalMenuItem(nullptr)
 {
 }
@@ -88,8 +84,6 @@ struct MenuItemData
 , bEnabled(false)
 , bVisible(false)
 , bIsTemporary(false)
-, bMirrorMode(false)
-, nItemImageAngle(0)
 , pSalMenuItem(nullptr)
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Pushing to LibO-5-2

2016-06-21 Thread jan iversen



> On 21 Jun 2016, at 13:03, Christian Lohmaier  wrote:
> 
> On Sun, Jun 19, 2016 at 9:07 AM, jan iversen
>  wrote:
>> 
>> As a new committer (thanks again for your confidence), I don't know yet all
>> the rules and I prefer to ask before breaking something.
>> 
>> Asking is clearly better than breaking :-)
>> 
>> As it is for 5-2 branch, do they require review from someone else than me,
>> before they can be pushed? (commits were already reviewed for master by jan)
>> 
>> Our review rules are described here (and how to add a patch to a branch):
>> https://wiki.documentfoundation.org/Development/Branches
>> Your patches are fixes to a X-Y branch, so no further review required.
> 
> Only in beta phase does a x-y branch not require review. after that it
> needs one review.

Maybe the text should be corrected in our wiki:
No review required until the last beta

which I read as no extra review is needed for a X-Y branch.

> And as Stephan pointed out: Only bugfixes go in.
And since this is a bugfix it should not be a problem ?

rgds
jan I.

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

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

2016-06-21 Thread Miklos Vajna

 libreofficekit/source/gtk/lokdocview.cxx |   30 --
 1 file changed, 28 insertions(+), 2 deletions(-)

New commits:
commit 6b9053d371fc8b8543faf7add5fb6d61aab26605
Author: Miklos Vajna 
Date:   Tue Jun 21 11:30:04 2016 +0200

lokdocview: handle LOK_CALLBACK_TEXT_VIEW_SELECTION

It's similar to the normal selection, but it's colored and has no
handles.

Change-Id: Ibd9594b4834ff4f9b1cfd85912ed5cee3c8b8c71
Reviewed-on: https://gerrit.libreoffice.org/26543
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 39676f3..802be93 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -89,6 +89,9 @@ struct LOKDocViewPrivateImpl
 guint32 m_nKeyModifier;
 /// Rectangles of the current text selection.
 std::vector m_aTextSelectionRectangles;
+/// Rectangles of view selections. The current view can only see
+/// them, can't modify them. Key is the view id.
+std::map> 
m_aTextViewSelectionRectangles;
 /// Position and size of the selection start (as if there would be a 
cursor caret there).
 GdkRectangle m_aTextSelectionStart;
 /// Position and size of the selection end.
@@ -1179,7 +1182,13 @@ callback (gpointer pData)
 }
 case LOK_CALLBACK_TEXT_VIEW_SELECTION:
 {
-// TODO: Implement me
+std::stringstream aStream(pCallback->m_aPayload);
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+std::uintptr_t nViewId = aTree.get("viewId");
+const std::string& rSelection = aTree.get("selection");
+priv->m_aTextViewSelectionRectangles[nViewId] = 
payloadToRectangles(pDocView, rSelection.c_str());
+gtk_widget_queue_draw(GTK_WIDGET(pDocView));
 break;
 }
 default:
@@ -1475,7 +1484,7 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
 // Set a minimal width if it would be 0.
 rCursor.width = 30;
 
-const GdkRGBA& rDark = getDarkColor(priv->m_nViewId);
+const GdkRGBA& rDark = getDarkColor(rPair.first);
 cairo_set_source_rgb(pCairo, rDark.red, rDark.green, rDark.blue);
 cairo_rectangle(pCairo,
 twipToPixel(rCursor.x, priv->m_fZoom),
@@ -1540,6 +1549,23 @@ renderOverlay(LOKDocView* pDocView, cairo_t* pCairo)
 }
 }
 
+// Selections of other views.
+for (std::pair>& rPair : 
priv->m_aTextViewSelectionRectangles)
+{
+for (GdkRectangle& rRectangle : rPair.second)
+{
+const GdkRGBA& rDark = getDarkColor(rPair.first);
+// 75% transparency.
+cairo_set_source_rgba(pCairo, rDark.red, rDark.green, rDark.blue, 
0.25);
+cairo_rectangle(pCairo,
+twipToPixel(rRectangle.x, priv->m_fZoom),
+twipToPixel(rRectangle.y, priv->m_fZoom),
+twipToPixel(rRectangle.width, priv->m_fZoom),
+twipToPixel(rRectangle.height, priv->m_fZoom));
+cairo_fill(pCairo);
+}
+}
+
 if (!isEmptyRectangle(priv->m_aGraphicSelection))
 {
 gchar* handleGraphicPath = g_strconcat (priv->m_aLOPath, 
CURSOR_HANDLE_DIR, "handle_graphic.png", nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/LibreOfficeKit include/sfx2 libreofficekit/source sfx2/source sw/qa sw/source

2016-06-21 Thread Miklos Vajna

 include/LibreOfficeKit/LibreOfficeKitEnums.h   |   16 +++-
 include/sfx2/lokhelper.hxx |4 
 libreofficekit/source/gtk/lokdocview.cxx   |7 +++
 sfx2/source/view/lokhelper.cxx |   25 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
 sw/source/core/crsr/viscrs.cxx |   23 +++
 6 files changed, 55 insertions(+), 22 deletions(-)

New commits:
commit 9f66db9c474f71f43d7a3667230241fd4fa4183f
Author: Miklos Vajna 
Date:   Tue Jun 21 11:29:49 2016 +0200

sw lok: add LOK_CALLBACK_TEXT_VIEW_SELECTION

So a view can be aware where selections of other views are.

Change-Id: I5026b1ff2b99a4eedfd0bde32a05ceb8e2f424bc
Reviewed-on: https://gerrit.libreoffice.org/26542
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 4229e73..4dfb8be 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -316,7 +316,6 @@ typedef enum
  * The size and/or the position of the view cursor changed. A view cursor
  * is a cursor of an other view, the current view can't change it.
  *
- * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  * The payload format:
  *
  * {
@@ -329,6 +328,21 @@ typedef enum
  */
 LOK_CALLBACK_INVALIDATE_VIEW_CURSOR,
 
+/**
+ * The the text selection in one of the other views has changed.
+ *
+ * The payload format:
+ *
+ * {
+ * "viewId": "..."
+ * "selection": "..."
+ * }
+ *
+ * - viewId is a value returned earlier by lok::Document::createView()
+ * - selection uses the format of LOK_CALLBACK_TEXT_SELECTION.
+ */
+LOK_CALLBACK_TEXT_VIEW_SELECTION,
+
 }
 LibreOfficeKitCallbackType;
 
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index ec68ed6..4cfe081 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class SfxViewShell;
 
@@ -29,6 +30,9 @@ public:
 static std::uintptr_t getView(SfxViewShell* pViewShell = nullptr);
 /// Get the number of views of the current object shell.
 static std::size_t getViews();
+
+/// Invoke the LOK callback of all views except pThisView, with a payload 
of rKey-rPayload.
+static void notifyOtherViews(SfxViewShell* pThisView, int nType, const 
OString& rKey, const OString& rPayload);
 };
 
 #endif
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 60d4cce..39676f3 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -346,6 +346,8 @@ callbackTypeToString (int nType)
 return "LOK_CALLBACK_CONTEXT_MENU";
 case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
 return "LOK_CALLBACK_INVALIDATE_VIEW_CURSOR";
+case LOK_CALLBACK_TEXT_VIEW_SELECTION:
+return "LOK_CALLBACK_TEXT_VIEW_SELECTION";
 }
 return nullptr;
 }
@@ -1175,6 +1177,11 @@ callback (gpointer pData)
 gtk_widget_queue_draw(GTK_WIDGET(pDocView));
 break;
 }
+case LOK_CALLBACK_TEXT_VIEW_SELECTION:
+{
+// TODO: Implement me
+break;
+}
 default:
 g_assert(false);
 break;
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index c994877..b44392c 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -8,6 +8,9 @@
  */
 
 #include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -86,4 +89,26 @@ std::size_t SfxLokHelper::getViews()
 return nRet;
 }
 
+void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const 
OString& rKey, const OString& rPayload)
+{
+if (SfxLokHelper::getViews() <= 1)
+return;
+
+SfxViewShell* pViewShell = SfxViewShell::GetFirst();
+while (pViewShell)
+{
+if (pViewShell != pThisView)
+{
+boost::property_tree::ptree aTree;
+aTree.put("viewId", SfxLokHelper::getView(pThisView));
+aTree.put(rKey.getStr(), rPayload.getStr());
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+OString aPayload = aStream.str().c_str();
+pViewShell->libreOfficeKitViewCallback(nType, aPayload.getStr());
+}
+pViewShell = SfxViewShell::GetNext(*pViewShell);
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b244635..a24042f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -551,7 +551,7 @@ public:
 
 ViewCallback()
 : m_bOwnCursorInvali

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/opengl

2016-06-21 Thread Tomaž Vajngerl

 vcl/opengl/salbmp.cxx |   92 +++---
 1 file changed, 66 insertions(+), 26 deletions(-)

New commits:
commit 60b74fe1775e647545d2da1fcc58a4c63ec18aa5
Author: TomaÅ¾ Vajngerl 
Date:   Tue Jun 21 14:34:45 2016 +0800

tdf#100451 convert texture buffer to 1-bit and 4-bit palette buffer

OpenGL doesn't support palettes so when the texture is created,
the bitmap buffer is converted to 24-bit RGB. This works nice for
showing the bitmaps on screen. The problem arises when we want to
read the bitmap buffer back (like in a PDF export) as we have to
convert that back to 1-bit or 4-bit palette bitmap buffer. For 4-bit
this was not implemented yet, on the other hand for 1-bit it was
implemented but it didn't take palette into account so the bitmap
was not correct (inverted).

This commit introduces a ScanlineWriter which handles writing
RGB colors to 1-bit and 4-bit palette scanlines. The class sets
up the masks and shifts needed to place the color information
at the correct place in a byte. It also automatically converts a
RGB to palette index.

Change-Id: Ie66ca8cecff40c1252072ba95196ef65ba787f4c
Reviewed-on: https://gerrit.libreoffice.org/26532
Reviewed-by: TomaÅ¾ Vajngerl 
Tested-by: TomaÅ¾ Vajngerl 
(cherry picked from commit c2fc93cae194a1aad94721edc51078b168a34f5f)
Reviewed-on: https://gerrit.libreoffice.org/26533
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index fbfcf6f..ef081ee 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -415,7 +415,48 @@ void lclInstantiateTexture(OpenGLTexture& rTexture, const 
int nWidth, const int
 rTexture = OpenGLTexture (nWidth, nHeight, nFormat, nType, pData);
 }
 
-}
+// Write color information for 1 and 4 bit palette bitmap scanlines.
+class ScanlineWriter
+{
+BitmapPalette& maPalette;
+sal_uInt8 mnColorsPerByte; // number of colors that are stored in one byte
+sal_uInt8 mnColorBitSize;  // number of bits a color takes
+sal_uInt8 mnColorBitMask;  // bit mask used to isolate the color
+sal_uInt8* mpCurrentScanline;
+long mnX;
+
+public:
+ScanlineWriter(BitmapPalette& aPalette, sal_Int8 nColorsPerByte)
+: maPalette(aPalette)
+, mnColorsPerByte(nColorsPerByte)
+, mnColorBitSize(8 / mnColorsPerByte) // bit size is number of bit in 
a byte divided by number of colors per byte (8 / 2 = 4 for 4-bit)
+, mnColorBitMask((1 << mnColorBitSize) - 1) // calculate the bit mask 
from the bit size
+, mpCurrentScanline(nullptr)
+, mnX(0)
+{}
+
+inline void writeRGB(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB)
+{
+// calculate to which index we will write
+long nScanlineIndex = mnX / mnColorsPerByte;
+
+// calculate the number of shifts to get the color information to the 
right place
+long nShift = (8 - mnColorBitSize) - ((mnX % mnColorsPerByte) * 
mnColorBitSize);
+
+sal_uInt16 nColorIndex = maPalette.GetBestIndex(BitmapColor(nR, nG, 
nB));
+mpCurrentScanline[nScanlineIndex] &= ~(mnColorBitMask << nShift); // 
clear
+mpCurrentScanline[nScanlineIndex] |= (nColorIndex & mnColorBitMask) << 
nShift; // set
+mnX++;
+}
+
+inline void nextLine(sal_uInt8* pScanline)
+{
+mnX = 0;
+mpCurrentScanline = pScanline;
+}
+};
+
+} // end anonymous namespace
 
 Size OpenGLSalBitmap::GetSize() const
 {
@@ -567,43 +608,43 @@ bool OpenGLSalBitmap::ReadTexture()
 #endif
 return true;
 }
-else if (mnBits == 1)
-{   // convert buffers from 24-bit RGB to 1-bit Mask
+else if (mnBits == 1 || mnBits == 4)
+{   // convert buffers from 24-bit RGB to 1 or 4-bit buffer
 std::vector aBuffer(mnWidth * mnHeight * 3);
 
 sal_uInt8* pBuffer = aBuffer.data();
 determineTextureFormat(24, nFormat, nType);
 maTexture.Read(nFormat, nType, pBuffer);
+sal_uInt16 nSourceBytesPerRow = lclBytesPerRow(24, mnWidth);
 
-int nShift = 7;
-size_t nIndex = 0;
-
-sal_uInt8* pCurrent = pBuffer;
+std::unique_ptr pWriter;
+switch(mnBits)
+{
+case 1:
+pWriter.reset(new ScanlineWriter(maPalette, 8));
+break;
+case 4:
+default:
+pWriter.reset(new ScanlineWriter(maPalette, 2));
+break;
+}
 
 for (int y = 0; y < mnHeight; ++y)
 {
+sal_uInt8* pSource = &pBuffer[y * nSourceBytesPerRow];
+sal_uInt8* pDestination = &pData[y * mnBytesPerRow];
+
+pWriter->nextLine(pDestination);
+
 for (int x = 0; x < mnWidth; ++x)
 {
-if (nShift < 0)
-{
-nShift = 7;
-nIndex++;
-

Re: Pushing to LibO-5-2

2016-06-21 Thread Christian Lohmaier

On Sun, Jun 19, 2016 at 9:07 AM, jan iversen
 wrote:
>
> As a new committer (thanks again for your confidence), I don't know yet all
> the rules and I prefer to ask before breaking something.
>
> Asking is clearly better than breaking :-)
>
> As it is for 5-2 branch, do they require review from someone else than me,
> before they can be pushed? (commits were already reviewed for master by jan)
>
> Our review rules are described here (and how to add a patch to a branch):
> https://wiki.documentfoundation.org/Development/Branches
> Your patches are fixes to a X-Y branch, so no further review required.

Only in beta phase does a x-y branch not require review. after that it
needs one review.

And as Stephan pointed out: Only bugfixes go in.

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

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

2016-06-21 Thread Noel Grandin

 oox/source/docprop/docprophandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46bf504e0384d7491b9543604e594228c64318a1
Author: Noel Grandin 
Date:   Tue Jun 21 12:59:50 2016 +0200

simplify

Change-Id: I67de532443cbb9e64bed67fe28ee94fef38f5eae

diff --git a/oox/source/docprop/docprophandler.cxx 
b/oox/source/docprop/docprophandler.cxx
index b71c5ec..773a6e5 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -305,7 +305,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( 
::sal_Int32 nElement, const
 if ( xAttribs.is() && xAttribs->hasAttribute( XML_name ) )
 m_aCustomPropertyName = xAttribs->getValue( XML_name );
 }
-else if ( m_nState && m_nInBlock && m_nInBlock == 2 && getNamespace( 
nElement ) == NMSP_officeDocPropsVT )
+else if ( m_nState && m_nInBlock == 2 && getNamespace( nElement ) == 
NMSP_officeDocPropsVT )
 {
 m_nType = nElement;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: pyuno/Library_pythonloader.mk pyuno/source

2016-06-21 Thread Stephan Bergmann

 pyuno/Library_pythonloader.mk |1 +
 pyuno/source/loader/pyuno_loader.cxx  |6 --
 pyuno/source/module/pyuno_adapter.cxx |4 +++-
 pyuno/source/module/pyuno_runtime.cxx |   10 --
 pyuno/source/module/pyuno_type.cxx|7 +--
 5 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 038069806e4e2a8760fa415a23c28ccd338239f4
Author: Stephan Bergmann 
Date:   Tue Jun 21 12:46:45 2016 +0200

Clean up uses of Any::getValue() in pyuno

Change-Id: I35c4ac0b84e439982f87420aa7587c99ee367920

diff --git a/pyuno/Library_pythonloader.mk b/pyuno/Library_pythonloader.mk
index f359057..adc622e 100644
--- a/pyuno/Library_pythonloader.mk
+++ b/pyuno/Library_pythonloader.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,pythonloader,\
 ))
 
 $(eval $(call gb_Library_use_externals,pythonloader,\
+boost_headers \
 python \
 ))
 
diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index ef16cfb..af83541 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -22,6 +22,8 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -71,8 +73,8 @@ static void raiseRuntimeExceptionWhenNeeded() throw ( 
RuntimeException )
 css::uno::Any a = runtime.extractUnoException( excType, excValue, 
excTraceback );
 OUStringBuffer buf;
 buf.append( "python-loader:" );
-if( a.hasValue() )
-buf.append( static_cast(a.getValue())->Message );
+if( auto e = o3tl::tryAccess(a) )
+buf.append( e->Message );
 throw RuntimeException( buf.makeStringAndClear() );
 }
 }
diff --git a/pyuno/source/module/pyuno_adapter.cxx 
b/pyuno/source/module/pyuno_adapter.cxx
index 77abd7d..cf60272 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -18,6 +18,8 @@
  */
 #include "pyuno_impl.hxx"
 
+#include 
+
 #include 
 #include 
 
@@ -87,7 +89,7 @@ void raiseInvocationTargetExceptionWhenNeeded( const Runtime 
&runtime )
 PyErr_Fetch(reinterpret_cast(&excType), 
reinterpret_cast(&excValue), 
reinterpret_cast(&excTraceback));
 Any unoExc( runtime.extractUnoException( excType, excValue, 
excTraceback ) );
 throw InvocationTargetException(
-static_cast(unoExc.getValue())->Message,
+o3tl::doAccess(unoExc)->Message,
 Reference(), unoExc );
 }
 }
diff --git a/pyuno/source/module/pyuno_runtime.cxx 
b/pyuno/source/module/pyuno_runtime.cxx
index 7d7cfeb..1cc9447 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -22,6 +22,7 @@
 
 #include "pyuno_impl.hxx"
 
+#include 
 #include 
 #include 
 #include 
@@ -378,7 +379,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
 }
 case typelib_TypeClass_CHAR:
 {
-sal_Unicode c = *static_cast(a.getValue());
+sal_Unicode c = *o3tl::forceAccess(a);
 return PyRef( PyUNO_char_new( c , *this ), SAL_NO_ACQUIRE );
 }
 case typelib_TypeClass_BOOLEAN:
@@ -491,15 +492,12 @@ PyRef Runtime::any2PyObject (const Any &a ) const
 throw RuntimeException( buf.makeStringAndClear() );
 }
 
-if( css::uno::TypeClass_EXCEPTION == a.getValueTypeClass() )
+if( auto e = o3tl::tryAccess(a) )
 {
 // add the message in a standard python way !
 PyRef args( PyTuple_New( 1 ), SAL_NO_ACQUIRE, NOT_NULL );
 
-// assuming that the Message is always the first member, w
-void const *pData = a.getValue();
-OUString message = *static_cast(pData);
-PyRef pymsg = ustring2PyString( message );
+PyRef pymsg = ustring2PyString( e->Message );
 PyTuple_SetItem( args.get(), 0 , pymsg.getAcquired() );
 // the exception base functions want to have an "args" tuple,
 // which contains the message
diff --git a/pyuno/source/module/pyuno_type.cxx 
b/pyuno/source/module/pyuno_type.cxx
index c2472e4..b522b8d 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -18,6 +18,8 @@
  */
 #include "pyuno_impl.hxx"
 
+#include 
+
 #include 
 #include 
 
@@ -220,13 +222,14 @@ Type PyType2Type( PyObject * o ) throw(RuntimeException )
 buf.append( "type " ).append(name).append( " is unknown" );
 throw RuntimeException( buf.makeStringAndClear() );
 }
-if( desc.get()->eTypeClass != (typelib_TypeClass) *static_cast(enumValue.getValue()) )
+css::uno::TypeClass tc = *o3tl::doAccess(enumValue);
+if( static_cast(desc.get()->eTypeClass) != tc )
 {
 OUStringBuffer buf;
 buf.append( "pyuno.checkType: " ).append(name).append( " is a " );
 buf.appendAscii( typeClassToString( (TypeClass) 
desc.get()->eTypeClass) );
 buf.append( ", but type got construct with typeclass " );
-buf.appendAscii( typeClassToStrin

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

2016-06-21 Thread Pranav Kant

 loolwsd/LOOLWSD.cpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 31009fa9c10212afa6f29f27b61286ce90bdd140
Author: Pranav Kant 
Date:   Tue Jun 21 16:06:12 2016 +0530

loolwsd: Handle document URIs with spaces

DocumentBroker stores encoded docKey, when child answers with
dockey in its query params, Poco::URI::getQueryParameter gives
decoded docKey -> mismatch -> document load failed.

Change-Id: I53d7cf9d932b9193f15f56ec74db24e279cf3b94

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 0947548..b194ea2 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -968,7 +968,8 @@ public:
 }
 else if (param.first == "docKey")
 {
-docKey = param.second;
+// We store encoded docKey in DocumentBroker only
+URI::encode(param.second, "", docKey);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Noel Grandin

 editeng/source/editeng/impedit3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc66f408f99602618be12ce6c47152233291e1db
Author: Noel Grandin 
Date:   Tue Jun 21 11:39:45 2016 +0200

fix DBG_ASSERT condition to match message

Change-Id: I7073d3063d17ade9b0d4f88013c47eabb646af58

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index b4c7bb6..9fdb389 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1848,7 +1848,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* 
pParaPortion, EditLine* pLine, Te
 pNode->GetString(), nBreakPos, GetLocale( EditPaM( pNode, 
nBreakPos ) ), css::i18n::WordType::DICTIONARY_WORD, true);
 sal_Int32 nWordStart = nBreakPos;
 sal_Int32 nWordEnd = aBoundary.endPos;
-DBG_ASSERT( nWordEnd > nWordStart, "ImpBreakLine: Start >= End?" );
+DBG_ASSERT( nWordEnd >= nWordStart, "Start >= End?" );
 
 sal_Int32 nWordLen = nWordEnd - nWordStart;
 if ( ( nWordEnd >= nMaxBreakPos ) && ( nWordLen > 3 ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Miklos Vajna

 include/vcl/ITiledRenderable.hxx  |9 -
 sc/inc/docuno.hxx |3 ---
 sc/source/ui/unoobj/docuno.cxx|4 
 sd/source/ui/inc/unomodel.hxx |2 --
 sd/source/ui/unoidl/unomodel.cxx  |4 
 sw/inc/unotxdoc.hxx   |2 --
 sw/source/uibase/uno/unotxdoc.cxx |4 
 7 files changed, 28 deletions(-)

New commits:
commit e65b5c19985d725779d8381cc3bd75c441c0ff2e
Author: Miklos Vajna 
Date:   Tue Jun 21 10:45:37 2016 +0200

Remove no longer needed vcl::ITiledRenderable::registerCallback()

All clients has been changed to use
SfxViewShell::registerLibreOfficeKitViewCallback() instead.

Change-Id: I2538268dc9c4b449f68b5d2b05a72de584c29fd0
Reviewed-on: https://gerrit.libreoffice.org/26540
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 9c82ba8..65043a0 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -102,15 +102,6 @@ public:
 virtual void initializeForTiledRendering(const 
css::uno::Sequence& rArguments) = 0;
 
 /**
- * Registers a callback that will be invoked whenever the tiled renderer
- * wants to notify the client about an event.
- *
- * @param pCallback is the callback function
- * @param pData is private data of the client that will be sent back when 
the callback is invoked
- */
-virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) = 0;
-
-/**
  * Posts a keyboard event on the document.
  *
  * @see lok::Document::postKeyEvent().
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 80ab14d..69833ea 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -381,9 +381,6 @@ public:
 /// @see vcl::ITiledRenderable::initializeForTiledRendering().
 virtual void initializeForTiledRendering(const 
css::uno::Sequence& rArguments) override;
 
-/// @see vcl::ITiledRenderable::registerCallback().
-virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) override;
-
 /// @see vcl::ITiledRenderable::postKeyEvent().
 virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 2dfbc2c..af54d38 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -554,10 +554,6 @@ Size ScModelObj::getDocumentSize()
 return aSize;
 }
 
-void ScModelObj::registerCallback(LibreOfficeKitCallback /*pCallback*/, void* 
/*pData*/)
-{
-}
-
 void ScModelObj::postKeyEvent(int nType, int nCharCode, int nKeyCode)
 {
 SolarMutexGuard aGuard;
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index c1097d1..894ff3a 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -247,8 +247,6 @@ public:
 
 /// @see vcl::ITiledRenderable::initializeForTiledRendering().
 virtual void initializeForTiledRendering(const 
css::uno::Sequence& rArguments) override;
-/// @see vcl::ITiledRenderable::registerCallback().
-virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) override;
 /// @see vcl::ITiledRenderable::postKeyEvent().
 virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
 /// @see vcl::ITiledRenderable::postMouseEvent().
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ebc6103..af123a9 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2415,10 +2415,6 @@ void 
SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence& rArguments) override;
-/// @see vcl::ITiledRenderable::registerCallback().
-virtual void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData) override;
 /// @see vcl::ITiledRenderable::postKeyEvent().
 virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override;
 /// @see vcl::ITiledRenderable::postMouseEvent().
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 5815ec0..c5cae92 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3299,10 +3299,6 @@ void SwXTextDocument::initializeForTiledRendering(const 
css::uno::Sequencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Pranav Kant

 loleaflet/dist/loleaflet.html|   21 +
 loleaflet/src/control/Control.Menubar.js |   21 +
 loleaflet/src/core/Socket.js |   12 +---
 3 files changed, 51 insertions(+), 3 deletions(-)

New commits:
commit 90aee41c7019b1cf9c4d6fa0258ad1feb6f61ff0
Author: Pranav Kant 
Date:   Tue Jun 21 15:05:11 2016 +0530

loleaflet: Dialog to show loolwsd, lokit version information

Change-Id: Ie05f0597d3464b5e7705bd1d1ff4ab5c03af013f

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index a9f6613..0a1bb9a 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -136,5 +136,26 @@
 
 
 
+
+  About LibreOffice Online
+  
+  This version of LibreOffice Online is powered 
by
+  
+LOOLWSD
+
+  
+  
+LOKit
+
+  
+
+
+
+var translatableContent = 
document.getElementsByClassName("translatable");
+for (var i=0; i < translatableContent.length; i++) {
+translatableContent[i].innerHTML = 
translatableContent[i].innerHTML.toLocaleString();
+}
+
+
 
 
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 9bdfba6..8ac4e25 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -4,6 +4,7 @@
 
 /* global $ _ map title vex */
 L.Control.Menubar = L.Control.extend({
+   // TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
options: {
text:  [
{name: _('File'), type: 'menu', menu: [{name: 
_('Save'), type: 'unocommand', uno: '.uno:Save'},
@@ -44,6 +45,8 @@ L.Control.Menubar = L.Control.extend({


{name: _('Column'), type: 'unocommand', uno: 
'.uno:EntireColumn'},


{name: _('Cell'), type: 'unocommand', uno: '.uno:EntireCell'}]},

  {name: _('Merge cells'), type: 'unocommand', uno: 
'.uno:MergeCells'}]
+   },
+   {name: _('Help'), type: 'menu', menu: [{name: 
_('About'), id: 'about', type: 'action'}]
}
],
 
@@ -86,6 +89,8 @@ L.Control.Menubar = L.Control.extend({

 {name: _('Delete slide'), id: 'deletepage', type: 'action'},

 {type: 'separator'},

 {name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'}]
+   },
+   {name: _('Help'), type: 'menu', menu: [{name: 
_('About'), id: 'about', type: 'action'}]
}
],
 
@@ -122,6 +127,8 @@ L.Control.Menubar = L.Control.extend({

 {type: 'separator'},

 {name: _('Delete row'), type: 'unocommand', uno: 
'.uno:DeleteRows'},

 {name: _('Delete column'), type: 'unocommand', uno: 
'.uno:DeleteColumns'}]
+   },
+   {name: _('Help'), type: 'menu', menu: [{name: 
_('About'), id: 'about', type: 'action'}]
}
],
 
@@ -290,6 +297,20 @@ L.Control.Menubar = L.Control.extend({
message: _('Are you sure you want to delete 
this slide?'),
callback: this._onDeleteSlide
}, this);
+   } else if (id === 'about') {
+   $('#about-dialog').modal({
+   overlayClose:true,
+   opacity: 80,
+   overlayCss: {
+   backgroundColor : '#000'
+   },
+   containerCss: {
+   overflow : 'hidden',
+   backgroundColor : '#fff',
+   padding : '20px',
+   border : '2px solid #000'
+   }
+

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sc/CppunitTest_sc_screenshots.mk sc/qa

2016-06-21 Thread Katarina Behrens

 sc/CppunitTest_sc_screenshots.mk   |   63 
 sc/qa/unit/screenshots/data/empty.ods  |binary
 sc/qa/unit/screenshots/screenshots.cxx |  173 +
 3 files changed, 236 insertions(+)

New commits:
commit ab52bdc42a42ed744d889aa0cf37ec55fd42506f
Author: Katarina Behrens 
Date:   Tue Jun 21 11:21:18 2016 +0200

Opening some sc dialogs from cppunit, first cut

Change-Id: I4e56f0264ada77e24f5d71fa9eaf48e5eedaaae8

diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk
new file mode 100644
index 000..ac1aa41
--- /dev/null
+++ b/sc/CppunitTest_sc_screenshots.mk
@@ -0,0 +1,63 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_screenshots))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_screenshots, \
+sc/qa/unit/screenshots/screenshots \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_screenshots, \
+comphelper \
+cppu \
+cppuhelper \
+editeng \
+sal \
+sfx \
+svl \
+svt \
+svxcore \
+sc \
+scui \
+test \
+unotest \
+vcl \
+tl \
+utl \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_screenshots,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_screenshots,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_screenshots,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_screenshots))
+$(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,sc_screenshots))
+
+$(eval $(call gb_CppunitTest_use_rdb,sc_screenshots,services))
+
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sc_screenshots))
+
+$(call gb_CppunitTest_get_target,sc_screenshots) : $(call 
gb_AllLangResTarget_get_target,sc)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/unit/screenshots/data/empty.ods 
b/sc/qa/unit/screenshots/data/empty.ods
new file mode 100644
index 000..14b4232
Binary files /dev/null and b/sc/qa/unit/screenshots/data/empty.ods differ
diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
new file mode 100644
index 000..fb27cab
--- /dev/null
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -0,0 +1,173 @@
+/* -*- 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/.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+using namespace css;
+
+#if !defined(WNT) && !defined(MACOSX)
+static const char* DATA_DIRECTORY = "/sc/qa/unit/screenshots/data/";
+#endif
+
+class ScScreenshotTest : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
+{
+public:
+ScScreenshotTest();
+virtual void setUp() SAL_OVERRIDE;
+virtual void tearDown() SAL_OVERRIDE;
+
+#if !defined(WNT) && !defined(MACOSX)
+void testOpeningSomeDialog();
+//void testOpeningModelessDialogs();
+#endif
+
+CPPUNIT_TEST_SUITE(ScScreenshotTest);
+#if !defined(WNT) && !defined(MACOSX)
+CPPUNIT_TEST(testOpeningSomeDialog);
+//CPPUNIT_TEST(testOpeningModelessDialogs);
+#endif
+CPPUNIT_TEST_SUITE_END();
+
+private:
+#if !defined(WNT) && !defined(MACOSX)
+ScModelObj* createDoc(const char* pName);
+
+#endif
+
+uno::Reference mxComponent;
+};
+
+ScScreenshotTest::ScScreenshotTest()
+{
+}
+
+void ScScreenshotTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+
mxDesktop.set(css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
+}
+
+void ScScreenshotTest::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
+#if !defined(WNT) && !defined(MACOSX)
+ScModelObj* ScScreenshotTest::createDoc(const char* pName)
+{
+if (mxComponent.is())
+mxComponent->dispose();
+mxComponent = loadFromDesktop(m_directories.getURLFromSrc(DATA_DIRECTORY) 
+ OUString::createFromAscii(pName), "com.sun.star.sheet.SpreadsheetDocument");
+ScModelObj* pModelObj = dynamic_cast(mxComponent.ge

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

2016-06-21 Thread Tor Lillqvist

 vcl/source/gdi/dibtools.cxx |   25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

New commits:
commit e63be69226a6282d0dac1bc327d8fa8f7e7bbada
Author: Tor Lillqvist 
Date:   Tue Jun 21 11:24:37 2016 +0300

Put more local functions into the unnamed namespace

Change-Id: I483a1943c3c229aa839a72b333061f92c6b728ba

diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 4e2dd86..7ef9463 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -40,9 +40,9 @@
 
 typedef sal_Int32 FXPT2DOT30;
 
-// Avoid conflict with wingdi.h
 namespace
 {
+
 struct CIEXYZ
 {
 FXPT2DOT30  aXyzX;
@@ -143,20 +143,17 @@ struct DIBV5Header : public DIBInfoHeader
 ~DIBV5Header()
 {}
 };
-}
-namespace
+
+inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount )
 {
-inline sal_uInt16 discretizeBitcount( sal_uInt16 nInputCount )
-{
-return ( nInputCount <= 1 ) ? 1 :
-   ( nInputCount <= 4 ) ? 4 :
-   ( nInputCount <= 8 ) ? 8 : 24;
-}
+return ( nInputCount <= 1 ) ? 1 :
+   ( nInputCount <= 4 ) ? 4 :
+   ( nInputCount <= 8 ) ? 8 : 24;
+}
 
-inline bool isBitfieldCompression( ScanlineFormat nScanlineFormat )
-{
-return (ScanlineFormat::N16BitTcLsbMask == nScanlineFormat) || 
(ScanlineFormat::N32BitTcMask == nScanlineFormat);
-}
+inline bool isBitfieldCompression( ScanlineFormat nScanlineFormat )
+{
+return (ScanlineFormat::N16BitTcLsbMask == nScanlineFormat) || 
(ScanlineFormat::N32BitTcMask == nScanlineFormat);
 }
 
 bool ImplReadDIBInfoHeader(SvStream& rIStm, DIBV5Header& rHeader, bool& 
bTopDown, bool bMSOFormat)
@@ -1631,6 +1628,8 @@ bool ImplWriteDIB(
 return bRet;
 }
 
+} // unnamed namespace
+
 bool ReadDIB(
 Bitmap& rTarget,
 SvStream& rIStm,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/ClientSession.cpp loolwsd/LibreOfficeKit.hpp loolwsd/LOOLForKit.cpp loolwsd/LOOLKit.cpp loolwsd/LOOLKit.hpp loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hp

2016-06-21 Thread Pranav Kant

 loolwsd/ClientSession.cpp  |   11 +--
 loolwsd/LOOLForKit.cpp |   12 
 loolwsd/LOOLKit.cpp|   15 +--
 loolwsd/LOOLKit.hpp|3 ++-
 loolwsd/LOOLWSD.cpp|   11 ++-
 loolwsd/LOOLWSD.hpp|1 +
 loolwsd/LibreOfficeKit.hpp |   13 +
 loolwsd/Util.cpp   |6 +++---
 loolwsd/Util.hpp   |4 ++--
 loolwsd/protocol.txt   |8 +++-
 10 files changed, 68 insertions(+), 16 deletions(-)

New commits:
commit b83ac269fa790f674cfe5b1bd90e9d6aadc28df4
Author: Pranav Kant 
Date:   Tue Jun 21 00:28:00 2016 +0530

loolwsd: Send LOKit version information to clients

Send as a response to 'loolclient' message received from the
client

Change-Id: I3d33f9fd087489aa9bf5a94f591ab04e208cbf13

diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index 1fb1ec7..ad73943 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -74,11 +74,18 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 if (std::get<0>(versionTuple) != ProtocolMajorVersionNumber ||
 std::get<1>(versionTuple) != ProtocolMinorVersionNumber)
 {
-sendTextFrame("error: cmd=loolclient kind=badversion");
+sendTextFrame("error: cmd=loolclient kind=badprotocolversion");
 return false;
 }
 
-return sendTextFrame("loolserver " + GetProtocolVersion());
+// Send LOOL version information
+std::string version, hash;
+Util::getVersionInfo(version, hash);
+sendTextFrame("loolserver " + version + " " + hash + " " + 
GetProtocolVersion());
+// Send LOKit version information
+sendTextFrame("lokitversion " + LOOLWSD::LOKitVersion);
+
+return true;
 }
 
 if (tokens[0] == "takeedit")
diff --git a/loolwsd/LOOLForKit.cpp b/loolwsd/LOOLForKit.cpp
index 9313adc..c29de0d 100644
--- a/loolwsd/LOOLForKit.cpp
+++ b/loolwsd/LOOLForKit.cpp
@@ -135,7 +135,8 @@ static void cleanupChildren()
 static int createLibreOfficeKit(const std::string& childRoot,
 const std::string& sysTemplate,
 const std::string& loTemplate,
-const std::string& loSubPath)
+const std::string& loSubPath,
+bool queryVersion = false)
 {
 Log::debug("Forking a loolkit process.");
 
@@ -157,7 +158,7 @@ static int createLibreOfficeKit(const std::string& 
childRoot,
 Thread::sleep(std::stoul(std::getenv("SLEEPKITFORDEBUGGER")) * 
1000);
 }
 
-lokit_main(childRoot, sysTemplate, loTemplate, loSubPath, 
NoCapsForKit);
+lokit_main(childRoot, sysTemplate, loTemplate, loSubPath, 
NoCapsForKit, queryVersion);
 }
 else
 {
@@ -308,7 +309,8 @@ int main(int argc, char** argv)
 Log::info("Preinit stage OK.");
 
 // We must have at least one child, more are created dynamically.
-if (createLibreOfficeKit(childRoot, sysTemplate, loTemplate, loSubPath) < 
0)
+// Ask this first child to send version information to master process
+if (createLibreOfficeKit(childRoot, sysTemplate, loTemplate, loSubPath, 
true) < 0)
 {
 Log::error("Failed to create a kit process.");
 std::_Exit(Application::EXIT_SOFTWARE);
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index f63f4cb..be7fb99 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1000,7 +1000,8 @@ void lokit_main(const std::string& childRoot,
 const std::string& sysTemplate,
 const std::string& loTemplate,
 const std::string& loSubPath,
-bool noCapabilities)
+bool noCapabilities,
+bool queryVersion)
 {
 // Reinitialize logging when forked.
 Log::initialize("kit");
@@ -1156,7 +1157,17 @@ void lokit_main(const std::string& childRoot,
 // Open websocket connection between the child process and WSD.
 HTTPClientSession cs("127.0.0.1", MasterPortNumber);
 cs.setTimeout(0);
-HTTPRequest request(HTTPRequest::HTTP_GET, std::string(NEW_CHILD_URI) 
+ "pid=" + pid);
+
+std::string requestUrl = std::string(NEW_CHILD_URI) + "pid=" + pid;
+if (queryVersion)
+{
+char* versionInfo = loKit->getVersionInfo();
+std::string encodedVersionStr;
+URI::encode(std::string(versionInfo), "", encodedVersionStr);
+requestUrl += "&version=" + encodedVersionStr;
+free(versionInfo);
+}
+HTTPRequest request(HTTPRequest::HTTP_GET, requestUrl);
 HTTPResponse response;
 auto ws = std::make_shared(cs, request, response);
 ws->setReceiveTimeout(0);
diff --git a/loolwsd/LOOLKit.hpp b/loolwsd/LOOLKit.hpp
index 2f43022..4206133 100644
--- a/loolwsd/LOOLKit.hpp
+++ b/loolwsd/LOOLKit.hpp
@@ -13,7 +1

[Libreoffice-commits] core.git: desktop/source include/LibreOfficeKit libreofficekit/source

2016-06-21 Thread Pranav Kant

 desktop/source/lib/init.cxx|   12 
 include/LibreOfficeKit/LibreOfficeKit.h|3 +++
 include/LibreOfficeKit/LibreOfficeKit.hxx  |   13 +
 include/LibreOfficeKit/LibreOfficeKitGtk.h |   13 +
 libreofficekit/source/gtk/lokdocview.cxx   |9 +
 5 files changed, 50 insertions(+)

New commits:
commit 90c75f775b6d1ca68389782a3768ee554b528e5d
Author: Pranav Kant 
Date:   Tue Jun 21 00:15:38 2016 +0530

lok: Expose LO version information

Change-Id: Ided924e928c04385457c7a2e231fdf57e7e38970

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a150535..2d30a32 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -73,6 +73,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -656,6 +657,7 @@ static void lo_setOptionalFeatures(LibreOfficeKit* pThis, 
uint64_t features);
 static voidlo_setDocumentPassword(LibreOfficeKit* pThis,
const char* pURL,
const char* pPassword);
+static char*   lo_getVersionInfo(LibreOfficeKit* pThis);
 
 LibLibreOffice_Impl::LibLibreOffice_Impl()
 : m_pOfficeClass( gOfficeClass.lock() )
@@ -677,6 +679,7 @@ LibLibreOffice_Impl::LibLibreOffice_Impl()
 m_pOfficeClass->getFilterTypes = lo_getFilterTypes;
 m_pOfficeClass->setOptionalFeatures = lo_setOptionalFeatures;
 m_pOfficeClass->setDocumentPassword = lo_setDocumentPassword;
+m_pOfficeClass->getVersionInfo = lo_getVersionInfo;
 
 gOfficeClass = m_pOfficeClass;
 }
@@ -2002,6 +2005,15 @@ static void lo_setDocumentPassword(LibreOfficeKit* pThis,
 pLib->mInteractionMap.find(OString(pURL))->second->SetPassword(pPassword);
 }
 
+static char* lo_getVersionInfo(LibreOfficeKit* /*pThis*/)
+{
+const OString sVersionStr = 
OUStringToOString(ReplaceStringHookProc("%PRODUCTNAME %PRODUCTVERSION 
%PRODUCTEXTENSION %BUILDID"), RTL_TEXTENCODING_UTF8);
+
+char* pVersion = static_cast(malloc(sVersionStr.getLength() + 1));
+strcpy(pVersion, sVersionStr.getStr());
+return pVersion;
+}
+
 static void force_c_locale()
 {
 // force locale (and resource files loaded) to en-US
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index a337bc3..559d28a 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -75,6 +75,9 @@ struct _LibreOfficeKitClass
 void (*setDocumentPassword) (LibreOfficeKit* pThis,
 char const* pURL,
 char const* pPassword);
+
+/// @see lok::Office::getVersionInfo().
+char* (*getVersionInfo) (LibreOfficeKit* pThis);
 #endif
 
 };
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index c496e2e..46a5e96 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -546,6 +546,19 @@ public:
 {
 mpThis->pClass->setDocumentPassword(mpThis, pURL, pPassword);
 }
+
+/**
+ * Get version information of the LOKit process
+ *
+ * @returns string containing version information in format:
+ * PRODUCT_NAME PRODUCT_VERSION PRODUCT_EXTENSION BUILD_ID
+ *
+ * Eg: LibreOffice 5.3 .0.0 alpha0 
+ */
+inline char* getVersionInfo()
+{
+return mpThis->pClass->getVersionInfo(mpThis);
+}
 #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
 };
 
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index a0082be..4b4284e 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -316,6 +316,19 @@ void
lok_doc_view_set_document_password (LOKDocView*
 const 
gchar* pPassword);
 
 /**
+ * lok_doc_view_get_version_info:
+ * @pDocView: The #LOKDocView instance
+ *
+ * Get version information of underlying LOKit process
+ *
+ * Returns: string containing version information in format
+ * PRODUCT_NAME PRODUCT_VERSION PRODUCT_EXTENSION BUILD_ID
+ *
+ * Eg: LibreOffice 5.3 .0.0.alpha0 
+ */
+gchar* lok_doc_view_get_version_info   
(LOKDocView* pDocView);
+
+/**
  * lok_doc_view_pixel_to_twip:
  * @pDocView: The #LOKDocView instance
  * @fInput: The value in pixels to convert to twips
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 90f01d9..60d4cce 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -3162,6 +3162,15 @@ lok_doc_view_set_document_password (LOKDocView* pDocView,
 priv->m_pOffice->pClass->setDocumentPassword(priv->m_pOffice, pURL, 
pPassword);
 }
 
+SAL_DLLPUBLIC_EXPORT gch

Re: Disabling of OpenCL by default in Calc

2016-06-21 Thread Markus Mohrhard

Hey,

On Tue, Jun 21, 2016 at 9:30 AM, Stephan Bergmann 
wrote:

> On 06/21/2016 02:51 AM, Markus Mohrhard wrote:
>
>> so I'd like to disable OpenCL by default in Calc. I was once again hit
>> by some nasty issue in the OpenCL code that makes calc unusable for me.
>> In my opinion we have way too many issues with it and it reduces the
>> reliability of Calc ( who trusts his OpenCL driver enough to do his
>> taxes with OpenCL enabled).
>>
>> Unless someone does some huge refactoring of the OpenCL code and makes
>> sure that we can trust the OpenCL backend as much as our normal formula
>> code I would prefer if we disable it. In this case it is a regression
>> from 40b0b9ab7703a165295b008f47df14d2ec076fb1 but that we don't detect
>> such fundamental problems because of the different engines and the
>> different devices makes it hard to rely on the OpenCL code.
>>
>
> Can you give a short description of what the problem actually is?
>

The device selection code that runs with a new profile has become quite
slow (taking several dozen seconds) which makes Calc which makes tests
extremely slow and causes dozens of seconds delay when you create the first
formula. I have not yet completely understood what is going wrong.

But that is not the only issue. Just going to bugzilla gives several open
issues and serious ones show up from time to time. E.g.
https://bugs.documentfoundation.org/show_bug.cgi?id=99053

It is also quite obvious in all the hard to reproduce calc bugs as now in
general one of the first questions is about OpenCL as nobody is currently
trusting the OpenCL device and we have no way to check the OpenCL device.
It is a bit similar to how the OpenGL drivers have to blacklisted with the
difference that for the OpenCL ones it is more serious as it causes wrong
spreadsheet calculations.

Regards,
Markus

> [...]
>
>> It would be nice if this could be put onto the ESC agenda so that we
>> could disable it in 5.2.
>>
>
> ___
> 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: sfx2/source

2016-06-21 Thread Miklos Vajna

 sfx2/source/view/classificationhelper.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 1811e656f08ba011a3c2a51cc60e90d2fa58e4c2
Author: Miklos Vajna 
Date:   Tue Jun 21 09:16:26 2016 +0200

tdf#100352 sfx classification: support localized policy files

The example policy is at:

instdir/share/classification/example.xml

If there is a localized version, e.g.:

instdir/share/classification/example_hu-HU.xml

(same syntax as already used for the autocorrect files), then use that
instead of the configured policy.

Change-Id: I0369e69f90a633af0676981f0c5760f8477b3c8c
Reviewed-on: https://gerrit.libreoffice.org/26535
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index f7357a4..cda045f 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -355,6 +356,19 @@ void SfxClassificationHelper::Impl::parsePolicy()
 uno::Reference xComponentContext = 
comphelper::getProcessComponentContext();
 SvtPathOptions aOptions;
 OUString aPath = aOptions.GetClassificationPath();
+
+// See if there is a localized variant next to the configured XML.
+OUString aExtension(".xml");
+if (aPath.endsWith(aExtension))
+{
+OUString aBase = aPath.copy(0, aPath.getLength() - 
aExtension.getLength());
+const LanguageTag& rLanguageTag = 
Application::GetSettings().GetLanguageTag();
+// Expected format is "_xx-XX.xml".
+OUString aLocalized = aBase + "_" + rLanguageTag.getBcp47() + 
aExtension;
+if (FStatHelper::IsDocument(aLocalized))
+aPath = aLocalized;
+}
+
 SvStream* pStream = utl::UcbStreamHelper::CreateStream(aPath, 
StreamMode::READ);
 uno::Reference xInputStream(new 
utl::OStreamWrapper(*pStream));
 xml::sax::InputSource aParserInput;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread David Tardon

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

New commits:
commit f5c1ba7054cfe6d7b75cf9037d616706fb1e23ab
Author: David Tardon 
Date:   Tue Jun 21 10:31:57 2016 +0200

tdf#100455 check for minimal dconf version

Change-Id: I8e164bb4afc221cefd93d519569cdefa4486349f
(cherry picked from commit 461e91ca91186c1ed23316127fffe4230e3aacd2)
Signed-off-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index cf3fb7f..e94e376 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10514,7 +10514,7 @@ AC_SUBST([COLLADA2GLTF_LIBS])
 AC_SUBST([SYSTEM_COLLADA2GLTF])
 
 if test "$enable_dconf" != no; then
-PKG_CHECK_MODULES([DCONF], [dconf], [], [
+PKG_CHECK_MODULES([DCONF], [dconf >= 0.15.2], [], [
 if test "$enable_dconf" = yes; then
 AC_MSG_ERROR([dconf not found])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2016-06-21 Thread David Tardon

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

New commits:
commit 461e91ca91186c1ed23316127fffe4230e3aacd2
Author: David Tardon 
Date:   Tue Jun 21 10:31:57 2016 +0200

tdf#100455 check for minimal dconf version

Change-Id: I8e164bb4afc221cefd93d519569cdefa4486349f

diff --git a/configure.ac b/configure.ac
index 97794c8..590e326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10587,7 +10587,7 @@ AC_SUBST([COLLADA2GLTF_LIBS])
 AC_SUBST([SYSTEM_COLLADA2GLTF])
 
 if test "$enable_dconf" != no; then
-PKG_CHECK_MODULES([DCONF], [dconf], [], [
+PKG_CHECK_MODULES([DCONF], [dconf >= 0.15.2], [], [
 if test "$enable_dconf" = yes; then
 AC_MSG_ERROR([dconf not found])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Stephan Bergmann

 svtools/source/config/optionsdrawinglayer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 85fba6b5b7f516e359d015ad31325feefffe1126
Author: Stephan Bergmann 
Date:   Tue Jun 21 10:21:46 2016 +0200

loplugin:override

Change-Id: I8ce79a9c4398657e2a6b4c94fecd21ade71e4ed0

diff --git a/svtools/source/config/optionsdrawinglayer.cxx 
b/svtools/source/config/optionsdrawinglayer.cxx
index fbf76ea..4964e9b 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -156,7 +156,7 @@ class SvtOptionsDrawinglayer_Impl : public ConfigItem
 {
 public:
 SvtOptionsDrawinglayer_Impl();
-~SvtOptionsDrawinglayer_Impl();
+~SvtOptionsDrawinglayer_Impl() override;
 
 virtual void Notify( const css::uno::Sequence& aPropertyNames) 
override;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-21 Thread Tor Lillqvist

 include/vcl/salbtype.hxx |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 81e3ca4f60e6ac0823c1233841c22a759cfe937f
Author: Tor Lillqvist 
Date:   Tue Jun 21 10:34:21 2016 +0300

Use real assert() instead of DBG_ASSERT()

These assertions guard important invariants. We use real assert() also
in the neighbouring bitmapaccess.hxx, for instance.

Drop annoying exclamation marks.

Change-Id: I9d08cb80b18e8f3a922357ec33c1418f8f1b33e6

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 7238e02..b713770 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -332,55 +332,55 @@ inline bool BitmapColor::IsIndex() const
 
 inline sal_uInt8 BitmapColor::GetRed() const
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 return mcRed;
 }
 
 inline void BitmapColor::SetRed( sal_uInt8 cRed )
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 mcRed = cRed;
 }
 
 inline sal_uInt8 BitmapColor::GetGreen() const
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 return mcGreen;
 }
 
 inline void BitmapColor::SetGreen( sal_uInt8 cGreen )
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 mcGreen = cGreen;
 }
 
 inline sal_uInt8 BitmapColor::GetBlue() const
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 return mcBlueOrIndex;
 }
 
 inline void BitmapColor::SetBlue( sal_uInt8 cBlue )
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 mcBlueOrIndex = cBlue;
 }
 
 inline sal_uInt8 BitmapColor::GetIndex() const
 {
-DBG_ASSERT( mbIndex, "Pixel represents color values!" );
+assert( mbIndex && "Pixel represents color values" );
 return mcBlueOrIndex;
 }
 
 inline void BitmapColor::SetIndex( sal_uInt8 cIndex )
 {
-DBG_ASSERT( mbIndex, "Pixel represents color values!" );
+assert( mbIndex && "Pixel represents color values" );
 mcBlueOrIndex = cIndex;
 }
 
 inline BitmapColor::operator Color() const
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 return Color( mcRed, mcGreen, mcBlueOrIndex );
 }
 
@@ -392,7 +392,7 @@ inline sal_uInt8 BitmapColor::GetBlueOrIndex() const
 
 inline BitmapColor& BitmapColor::Invert()
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 mcBlueOrIndex = ~mcBlueOrIndex;
 mcGreen = ~mcGreen;
 mcRed = ~mcRed;
@@ -402,15 +402,15 @@ inline BitmapColor& BitmapColor::Invert()
 
 inline sal_uInt8 BitmapColor::GetLuminance() const
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
 return (static_cast(mcBlueOrIndex) * 28UL + 
static_cast(mcGreen) * 151UL + static_cast(mcRed) 
* 77UL) >> 8;
 }
 
 
 inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, 
sal_uInt8 cTransparency )
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
-DBG_ASSERT( !rBitmapColor.mbIndex, "Pixel represents index into 
colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
+assert( !rBitmapColor.mbIndex && "Pixel represents index into colortable" 
);
 mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, 
rBitmapColor.mcBlueOrIndex, cTransparency );
 mcGreen = COLOR_CHANNEL_MERGE( mcGreen, rBitmapColor.mcGreen, 
cTransparency );
 mcRed = COLOR_CHANNEL_MERGE( mcRed, rBitmapColor.mcRed, cTransparency );
@@ -421,8 +421,8 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& 
rBitmapColor, sal_uIn
 
 inline sal_uInt16 BitmapColor::GetColorError( const BitmapColor& rBitmapColor 
) const
 {
-DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" );
-DBG_ASSERT( !rBitmapColor.mbIndex, "Pixel represents index into 
colortable!" );
+assert( !mbIndex && "Pixel represents index into colortable" );
+assert( !rBitmapColor.mbIndex && "Pixel represents index into colortable" 
);
 return static_cast(
 abs( static_cast(mcBlueOrIndex) - 
static_cast(rBitmapColor.mcBlueOrIndex) ) +
 abs( static_cast(mcGreen) - 
static_cast(rBitmapColor.mcGreen) ) +
@@ -544,19 +544,19 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 
nCount )
 
 inline const BitmapColor& BitmapPalette::operator[]( sal_uIn

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

2016-06-21 Thread Caolán McNamara

 sc/source/ui/app/transobj.cxx |   15 +++
 sc/source/ui/inc/transobj.hxx |8 +++-
 sc/source/ui/view/gridwin.cxx |   14 --
 sc/source/ui/view/select.cxx  |1 +
 sc/source/ui/view/tabcont.cxx |2 ++
 5 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit 7a347bbc24d2b7b1f520b249a5a20b06643f85c2
Author: CaolÃ¡n McNamara 
Date:   Mon Jun 20 12:13:02 2016 +0100

tdf#96540 dragging between sheets can change the current cursor position

so the at position at time of drop may not be that at the start of
the drag.

So set the current cursor position to ScTransferObj when the drag starts
and retrieve it later

Related to:

commit ac3b66057ba677903b6de354317417b267be0fa0
Author: Kohei Yoshida 
Date:   Thu Sep 16 11:09:29 2010 +0200

calc-selection-fixed-cursor.diff: Migrated

n#502717, i#21869, i#97093, when making selection, don't move the 
cursor position

and

commit c433fa0639ccf5caeb0c128c8a3794322e2a1c81
Author: Markus Mohrhard 
Date:   Fri Jul 6 02:04:44 2012 +0200

adjust the calculation of the cursor pos if ALT is used, fdo#48869

Change-Id: I6316717c860d999270aa7f0fb50af5f6dfc7efd7

I haven't used SetSourceCursorPos everywhere a ScTransferObj is created, 
just
where its created through a drag event

Change-Id: I50c36b4a2ba45426edebc1f1dfa5e262db3c5d03
Reviewed-on: https://gerrit.libreoffice.org/26512
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit f9b46bbd2446a6c9a0aaab31016536bda4a77294)

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 016e0e4..802533f 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -119,6 +119,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const 
TransferableObjectDesc
 aObjDesc( rDesc ),
 nDragHandleX( 0 ),
 nDragHandleY( 0 ),
+nSourceCursorX( MAXCOL + 1 ),
+nSourceCursorY( MAXROW + 1 ),
 nDragSourceFlags( 0 ),
 bDragWasInternal( false ),
 bUsedForLink( false ),
@@ -524,6 +526,19 @@ void ScTransferObj::SetDragHandlePos( SCCOL nX, SCROW nY )
 nDragHandleY = nY;
 }
 
+void ScTransferObj::SetSourceCursorPos( SCCOL nX, SCROW nY )
+{
+nSourceCursorX = nX;
+nSourceCursorY = nY;
+}
+
+bool ScTransferObj::WasSourceCursorInSelection() const
+{
+return
+nSourceCursorX >= aBlock.aStart.Col() && nSourceCursorX <= 
aBlock.aEnd.Col() &&
+nSourceCursorY >= aBlock.aStart.Row() && nSourceCursorY <= 
aBlock.aEnd.Row();
+}
+
 void ScTransferObj::SetVisibleTab( SCTAB nNew )
 {
 nVisibleTab = nNew;
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index b33c88b..9e2e823 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -48,6 +48,8 @@ private:
 css::uno::Reference xDragSourceRanges;
 SCCOL   nDragHandleX;
 SCROW   nDragHandleY;
+SCCOL   nSourceCursorX;
+SCROW   nSourceCursorY;
 SCTAB   nVisibleTab;
 sal_uInt16  nDragSourceFlags;
 boolbDragWasInternal;
@@ -82,8 +84,11 @@ public:
 SCROW   GetNonFilteredRows() const { return nNonFiltered; }
 SCCOL   GetDragHandleX() const  { return nDragHandleX; }
 SCROW   GetDragHandleY() const  { return nDragHandleY; }
+boolWasSourceCursorInSelection() const;
+SCCOL   GetSourceCursorX() const  { return nSourceCursorX; }
+SCROW   GetSourceCursorY() const  { return nSourceCursorY; }
 SCTAB   GetVisibleTab() const   { return nVisibleTab; }
-sal_uInt16  GetDragSourceFlags() const  { return 
nDragSourceFlags; }
+sal_uInt16  GetDragSourceFlags() const  { return nDragSourceFlags; 
}
 boolHasFilteredRows() const { return bHasFiltered; }
 boolGetUseInApi() const { return bUseInApi; }
 ScDocShell* GetSourceDocShell();
@@ -92,6 +97,7 @@ public:
 
 voidSetDrawPersist( const SfxObjectShellRef& rRef );
 voidSetDragHandlePos( SCCOL nX, SCROW nY );
+voidSetSourceCursorPos( SCCOL nX, SCROW nY );
 voidSetVisibleTab( SCTAB nNew );
 voidSetDragSource( ScDocShell* pSourceShell, const 
ScMarkData& rMark );
 voidSetDragSourceFlags( sal_uInt16 nFlags );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fa62d3f..ffaa9d9 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4214,8 +4214,18 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* 
pTransObj, SCCOL nDestPos
 {

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

2016-06-21 Thread Thorsten Behrens

 vcl/source/gdi/pdfwriter_impl.cxx |   60 +++---
 vcl/source/outdev/font.cxx|9 +++--
 vcl/source/outdev/text.cxx|5 +--
 3 files changed, 39 insertions(+), 35 deletions(-)

New commits:
commit 406e39fad66c6f4b0f589dcc682c57464b230d69
Author: Thorsten Behrens 
Date:   Tue Jun 21 03:43:19 2016 +0200

vcl: fprintf -> SAL_INFO

Only touching dbglevel > 0 code here, so clearly only
informational..

Change-Id: Id6991c93f971bcc2a8badc809b98870a85322992
Reviewed-on: https://gerrit.libreoffice.org/26531
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index f719e70..f29e8d1 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2410,7 +2410,7 @@ const sal_Char* PDFWriterImpl::getAttributeTag( 
PDFWriter::StructAttribute eAttr
 
 #if OSL_DEBUG_LEVEL > 1
 if( it == aAttributeStrings.end() )
-fprintf( stderr, "invalid PDFWriter::StructAttribute %d\n", eAttr );
+SAL_INFO("vcl.pdfwriter", "invalid PDFWriter::StructAttribute " << 
eAttr);
 #endif
 
 return it != aAttributeStrings.end() ? it->second : "";
@@ -2455,7 +2455,7 @@ const sal_Char* PDFWriterImpl::getAttributeValueTag( 
PDFWriter::StructAttributeV
 
 #if OSL_DEBUG_LEVEL > 1
 if( it == aValueStrings.end() )
-fprintf( stderr, "invalid PDFWriter::StructAttributeValue %d\n", eVal 
);
+SAL_INFO("vcl.pdfwriter", "invalid PDFWriter::StructAttributeValue " 
<< eVal);
 #endif
 
 return it != aValueStrings.end() ? it->second : "";
@@ -2531,7 +2531,7 @@ OString PDFWriterImpl::emitStructureAttributes( 
PDFStructureElement& i_rEle )
 {
 OSL_FAIL( "unresolved link id for Link structure" );
 #if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "unresolved link id %" SAL_PRIdINT32 " for 
Link structure\n", nLink );
+SAL_INFO("vcl.pdfwriter", "unresolved link id " << nLink << " 
for Link structure");
 {
 OStringBuffer aLine( "unresolved link id " );
 aLine.append( nLink );
@@ -2638,7 +2638,7 @@ sal_Int32 PDFWriterImpl::emitStructure( 
PDFStructureElement& rEle )
 {
 OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child 
structure element" );
 #if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "PDFWriterImpl::emitStructure: invalid 
child structure elemnt with id %" SAL_PRIdINT32 "\n", *it );
+SAL_INFO("vcl.pdfwriter", "PDFWriterImpl::emitStructure: 
invalid child structure elemnt with id " << *it);
 #endif
 }
 }
@@ -2647,7 +2647,7 @@ sal_Int32 PDFWriterImpl::emitStructure( 
PDFStructureElement& rEle )
 {
 OSL_FAIL( "PDFWriterImpl::emitStructure: invalid child structure 
id" );
 #if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "PDFWriterImpl::emitStructure: invalid child 
structure id %" SAL_PRIdINT32 "\n", *it );
+SAL_INFO("vcl.pdfwriter", "PDFWriterImpl::emitStructure: invalid 
child structure id " << *it);
 #endif
 }
 }
@@ -4022,7 +4022,7 @@ bool PDFWriterImpl::emitFonts()
 }
 else
 {
-fprintf( stderr, "PDF: CreateFontSubset result in not yet 
supported format=%d\n",aSubsetInfo.m_nFontType);
+SAL_INFO("vcl.pdfwriter", "PDF: CreateFontSubset result in 
not yet supported format=" << aSubsetInfo.m_nFontType);
 aLine.append( "0 >>\nstream\n" );
 }
 
@@ -4331,7 +4331,7 @@ bool PDFWriterImpl::appendDest( sal_Int32 nDestID, 
OStringBuffer& rBuffer )
 if( nDestID < 0 || nDestID >= (sal_Int32)m_aDests.size() )
 {
 #if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "ERROR: invalid dest %d requested\n", (int)nDestID );
+SAL_INFO("vcl.pdfwriter", "ERROR: invalid dest " << (int)nDestID << " 
requested");
 #endif
 return false;
 }
@@ -8178,8 +8178,10 @@ void PDFWriterImpl::sortWidgets()
 {
 SAL_WARN( "vcl", "wrong number of sorted annotations" );
 #if OSL_DEBUG_LEVEL > 0
-fprintf( stderr, "PDFWriterImpl::sortWidgets(): wrong number of 
sorted assertions on page nr %ld\n"
- "%ld sorted and %ld unsorted\n", (long int)it->first, 
(long int)it->second.aSortedAnnots.size(), (long int)nAnnots );
+SAL_INFO("vcl.pdfwriter", "PDFWriterImpl::sortWidgets(): wrong 
number of sorted assertions "
+ "on page nr " << (long int)it->first << ", " <<
+ (long int)it->second.aSortedAnnots.size() << " sorted and 
" <<
+ (long int)nAnnots << " unsorted");
 #endif
 }
 }
@@ -12375,10 +12377,9 @@ void PDFWriterImpl::beginStructureElementMCSeq()
 
 // update the element's content list
 #if OSL_DEBU

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

2016-06-21 Thread Xisco Fauli

 include/svtools/optionsdrawinglayer.hxx   |   24 
 svtools/source/config/optionsdrawinglayer.cxx |  155 +++---
 2 files changed, 46 insertions(+), 133 deletions(-)

New commits:
commit 5ee7d509e7c6d78e758286efb6145385a310cfa5
Author: Xisco Fauli 
Date:   Wed Jun 15 01:57:25 2016 +0200

tdf#89329: use shared_ptr for pImpl in optionsdrawinglayer

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

diff --git a/include/svtools/optionsdrawinglayer.hxx 
b/include/svtools/optionsdrawinglayer.hxx
index 25951f6..c096f48 100644
--- a/include/svtools/optionsdrawinglayer.hxx
+++ b/include/svtools/optionsdrawinglayer.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
/*-
 @short  forward declaration to our private date container 
implementation
@@ -44,17 +45,6 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
 {
 public:
 
-
/*-
-@short  standard constructor and destructor
-@descr  This will initialize an instance with default values.
-We implement these class with a refcount mechanism! 
Every instance of this class increase it
-at create and decrease it at delete time - but all 
instances use the same data container!
-He is implemented as a static member ...
-
-@seealsomember m_nRefCount
-@seealsomember m_pDataContainer
-
*//*-*/
-
  SvtOptionsDrawinglayer();
 ~SvtOptionsDrawinglayer();
 
@@ -140,17 +130,7 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer
 
*//*-*/
 SVT_DLLPRIVATE static ::osl::Mutex& GetOwnStaticMutex();
 
-/*Attention
-
-Don't initialize these static members in these headers!
-a) Double defined symbols will be detected ...
-b) and unresolved externals exist at linking time.
-Do it in your source only.
- */
-
-static SvtOptionsDrawinglayer_Impl* m_pDataContainer;
-static sal_Int32m_nRefCount ;
-
+std::shared_ptr m_pImpl;
 };
 
 #endif  // #ifndef INCLUDED_SVTOOLS_OPTIONSDRAWINGLAYER_HXX
diff --git a/svtools/source/config/optionsdrawinglayer.cxx 
b/svtools/source/config/optionsdrawinglayer.cxx
index ce7eaa8..fbf76ea 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -28,10 +28,8 @@
 #include 
 #include 
 
-
 //  namespaces
 
-
 using namespace ::utl   ;
 using namespace ::osl   ;
 using namespace ::com::sun::star::uno   ;
@@ -157,23 +155,11 @@ using namespace ::com::sun::star::uno   ;
 class SvtOptionsDrawinglayer_Impl : public ConfigItem
 {
 public:
-
-
-//  constructor / destructor
-
-
- SvtOptionsDrawinglayer_Impl();
-virtual ~SvtOptionsDrawinglayer_Impl();
-
-
-//  override methods of baseclass
+SvtOptionsDrawinglayer_Impl();
+~SvtOptionsDrawinglayer_Impl();
 
 virtual void Notify( const css::uno::Sequence& aPropertyNames) 
override;
 
-
-//  public interface
-
-
 boolIsOverlayBuffer() const { return m_bOverlayBuffer;}
 boolIsPaintBuffer() const { return m_bPaintBuffer;}
 const Color& GetStripeColorA() const { return m_bStripeColorA;}
@@ -220,8 +206,7 @@ public:
 //  private methods
 
 private:
-
-virtual void ImplCommit() override;
+virtual void ImplCommit() SAL_FINAL override;
 
 static Sequence< OUString > impl_GetPropertyNames();
 
@@ -272,9 +257,6 @@ private:
 boolm_bAllowAAChecked : 1;
 };
 
-
-//  constructor
-
 SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
 ConfigItem( ROOTNODE_START  ),
 m_bOverlayBuffer( DEFAULT_OVERLAYBUFFER ),
@@ -535,15 +517,12 @@ 
SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
 }
 }
 
-
-//  destructor
-
 SvtOptionsDrawinglayer_Impl::~SvtOptionsDrawinglayer_Impl()
 {
-assert(!IsModified()); // should have been committed
+if (IsModified())
+Commit();
 }
 
-
 //  Commit
 
 void SvtOptionsDrawinglayer_Impl::ImplCommit()
@@ -676,32 +655,12 @@ void SvtOptionsDrawinglayer_Impl::ImplCommit()
 void SvtOptionsDrawinglayer_Impl::Notify( const css::uno::Sequence& )
 {
 }
-
-
-//  public method
-
-
-//  public method
-
-
-//  public method
-
-
-//  public method
-
-
-//  public method
-
-
 // #i73602#
 
-
 // #i74769#, #i75172#
 
-
 // #i4219#
 
-
 // helper
 b

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

2016-06-21 Thread Jorenz Paragas

 formula/source/core/api/FormulaOpCodeMapperObj.cxx |1 
 formula/source/core/api/token.cxx  |1 
 formula/source/ui/dlg/FormulaHelper.cxx|1 
 formula/source/ui/dlg/formula.cxx  |2 +
 formula/source/ui/dlg/funcutl.cxx  |1 
 include/formula/ExternalReferenceHelper.hxx|5 +++-
 include/formula/FormulaCompiler.hxx|   21 
 include/formula/FormulaOpCodeMapperObj.hxx |   26 -
 include/formula/IControlReferenceHandler.hxx   |1 
 include/formula/IFunctionDescription.hxx   |   18 +-
 include/formula/errorcodes.hxx |2 +
 include/formula/formdata.hxx   |2 +
 include/formula/formula.hxx|   20 +---
 include/formula/formulahelper.hxx  |   12 ++---
 include/formula/funcutl.hxx|   15 ++--
 include/formula/grammar.hxx|1 
 include/formula/token.hxx  |   14 +--
 include/formula/tokenarray.hxx |   23 --
 include/formula/vectortoken.hxx|5 
 sc/source/core/tool/token.cxx  |1 
 20 files changed, 126 insertions(+), 46 deletions(-)

New commits:
commit 8a6bffd2fefcc81dc34951ba2e178d9938b59fb3
Author: Jorenz Paragas 
Date:   Thu Jun 16 18:59:35 2016 -0700

tdf#42949: clean up includes in include/formula with iwyu

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

diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx 
b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 55bdc9e..c034b64 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -21,6 +21,7 @@
 
 #include 
 
+#include 
 #include "formula/FormulaOpCodeMapperObj.hxx"
 #include "formula/opcode.hxx"
 #include 
diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 9c16870..3c3bdc5 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 
+#include 
 #include "formula/token.hxx"
 #include "formula/tokenarray.hxx"
 #include "formula/FormulaCompiler.hxx"
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx 
b/formula/source/ui/dlg/FormulaHelper.cxx
index 2ffe25e..4e6c6c8 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include "formula/formulahelper.hxx"
+#include 
 #include 
 #include 
 
diff --git a/formula/source/ui/dlg/formula.cxx 
b/formula/source/ui/dlg/formula.cxx
index b0925fb..1174677 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -57,6 +57,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/formula/source/ui/dlg/funcutl.cxx 
b/formula/source/ui/dlg/funcutl.cxx
index 9052d7c..d67bb00 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "formula/funcutl.hxx"
 #include "formula/IControlReferenceHandler.hxx"
diff --git a/include/formula/ExternalReferenceHelper.hxx 
b/include/formula/ExternalReferenceHelper.hxx
index 6c93286..364307f 100644
--- a/include/formula/ExternalReferenceHelper.hxx
+++ b/include/formula/ExternalReferenceHelper.hxx
@@ -20,8 +20,11 @@
 #ifndef INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX
 #define INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX
 
-#include 
+#include 
+
 #include 
+#include 
+#include 
 
 namespace formula
 {
diff --git a/include/formula/FormulaCompiler.hxx 
b/include/formula/FormulaCompiler.hxx
index fc912fc..adad03f 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -20,20 +20,21 @@
 #ifndef INCLUDED_FORMULA_FORMULACOMPILER_HXX
 #define INCLUDED_FORMULA_FORMULACOMPILER_HXX
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
-
-#include 
+#include 
 #include 
+#include 
 #include 
-#include 
-
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #define FORMULA_MAXJUMPCOUNT32  /* maximum number of jumps (ocChoose) */
 #define FORMULA_MAXTOKENS 8192  /* maximum number of tokens in formula */
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx 
b/include/formula/FormulaOpCodeMapperObj.hxx
index 1cfc40c..fdf28eb 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -20,18 +20,32 @@
 #ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
 #define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
 
-#include 
-#include 
-#

1 2 >

1 - 100 of 105 matches

Mail list logo