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

[Francisco Adrián Sánchez]

 extras/source/templates/presnt/AbstractGreen.otp  |binary
 extras/source/templates/presnt/AbstractRed.otp|binary
 extras/source/templates/presnt/AbstractYellow.otp |binary
 svx/source/dialog/crashreportdlg.cxx  |   15 +++
 svx/source/dialog/crashreportdlg.hxx  |1 +
 svx/uiconfig/ui/crashreportdlg.ui |   15 +++
 6 files changed, 31 insertions(+)

New commits:
commit 74b8ae360a5bdc9d6a37bc80136ac4bc7ede7563
Author: Francisco Adrián Sánchez 
Date:   Mon Oct 10 22:02:47 2016 +0200

Fix language on Abstract* templates

Changed the default language from German to English (US)
Corrected also the area and line style of background objects

Change-Id: I632b922c0e48ea578a5290015ddc499ba2af0781

diff --git a/extras/source/templates/presnt/AbstractGreen.otp 
b/extras/source/templates/presnt/AbstractGreen.otp
index d819926..0ac2540 100644
Binary files a/extras/source/templates/presnt/AbstractGreen.otp and 
b/extras/source/templates/presnt/AbstractGreen.otp differ
diff --git a/extras/source/templates/presnt/AbstractRed.otp 
b/extras/source/templates/presnt/AbstractRed.otp
index 52525f7..a43f80b 100644
Binary files a/extras/source/templates/presnt/AbstractRed.otp and 
b/extras/source/templates/presnt/AbstractRed.otp differ
diff --git a/extras/source/templates/presnt/AbstractYellow.otp 
b/extras/source/templates/presnt/AbstractYellow.otp
index 0b0894a..59829b4 100644
Binary files a/extras/source/templates/presnt/AbstractYellow.otp and 
b/extras/source/templates/presnt/AbstractYellow.otp differ
commit 5daafc88ca0d8fd06080a6fe2f7487188953ebe3
Author: Samuel Mehrbrodt 
Date:   Mon Oct 10 21:55:10 2016 +0200

Allow entering safemode after crash

Change-Id: Id12d3c10714b7ce5722c2270e9e897db63bedcf2

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index d31a863..bbac211 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -15,8 +15,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
+#include 
+#include 
+
 CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
 Dialog(pParent, "CrashReportDialog",
 "svx/ui/crashreportdlg.ui")
@@ -27,6 +31,7 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
 get(mpEditPreUpload, "ed_pre");
 get(mpEditPostUpload, "ed_post");
 get(mpFtBugReport, "ed_bugreport");
+get(mpCBSafeMode, "check_safemode");
 
 maSuccessMsg = mpEditPostUpload->GetText();
 
@@ -49,6 +54,7 @@ void CrashReportDialog::dispose()
 mpEditPreUpload.clear();
 mpEditPostUpload.clear();
 mpFtBugReport.clear();
+mpCBSafeMode.clear();
 
 Dialog::dispose();
 }
@@ -94,6 +100,15 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 {
 Close();
 }
+
+// Check whether to go to safe mode
+if (mpCBSafeMode->IsChecked())
+{
+//TODO: Actually set the safe mode, currently it's only restarting
+css::uno::Reference< css::uno::XComponentContext > xContext = 
comphelper::getProcessComponentContext();
+css::task::OfficeRestartManager::get(xContext)->requestRestart(
+css::uno::Reference< css::task::XInteractionHandler >());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index 602d706..ecdd445 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -34,6 +34,7 @@ private:
 VclPtr mpEditPreUpload;
 VclPtr mpEditPostUpload;
 VclPtr mpFtBugReport;
+VclPtr mpCBSafeMode;
 
 OUString maSuccessMsg;
 
diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index 9dd35f6..4b8b229 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -111,6 +111,21 @@ Thank you for your help in improving 
%PRODUCTNAME.
 3
   
 
+
+   
+ Restart LibreOffice to 
enter Safe Mode
+ True
+ True
+ False
+ 0
+ True
+   
+   
+ False
+ True
+ 3
+  
+
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

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

[Libreoffice-commits] help.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

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

[Libreoffice-commits] translations.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

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

[Libreoffice-commits] core.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
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/cp-5.1-9'

[Andras Timar]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 07:26 +

cp-5.1-9

Changes since cp-5.1-3:
Andras Timar (1):
  Update pt_PT dictionary to version 16.7.4.1

---
 pt_PT/description.xml |2 -
 pt_PT/pt_PT.aff   |   25 +++--
 pt_PT/pt_PT.dic   |   93 +++---
 3 files changed, 74 insertions(+), 46 deletions(-)
---
___
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/cp-5.1-9'

[Miklos Vajna]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 07:26 +

cp-5.1-9

Changes since libreoffice-5-1-branch-point-11:
---
 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/cp-5.1-9'

[Christian Lohmaier]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 07:26 +

cp-5.1-9

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-9'

[Andras Timar]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 07:26 +

cp-5.1-9

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

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

[Stephan Bergmann]

 external/nss/asan.patch.1|   12 ++--
 external/nss/ubsan-alignment.patch.0 |   34 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 5ab5779bf4a16f4ee4a8d1198ffbd8f842f2edd9
Author: Stephan Bergmann 
Date:   Tue Oct 11 09:39:21 2016 +0200

external/nss: Adapt ASan/UBSan-specific patches to nss 3.27

Change-Id: Ic96a57a1f43f7aae4e0733d2e65edd843b827a54

diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index 3b64aa6..0685adb 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -1,12 +1,12 @@
 diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
 --- nss.org/nss/coreconf/Linux.mk  2014-05-06 04:36:01.817838877 +0200
 +++ nss/nss/coreconf/Linux.mk  2014-05-06 04:37:25.387835456 +0200
-@@ -145,7 +145,7 @@
- # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
- # incorrectly reports undefined references in the libraries we link with, so
+@@ -158,7 +158,7 @@
  # we don't use -z defs there.
+ # Also, -z defs conflicts with Address Sanitizer, which emits relocations
+ # against the libsanitizer runtime built into the main executable.
 -ZDEFS_FLAG= -Wl,-z,defs
 +ZDEFS_FLAG=
- DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
- LDFLAGS   += $(ARCHFLAG)
- 
+ ifneq ($(USE_ASAN),1)
+ DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ endif
diff --git a/external/nss/ubsan-alignment.patch.0 
b/external/nss/ubsan-alignment.patch.0
index 4d13ffc..651939f 100644
--- a/external/nss/ubsan-alignment.patch.0
+++ b/external/nss/ubsan-alignment.patch.0
@@ -1,13 +1,13 @@
 --- nss/lib/freebl/md5.c
 +++ nss/lib/freebl/md5.c
-@@ -443,7 +443,7 @@
-   /* Iterate over 64-byte chunks of the message. */
-   while (inputLen >= MD5_BUFFER_SIZE) {
+@@ -445,7 +445,7 @@
+ /* Iterate over 64-byte chunks of the message. */
+ while (inputLen >= MD5_BUFFER_SIZE) {
  #ifdef IS_LITTLE_ENDIAN
 -#ifdef NSS_X86_OR_X64
 +#if 0
-   /* x86 can handle arithmetic on non-word-aligned buffers */
-   wBuf = (PRUint32 *)input;
+ /* x86 can handle arithmetic on non-word-aligned buffers */
+ wBuf = (PRUint32 *)input;
  #else
 --- nss/lib/freebl/sha_fast.c
 +++ nss/lib/freebl/sha_fast.c
@@ -15,26 +15,26 @@
  #include "ssltrace.h"
  #endif
  
--static void shaCompress(volatile SHA_HW_t *X, const PRUint32 * datain);
-+static void shaCompress(volatile SHA_HW_t *X, const unsigned char * datain);
+-static void shaCompress(volatile SHA_HW_t *X, const PRUint32 *datain);
++static void shaCompress(volatile SHA_HW_t *X, const unsigned char *datain);
  
  #define W u.w
  #define B u.b
-@@ -243,7 +243,7 @@
+@@ -241,7 +241,7 @@
   * code on AMD64.
   */
- static void 
--shaCompress(volatile SHA_HW_t *X, const PRUint32 *inbuf) 
-+shaCompress(volatile SHA_HW_t *X, const unsigned char *inbuf) 
+ static void
+-shaCompress(volatile SHA_HW_t *X, const PRUint32 *inbuf)
++shaCompress(volatile SHA_HW_t *X, const unsigned char *inbuf)
  {
-   register SHA_HW_t A, B, C, D, E;
+ register SHA_HW_t A, B, C, D, E;
  
-@@ -275,7 +275,7 @@
- #define SHA_RND4(a,b,c,d,e,n) \
-   a = SHA_ROTL(b,5)+SHA_F4(c,d,e)+a+XW(n)+K3; c=SHA_ROTL(c,30) 
+@@ -277,7 +277,7 @@
+ a = SHA_ROTL(b, 5) + SHA_F4(c, d, e) + a + XW(n) + K3; \
+ c = SHA_ROTL(c, 30)
  
 -#define LOAD(n) XW(n) = SHA_HTONL(inbuf[n])
 +#define LOAD(n) XW(n) = 
(((PRUint32)inbuf[4*n])<<24)|(((PRUint32)inbuf[4*n+1])<<16)|(((PRUint32)inbuf[4*n+2])<<8)|((PRUint32)inbuf[4*n+3])
  
-   A = XH(0);
-   B = XH(1);
+ A = XH(0);
+ B = XH(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: concat of OUStringBuffer

[Stephan Bergmann]

On 10/10/2016 10:24 PM, Eike Rathke wrote:

I'd rather say it's a bug when assigning the involved OUStringBuffer
(here aLCIDString) to itself again.. so for clarification:

https://gerrit.libreoffice.org/#/c/28666/5 had

aLCIDString = "[$-" + aLCIDString + "]";
aFormatStr.insert( nPosInsertLCID, aLCIDString.toString() );

which produced an erroneous "[$-[$-[$-0]"


Ouch.  Would probably make sense to forbid that O[U]StringBuffer takes 
part in such concatenations (by removing the 
ToStringHelper specializations, which are luckily 
LIBO_INTERNAL_ONLY).  I'll look into that.


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

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

[Aleksander Machniak]

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

New commits:
commit 799b783968f86f1c943e17008220bb4741f41b5f
Author: Aleksander Machniak 
Date:   Mon Oct 10 09:12:01 2016 +0200

Fix WOPI request header: X-WOPIOverride -> X-WOPI-Override

Change-Id: Ibd288beeffecea415c8524dfc03e77e71ba3c10e
Reviewed-on: https://gerrit.libreoffice.org/29662
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index 57e3c5f..7cf5693 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -364,7 +364,7 @@ bool WopiStorage::saveLocalFileToStorage()
 std::unique_ptr 
psession(getHTTPClientSession(uriObject));
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
uriObject.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
-request.set("X-WOPIOverride", "PUT");
+request.set("X-WOPI-Override", "PUT");
 request.setContentType("application/octet-stream");
 request.setContentLength(size);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/count-src-resources bin/count-todo-dialogs

[Caolán McNamara]

 bin/count-src-resources |   11 +++
 bin/count-todo-dialogs  |   41 -
 2 files changed, 11 insertions(+), 41 deletions(-)

New commits:
commit 411c04c4025b4349df70a2dae723bbeac9f12f57
Author: Caolán McNamara 
Date:   Tue Oct 11 09:05:53 2016 +0100

repurpose count dialogs

Change-Id: Id19d514f7ccbc69bf5ad0ca63181e2815f067178

diff --git a/bin/count-src-resources b/bin/count-src-resources
new file mode 100755
index 000..01fbdfc
--- /dev/null
+++ b/bin/count-src-resources
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# 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/.
+#
+# Run this from the source root dir to count the number of remaining .src 
resources
+
+git ls-files *.src | xargs grep -ohE '^[a-zA-Z]+[ ]+[a-zA-Z_0-9]+' | cut -f 1 
-d ' ' | sort | uniq -c | sort -n
diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
deleted file mode 100755
index 09f85c9..000
--- a/bin/count-todo-dialogs
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# 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/.
-#
-# Run this from the source root dir to count:
-# a) the number of .ui files
-# b) the estimated amount of additional .ui files required
-
-converted=`ls */uiconfig/ui/*.ui */uiconfig/*/ui/*.ui|wc -l`
-echo $converted .ui files currently exist
-
-dialogs=0
-tabpages=0
-errorboxes=0
-infoboxes=0
-queryboxes=0
-warningboxes=0
-msgboxes=0
-floatingwindows=0
-dockingwindows=`git grep -h DockingWindow -- *.src|grep -v HelpID|grep -v 
hrc|cut -d' ' -f2- |sort|uniq|wc -l`
-
-echo There are $dialogs unconverted dialogs
-echo There are $tabpages unconverted tabpages
-echo There are $errorboxes unconverted errorboxes
-echo There are $infoboxes unconverted infoboxes
-echo There are $queryboxes unconverted queryboxes
-echo There are $warningboxes unconverted warningboxes
-echo There are $msgboxes unconverted msgboxes
-echo There are $floatingwindows unconverted floatingwindows
-echo There are $dockingwindows unconverted dockingwindows
-
-num=$dockingwindows
-echo An estimated additional $num .ui are required
-
-percent=$(($converted * 100 / ($num + $converted)))
-echo We are $percent% of the way through the .ui conversion.
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Federico Bassini license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
Jan Iversen.


Ps. Do not forget the italian libreoffice conference 5th November in Turin, 
rumour is that there might be a special afternoon for developers.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Mirco Rondini license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

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

[Noel Grandin]

 include/sfx2/stbitem.hxx|1 -
 include/sfx2/thumbnailview.hxx  |2 --
 sfx2/source/control/thumbnailview.cxx   |5 -
 sfx2/source/dialog/splitwin.cxx |6 --
 sfx2/source/inc/splitwin.hxx|1 -
 sfx2/source/notebookbar/ContextVBox.cxx |5 -
 sfx2/source/statbar/stbitem.cxx |6 --
 7 files changed, 26 deletions(-)

New commits:
commit 52dfb06b194bf890510352a98540c64bc3d44b70
Author: Noel Grandin 
Date:   Tue Oct 11 08:21:34 2016 +0200

loplugin:unnecessaryoverride in sfx2

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

diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 6f54c4a..d3cb43b 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -65,7 +65,6 @@ class SFX2_DLLPUBLIC SfxStatusBarControl: public 
svt::StatusbarController
 protected:
 // new controller API
 // XInterface
-virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & 
rType ) throw(css::uno::RuntimeException, std::exception) override;
 virtual void   SAL_CALL acquire() throw() override;
 virtual void   SAL_CALL release() throw() override;
 
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 81cab2d..d118782 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -244,8 +244,6 @@ protected:
 
 virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
 
-virtual void MouseButtonUp( const MouseEvent& rMEvt ) override;
-
 virtual void Command( const CommandEvent& rCEvt ) override;
 
 virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect) override;
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 68e88ba..6bcb281 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -828,11 +828,6 @@ void ThumbnailView::MouseButtonDown( const MouseEvent& 
rMEvt )
 }
 }
 
-void ThumbnailView::MouseButtonUp( const MouseEvent& rMEvt )
-{
-Control::MouseButtonUp( rMEvt );
-}
-
 void ThumbnailView::Command( const CommandEvent& rCEvt )
 {
 if ( (rCEvt.GetCommand() == CommandEventId::Wheel) ||
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index ba2d871..95b12bd 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -928,12 +928,6 @@ sal_uInt16 SfxSplitWindow::GetWindowCount() const
 }
 
 
-void SfxSplitWindow::Command( const CommandEvent& rCEvt )
-{
-SplitWindow::Command( rCEvt );
-}
-
-
 IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer, void)
 {
 if ( pTimer )
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 3b917f9e..d6eb7ae 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -71,7 +71,6 @@ protected:
 virtual voidStartSplit() override;
 virtual voidSplitResize() override;
 virtual voidSplit() override;
-virtual voidCommand ( const CommandEvent& rCEvt ) override;
 virtual voidMouseButtonDown ( const MouseEvent& ) override;
 
 public:
diff --git a/sfx2/source/notebookbar/ContextVBox.cxx 
b/sfx2/source/notebookbar/ContextVBox.cxx
index 3bbe14a..64de1ca 100644
--- a/sfx2/source/notebookbar/ContextVBox.cxx
+++ b/sfx2/source/notebookbar/ContextVBox.cxx
@@ -42,11 +42,6 @@ public:
 disposeOnce();
 }
 
-virtual void dispose() override
-{
-VclVBox::dispose();
-}
-
 void SetContext( vcl::EnumContext::Context eContext ) override
 {
 for (int nChild = 0; nChild < GetChildCount(); ++nChild)
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index e89a25e..87b2102 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -172,12 +172,6 @@ SfxStatusBarControl::~SfxStatusBarControl()
 
 
 // XInterface
-uno::Any SAL_CALL SfxStatusBarControl::queryInterface( const uno::Type & rType 
)
-throw( uno::RuntimeException, std::exception)
-{
-return svt::StatusbarController::queryInterface( rType );
-}
-
 void SAL_CALL SfxStatusBarControl::acquire() throw()
 {
 OWeakObject::acquire();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Huzaifa Iftikhar license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

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

[Noel Grandin]

 i18npool/source/calendar/calendar_jewish.cxx |   22 +++---
 rsc/inc/rscclobj.hxx |2 +-
 rsc/inc/rscdef.hxx   |1 -
 rsc/inc/rscerror.h   |4 ++--
 rsc/source/parser/erscerr.cxx|8 
 rsc/source/parser/rsclex.cxx |2 +-
 rsc/source/parser/rscyacc.y  |6 +++---
 rsc/source/res/rscclobj.cxx  |4 ++--
 rsc/source/res/rsccont.cxx   |6 +++---
 rsc/source/res/rscmgr.cxx|2 +-
 rsc/source/res/rscrange.cxx  |2 +-
 rsc/source/tools/rscdef.cxx  |5 -
 svtools/source/misc/ehdl.cxx |   12 ++--
 13 files changed, 35 insertions(+), 41 deletions(-)

New commits:
commit d0304a8f57b3fe0065193a2a3f7089f414b1ffd9
Author: Noel Grandin 
Date:   Tue Oct 11 08:15:05 2016 +0200

remove some conversion operator methods

which, in these cases, only serve to make the code harder to read

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

diff --git a/i18npool/source/calendar/calendar_jewish.cxx 
b/i18npool/source/calendar/calendar_jewish.cxx
index 19b62d3..a060aa9 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -139,20 +139,20 @@ public:
 explicit HebrewDate(sal_Int32 d) { // Computes the Hebrew date from the 
absolute date.
 year = (d + HebrewEpoch) / 366; // Approximation from below.
 // Search forward for year from the approximation.
-while (d >= HebrewDate(7,1,year + 1))
+while (d >= HebrewDate(7,1,year + 1).GetAbsoluteDate())
   year++;
 // Search forward for month from either Tishri or Nisan.
-if (d < HebrewDate(1, 1, year))
+if (d < HebrewDate(1, 1, year).GetAbsoluteDate())
   month = 7;  //  Start at Tishri
 else
   month = 1;  //  Start at Nisan
-while (d > HebrewDate(month, (LastDayOfHebrewMonth(month,year)), year))
+while (d > HebrewDate(month, (LastDayOfHebrewMonth(month,year)), 
year).GetAbsoluteDate())
   month++;
 // Calculate the day by subtraction.
-day = d - HebrewDate(month, 1, year) + 1;
+day = d - HebrewDate(month, 1, year).GetAbsoluteDate() + 1;
 }
 
-operator int() { // Computes the absolute date of Hebrew date.
+int GetAbsoluteDate() const { // Computes the absolute date of Hebrew date.
 sal_Int32 DayInYear = day; // Days so far this month.
 if (month < 7) { // Before Tishri, so add days in prior months
  // this year before and after Nisan.
@@ -217,16 +217,16 @@ public:
 explicit GregorianDate(int d) { // Computes the Gregorian date from the 
absolute date.
 // Search forward year by year from approximate year
 year = d/366;
-while (d >= GregorianDate(1,1,year+1))
+while (d >= GregorianDate(1,1,year+1).GetAbsoluteDate())
   year++;
 // Search forward month by month from January
 month = 1;
-while (d > GregorianDate(month, LastDayOfGregorianMonth(month,year), 
year))
+while (d > GregorianDate(month, LastDayOfGregorianMonth(month,year), 
year).GetAbsoluteDate())
   month++;
-day = d - GregorianDate(month,1,year) + 1;
+day = d - GregorianDate(month,1,year).GetAbsoluteDate() + 1;
 }
 
-operator int() { // Computes the absolute date from the Gregorian date.
+int GetAbsoluteDate() const { // Computes the absolute date from the 
Gregorian date.
 int N = day;   // days this month
 for (int m = month - 1;  m > 0; m--) // days in prior months this year
   N = N + LastDayOfGregorianMonth(m, year);
@@ -251,7 +251,7 @@ void Calendar_jewish::mapFromGregorian() 
throw(RuntimeException)
 if (fieldValue[CalendarFieldIndex::ERA] == 0)
 y = 1 - y;
 GregorianDate Temp(fieldValue[CalendarFieldIndex::MONTH] + 1, 
fieldValue[CalendarFieldIndex::DAY_OF_MONTH], y);
-HebrewDate hd(Temp);
+HebrewDate hd(Temp.GetAbsoluteDate());
 
 fieldValue[CalendarFieldIndex::ERA] = hd.GetYear() <= 0 ? 0 : 1;
 fieldValue[CalendarFieldIndex::MONTH] = sal::static_int_cast( 
hd.GetMonth() - 1 );
@@ -268,7 +268,7 @@ void Calendar_jewish::mapToGregorian() 
throw(RuntimeException)
 if (fieldSetValue[CalendarFieldIndex::ERA] == 0)
 y = 1 - y;
 HebrewDate Temp(fieldSetValue[CalendarFieldIndex::MONTH] + 1, 
fieldSetValue[CalendarFieldIndex::DAY_OF_MONTH], y);
-GregorianDate gd(Temp);
+GregorianDate gd(Temp.GetAbsoluteDate());
 
 fieldSetValue[CalendarFieldIndex::ERA] = gd.GetYear() <= 0 ? 0 : 1;
 fieldSetValue[CalendarFieldIndex::MONTH] = 
sal::static_int_cast( gd.GetMonth() - 1 );
diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index eeb

Re: Abdul Wadood license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - writerfilter/source

[Andras Timar]

 writerfilter/source/dmapper/DomainMapper.cxx  |   12 +---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   11 ---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 ---
 3 files changed, 5 insertions(+), 21 deletions(-)

New commits:
commit fc74cf662ce4c50e9f9e65d843bc5ea85f4e8e4e
Author: Andras Timar 
Date:   Tue Oct 11 10:39:32 2016 +0200

Revert "tdf#75573 - docx don't remove frame anchor paragraph"

This reverts commit a895a7051f2cca37595f755212399843116678c9.

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5a1bcd9..ae201aa 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3221,18 +3221,16 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 bool bSingleParagraph = m_pImpl->GetIsFirstParagraphInSection() && 
m_pImpl->GetIsLastParagraphInSection();
 // If the paragraph contains only the section properties and it has
 // no runs, we should not create a paragraph for it in Writer, 
unless that would remove the whole section.
-bool bRemove = !m_pImpl->GetParaChanged() && 
m_pImpl->GetParaSectpr()
-   && !bSingleParagraph
-   && !m_pImpl->GetIsDummyParaAddedForTableInSection()
-   && !m_pImpl->GetIsLastParagraphFramed();
-if (bRemove)
+bool bRemove = !m_pImpl->GetParaChanged() && 
m_pImpl->GetParaSectpr() && !bSingleParagraph && 
!m_pImpl->GetIsDummyParaAddedForTableInSection();
+PropertyMapPtr xContext = bRemove ? 
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr();
+if (xContext)
 {
 // tdf#97417 delete numbering of the paragraph
 // it will be deleted anyway, and the numbering would be copied
 // to the next paragraph in sw SplitNode and then be applied to
 // every following paragraph
-
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)->Erase(PROP_NUMBERING_RULES);
-
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH)->Erase(PROP_NUMBERING_LEVEL);
+xContext->Erase(PROP_NUMBERING_RULES);
+xContext->Erase(PROP_NUMBERING_LEVEL);
 }
 m_pImpl->SetParaSectpr(false);
 
m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6ccbb83..40c2e18 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -216,7 +216,6 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bIsFirstParaInSection( true ),
 m_bDummyParaAddedForTableInSection( false ),
 m_bTextFrameInserted(false),
-m_bIsLastParagraphFramed( false ),
 m_bIsLastParaInSection( false ),
 m_bIsLastSectionGroup( false ),
 m_bIsInComments( false ),
@@ -1190,16 +1189,6 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr 
pPropertyMap )
 }
 }
 
-if((pParaContext && pParaContext->IsFrameMode())
-|| (IsInHeaderFooter() && GetIsLastParagraphFramed()) )
-{
-SetIsLastParagraphFramed(true);
-}
-else
-{
-SetIsLastParagraphFramed(false);
-}
-
 m_bParaChanged = false;
 if (!pParaContext || !pParaContext->IsFrameMode())
 { // If the paragraph is in a frame, it's not a paragraph of the section 
itself.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 7204c59..b602a70 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -436,7 +436,6 @@ private:
 boolm_bIsFirstParaInSection;
 boolm_bDummyParaAddedForTableInSection;
 boolm_bTextFrameInserted;
-boolm_bIsLastParagraphFramed;
 boolm_bIsLastParaInSection;
 boolm_bIsLastSectionGroup;
 boolm_bIsInComments;
@@ -525,8 +524,6 @@ public:
 bool GetIsDummyParaAddedForTableInSection() { return 
m_bDummyParaAddedForTableInSection;}
 void SetIsTextFrameInserted( bool bIsInserted );
 bool GetIsTextFrameInserted() { return m_bTextFrameInserted;}
-void SetIsLastParagraphFramed( bool bIsFramed ) { m_bIsLastParagraphFramed 
= bIsFramed; }
-bool GetIsLastParagraphFramed() { return m_bIsLastParagraphFramed; }
 void SetParaSectpr(bool bParaSectpr);
 bool GetParaSectpr() { return m_bParaSectpr;}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@list

Re: Dilek Uzulmez license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

[Libreoffice-commits] core.git: Branch 'feature/profilesafemode' - 222 commits - basctl/source basctl/uiconfig basegfx/source basegfx/test basic/qa basic/source bin/check-elf-dynamic-objects bin/test-

[Armin Le Grand]

Rebased ref, commits from common ancestor:
commit aac3d62c0bf4ed6a09b03aec9111ec42619ccc24
Author: Armin Le Grand 
Date:   Thu Sep 29 18:00:35 2016 +0200

profilesafe: Add values for SecureUserConfig

Added default values for SecureUserConfig values
to soffice.ini/rc which enable the mechanism,
enable by default and set a maximum of three backups
file in packed form. Added more handy flag for easy
decision to add compressed/uncompressed.

Change-Id: I5a624c09fec4e4278314e13fc5f693ac085d5e61

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index e02a855..5270306 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -103,7 +103,7 @@ namespace
 {
 sal_uInt8 aArray[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt64 nBytesTransfer(0);
-sal_uInt64 nSize(getFullFileSize());
+sal_uInt64 nSize(getPackFileSize());
 
 // set offset in source file - when this is zero, a new file 
is to be added
 if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, 
sal_Int64(getOffset(
@@ -140,7 +140,7 @@ namespace
 sal_uInt8 aArray[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt8 aBuffer[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt64 nBytesTransfer(0);
-sal_uInt64 nSize(getFullFileSize());
+sal_uInt64 nSize(getPackFileSize());
 std::unique_ptr< z_stream > zstream(new z_stream);
 memset(zstream.get(), 0, sizeof(*zstream));
 
@@ -294,21 +294,22 @@ namespace
 
 
 public:
+// create new, uncompressed entry
 PackedFileEntry(
 sal_uInt32 nFullFileSize,
-sal_uInt32 nOffset,
 sal_uInt32 nCrc32,
 FileSharedPtr& rFile,
 bool bDoCompress)
 :   mnFullFileSize(nFullFileSize),
 mnPackFileSize(nFullFileSize),
-mnOffset(nOffset),
+mnOffset(0),
 mnCrc32(nCrc32),
 maFile(rFile),
 mbDoCompress(bDoCompress)
 {
 }
 
+// create entry to be loaded as header (read_header)
 PackedFileEntry()
 :   mnFullFileSize(0),
 mnPackFileSize(0),
@@ -669,7 +670,7 @@ namespace
 return bRetval;
 }
 
-bool tryPush(FileSharedPtr& rFileCandidate)
+bool tryPush(FileSharedPtr& rFileCandidate, bool bCompress)
 {
 sal_uInt64 nFileSize(0);
 
@@ -724,19 +725,14 @@ namespace
 nCrc32 = createCrc32(rFileCandidate, 0);
 }
 
-// create a file entry for a new file. Offset is set to 0 to 
mark
-// the entry as new file entry
-// the compress flag decides if entries should be compressed 
when
-// they get written to the target package
-static bool bUseCompression(true);
-
+// create a file entry for a new file. Offset is set 
automatically
+// to 0 to mark the entry as new file entry
 maPackedFileEntryVector.push_back(
 PackedFileEntry(
 static_cast< sal_uInt32 >(nFileSize),
-0,
 nCrc32,
 rFileCandidate,
-bUseCompression));
+bCompress));
 
 mbChanged = true;
 }
@@ -837,14 +833,14 @@ namespace comphelper
 return OUString(maBase + "/." + maName + ".pack");
 }
 
-bool BackupFileHelper::tryPush()
+bool BackupFileHelper::tryPush(bool bCompress)
 {
 if (splitBaseURL() && baseFileExists())
 {
 PackedFile aPackedFile(getName());
 FileSharedPtr aBaseFile(new osl::File(mrBaseURL));
 
-if (aPackedFile.tryPush(aBaseFile))
+if (aPackedFile.tryPush(aBaseFile, bCompress))
 {
 // reduce to allowed number and flush
 aPackedFile.tryReduceToNumBackups(mnNumBackups);
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 206d346..17f09a3 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -613,8 +613,6 @@ Components::Components(
 
 Components::~Components()
 {
-SAL_WARN("configmgr", "# Components::~Components() 
#");
-
 // get flag if _exit was already called which is a sign to not to secure 
user config
 const bool 
bExitWasCalled(comphelper::BackupFileHelper::getExitWasCalled());
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 798d60d..a9d10c3 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -569,11 +569,14 @@ void Desktop::Init()
 Set

Re:

[Jan Iversen]

> On 10 Oct 2016, at 21:43, Ashod Nakashian  wrote:
> 
> Hi Pierre,
> 
> On Sat, Oct 8, 2016 at 11:38 AM, Pierre Lepage  > wrote:
> OK. I understood. Changes are in the include directory. And there, there is 
> no Makefile for just recompile this directory. So, I must recompile the whole 
> thing. Not just the basic directory.
> 
> 
> You need to invoke make from the root of the source (normally). But you can 
> compile specific libraries if you want. You can use 'make '.
> 
> But I strongly suggest just running make in the source directory, followed by 
> 'make check', before trying anything more advanced. You should get clean 
> results before you move on.
you need to have a complete build before starting only compiling the directory 
you work in. If you do not have that, first of all make will build a lot more 
than you expect, and secondly you do not really know if it works.

Please remember if you do make , then the executable will not be build, so 
you cannot test it.

rgds
jan I.

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

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

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

[Caolán McNamara]

 accessibility/inc/standard/vclxaccessiblelist.hxx|2 
 accessibility/inc/standard/vclxaccessiblelistitem.hxx|   16 ---
 accessibility/source/standard/vclxaccessiblelist.cxx |4 
 accessibility/source/standard/vclxaccessiblelistitem.cxx |   80 ---
 4 files changed, 50 insertions(+), 52 deletions(-)

New commits:
commit 6c220995aa2485a9c5d23f0ec952a64151ab25b6
Author: Caolán McNamara 
Date:   Tue Oct 11 10:04:13 2016 +0100

Resolves: tdf#103032 a11y crash on listbox dispose in toolbar dropdown

Change-Id: I70bce310ba9b46efdbdfdec8d2c6689d0ba2e655

diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx 
b/accessibility/inc/standard/vclxaccessiblelist.hxx
index 9b20b0b..a8aa753 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include "standard/vclxaccessiblelistitem.hxx"
 #include 
 #include 
 #include 
@@ -136,6 +135,7 @@ public:
 
 void UpdateFocus_Impl_Acc ( sal_Int32 nPos, bool b_IsDropDownList) ;
 static void NotifyListItem(css::uno::Any& val);
+::accessibility::IComboListBoxHelper* getListBoxHelper() { return 
m_pListBoxHelper; }
 protected:
 BoxType m_aBoxType;
 ::accessibility::IComboListBoxHelper* m_pListBoxHelper;
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx 
b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 405ecb5..fb5cab4 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // forward ---
 
@@ -40,11 +41,6 @@ namespace com { namespace sun { namespace star { namespace 
awt {
 class XFocusListener;
 } } } }
 
-namespace accessibility
-{
-class IComboListBoxHelper;
-}
-
 // class VCLXAccessibleListItem --
 
 typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible
@@ -69,9 +65,8 @@ private:
 protected:
 /// client id in the AccessibleEventNotifier queue
 sal_uInt32  m_nClientId;
-::accessibility::IComboListBoxHelper*   m_pListBoxHelper;
 
-css::uno::Reference< css::accessibility::XAccessible >m_xParent;
+css::uno::Reference< VCLXAccessibleList > m_xParent;
 css::uno::Reference< css::accessibility::XAccessibleContext > 
m_xParentContext;
 
 protected:
@@ -87,16 +82,13 @@ protected:
 
 public:
 /** OAccessibleBase needs a valid view
-@param  _pListBoxHelper
-is the list- or combobox for which we implement an accessible 
object
 @param  _nIndexInParent
 is the position of the entry inside the listbox
 @param  _xParent
 is our parent accessible object
 */
-VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* 
_pListBoxHelper,
-sal_Int32 _nIndexInParent,
-const css::uno::Reference< 
css::accessibility::XAccessible >& _xParent );
+VCLXAccessibleListItem(sal_Int32 _nIndexInParent,
+   const css::uno::Reference< VCLXAccessibleList >& 
_xParent);
 
 voidNotifyAccessibleEvent(  sal_Int16 _nEventId, const 
css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );
 
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 42747d74..38f6c39 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -507,7 +507,7 @@ Reference VCLXAccessibleList::CreateChild 
(sal_Int32 nPos)
 m_aAccessibleChildren.resize(nPos + 1);
 
 // insert into the container
-xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this);
+xChild = new VCLXAccessibleListItem(nPos, this);
 m_aAccessibleChildren[nPos] = xChild;
 }
 else
@@ -516,7 +516,7 @@ Reference VCLXAccessibleList::CreateChild 
(sal_Int32 nPos)
 // check if position is empty and can be used else we have to adjust 
all entries behind this
 if (!xChild.is())
 {
-xChild = new VCLXAccessibleListItem(m_pListBoxHelper, nPos, this);
+xChild = new VCLXAccessibleListItem(nPos, this);
 m_aAccessibleChildren[nPos] = xChild;
 }
 }
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 49b9e8f..53090a7 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -61,23 +61,21 @@ using namespace ::com::sun::star;
 
 // Ctor() and Dtor()
 
-VCLXAccessibleListItem::VCLXAccessibleListItem( 
::accessibility::IComboListBoxHelper

Re: Introducing myself

[Jan Iversen]

> 
> you can start from here
> https://wiki.documentfoundation.org/Development 
> 

We have a step by step guide, that takes you through the whole process until 
you have successfully got your first patch merged:

https://wiki.documentfoundation.org/Development/GetInvolved 


rgds
jan I.


> 
> Regards,
> Huzaifa Iftikhar
>  
> 
> 
> ___
> 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 mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 65/e38169a7edff860082509a596105deaf4afb7c

[Caolán McNamara]

 65/e38169a7edff860082509a596105deaf4afb7c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4f725bc519c0ec735fb423f22dd4eaeeb494751c
Author: Caolán McNamara 
Date:   Tue Oct 11 10:06:43 2016 +0100

Notes added by 'git notes add'

diff --git a/65/e38169a7edff860082509a596105deaf4afb7c 
b/65/e38169a7edff860082509a596105deaf4afb7c
new file mode 100644
index 000..4871032
--- /dev/null
+++ b/65/e38169a7edff860082509a596105deaf4afb7c
@@ -0,0 +1 @@
+prefer: f3fff04ddd411ab001cedfa43d6733440557
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 accessibility/source/standard/vclxaccessiblelistitem.cxx |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 99a4ab06a9ad5c05d4cd7282f68ea5faaf2f1188
Author: Caolán McNamara 
Date:   Tue Oct 11 10:08:27 2016 +0100

parent will definitely exist at ctor time

Change-Id: I3d30b17e4105a98ad6ab378cee7128cac23f1dc0

diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 53090a7..a7e0795 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -69,13 +69,11 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 
_nIndexInParent, const
 , m_nClientId(0)
 , m_xParent(_xParent)
 {
-if (m_xParent.is())
-{
-m_xParentContext = m_xParent->getAccessibleContext();
-::accessibility::IComboListBoxHelper* pListBoxHelper = 
m_xParent->getListBoxHelper();
-if (pListBoxHelper)
-m_sEntryText = 
pListBoxHelper->GetEntry((sal_uInt16)_nIndexInParent);
-}
+assert(m_xParent.is());
+m_xParentContext = m_xParent->getAccessibleContext();
+::accessibility::IComboListBoxHelper* pListBoxHelper = 
m_xParent->getListBoxHelper();
+if (pListBoxHelper)
+m_sEntryText = pListBoxHelper->GetEntry((sal_uInt16)_nIndexInParent);
 }
 
 VCLXAccessibleListItem::~VCLXAccessibleListItem()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 winaccessibility/source/UAccCOM/UNOXWrapper.h |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4624e2d11cbcb0fa4e84acb2e1b73bd2db6ae751
Author: Jochen Nitschke 
Date:   Sun Oct 9 18:05:26 2016 +0200

cppcheck: uninitMemberVar

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

diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h 
b/winaccessibility/source/UAccCOM/UNOXWrapper.h
index 2385dc5..e50dd8a 100644
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.h
+++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h
@@ -38,19 +38,19 @@
  */
 class ATL_NO_VTABLE CUNOXWrapper : public IUNOXWrapper
 {
+protected:
+css::accessibility::XAccessible* pUNOInterface;
+
 public:
-CUNOXWrapper()
+CUNOXWrapper() : pUNOInterface(nullptr)
 {   }
 
-public:
 // IUNOXWrapper
 STDMETHOD(put_XInterface)(hyper pXInterface);
 STDMETHOD(put_XSubInterface)(hyper);
 
 protected:
 ~CUNOXWrapper() {}
-
-css::accessibility::XAccessible* pUNOInterface;
 };
 
 #endif // INCLUDED_WINACCESSIBILITY_SOURCE_UACCCOM_UNOXWRAPPER_H
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Björn Balazs license statement

[Björn Balazs]

To the extent possible under law, I waive all copyright and related or 
neighboring rights to my past & future contributions to LibreOffice:

   http://creativecommons.org/publicdomain/zero/1.0

Cheers,
Björn
---
Dipl.-Psych. Björn Balazs
Business Management & Research

User Prompt GmbH | Psychologic IT Expertise 
Grünberger Str. 49, 10245 Berlin | www.user-prompt.com 
HRB 142277 | AG Berlin Charlottenburg | Geschäftsführer Björn Balazs

signature.asc
Description: This is a digitally signed message part.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: helpers/help_hid.lst

[Caolán McNamara]

 helpers/help_hid.lst |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b5b5879c9ed7b8c120c21f9b700247a1442d2a47
Author: Caolán McNamara 
Date:   Tue Oct 11 10:34:31 2016 +0100

drop unused HID_NAVIGATION_PI

Change-Id: I453cd425ee8b79ad9caf47a791ac8ef4a3676bf4

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1d316c3..2168ac7 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2011,7 +2011,6 @@ HID_MN_XFORMS_MODELS_REMOVE,38118,
 HID_MN_XFORMS_SHOW_DETAILS,38122,
 HID_MODULE_TOOLBOX,54952,
 HID_NAVIGATION_IMGBTN,54822,
-HID_NAVIGATION_PI,54424,
 HID_NAVIGATOR_GLOBAL_TOOLBOX,53019,
 HID_NAVIGATOR_GLOB_TREELIST,53020,
 HID_NAVIGATOR_LISTBOX,52978,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 4ee81e595a933b901f280c0fc250f0a34232e92a
Author: Caolán McNamara 
Date:   Tue Oct 11 10:34:31 2016 +0100

Updated core
Project: help  b5b5879c9ed7b8c120c21f9b700247a1442d2a47

drop unused HID_NAVIGATION_PI

Change-Id: I453cd425ee8b79ad9caf47a791ac8ef4a3676bf4

diff --git a/helpcontent2 b/helpcontent2
index 2729e2c..b5b5879 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2729e2ce77fb2bb13307f86d23c4ac9c0a87799e
+Subproject commit b5b5879c9ed7b8c120c21f9b700247a1442d2a47
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Björn Balazs license statement

[Jan Iversen]

Hi

Thanks for your license statement. Please be aware this license cannot be used 
for development activities. Our project consist of many other activities where 
this license is good.

rgds
jan I.

> On 11 Oct 2016, at 11:30, Björn Balazs  wrote:
> 
> To the extent possible under law, I waive all copyright and related or 
> neighboring rights to my past & future contributions to LibreOffice:
> 
>   http://creativecommons.org/publicdomain/zero/1.0
> 
> Cheers,
> Björn
> ---
> Dipl.-Psych. Björn Balazs
> Business Management & Research
> 
> User Prompt GmbH | Psychologic IT Expertise 
> Grünberger Str. 49, 10245 Berlin | www.user-prompt.com 
> HRB 142277 | AG Berlin Charlottenburg | Geschäftsführer Björn 
> Balazs___
> 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] online.git: loolwsd/test

[Tor Lillqvist]

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

New commits:
commit 9ff9452e4c427fe66ee8fea3bf0eb44a00d3d53e
Author: Tor Lillqvist 
Date:   Tue Oct 11 13:05:13 2016 +0300

It's 'error:', in lower case

Clearly this if branch has never been reached.

diff --git a/loolwsd/test/UnitPrefork.cpp b/loolwsd/test/UnitPrefork.cpp
index 393d449..b4213bd 100644
--- a/loolwsd/test/UnitPrefork.cpp
+++ b/loolwsd/test/UnitPrefork.cpp
@@ -62,7 +62,7 @@ public:
 virtual bool filterChildMessage(const std::vector& payload) override
 {
 const std::string memory = LOOLProtocol::getFirstLine(payload);
-if (!memory.compare(0,6,"Error:"))
+if (!memory.compare(0,6,"error:"))
 {
 _failure = memory;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 loleaflet/po/templates/loleaflet-help.pot |2 
 loleaflet/po/templates/loleaflet-ui.pot   |  666 ++
 2 files changed, 401 insertions(+), 267 deletions(-)

New commits:
commit 7ecf78a18e8ea9a7b809a89e2dec748aa64715b5
Author: Andras Timar 
Date:   Tue Oct 11 12:13:23 2016 +0200

update pot files

diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index 4226c27..b05eab5 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-09 07:00+\n"
+"POT-Creation-Date: 2016-10-11 12:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index a5bb598..307e66f 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-09 07:00+\n"
+"POT-Creation-Date: 2016-10-11 12:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -17,6 +17,92 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: admin.strings.js:5
+msgid "Admin console"
+msgstr ""
+
+#: admin.strings.js:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: admin.strings.js:7
+msgid "Settings"
+msgstr ""
+
+#: admin.strings.js:8
+msgid "Overview"
+msgstr ""
+
+#: admin.strings.js:9
+msgid "(current)"
+msgstr ""
+
+#: admin.strings.js:10
+msgid "Analytics"
+msgstr ""
+
+#: admin.strings.js:11
+msgid "Dashboard"
+msgstr ""
+
+#: admin.strings.js:12
+msgid "Users online"
+msgstr ""
+
+#: admin.strings.js:13
+msgid "Documents opened"
+msgstr ""
+
+#: admin.strings.js:14
+msgid "Memory consumed"
+msgstr ""
+
+#: admin.strings.js:15
+msgid "PID"
+msgstr ""
+
+#: admin.strings.js:16
+msgid "Document"
+msgstr ""
+
+#: admin.strings.js:17
+msgid "Number of views"
+msgstr ""
+
+#: admin.strings.js:18
+msgid "Elapsed time"
+msgstr ""
+
+#: admin.strings.js:19
+msgid "Kill"
+msgstr ""
+
+#: admin.strings.js:20
+msgid "Graphs"
+msgstr ""
+
+#: admin.strings.js:21 dist/toolbar/toolbar.js:337
+#: src/control/Control.Menubar.js:10 src/control/Control.Menubar.js:63
+#: src/control/Control.Menubar.js:109
+msgid "Save"
+msgstr ""
+
+#: admin.strings.js:22
+msgid "Cache size of memory statistics"
+msgstr ""
+
+#: admin.strings.js:23
+msgid "Time interval of memory statistics (in ms)"
+msgstr ""
+
+#: admin.strings.js:24
+msgid "Cache size of CPU statistics"
+msgstr ""
+
+#: admin.strings.js:25
+msgid "Time interval of CPU statistics (in ms)"
+msgstr ""
+
 #: evol.colorpicker.strings.js:2
 msgid "Theme Colors"
 msgstr ""
@@ -85,6 +171,30 @@ msgstr ""
 msgid "Unformatted Text"
 msgstr ""
 
+#: unocommands.js:12
+msgid "No Wrap"
+msgstr ""
+
+#: unocommands.js:13
+msgid "Wrap Before"
+msgstr ""
+
+#: unocommands.js:14
+msgid "Wrap After"
+msgstr ""
+
+#: unocommands.js:15
+msgid "Enable Contour"
+msgstr ""
+
+#: unocommands.js:16
+msgid "Update Index or Table of Contents"
+msgstr ""
+
+#: unocommands.js:17
+msgid "Delete Index or Table of Contents"
+msgstr ""
+
 #: dist/errormessages.js:1
 msgid ""
 "Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or file_path, usage: "
@@ -97,347 +207,387 @@ msgid ""
 "contact the administrator."
 msgstr ""
 
-#: dist/toolbar/toolbar.js:154
+#: dist/errormessages.js:3
+msgid ""
+"No disk space left on server, please contact the server administrator to "
+"continue."
+msgstr ""
+
+#: dist/errormessages.js:4
+msgid ""
+"This development build is limited to %0 documents, and %1 connections - to "
+"avoid the impression that it is suitable for deployment in large "
+"enterprises. To find out more about deploying and scaling %2 checkout: %3."
+msgstr ""
+
+#: dist/toolbar/toolbar.js:150
 msgid "Are you sure you want to delete this page?"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:329 src/admin/AdminStrings.js:20
-#: src/control/Control.Menubar.js:10 src/control/Control.Menubar.js:56
-#: src/control/Control.Menubar.js:102
-msgid "Save"
+#: dist/toolbar/toolbar.js:328
+msgid "Textwrap"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:331 src/control/Control.Menubar.js:18
-#: src/control/Control.Menubar.js:64 src/control/Control.Menubar.js:110
+#: dist/toolbar/toolbar.js:329
+msgid "No wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:330
+msgid "Page wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:331
+msgid "Wrap anchor only"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:332
+msgid "Ideal wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:333
+msgid "Left wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:334
+msgid "Right wrap"
+msgstr ""
+
+#: dist/toolbar/toolbar.js:335
+msgid "Wr

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/tdf103001.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|   13 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   32 +++
 sw/source/filter/ww8/docxattributeoutput.hxx |7 +++--
 sw/source/filter/ww8/docxexport.cxx  |8 +++---
 5 files changed, 44 insertions(+), 16 deletions(-)

New commits:
commit 3906d25a2e12123aee54654ad26699a2832389d4
Author: Miklos Vajna 
Date:   Tue Oct 11 08:03:58 2016 +0200

tdf#103001 DOCX export: fix RelId cache when switching streams

RelIds are used to refer to external streams, e.g. images. A RelId cache
tries to avoid storing the same image more than once in the export
result. RelIds are relative to an XML stream, so caching them across
stream switches is problematic. There was code already to notify the
cache after a header or footer was written, but:

1) It was only done after a switch, not before and

2) It cleared the whole cache, instead of stashing it away, and
restoring it when the write of the special stream is done.

Regression from commit b484e9814c66d8d51cea974390963a6944bc9d73
(tdf#83227 oox: reuse RelId in DML/VML export for the same graphic,
2015-09-07), this existing problem became more visible when caching
started to include draw images, not just writer ones.

Fix both problems by turning the cache into a stack that is
pushed/popped around stream changes.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf103001.docx 
b/sw/qa/extras/ooxmlexport/data/tdf103001.docx
new file mode 100644
index 000..332d415
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf103001.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 1a6c967..d08d751 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -958,6 +958,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf83227, "tdf83227.docx")
 CPPUNIT_ASSERT_EQUAL(false, 
bool(xNameAccess->hasByName("word/media/image2.png")));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf103001, "tdf103001.docx")
+{
+// The same image is featured in the header and in the body text, make sure
+// the header relation is still written, even when caching is enabled.
+if (!mbExported)
+return;
+
+uno::Reference xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
 maTempFile.GetURL());
+// This failed: header reused the RelId of the body text, even if RelIds
+// are local to their stream.
+CPPUNIT_ASSERT(xNameAccess->hasByName("word/_rels/header1.xml.rels"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf92521, "tdf92521.odt")
 {
 if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 582e8cd..4096694 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4166,25 +4166,34 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* 
pSdrObj )
 }
 }
 
-void DocxAttributeOutput::ClearRelIdCache()
+void DocxAttributeOutput::PopRelIdCache()
 {
-m_aRelIdCache.clear();
-m_aSdrRelIdCache.clear();
+if (!m_aRelIdCache.empty())
+m_aRelIdCache.pop();
+if (!m_aSdrRelIdCache.empty())
+m_aSdrRelIdCache.pop();
+}
+
+void DocxAttributeOutput::PushRelIdCache()
+{
+m_aRelIdCache.push(std::map());
+m_aSdrRelIdCache.push(std::map());
 }
 
 OUString DocxAttributeOutput::FindRelId(BitmapChecksum nChecksum)
 {
 OUString aRet;
 
-if (m_aSdrRelIdCache.find(nChecksum) != m_aSdrRelIdCache.end())
-aRet = m_aSdrRelIdCache[nChecksum];
+if (!m_aSdrRelIdCache.empty() && m_aSdrRelIdCache.top().find(nChecksum) != 
m_aSdrRelIdCache.top().end())
+aRet = m_aSdrRelIdCache.top()[nChecksum];
 
 return aRet;
 }
 
 void DocxAttributeOutput::CacheRelId(BitmapChecksum nChecksum, const OUString& 
rRelId)
 {
- m_aSdrRelIdCache[nChecksum] = rRelId;
+if (!m_aSdrRelIdCache.empty())
+m_aSdrRelIdCache.top()[nChecksum] = rRelId;
 }
 
 void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const 
Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, 
const SdrObject* pSdrObj )
@@ -4222,9 +4231,9 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 else
 pGraphic = pOLENode->GetGraphic();
 
-if (m_aRelIdCache.find(pGraphic) != m_aRelIdCache.end())
+if (!m_aRelIdCache.empty() && m_aRelIdCache.top().find(pGraphic) != 
m_aRelIdCache.top().end())
 // We already have a RelId for this Graphic.
-aRelId = 

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 7dbe627ca8dbb8745e25c4217913c88d2caabe89
Author: Caolán McNamara 
Date:   Tue Oct 11 11:33:41 2016 +0100

Updated core
Project: help  b223bd2e0ccf3c09d69b0cbf4da063f15ca453ef

update helpids for writer navigator .ui conversion

Change-Id: Ib25355ffe0d58a50eaad7e5aaeb1d10efc101404

diff --git a/helpcontent2 b/helpcontent2
index b5b5879..b223bd2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b5b5879c9ed7b8c120c21f9b700247a1442d2a47
+Subproject commit b223bd2e0ccf3c09d69b0cbf4da063f15ca453ef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpers/help_hid.lst|   26 ---
 source/text/shared/01/0211.xhp  |   18 +-
 source/text/swriter/01/0211.xhp |   59 ++--
 3 files changed, 39 insertions(+), 64 deletions(-)

New commits:
commit b223bd2e0ccf3c09d69b0cbf4da063f15ca453ef
Author: Caolán McNamara 
Date:   Tue Oct 11 11:33:41 2016 +0100

update helpids for writer navigator .ui conversion

Change-Id: Ib25355ffe0d58a50eaad7e5aaeb1d10efc101404

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2168ac7..f25231d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2017,36 +2017,10 @@ HID_NAVIGATOR_LISTBOX,52978,
 HID_NAVIGATOR_TOOLBOX,52977,
 HID_NAVIGATOR_TREELIST,52974,
 HID_NAVIGATOR_WINDOW,33154,
-HID_NAVI_CONTENT,53044,
 HID_NAVI_DRAG_COPY,52831,
 HID_NAVI_DRAG_HYP,52829,
 HID_NAVI_DRAG_LINK,52830,
-HID_NAVI_GLOBAL,53045,
 HID_NAVI_OUTLINES,52832,
-HID_NAVI_TBX1,52987,
-HID_NAVI_TBX10,52996,
-HID_NAVI_TBX11,52997,
-HID_NAVI_TBX12,52998,
-HID_NAVI_TBX13,52999,
-HID_NAVI_TBX14,53000,
-HID_NAVI_TBX15,53001,
-HID_NAVI_TBX16,53005,
-HID_NAVI_TBX17,53011,
-HID_NAVI_TBX18,53012,
-HID_NAVI_TBX19,53013,
-HID_NAVI_TBX2,52988,
-HID_NAVI_TBX20,53014,
-HID_NAVI_TBX21,53015,
-HID_NAVI_TBX22,53016,
-HID_NAVI_TBX23,53017,
-HID_NAVI_TBX24,53018,
-HID_NAVI_TBX3,52989,
-HID_NAVI_TBX4,52990,
-HID_NAVI_TBX5,52991,
-HID_NAVI_TBX6,52992,
-HID_NAVI_TBX7,52993,
-HID_NAVI_TBX8,52994,
-HID_NAVI_TBX9,52995,
 HID_NAVI_VS,53002,
 HID_NID_BKM,55007,
 HID_NID_CTRL,55004,
diff --git a/source/text/shared/01/0211.xhp 
b/source/text/shared/01/0211.xhp
index 0ea745b..2ef8f03 100644
--- a/source/text/shared/01/0211.xhp
+++ b/source/text/shared/01/0211.xhp
@@ -48,7 +48,7 @@
  
   
 
-
+
 
 Edit
   Edit the contents of the component 
selected in the Navigator list. If the selection is a file, the file is opened 
for editing. If the selection is an index, the index dialog is 
opened.
@@ -65,7 +65,7 @@
  
   
 
-
+
 
 Update
@@ -103,7 +103,7 @@
 Edit link
   This command is found by right-clicking an inserted file in the 
Navigator.Changes the link properties for 
the selected file.
-
+
 
 Insert
@@ -138,10 +138,10 @@
 Text
   Inserts a new 
paragraph in the master document where you can enter text. You cannot insert 
text next to an existing text entry in the 
Navigator.i81372
-
+
 Save Contents as well
-  Saves a copy of the contents of the 
linked files in the master document. This ensures that the current contents are 
available when the linked files cannot be accessed.
+  Saves a copy of 
the contents of the linked files in the master document. This ensures that the 
current contents are available when the linked files cannot be 
accessed.
   
  
 
@@ -155,10 +155,10 @@
  
   
 
-
+
 Move Down
-  Moves the selection down one position 
in the Navigator list. You can also move entries by dragging and 
dropping them in the list. If you move a text section onto another text 
section, the text sections are merged.
+  Moves the 
selection down one position in the Navigator list. You can also move 
entries by dragging and dropping them in the list. If you move a text section 
onto another text section, the text sections are merged.
   
  
 
@@ -172,10 +172,10 @@
  
   
 
-
+
 Move Up
-  Moves the selection up one position in 
the Navigator list. You can also move entries by dragging and dropping 
them in the list. If you move a text section onto another text section, the 
text sections are merged.
+  Moves the 
selection up one position in the Navigator list. You can also move 
entries by dragging and dropping them in the list. If you move a text section 
onto another text section, the text sections are merged.
   
  
 
diff --git a/source/text/swriter/01/0211.xhp 
b/source/text/swriter/01/0211.xhp
index be2fca6..c452b7e 100644
--- a/source/text/swriter/01/0211.xhp
+++ b/source/text/swriter/01/0211.xhp
@@ -39,7 +39,8 @@
 Click the plus sign (+) next to a category in the Navigator to view 
the items in the category. To view the number of items in a category, rest your 
mouse pointer over the category in the Navigator. To jump to an item in the 
document, double-click the item in the Navigator.
 To jump to the next or previous item in a document, click the Navigation icon to 
open the Navigation toolbar, click the item category, and then click the up or 
down arrows.
 A hidden section in a document appears gray in the Navigator, and 
displays the text "hidden" when you rest the mouse pointer over it. The same 
applies to header and footer contents of Page Styles that are not used in a 
document, and hidden contents in tables, text frames, graphics, OLE objects, 
and indexes.
-
+
+
 Toggle Master View
 Switches between master view and 
normal view if a master document is open. Switches between ma

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 2 commits - loleaflet/src loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/LOOLWSD.cpp loolwsd/MasterPro

[Pranav Kant]

 loleaflet/src/core/Socket.js |5 +++-
 loleaflet/src/map/Map.js |2 -
 loolwsd/DocumentBroker.cpp   |   45 +++
 loolwsd/DocumentBroker.hpp   |8 +-
 loolwsd/LOOLWSD.cpp  |   26 +++---
 loolwsd/MasterProcessSession.cpp |   10 +---
 loolwsd/MasterProcessSession.hpp |7 +-
 7 files changed, 77 insertions(+), 26 deletions(-)

New commits:
commit c52e09d2677725725984e062cd1a45a28012c8f3
Author: Pranav Kant 
Date:   Tue Oct 11 16:17:03 2016 +0530

Revert "loleaflet: Fix incorrect reference to username"

Structure of viewInfo object in master and this branch is
different, so don't backport this here.

This reverts commit 76e739bc0da70de966917267bbbf8fd411d81d4a.

Change-Id: Ida30959a59cdf89183783ba9e4d84b7d32673489

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 56ac23a..ba72f67 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -131,7 +131,7 @@ L.Map = L.Evented.extend({
},
 
removeView: function(viewid) {
-   var username = this._viewInfo[viewid].username;
+   var username = this._viewInfo[viewid];
delete this._viewInfo[viewid];
this.fire('removeview', {viewId: viewid, username: username});
},
commit 3ab3e3658429d63173f26cdff1157b5e87684b65
Author: Pranav Kant 
Date:   Mon Jul 11 10:20:25 2016 +0530

loolwsd: Introduce a readonly mode

Specified when websocket is initialized. Documents once
opened in readonly mode cannot edit throughout the life of the session.
This is very much like present view mode except the ability to
change to edit mode.

Change-Id: I176e3bbf210c3383268d1a5b50dc17f0cbfb26b8
(cherry picked from commit 62814d29cf7386343a85cc66a2fe2b039bcd2e83)
(cherry picked from commit 3d306a0d7b0bf4030bb8b926f9e81a67d10f2b6b)

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 688b9ca..2c28d3b 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -9,7 +9,10 @@ L.Socket = L.Class.extend({
initialize: function (map) {
this._map = map;
try {
-   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc) + '/ws');
+   var params = {
+   permission: map.options.permission
+   };
+   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + $.param(params)) + '/ws');
this.socket.onerror = L.bind(this._onSocketError, this);
this.socket.onclose = L.bind(this._onSocketClose, this);
this.socket.onopen = L.bind(this._onSocketOpen, this);
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 818c32b..85e2830 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -96,6 +96,7 @@ DocumentBroker::DocumentBroker(const Poco::URI& uriPublic,
 _childProcess(childProcess),
 _lastSaveTime(std::chrono::steady_clock::now()),
 _markToDestroy(false),
+_lastEditableSession(false),
 _isLoaded(false),
 _isModified(false)
 {
@@ -193,7 +194,7 @@ bool DocumentBroker::save(bool success, const std::string& 
result)
 // If we aren't destroying the last editable session just yet, and the file
 // timestamp hasn't changed, skip saving.
 const auto newFileModifiedTime = 
Poco::File(_storage->getLocalRootPath()).getLastModified();
-if (!isMarkedToDestroy() && newFileModifiedTime == _lastFileModifiedTime)
+if (!isLastEditableSession() && newFileModifiedTime == 
_lastFileModifiedTime)
 {
 // Nothing to do.
 Log::debug() << "Skipping unnecessary saving to URI [" << uri
@@ -369,7 +370,13 @@ size_t 
DocumentBroker::addSession(std::shared_ptr& session
 Log::warn("DocumentBroker: Trying to add already existing session.");
 }
 
-if (_sessions.size() == 1)
+if (session->isReadOnly())
+{
+Log::debug("Adding a readonly session [" + id + "]");
+}
+// TODO: Below is not always true. What if readonly session is already 
opened
+// In that case we still have to give edit lock to this *second* session.
+else if (_sessions.size() == 1)
 {
 Log::debug("Giving editing lock to the first session [" + id + "].");
 _sessions.begin()->second->markEditLock(true);
@@ -413,11 +420,14 @@ size_t DocumentBroker::removeSession(const std::string& 
id)
 
 if (haveEditLock)
 {
-// pass the edit lock to first session in map
-it = _sessions.begin();
-if (it != _sessions.end())
+// pass the edit lock to first non-readonly session in map
+for (auto& session: _sessions)
 {

[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

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

[Libreoffice-commits] help.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

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

[Libreoffice-commits] translations.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

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

[Libreoffice-commits] core.git: Branch 'refs/tags/cp-5.1-9' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
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/cp-5.1-9'

[Andras Timar]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 10:57 +

cp-5.1-9

Changes since cp-5.1-3:
Andras Timar (1):
  Update pt_PT dictionary to version 16.7.4.1

---
 pt_PT/description.xml |2 -
 pt_PT/pt_PT.aff   |   25 +++--
 pt_PT/pt_PT.dic   |   93 +++---
 3 files changed, 74 insertions(+), 46 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Björn Balazs license statement

[Dennis Roczek]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi Jan,

why cannot Björn's contributions be licensed under CC-0 or under Public
Domain? Doug - for example - chose WTFL... Technically this is possible!

It's the same if somebody wants to use APLv2. It is compatible with our
license and it totally valid.

Regards,

Dennis Roczek

On 11.10.2016 11:59, Jan Iversen wrote:
> Hi
> 
> Thanks for your license statement. Please be aware this license cannot
 be used for development activities. Our project consist of many other a
ctivities where this license is good.
> 
> rgds
> jan I.
> 
>> On 11 Oct 2016, at 11:30, Björn Balazs  wrote:
>>
>> To the extent possible under law, I waive all copyright and related o
r
>> neighboring rights to my past & future contributions to LibreOffice:
>>
>>   http://creativecommons.org/publicdomain/zero/1.0
>>
>> Cheers,
>> Björn
>> ---
>> Dipl.-Psych. Björn Balazs
>> Business Management & Research
>>
>> User Prompt GmbH | Psychologic IT Expertise 
>> Grünberger Str. 49, 10245 Berlin | www.user-prompt.com 
>> HRB 142277 | AG Berlin Charlottenburg | Geschäftsführer Björn Balazs_
__
>> 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
> 
-BEGIN PGP SIGNATURE-
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJX/MWfAAoJEM4+Qf3OKrbZY80QAIshXvxO//amXwNwL1eDFs5b
+WRWLevhvK41kH56MZSr2ZWacJ2qD2E9ATWAgxZ5DDVhaio6LVrvyXZhQ9BB7pzS
UKTuT9YAqIDi0FktoW7eJ1/markWCQr0KKRS60FcKjm1CqSyym80lp7gjY/NqYV4
0legUJ6m21qMuupWFhEc9ZMio7SOqaaUC2beE8JihzGVaqXtx4574iBDvPpq9adr
mWl0o7uW4ZJVIGklpu244UVYnq0AHCgb7Xdlql37bmAa4Ygghfa4W2khd3lDfKKP
aOZDSSTqw5BbjQTvYikkInlmFA3+dvbR86zHyrvYj6VEmYvjbOS3z5HcGZ73YowP
dXQG+ISjjiDvgVrAPq4RjR4XtxY2epNrGbL7ALMVROlBDGaEVOSBDoPxbPIOSeCg
DqN4URm0vLCXnIhgfydcoeoIRqvtPtiFoK8mhD3awdr2q7SxQBLvFRKYrzyg1J0Z
xePWyY1vsH/2lqM6WY14Q/v4o4vNWj3xl6v8DidY8fXzlo3TriuqVKIga2DpFkpX
lCHPAB9MpwCZLZW8hjdpfGO4lXmRhn8iT22JVD/r6ARuV63qdDquuimM09g9HP0d
wSJ8LqJyIEoUfEHajGrokVykAAYI9BOGxkfOfRf43J1BgyEgHP0P3i26tYEV+kpD
wmQuc6a+F/fOGMM/56gB
=mbbS
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.1-9'

[Christian Lohmaier]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 10:57 +

cp-5.1-9

Changes since cp-5.1-3-1:
---
 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/cp-5.1-9'

[Miklos Vajna]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 10:57 +

cp-5.1-9

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-9'

[Andras Timar]

Tag 'cp-5.1-9' created by Andras Timar  at 
2016-10-11 10:56 +

cp-5.1-9

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

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

[Tomaž Vajngerl]

 vcl/source/gdi/graph.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9c9f184138dd9e3dbd50d5d50fc86ca172ae4dfe
Author: Tomaž Vajngerl 
Date:   Tue Oct 11 12:59:00 2016 +0200

vcl: put in anonymous namespace

Change-Id: Ib24a8dd044003f8d667d97e989fbbf640d4eacdf

diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 77c8fad..db4f1a7 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -33,7 +33,10 @@
 
 using namespace ::com::sun::star;
 
-static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
+namespace
+{
+
+void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
  vcl::Font* pFont, const Bitmap* pBitmap, const 
BitmapEx* pBitmapEx,
  const Point& rDestPt, const Size& rDestSize )
 {
@@ -178,6 +181,8 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const 
OUString* pText,
 pOutDev->Pop();
 }
 
+} // end anonymous namespace
+
 Graphic::Graphic()
 : mxImpGraphic(new ImpGraphic)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Filippo Giacchè license statement

[Filippo giacchè]

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

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

[Pranav Kant]

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

New commits:
commit 493c460ec119ed9e9be8e280eaa921eb006f0e6f
Author: Pranav Kant 
Date:   Sun Jul 10 01:08:56 2016 +0530

loleaflet: Separate document URL from query params

Change-Id: I9b8381b8c0d92796aadabe0bc63e5a1b144f8b41
(cherry picked from commit 126503289613704dc490adca367bc90d35b8674f)

 Conflicts:
loleaflet/src/core/Socket.js

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 4610a6b..371b0c7 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -93,7 +93,7 @@
 var wopiSrc = getParameterByName('WOPISrc');
 var access_token = '%ACCESS_TOKEN%';
 if (wopiSrc !== '' && access_token !== '') {
-wopiSrc += '?access_token=' + access_token;
+var wopiParams = { 'access_token': access_token }
 }
 
 var filePath = getParameterByName('file_path');
@@ -116,12 +116,20 @@
 vex.dialog.alert(emptyhosturl);
 }
 
-var docURL = wopiSrc !== '' ? wopiSrc : filePath;
+var docURL, docParams;
+if (wopiSrc != '') {
+docURL = wopiSrc;
+docParams = wopiParams;
+} else {
+docURL = filePath;
+docParams = {};
+}
 
 document.title = title;
 var map = L.map('map', {
server: host,
doc: docURL,
+   docParams: docParams,
permission: permission,
timestamp: timestamp,
documentContainer: 'document-container'
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 2c28d3b..4cf4ef8 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -9,10 +9,10 @@ L.Socket = L.Class.extend({
initialize: function (map) {
this._map = map;
try {
-   var params = {
-   permission: map.options.permission
-   };
-   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + $.param(params)) + '/ws');
+   if (map.options.permission) {
+   map.options.docParams['permission'] = 
map.options.permission;
+   }
+   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + 
$.param(map.options.docParams)) + '/ws');
this.socket.onerror = L.bind(this._onSocketError, this);
this.socket.onclose = L.bind(this._onSocketClose, this);
this.socket.onopen = L.bind(this._onSocketOpen, this);
___
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' - 3 commits - loolwsd/DocumentBroker.cpp loolwsd/test loolwsd/Unit.hpp

[Ashod Nakashian]

 loolwsd/DocumentBroker.cpp   |6 ++
 loolwsd/Unit.hpp |4 +
 loolwsd/test/UnitPrefork.cpp |  101 +++
 3 files changed, 74 insertions(+), 37 deletions(-)

New commits:
commit a6412ca90b1ce56130b1b63ad084b61523890247
Author: Ashod Nakashian 
Date:   Fri May 20 23:08:00 2016 -0400

loolwsd: UnitPrefork can't use the more recent child

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

diff --git a/loolwsd/test/UnitPrefork.cpp b/loolwsd/test/UnitPrefork.cpp
index 9c5766b..cd4bed0 100644
--- a/loolwsd/test/UnitPrefork.cpp
+++ b/loolwsd/test/UnitPrefork.cpp
@@ -32,7 +32,6 @@ const int NumToPrefork = 20;
 // Inside the WSD process
 class UnitPrefork : public UnitWSD
 {
-int _numStarted;
 std::string _failure;
 Poco::Timestamp _startTime;
 size_t _totalPSS;
@@ -43,8 +42,7 @@ class UnitPrefork : public UnitWSD
 
 public:
 UnitPrefork()
-: _numStarted(0),
-  _totalPSS(0),
+: _totalPSS(0),
   _totalDirty(0)
 {
 setHasKitHooks();
@@ -99,6 +97,7 @@ public:
 if (_cv.wait_for(lock, std::chrono::milliseconds(5 * 1000)) == 
std::cv_status::timeout)
 {
 _failure = "Timed out waiting for child to respond to 
unit-memdump.";
+Log::error(_failure);
 }
 
 totalPSS = _totalPSS;
@@ -107,19 +106,21 @@ public:
 
 virtual void newChild(const std::shared_ptr &socket) 
override
 {
-++_numStarted;
 _childSockets.push_back(socket);
-if (_numStarted >= NumToPrefork)
+if (_childSockets.size() > NumToPrefork)
 {
 Poco::Timestamp::TimeDiff elapsed = _startTime.elapsed();
 
 auto totalTime = (1000. * elapsed)/Poco::Timestamp::resolution();
-Log::info() << "Launched " << _numStarted << " in "
+Log::info() << "Launched " << _childSockets.size() << " in "
 << totalTime << Log::end;
 size_t totalPSSKb = 0;
 size_t totalDirtyKb = 0;
-for (auto child : _childSockets)
-getMemory(child, totalPSSKb, totalDirtyKb);
+// Skip the last one as it's not completely initialized yet.
+for (size_t i = 0; i < _childSockets.size() - 1; ++i)
+{
+getMemory(_childSockets[i], totalPSSKb, totalDirtyKb);
+}
 
 Log::info() << "Memory use total   " << totalPSSKb << "k shared "
 << totalDirtyKb << "k dirty" << Log::end;
commit 88df7731da0d24a8925476300504c2fef235cebe
Author: Ashod Nakashian 
Date:   Fri May 20 22:52:55 2016 -0400

loolwsd: cleanup and improvements to UnitPrefork

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

diff --git a/loolwsd/test/UnitPrefork.cpp b/loolwsd/test/UnitPrefork.cpp
index f9437bb..9c5766b 100644
--- a/loolwsd/test/UnitPrefork.cpp
+++ b/loolwsd/test/UnitPrefork.cpp
@@ -53,6 +53,11 @@ public:
 virtual void returnValue(int &retValue) override
 {
 // 0 when empty (success), otherwise failure.
+if (!_failure.empty())
+{
+Log::error("UnitPrefork failed due to: " + _failure);
+}
+
 retValue = !_failure.empty();
 }
 
@@ -108,8 +113,9 @@ public:
 {
 Poco::Timestamp::TimeDiff elapsed = _startTime.elapsed();
 
+auto totalTime = (1000. * elapsed)/Poco::Timestamp::resolution();
 Log::info() << "Launched " << _numStarted << " in "
-<< (1.0 * elapsed)/Poco::Timestamp::resolution() << 
Log::end;
+<< totalTime << Log::end;
 size_t totalPSSKb = 0;
 size_t totalDirtyKb = 0;
 for (auto child : _childSockets)
@@ -123,10 +129,19 @@ public:
 Log::info() << "Memory use average " << totalPSSKb << "k shared "
 << totalDirtyKb << "k dirty" << Log::end;
 
+Log::info() << "Launch time total   " << totalTime << " ms" << 
Log::end;
+totalTime /= _childSockets.size();
+Log::info() << "Launch time average " << totalTime << " ms" << 
Log::end;
+
 if (!_failure.empty())
+{
+Log::error("UnitPrefork failed due to: " + _failure);
 exitTest(TestResult::TEST_FAILED);
+}
 else
+{
 exitTest(TestResult::TEST_OK);
+}
 }
 }
 };
@@ -140,14 +155,13 @@ namespace {
 if (!strncmp(line, tag, len))
 {
 while (!isdigit(line[len]) && line[len] != '\0')
-len++;
+++len;
 
 const auto str = std::string(line + len, strlen(line

Re: Björn Balazs license statement

[Jan Iversen]

> 
> Signed PGP part
> Hi Jan,
> 
> why cannot Björn's contributions be licensed under CC-0 or under Public
> Domain? Doug - for example - chose WTFL... Technically this is possible!
> 
> It's the same if somebody wants to use APLv2. It is compatible with our
> license and it totally valid.

Not again, sorry.

Look at:
https://wiki.documentfoundation.org/Development/Developers#Example_Statement 


that is the current rulebook, for development exclusively use MPLv2/LGPLv3+ 
dual license

The ESC can change that rule, but until then, that is how we work with our 
development repos.

Other types of work is less my concern, but there is an ongoing discussion 
about how documentation should be licensed.

rgds
jan I.

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

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

[Miklos Vajna]

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

New commits:
commit 844f7757903163f5e6e49389b5c4e247f0df3300
Author: Miklos Vajna 
Date:   Thu Jun 16 13:45:20 2016 +0200

loolwsd: disable unit-fonts for now as it's unstable

diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 4f28533..a01478d 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -51,7 +51,8 @@ endif
 if HAVE_LO_PATH
 check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
-TESTS = unit-tilecache.la unit-admin.la unit-timeout.la unit-fonts.la 
unit-storage.la unit-prefork.la
+# FIXME unit-fonts.la is unstable, disabled for now.
+TESTS = unit-tilecache.la unit-admin.la unit-timeout.la unit-storage.la 
unit-prefork.la
 else
 TESTS = ${top_builddir}/test/test
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Björn Balazs license statement

[Michael Meeks]

Hi Dennis,

On 10/11/2016 11:57 AM, Dennis Roczek wrote:
> why cannot Björn's contributions be licensed under CC-0 or under Public
> Domain? Doug - for example - chose WTFL... Technically this is possible!

Technically =) but let me link to the MPLv2 quickly to see some of what
we'd miss in this case (ie. virtually all of it) - IANAL but for reference:

https://www.mozilla.org/en-US/MPL/2.0/

Some quick examples; section 2.5 is interesting, 8. likewise, 2.1 +
1.11 is particularly helpful - there are more, but these jump out at me
in the 2 minutes I took to skim it again =)

So - the policy does have some basis in usefulness =) Although you are
right, we could take contributions under other licenses, it is really
non-ideal. And it is seldom an issue, having clarity is helpful.

Thanks,

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Akshay Nagar license statement

[Nagar Akshay]

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - loolwsd/debian loolwsd/loolwsd.spec.in

[Andras Timar]

 loolwsd/debian/control  |2 +-
 loolwsd/loolwsd.spec.in |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a584cc0b76fd87e5a6ce4e3edc97da41781bc6e1
Author: Andras Timar 
Date:   Tue Oct 11 13:52:26 2016 +0200

Bump Collabora Office version

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index d40074a..d06db78 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.8), collaboraofficebasis5.1-calc 
(>= 5.1.10.8), collaboraofficebasis5.1-core (>= 5.1.10.8), 
collaboraofficebasis5.1-draw (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.8), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.8), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.8), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.8), 
collaboraofficebasis5.1-images (>
 = 5.1.10.8), collaboraofficebasis5.1-impress (>= 5.1.10.8), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.8), collaboraofficebasis5.1-math 
(>= 5.1.10.8), collaboraofficebasis5.1-ogltrans (>= 5.1.10.8), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.8), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.8), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.8), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.8), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.8), collaboraofficebasis5.1-writer (>= 
5.1.10.8), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.8), collaboraoffice5.1 
(>= 5.1.10.8), collaboraoffice5.1-base (>= 5.1.10.8), collaboraoffice5.1-calc 
(>= 5.1.10.8), collaboraoffice5.1-dict-en (>= 5.1.10.8), 
collaboraoffice5.1-draw (>= 5.1.10.8), collaboraoffice5.1-debian-menus (>= 
5.1.10.8), collaboraoffice5.1-impress (>= 5.1.10.8), collaboraoffice5.1-math 
(>= 5.1.10.8), collaboraoffice5.1-ure (>= 5.1.10.8), collaboraoffice5.1-writer 
(>= 5.1.10.8), collaboraofficebasis5.1-en-us (>= 5.1
 .10.8), collaboraofficebasis5.1-en-us-base (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-math (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-res (>= 5.1.10.8), 
collaboraofficebasis5.1-en-us-writer (>= 5.1.10.8), collaboraoffice5.1-en-us 
(>= 5.1.10.8)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.9), collaboraofficebasis5.1-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-core (>= 5.1.10.9), 
collaboraofficebasis5.1-draw (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.9), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.9), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.9), 
collaboraofficebasis5.1-images (>
 = 5.1.10.9), collaboraofficebasis5.1-impress (>= 5.1.10.9), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.9), collaboraofficebasis5.1-math 
(>= 5.1.10.9), collaboraofficebasis5.1-ogltrans (>= 5.1.10.9), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.9), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.9), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.9), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.9), collaboraofficebasis5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.9), collaboraoffice5.1 
(>= 5.1.10.9), collaboraoffice5.1-base (>= 5.1.10.9), collaboraoffice5.1-calc 
(>= 5.1.10.9), collaboraoffice5.1-dict-en (>= 5.1.10.9), 
collaboraoffice5.1-draw (>= 5.1.10.9), collaboraoffice5.1-debian-menus (>= 
5.1.10.9), collaboraoffice5.1-impress (>= 5.1.10.9), collaboraoffice5.1-math 
(>= 5.1.10.9), collaboraoffice5.1-ure (>= 5.1.10.9), collaboraoffice5.1-writer 
(>= 5.1.10.9), collaboraofficebasis5.1-en-us (>= 5.1
 .10.9), collaboraofficebasis5.1-en-us-base (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.9), 
collaborao

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 93 commits - loleaflet/dist loleaflet/Makefile loleaflet/po loleaflet/README loleaflet/reference.html loleaflet/src l

[Andras Timar]

 loleaflet/Makefile|2 
 loleaflet/README  |4 
 loleaflet/dist/toolbar/toolbar.js |6 
 loleaflet/po/help-da.po   |6 
 loleaflet/po/help-gd.po   | 1023 --
 loleaflet/po/help-gl.po   |  787 +---
 loleaflet/po/help-kab.po  |   14 
 loleaflet/po/help-lt.po   |6 
 loleaflet/po/help-oc.po   |  675 -
 loleaflet/po/help-ro.po   |   10 
 loleaflet/po/help-ta.po   |  833 ++---
 loleaflet/po/help-uz.po   |  114 +-
 loleaflet/po/help-vec.po  |8 
 loleaflet/po/templates/loleaflet-help.pot |2 
 loleaflet/po/templates/loleaflet-ui.pot   |  666 ++--
 loleaflet/po/ui-ca.po |   76 -
 loleaflet/po/ui-da.po |   64 -
 loleaflet/po/ui-fi.po |   68 -
 loleaflet/po/ui-gd.po |  149 +--
 loleaflet/po/ui-gl.po |  195 +---
 loleaflet/po/ui-lt.po |6 
 loleaflet/po/ui-nl.po |   16 
 loleaflet/po/ui-nn.po |   43 -
 loleaflet/po/ui-oc.po |  211 +
 loleaflet/po/ui-sk.po |   64 -
 loleaflet/po/ui-ta.po |  505 +---
 loleaflet/po/ui-th.po |  263 ++
 loleaflet/po/ui-vec.po|8 
 loleaflet/reference.html  |   21 
 loleaflet/src/control/Control.ColumnHeader.js |4 
 loleaflet/src/control/Control.Menubar.js  |8 
 loleaflet/src/control/Control.RowHeader.js|4 
 loleaflet/src/core/LOUtil.js  |8 
 loleaflet/src/core/Socket.js  |7 
 loleaflet/src/layer/tile/TileLayer.js |  109 +-
 loleaflet/src/map/Map.js  |   19 
 loolwsd/.gitignore|1 
 loolwsd/ChildSession.cpp  |   48 -
 loolwsd/ChildSession.hpp  |   19 
 loolwsd/ClientSession.cpp |   20 
 loolwsd/ClientSession.hpp |   16 
 loolwsd/DocumentBroker.cpp|  114 ++
 loolwsd/DocumentBroker.hpp|   23 
 loolwsd/LOOLForKit.cpp|   12 
 loolwsd/LOOLKit.cpp   |  411 --
 loolwsd/LOOLKit.hpp   |3 
 loolwsd/LOOLProtocol.cpp  |   43 -
 loolwsd/LOOLProtocol.hpp  |   56 +
 loolwsd/LOOLSession.hpp   |2 
 loolwsd/LOOLStress.cpp|5 
 loolwsd/LOOLWSD.cpp   |  165 ++--
 loolwsd/MessageQueue.cpp  |   52 +
 loolwsd/MessageQueue.hpp  |7 
 loolwsd/PrisonerSession.cpp   |   33 
 loolwsd/Storage.cpp   |   26 
 loolwsd/TileCache.cpp |   19 
 loolwsd/TileDesc.hpp  |1 
 loolwsd/Unit.cpp  |1 
 loolwsd/UserMessages.hpp  |2 
 loolwsd/Util.cpp  |2 
 loolwsd/Util.hpp  |   38 
 loolwsd/configure.ac  |3 
 loolwsd/discovery.xml |  130 ++-
 loolwsd/lint-discovery.py |  246 ++
 loolwsd/protocol.txt  |   51 -
 loolwsd/test/Makefile.am  |   16 
 loolwsd/test/TileCacheTests.cpp   |  150 ++-
 loolwsd/test/TileQueueTests.cpp   |   83 +-
 loolwsd/test/UnitFonts.cpp|4 
 loolwsd/test/UnitPrefork.cpp  |   86 +-
 loolwsd/test/UnitTileCache.cpp|   13 
 loolwsd/test/WhiteBoxTests.cpp|7 
 loolwsd/test/countloolkits.hpp|   15 
 loolwsd/test/helpers.hpp  |  187 
 loolwsd/test/httpcrashtest.cpp|2 
 loolwsd/test/httpwserror.cpp  |2 
 loolwsd/test/httpwstest.cpp   |  720 --
 loolwsd/test/integration-http-server.cpp  |1 
 loolwsd/test/test.cpp |1 
 loolwsd/test/testlokit.cpp|  107 ++
 80 files changed, 4645 insertions(+), 4302 deletions(-)

New commits:
commit a66db5303ee4df8481705be03ebfb5e36d1c9363
Author: Andras Timar 
Date:   Tue Oct 11 13:54:54 2016 +0200

Bump version to 1.9.4

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 487fcb0..0a8cb52 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, e

[Libreoffice-commits] core.git: Branch 'feature/profilesafemode' - 15 commits - accessibility/inc accessibility/source bin/count-src-resources bin/count-todo-dialogs comphelper/Library_comphelper.mk c

[Armin Le Grand]

Rebased ref, commits from common ancestor:
commit 35ec8253ad80b0381e73a8f00fd3deb2309f5fe4
Author: Armin Le Grand 
Date:   Thu Sep 29 18:00:35 2016 +0200

profilesafe: Add values for SecureUserConfig

Added default values for SecureUserConfig values
to soffice.ini/rc which enable the mechanism,
enable by default and set a maximum of three backups
file in packed form. Added more handy flag for easy
decision to add compressed/uncompressed.

Change-Id: I5a624c09fec4e4278314e13fc5f693ac085d5e61

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index e02a855..5270306 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -103,7 +103,7 @@ namespace
 {
 sal_uInt8 aArray[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt64 nBytesTransfer(0);
-sal_uInt64 nSize(getFullFileSize());
+sal_uInt64 nSize(getPackFileSize());
 
 // set offset in source file - when this is zero, a new file 
is to be added
 if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, 
sal_Int64(getOffset(
@@ -140,7 +140,7 @@ namespace
 sal_uInt8 aArray[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt8 aBuffer[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt64 nBytesTransfer(0);
-sal_uInt64 nSize(getFullFileSize());
+sal_uInt64 nSize(getPackFileSize());
 std::unique_ptr< z_stream > zstream(new z_stream);
 memset(zstream.get(), 0, sizeof(*zstream));
 
@@ -294,21 +294,22 @@ namespace
 
 
 public:
+// create new, uncompressed entry
 PackedFileEntry(
 sal_uInt32 nFullFileSize,
-sal_uInt32 nOffset,
 sal_uInt32 nCrc32,
 FileSharedPtr& rFile,
 bool bDoCompress)
 :   mnFullFileSize(nFullFileSize),
 mnPackFileSize(nFullFileSize),
-mnOffset(nOffset),
+mnOffset(0),
 mnCrc32(nCrc32),
 maFile(rFile),
 mbDoCompress(bDoCompress)
 {
 }
 
+// create entry to be loaded as header (read_header)
 PackedFileEntry()
 :   mnFullFileSize(0),
 mnPackFileSize(0),
@@ -669,7 +670,7 @@ namespace
 return bRetval;
 }
 
-bool tryPush(FileSharedPtr& rFileCandidate)
+bool tryPush(FileSharedPtr& rFileCandidate, bool bCompress)
 {
 sal_uInt64 nFileSize(0);
 
@@ -724,19 +725,14 @@ namespace
 nCrc32 = createCrc32(rFileCandidate, 0);
 }
 
-// create a file entry for a new file. Offset is set to 0 to 
mark
-// the entry as new file entry
-// the compress flag decides if entries should be compressed 
when
-// they get written to the target package
-static bool bUseCompression(true);
-
+// create a file entry for a new file. Offset is set 
automatically
+// to 0 to mark the entry as new file entry
 maPackedFileEntryVector.push_back(
 PackedFileEntry(
 static_cast< sal_uInt32 >(nFileSize),
-0,
 nCrc32,
 rFileCandidate,
-bUseCompression));
+bCompress));
 
 mbChanged = true;
 }
@@ -837,14 +833,14 @@ namespace comphelper
 return OUString(maBase + "/." + maName + ".pack");
 }
 
-bool BackupFileHelper::tryPush()
+bool BackupFileHelper::tryPush(bool bCompress)
 {
 if (splitBaseURL() && baseFileExists())
 {
 PackedFile aPackedFile(getName());
 FileSharedPtr aBaseFile(new osl::File(mrBaseURL));
 
-if (aPackedFile.tryPush(aBaseFile))
+if (aPackedFile.tryPush(aBaseFile, bCompress))
 {
 // reduce to allowed number and flush
 aPackedFile.tryReduceToNumBackups(mnNumBackups);
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 206d346..17f09a3 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -613,8 +613,6 @@ Components::Components(
 
 Components::~Components()
 {
-SAL_WARN("configmgr", "# Components::~Components() 
#");
-
 // get flag if _exit was already called which is a sign to not to secure 
user config
 const bool 
bExitWasCalled(comphelper::BackupFileHelper::getExitWasCalled());
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 798d60d..a9d10c3 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -569,11 +569,14 @@ void Desktop::Init()
 Set

[Libreoffice-commits] core.git: 5 commits - comphelper/Library_comphelper.mk comphelper/source configmgr/source desktop/source desktop/uiconfig include/comphelper instsetoo_native/CustomTarget_setup.m

[Armin Le Grand]

 comphelper/Library_comphelper.mk|2 
 comphelper/source/misc/backupfilehelper.cxx |  934 
 configmgr/source/components.cxx |   44 
 configmgr/source/writemodfile.cxx   |   60 
 desktop/source/app/app.cxx  |  104 +
 desktop/uiconfig/ui/querytrytorestoreconfigurationdialog.ui |   37 
 include/comphelper/backupfilehelper.hxx |  154 +
 instsetoo_native/CustomTarget_setup.mk  |3 
 8 files changed, 1325 insertions(+), 13 deletions(-)

New commits:
commit 35ec8253ad80b0381e73a8f00fd3deb2309f5fe4
Author: Armin Le Grand 
Date:   Thu Sep 29 18:00:35 2016 +0200

profilesafe: Add values for SecureUserConfig

Added default values for SecureUserConfig values
to soffice.ini/rc which enable the mechanism,
enable by default and set a maximum of three backups
file in packed form. Added more handy flag for easy
decision to add compressed/uncompressed.

Change-Id: I5a624c09fec4e4278314e13fc5f693ac085d5e61

diff --git a/comphelper/source/misc/backupfilehelper.cxx 
b/comphelper/source/misc/backupfilehelper.cxx
index e02a855..5270306 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -103,7 +103,7 @@ namespace
 {
 sal_uInt8 aArray[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt64 nBytesTransfer(0);
-sal_uInt64 nSize(getFullFileSize());
+sal_uInt64 nSize(getPackFileSize());
 
 // set offset in source file - when this is zero, a new file 
is to be added
 if (osl::File::E_None == maFile->setPos(osl_Pos_Absolut, 
sal_Int64(getOffset(
@@ -140,7 +140,7 @@ namespace
 sal_uInt8 aArray[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt8 aBuffer[BACKUP_FILE_HELPER_BLOCK_SIZE];
 sal_uInt64 nBytesTransfer(0);
-sal_uInt64 nSize(getFullFileSize());
+sal_uInt64 nSize(getPackFileSize());
 std::unique_ptr< z_stream > zstream(new z_stream);
 memset(zstream.get(), 0, sizeof(*zstream));
 
@@ -294,21 +294,22 @@ namespace
 
 
 public:
+// create new, uncompressed entry
 PackedFileEntry(
 sal_uInt32 nFullFileSize,
-sal_uInt32 nOffset,
 sal_uInt32 nCrc32,
 FileSharedPtr& rFile,
 bool bDoCompress)
 :   mnFullFileSize(nFullFileSize),
 mnPackFileSize(nFullFileSize),
-mnOffset(nOffset),
+mnOffset(0),
 mnCrc32(nCrc32),
 maFile(rFile),
 mbDoCompress(bDoCompress)
 {
 }
 
+// create entry to be loaded as header (read_header)
 PackedFileEntry()
 :   mnFullFileSize(0),
 mnPackFileSize(0),
@@ -669,7 +670,7 @@ namespace
 return bRetval;
 }
 
-bool tryPush(FileSharedPtr& rFileCandidate)
+bool tryPush(FileSharedPtr& rFileCandidate, bool bCompress)
 {
 sal_uInt64 nFileSize(0);
 
@@ -724,19 +725,14 @@ namespace
 nCrc32 = createCrc32(rFileCandidate, 0);
 }
 
-// create a file entry for a new file. Offset is set to 0 to 
mark
-// the entry as new file entry
-// the compress flag decides if entries should be compressed 
when
-// they get written to the target package
-static bool bUseCompression(true);
-
+// create a file entry for a new file. Offset is set 
automatically
+// to 0 to mark the entry as new file entry
 maPackedFileEntryVector.push_back(
 PackedFileEntry(
 static_cast< sal_uInt32 >(nFileSize),
-0,
 nCrc32,
 rFileCandidate,
-bUseCompression));
+bCompress));
 
 mbChanged = true;
 }
@@ -837,14 +833,14 @@ namespace comphelper
 return OUString(maBase + "/." + maName + ".pack");
 }
 
-bool BackupFileHelper::tryPush()
+bool BackupFileHelper::tryPush(bool bCompress)
 {
 if (splitBaseURL() && baseFileExists())
 {
 PackedFile aPackedFile(getName());
 FileSharedPtr aBaseFile(new osl::File(mrBaseURL));
 
-if (aPackedFile.tryPush(aBaseFile))
+if (aPackedFile.tryPush(aBaseFile, bCompress))
 {
 // reduce to allowed number and flush
 aPackedFile.tryReduceToNumBackups(mnNumBackups);
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 206d346..17f09a3 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/

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

[Henry Castro]

 loolwsd/LOOLWSD.cpp  |   15 +++
 loolwsd/UserMessages.hpp |2 --
 loolwsd/test/httpwserror.cpp |2 --
 3 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit e7009c12e10a472741e0a93b32cf51bff842dd27
Author: Henry Castro 
Date:   Mon Oct 10 22:28:56 2016 -0400

loolwsd: websocket shutdown cleanup

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 7d181fb..bb1a9c6 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -180,7 +180,6 @@ static inline
 void lcl_shutdownLimitReached(WebSocket& ws)
 {
 const std::string error = Poco::format(PAYLOAD_UNAVALABLE_LIMIT_REACHED, 
MAX_DOCUMENTS, MAX_CONNECTIONS);
-const std::string close = Poco::format(SERVICE_UNAVALABLE_LIMIT_REACHED, 
static_cast(WebSocket::WS_POLICY_VIOLATION));
 
 /* loleaflet sends loolclient, load and partrectangles message immediately
after web socket handshake, so closing web socket fails loading page in
@@ -202,7 +201,7 @@ void lcl_shutdownLimitReached(WebSocket& ws)
 if (--retries == 4)
 {
 ws.sendFrame(error.data(), error.size());
-ws.shutdown(WebSocket::WS_POLICY_VIOLATION, close);
+ws.shutdown(WebSocket::WS_POLICY_VIOLATION, "");
 }
 }
 while (retries > 0 && (flags & WebSocket::FRAME_OP_BITMASK) != 
WebSocket::FRAME_OP_CLOSE);
@@ -210,7 +209,7 @@ void lcl_shutdownLimitReached(WebSocket& ws)
 catch (Exception&)
 {
 ws.sendFrame(error.data(), error.size());
-ws.shutdown(WebSocket::WS_POLICY_VIOLATION, close);
+ws.shutdown(WebSocket::WS_POLICY_VIOLATION, "");
 }
 }
 
@@ -835,8 +834,8 @@ private:
 // something wrong, with internal exceptions
 Log::trace("Abnormal close handshake.");
 session->closeFrame();
-ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, 
SERVICE_UNAVALABLE_INTERNAL_ERROR);
-session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, 
SERVICE_UNAVALABLE_INTERNAL_ERROR);
+ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
 }
 }
 
@@ -985,7 +984,7 @@ public:
 const std::string msg = std::string("error: ") + 
exc.what();
 ws->sendFrame(msg.data(), msg.size());
 // abnormal close frame handshake
-ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, msg);
+ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
 }
 catch (const std::exception& exc2)
 {
@@ -1199,8 +1198,8 @@ public:
 // something wrong, with internal exceptions
 Log::trace("Abnormal close handshake.");
 session->closeFrame();
-ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, 
SERVICE_UNAVALABLE_INTERNAL_ERROR);
-session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, 
SERVICE_UNAVALABLE_INTERNAL_ERROR);
+ws->shutdown(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
+session->shutdownPeer(WebSocket::WS_ENDPOINT_GOING_AWAY, "");
 }
 }
 catch (const Exception& exc)
diff --git a/loolwsd/UserMessages.hpp b/loolwsd/UserMessages.hpp
index 36e6ad3..7883fc0 100644
--- a/loolwsd/UserMessages.hpp
+++ b/loolwsd/UserMessages.hpp
@@ -13,9 +13,7 @@
 #define INCLUDED_USERMESSAGES_HPP
 
 //NOTE: For whatever reason Poco seems to trim the first character.
-
 constexpr auto SERVICE_UNAVALABLE_INTERNAL_ERROR = " Service is unavailable. 
Please try again later and report to your administrator if the issue persists.";
-constexpr auto SERVICE_UNAVALABLE_LIMIT_REACHED = "error: cmd=socket 
kind=close code=%d";
 constexpr auto PAYLOAD_UNAVALABLE_LIMIT_REACHED = "error: cmd=socket 
kind=limitreached params=%d,%d";
 
 #endif
diff --git a/loolwsd/test/httpwserror.cpp b/loolwsd/test/httpwserror.cpp
index 8e7769d..509046c 100644
--- a/loolwsd/test/httpwserror.cpp
+++ b/loolwsd/test/httpwserror.cpp
@@ -103,7 +103,6 @@ void HTTPWSError::testMaxDocuments()
 sendTextFrame(socket, "partpagerectangles ");
 statusCode = getErrorCode(socket, message);
 
CPPUNIT_ASSERT_EQUAL(static_cast(Poco::Net::WebSocket::WS_POLICY_VIOLATION),
 statusCode);
-CPPUNIT_ASSERT_MESSAGE("Wrong error message ", message.find("error: 
cmd=socket kind=close") != std::string::npos);
 }
 catch (const Poco::Exception& exc)
 {
@@ -144,7 +143,6 @@ void HTTPWSError::testMaxConnections()
 sendTextFrame(socketN, "partpagerectangles ");
 statusCode = getErrorCode(*socketN, message);
 
CPPUNIT_ASSERT_EQUAL(static_cast(Poco::Net::WebSocket::WS_POLICY_VIOLATION),
 statusCode);
-CPPUNIT_ASSERT_MESSAGE("Wrong error message ", message.find("error: 
cmd=socket kind=close") != std::string::npos);

[Libreoffice-commits] core.git: sfx2/classification sfx2/Package_classification.mk

[Adolfo Jayme Barrientos]

 sfx2/Package_classification.mk|1 
 sfx2/classification/example_ca-ES.xml |   71 ++
 2 files changed, 72 insertions(+)

New commits:
commit 1ddbbe3e0aebfa86f284ac2712c0d1b36b36fe54
Author: Adolfo Jayme Barrientos 
Date:   Tue Oct 11 07:31:00 2016 -0500

tdf#100352 Provide Catalan classification file

Change-Id: If0bccf16fb83deaf5b13ab5f45d1aaec9ed48bda

diff --git a/sfx2/Package_classification.mk b/sfx2/Package_classification.mk
index a65a82a..e50eb14 100644
--- a/sfx2/Package_classification.mk
+++ b/sfx2/Package_classification.mk
@@ -11,6 +11,7 @@ $(eval $(call 
gb_Package_Package,sfx2_classification,$(SRCDIR)/sfx2))
 
 $(eval $(call 
gb_Package_add_files,sfx2_classification,$(LIBO_SHARE_FOLDER)/classification,\
classification/example.xml \
+   classification/example_ca-ES.xml \
classification/example_hu-HU.xml \
classification/example_nl-NL.xml \
classification/example_pt-BR.xml \
diff --git a/sfx2/classification/example_ca-ES.xml 
b/sfx2/classification/example_ca-ES.xml
new file mode 100644
index 000..707c090
--- /dev/null
+++ b/sfx2/classification/example_ca-ES.xml
@@ -0,0 +1,71 @@
+
+
+Autoritat de polítiques TSCP de 
exemple
+Política TSCP de exemple
+
+urn:example:tscp:1
+
+
+
+
+
+UK-Cabinet
+0
+
+
+
+
+
+Document: Header
+Classificació: afers generals
+
+
+
+UK-Cabinet
+1
+
+
+
+
+
+Document: Header
+Classificació: confidencial
+
+
+Document: Footer
+Aquest contingut és de caràcter confidencial. 
No ho distribuïu externament sense autorització.
+
+
+Document: Watermark
+Confidencial
+
+
+
+UK-Cabinet
+2
+
+
+
+
+
+Document: Header
+Classificació: només d’ús 
intern
+
+
+Document: Footer
+Aquest contingut és només d’ús intern. No 
ho distribuïu externament.
+
+
+Document: Watermark
+Ús intern
+
+
+
+UK-Cabinet
+3
+
+
+
+
+
___
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' - 4 commits - loolwsd/debian loolwsd/loolwsd.spec.in loolwsd/test

[Tor Lillqvist]

 loolwsd/debian/control  |2 +-
 loolwsd/loolwsd.spec.in |2 +-
 loolwsd/test/httpwstest.cpp |   35 ++-
 3 files changed, 32 insertions(+), 7 deletions(-)

New commits:
commit beb38d409637c45c0139f7fd990e02d644201692
Author: Tor Lillqvist 
Date:   Tue Oct 11 15:30:54 2016 +0300

Just give up on testEditLock

Even after cherry-picking fixes made to it in the master branch
(before it was removed completely there as it lost relevance), it
causes the process to die with 'terminate called without an active
exception'. Threads, huh.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 91cdf96..6985914 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -74,7 +74,9 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 CPPUNIT_TEST(testPasswordProtectedDocumentWithCorrectPassword);
 CPPUNIT_TEST(testPasswordProtectedDocumentWithCorrectPasswordAgain);
 CPPUNIT_TEST(testInsertDelete);
+#if 0 // This test just doesn't work. Threads.
 CPPUNIT_TEST(testEditLock);
+#endif
 CPPUNIT_TEST(testSlideShow);
 CPPUNIT_TEST(testInactiveClient);
 CPPUNIT_TEST(testMaxColumn);
commit 9f923e3b1e768ed0017284b042980dac4269bc5f
Author: Ashod Nakashian 
Date:   Sun May 15 10:23:18 2016 -0400

loolwsd: better editlock test

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

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 8f4499f..91cdf96 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -1033,6 +1033,10 @@ void HTTPWSTest::testEditLock()
 std::string documentPath, documentURL;
 getDocumentPathAndURL("hello.odt", documentPath, documentURL);
 
+// This test doesn't really need to be multithreaded.
+// But it's done this way as an experiment and to serve
+// as an example for other similar tests (where necessary).
+// Ultimately, the complexity doesn't justify it.
 std::mutex mutex;
 std::condition_variable cv;
 volatile bool second_client_died = false;
@@ -1065,7 +1069,7 @@ void HTTPWSTest::testEditLock()
 lock.unlock();
 cv.notify_one();
 }
-else if (editlock1 == "editlock: 1")
+else if (msg == "editlock: 1")
 {
 if (second_client_died)
 {
@@ -1080,6 +1084,7 @@ void HTTPWSTest::testEditLock()
 {
 // Normal broadcast when the second 
client joins.
 std::cerr << "First client still has 
the lock." << std::endl;
+
CPPUNIT_ASSERT_EQUAL(std::string("editlock: 1"), msg);
 CPPUNIT_ASSERT_MESSAGE("First doesn't 
have the lock", first_has_editlock);
 }
 }
@@ -1089,6 +1094,8 @@ void HTTPWSTest::testEditLock()
 std::cerr << "First client lost the lock." 
<< std::endl;
 
CPPUNIT_ASSERT_EQUAL(std::string("editlock: 0"), msg);
 first_has_editlock = false;
+std::cerr << "Allowing the second to die." 
<< std::endl;
+cv.notify_one();
 }
 }
 
@@ -1129,6 +1136,9 @@ void HTTPWSTest::testEditLock()
 // But we will take it.
 std::cerr << "Second client taking lock." << 
std::endl;
 sendTextFrame(*socket, "takeedit");
+
+// Wait until the first gets the notification that 
we took it.
+cv.wait(lock);
 }
 else
 {
@@ -1144,8 +1154,8 @@ void HTTPWSTest::testEditLock()
 });
 
 std::cerr << "Second client out." << std::endl;
-socket->shutdown();
 second_client_died = true;
+socket->shutdown();
 first_client.join();
 
 // The second will think it had the lock when it died, but it will 
give it up.
commit 8b4f365577681f05d5db74b825187e0e37f8a99b
Author: Ashod Nakashian 
Date:   Fri May 13 08:47:47 2016 -0400

loolwsd: improved testEditLock to minimize random failures and maximize 
checks

Change-Id: I8ae03d57c9f0f13ebf75122dc66ccdf5b756917d
Reviewed-on: https://gerrit.libreoffice.org/24969
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashia

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

[Henry Castro]

 loolwsd/.gitignore |1 
 loolwsd/test/Makefile.am   |   14 -
 loolwsd/test/testlokit.cpp |  107 -
 3 files changed, 2 insertions(+), 120 deletions(-)

New commits:
commit c3c8235561dabd6ed47dbeef19d076b785de5fee
Author: Henry Castro 
Date:   Tue Oct 11 08:26:02 2016 -0400

Revert "loolwsd: test: .uno:AutoSum"

This is no longer need it, because the unit test
was already added to sc/qa/unit/tiledrendering/tiledrendering.cxx

This reverts commit 9b1087e000a5e1ca5ebf9e9c25c8a31705ce6795.

diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore
index d2ff61f..d98297b 100644
--- a/loolwsd/.gitignore
+++ b/loolwsd/.gitignore
@@ -56,4 +56,3 @@ loolstress
 loolforkit-nocaps
 loadtest
 unittest
-testlokit
diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 1cf21fe..70c073a 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTION = serial-tests
 # test: tests that need loolwsd running, and that are run via 'make check'
 check_PROGRAMS = test
 
-noinst_PROGRAMS = test unittest testlokit
+noinst_PROGRAMS = test unittest
 
 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
 
@@ -46,10 +46,6 @@ unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
 unittest_SOURCES = TileQueueTests.cpp WhiteBoxTests.cpp test.cpp $(wsd_sources)
 unittest_LDADD = $(CPPUNIT_LIBS)
 
-testlokit_CPPFLAGS = -DTDOC=\"$(abs_top_srcdir)/test/data\" -I$(top_srcdir) 
-DBUILDING_TESTS
-testlokit_SOURCES = testlokit.cpp test.cpp $(wsd_sources)
-testlokit_LDADD = $(CPPUNIT_LIBS)
-
 # unit test modules:
 unit_fuzz_la_SOURCES = UnitFuzz.cpp
 unit_admin_la_SOURCES = UnitAdmin.cpp
@@ -69,13 +65,7 @@ SYSTEM_STAMP =
 endif
 
 if HAVE_LO_PATH
-check-lokit: testlokit
-   @echo
-   @echo "Running testlokit."
-   @echo
-   @JAIL_PATH="file://@JAILS_PATH@/user" LO_PATH="@LO_PATH@/program" 
${top_builddir}/test/testlokit > check-lokit.log 2>&1 || { cat check-lokit.log 
; exit 1 ; }
-
-check-local: check-lokit
+check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME unit-fonts.la is unstable, disabled for now.
 TESTS = unit-timeout.la unit-prefork.la unit-tilecache.la unit-admin.la 
unit-storage.la
diff --git a/loolwsd/test/testlokit.cpp b/loolwsd/test/testlokit.cpp
deleted file mode 100644
index 5d02c20..000
--- a/loolwsd/test/testlokit.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
-/*
- * 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 "config.h"
-
-#include 
-#include 
-#include 
-#include 
-
-#define LOK_USE_UNSTABLE_API
-#include 
-
-#include "LibreOfficeKit.hpp"
-
-#include 
-
-class TestLOKit : public CPPUNIT_NS::TestFixture
-{
-std::shared_ptr _loKit;
-
-CPPUNIT_TEST_SUITE(TestLOKit);
-
-CPPUNIT_TEST(testAutoSum);
-
-CPPUNIT_TEST_SUITE_END();
-
-void testAutoSum();
-
-public:
-bool _readyCallback;
-std::string _cellFormula;
-std::condition_variable _cvCallback;
-
-TestLOKit()
-{
-char* userdir = getenv("JAIL_PATH");
-CPPUNIT_ASSERT_MESSAGE("JAIL_PATH env variable not set", userdir != 
nullptr);
-
-char* instdir = getenv("LO_PATH");
-CPPUNIT_ASSERT_MESSAGE("LO_PATH env variable not set", instdir != 
nullptr);
-
-_loKit = std::make_shared(lok_init_2(instdir, userdir));
-if (!_loKit || !_loKit->get())
-{
-CPPUNIT_FAIL("LibreOfficeKit initialization failed.");
-}
-}
-
-~TestLOKit()
-{
-}
-
-static void ViewCallback(const int type, const char* payload, void* data)
-{
-if (data == nullptr)
-{
-CPPUNIT_FAIL("Data is nullptr");
-}
-
-TestLOKit* test = static_cast(data);
-
-switch (type)
-{
-case LOK_CALLBACK_CELL_FORMULA:
-{
-test->_cellFormula = payload;
-test->_readyCallback = true;
-test->_cvCallback.notify_one();
-}
-}
-}
-
-void setUp()
-{
-}
-
-void tearDown()
-{
-}
-};
-
-void TestLOKit::testAutoSum()
-{
-std::shared_ptr doc = 
_loKit->documentLoad(TDOC"/empty.ods");
-CPPUNIT_ASSERT(doc);
-
-std::mutex mutex;
-doc->initializeForRendering("");
-doc->registerCallback(ViewCallback, this);
-doc->postUnoCommand(".uno:AutoSum");
-
-std::unique_lock lock(mutex);
-_cvCallback.wait_for(lock, std::chrono::seconds(2), [this] { return 
_readyCallback; });
-doc->registerCallback(nullptr, nullptr);
-CPPUNIT_ASSERT(_cellFormula.find("=SUM(") != std::string::npos);
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestLOKit);
-
-/* vim:set shiftwidth=4 s

[Libreoffice-commits] core.git: 3 commits - sd/inc sd/qa sd/source sd/xml

[Noel Grandin]

 sd/inc/pres.hxx   |   21 +-
 sd/qa/unit/dialogs-test.cxx   |   12 -
 sd/qa/unit/misc-tests.cxx |8 
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |4 
 sd/qa/unit/uimpress.cxx   |2 
 sd/source/core/EffectMigration.cxx|   10 -
 sd/source/core/PageListWatcher.cxx|   24 +-
 sd/source/core/drawdoc.cxx|   20 +-
 sd/source/core/drawdoc2.cxx   |  100 
+-
 sd/source/core/drawdoc3.cxx   |   78 
+++
 sd/source/core/pglink.cxx |2 
 sd/source/core/sdpage.cxx |   71 
+++
 sd/source/core/sdpage2.cxx|   14 -
 sd/source/core/stlpool.cxx|4 
 sd/source/core/stlsheet.cxx   |4 
 sd/source/filter/cgm/sdcgmfilter.cxx  |2 
 sd/source/filter/grf/sdgrffilter.cxx  |   10 -
 sd/source/filter/html/HtmlOptionsDialog.cxx   |6 
 sd/source/filter/html/htmlex.cxx  |   16 -
 sd/source/filter/html/pubdlg.cxx  |2 
 sd/source/filter/ppt/pptin.cxx|   56 ++---
 sd/source/filter/sdfilter.cxx |2 
 sd/source/filter/xml/sdxmlwrp.cxx |4 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |6 
 sd/source/ui/animations/CustomAnimationPane.cxx   |4 
 sd/source/ui/animations/SlideTransitionPane.cxx   |8 
 sd/source/ui/annotations/annotationmanager.cxx|   24 +-
 sd/source/ui/app/sdmod.cxx|6 
 sd/source/ui/app/sdmod1.cxx   |   14 -
 sd/source/ui/app/sdmod2.cxx   |   20 +-
 sd/source/ui/app/sdxfer.cxx   |   10 -
 sd/source/ui/app/tmplctrl.cxx |6 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx |4 
 sd/source/ui/dlg/animobjs.cxx |   10 -
 sd/source/ui/dlg/custsdlg.cxx |6 
 sd/source/ui/dlg/docprev.cxx  |2 
 sd/source/ui/dlg/headerfooterdlg.cxx  |   42 ++--
 sd/source/ui/dlg/masterlayoutdlg.cxx  |   10 -
 sd/source/ui/dlg/sdpreslt.cxx |4 
 sd/source/ui/dlg/sdtreelb.cxx |   14 -
 sd/source/ui/docshell/docshel2.cxx|   12 -
 sd/source/ui/docshell/docshel4.cxx|   24 +-
 sd/source/ui/framework/factories/BasicViewFactory.cxx |6 
 sd/source/ui/framework/tools/FrameworkHelper.cxx  |4 
 sd/source/ui/func/fuconstr.cxx|4 
 sd/source/ui/func/fuexpand.cxx|8 
 sd/source/ui/func/fuinsert.cxx|2 
 sd/source/ui/func/fuinsfil.cxx|   12 -
 sd/source/ui/func/fuolbull.cxx|2 
 sd/source/ui/func/fupage.cxx  |8 
 sd/source/ui/func/fuprlout.cxx|   10 -
 sd/source/ui/func/fusldlg.cxx |8 
 sd/source/ui/func/fusumry.cxx |   10 -
 sd/source/ui/func/futempl.cxx |6 
 sd/source/ui/func/futext.cxx  |4 
 sd/source/ui/inc/DrawDocShell.hxx |6 
 sd/source/ui/inc/DrawViewShell.hxx|2 
 sd/source/ui/inc/GraphicDocShell.hxx  |4 
 sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx   |   10 -
 sd/source/ui/sidebar/DocumentHelper.cxx   |   20 +-
 sd/source/ui/sidebar/LayoutMenu.cxx   |2 
 sd/source/ui/sidebar/MasterPageContainerProviders.cxx |4 
 sd/source/ui/sidebar/MasterPageObserver.cxx   |   12 -
 sd/source/ui/sidebar/MasterPagesSelector.cxx  |4 
 sd/source/ui/sidebar/RecentMasterPagesSelector.cxx|4 
 sd/source/ui/sidebar/SlideBackground.cxx 

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

[Tor Lillqvist]

 loolwsd/test/TileCacheTests.cpp |2 +-
 loolwsd/test/httpwstest.cpp |   16 
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 08bd2c8f1d3710ddc0345f92bb8948f91434d9e4
Author: Tor Lillqvist 
Date:   Tue Oct 11 16:03:29 2016 +0300

We now get viewid parameters, too, in status: messages

So adapt the cppunit checks that test the exact number of tokens.

As such I am not sure whether it makes sense to have such checks. See
"Robustness principle". It should be enough to check that the
mandatory parameters are present, and whether there are more should be
irrelevant. Also, ideally we should accept parameters in arbitrary
order. They are named, after all.

diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp
index ddf620b..0660386 100644
--- a/loolwsd/test/TileCacheTests.cpp
+++ b/loolwsd/test/TileCacheTests.cpp
@@ -340,7 +340,7 @@ void TileCacheTests::checkTiles(Poco::Net::WebSocket& 
socket, const std::string&
 
 std::cout << "status: " << response << std::endl;
 Poco::StringTokenizer tokens(line, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-CPPUNIT_ASSERT_EQUAL(static_cast(5), tokens.count());
+CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count());
 
 // Expected format is something like 'type= parts= current= width= 
height='.
 text = tokens[0].substr(type.size());
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 6985914..fcaa88f 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -657,9 +657,9 @@ void HTTPWSTest::testExcelLoad()
 while (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != 
Poco::Net::WebSocket::FRAME_OP_CLOSE);
 socket.shutdown();
 Util::removeFile(documentPath);
-// Expected format is something like 'type=text parts=2 current=0 
width=12808 height=1142'.
+// Expected format is something like 'type=text parts=2 current=0 
width=12808 height=1142 viewid=22'.
 Poco::StringTokenizer tokens(status, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-CPPUNIT_ASSERT_EQUAL(static_cast(5), tokens.count());
+CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count());
 }
 catch (const Poco::Exception& exc)
 {
@@ -814,9 +814,9 @@ void HTTPWSTest::testRenderingOptions()
 socket.shutdown();
 Util::removeFile(documentPath);
 
-// Expected format is something like 'type=text parts=2 current=0 
width=12808 height=1142'.
+// Expected format is something like 'type=text parts=2 current=0 
width=12808 height=1142 viewid=25'.
 Poco::StringTokenizer tokens(status, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-CPPUNIT_ASSERT_EQUAL(static_cast(5), tokens.count());
+CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count());
 
 const std::string token = tokens[4];
 const std::string prefix = "height=";
@@ -1369,9 +1369,9 @@ void HTTPWSTest::getPartHashCodes(const std::string 
status,
 
 std::cerr << "Reading parts from [" << status << "]." << std::endl;
 
-// Expected format is something like 'type= parts= current= width= 
height='.
+// Expected format is something like 'type= parts= current= width= height= 
viewid='.
 Poco::StringTokenizer tokens(line, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-CPPUNIT_ASSERT_EQUAL(static_cast(5), tokens.count());
+CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count());
 
 const auto type = tokens[0].substr(std::string("type=").size());
 CPPUNIT_ASSERT_MESSAGE("Expected presentation or spreadsheet type to read 
part names/codes.",
@@ -1408,9 +1408,9 @@ void HTTPWSTest::getDocSize(const std::string& message, 
const std::string& type,
 int& part, int& parts, int& width, int& height)
 {
 Poco::StringTokenizer tokens(message, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-CPPUNIT_ASSERT_EQUAL(static_cast(5), tokens.count());
+CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count());
 
-// Expected format is something like 'type= parts= current= width= 
height='.
+// Expected format is something like 'type= parts= current= width= height= 
viewid='.
 const std::string text = tokens[0].substr(std::string("type=").size());
 parts = std::stoi(tokens[1].substr(std::string("parts=").size()));
 part = std::stoi(tokens[2].substr(std::string("current=").size()));
___
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/test

[Tor Lillqvist]

 loolwsd/test/httpwstest.cpp |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 45c70da298892b54bb8bf754ee8eff475869cb0c
Author: Tor Lillqvist 
Date:   Tue Oct 11 16:14:53 2016 +0300

More adaption for viewid parameters

Do what the comment said, be more flexible. This is how this kind of
testing should be done IMHO. Use the LOOLProtocol helpers.

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index fcaa88f..c7c3c09 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -351,8 +351,22 @@ void HTTPWSTest::loadDoc(const std::string& documentURL)
 if (msg.find(prefix) == 0)
 {
 const auto status = msg.substr(prefix.length());
-// Might be too strict, consider something flexible 
instread.
-CPPUNIT_ASSERT_EQUAL(std::string("type=text parts=1 
current=0 width=12808 height=16408"), status);
+Poco::StringTokenizer tokens(status, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
+std::string type;
+int parts;
+int current;
+int width;
+int height;
+CPPUNIT_ASSERT(LOOLProtocol::getTokenString(tokens, 
"type", type));
+CPPUNIT_ASSERT_EQUAL(std::string("text"), type);
+CPPUNIT_ASSERT(LOOLProtocol::getTokenInteger(tokens, 
"parts", parts));
+CPPUNIT_ASSERT_EQUAL(1, parts);
+CPPUNIT_ASSERT(LOOLProtocol::getTokenInteger(tokens, 
"current", current));
+CPPUNIT_ASSERT_EQUAL(0, current);
+CPPUNIT_ASSERT(LOOLProtocol::getTokenInteger(tokens, 
"width", width));
+CPPUNIT_ASSERT_EQUAL(12808, width);
+CPPUNIT_ASSERT(LOOLProtocol::getTokenInteger(tokens, 
"height", height));
+CPPUNIT_ASSERT_EQUAL(16408, height);
 }
 else if (msg.find("editlock") == 0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/docshell/externalrefmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 351164ea2c70923e47d5f01f3934c73cfc5839a9
Author: Eike Rathke 
Date:   Tue Oct 11 15:10:46 2016 +0200

Resolves: tdf#101691 re-intern strings of external formula results

If the external cell referenced is a formula result of type string that
string needs to be re-interned for the reference cache as well.

Change-Id: Iea3c3d777dede2ad6ba0b084533af964da991ca6

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index d3f2a4e..39cc31f60 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1557,8 +1557,8 @@ static FormulaToken* convertToToken( ScDocument* 
pHostDoc, ScDocument* pSrcDoc,
 }
 else
 {
-svl::SharedString aStr = pFCell->GetString();
-return new formula::FormulaStringToken(aStr);
+svl::SharedString aSS = 
pHostDoc->GetSharedStringPool().intern( pFCell->GetString().getString());
+return new formula::FormulaStringToken(aSS);
 }
 }
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit b193f283457c290e2cd75df0f3f6a185b66a516d
Author: Muhammet Kara 
Date:   Sat Oct 8 01:09:10 2016 +0300

tdf#102004 Do not open options for extensions without options

Also fix similar issue for "Disable/Enable" and "Remove" buttons

Change-Id: I383e64a9c6133ff2ebc991747c5c47c033a91174
Reviewed-on: https://gerrit.libreoffice.org/29600
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 553f1f5..c753015 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -225,8 +225,11 @@ void ExtBoxWithBtns_Impl::RecalcAll()
 }
 else
 {
+m_pOptionsBtn->Disable();
 m_pOptionsBtn->Hide();
+m_pEnableBtn->Disable();
 m_pEnableBtn->Hide();
+m_pRemoveBtn->Disable();
 m_pRemoveBtn->Hide();
 }
 
@@ -280,7 +283,10 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const 
TEntry_Impl& rEntry)
 
 if ( ( !rEntry->m_bUser || ( rEntry->m_eState == NOT_AVAILABLE ) || 
rEntry->m_bMissingDeps )
  && !rEntry->m_bMissingLic )
+{
+m_pEnableBtn->Disable();
 m_pEnableBtn->Hide();
+}
 else
 {
 m_pEnableBtn->Enable( !rEntry->m_bLocked );
@@ -290,12 +296,15 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const 
TEntry_Impl& rEntry)
 
 if ( rEntry->m_bHasOptions && bShowOptionBtn )
 {
-m_pOptionsBtn->Enable( rEntry->m_bHasOptions );
+m_pOptionsBtn->Enable();
 m_pOptionsBtn->Show();
 rEntry->m_bHasButtons = true;
 }
 else
+{
+m_pOptionsBtn->Disable();
 m_pOptionsBtn->Hide();
+}
 
 if ( rEntry->m_bUser || rEntry->m_bShared )
 {
@@ -304,7 +313,10 @@ void ExtBoxWithBtns_Impl::SetButtonStatus(const 
TEntry_Impl& rEntry)
 rEntry->m_bHasButtons = true;
 }
 else
+{
+m_pRemoveBtn->Disable();
 m_pRemoveBtn->Hide();
+}
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/source/gdi/sallayout.cxx|4 
 vcl/unx/generic/glyphs/gcach_layout.cxx |   30 +++---
 2 files changed, 11 insertions(+), 23 deletions(-)

New commits:
commit f48cbaac0a2a7278f366a3b0118b399c0a938a44
Author: Khaled Hosny 
Date:   Tue Oct 11 14:53:06 2016 +0200

tdf#103103: Many Arabic fonts dont render correctly

Revert the remaining bits of 1da9b4c24e806ad2447b4a656e2a7192755bb6a8,
the rest was reverted in 6323e6628668849438e6e19ba7ad2c6598263261.

This break many assumptions made by GenericSalLayout::ApplyDXArray().

Change-Id: I25fbafe06032ab1e8860df6c5932a7157575aa32

diff --git a/vcl/unx/generic/glyphs/gcach_layout.cxx 
b/vcl/unx/generic/glyphs/gcach_layout.cxx
index 38d7e84..46420cb 100644
--- a/vcl/unx/generic/glyphs/gcach_layout.cxx
+++ b/vcl/unx/generic/glyphs/gcach_layout.cxx
@@ -21,7 +21,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -309,16 +308,14 @@ static unsigned int 
unicodeDecomposeCompatibility(hb_unicode_funcs_t* /*ufuncs*/
 {
 return 0;
 }
-#endif
 
 static hb_unicode_funcs_t* getUnicodeFuncs()
 {
 static hb_unicode_funcs_t* ufuncs = 
hb_unicode_funcs_create(hb_icu_get_unicode_funcs());
-#if !HB_VERSION_ATLEAST(1, 1, 0)
 hb_unicode_funcs_set_decompose_compatibility_func(ufuncs, 
unicodeDecomposeCompatibility, nullptr, nullptr);
-#endif
 return ufuncs;
 }
+#endif
 
 class HbLayoutEngine : public ServerFontLayoutEngine
 {
@@ -492,8 +489,8 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 nHbFlags |= HB_BUFFER_FLAG_EOT; /* End-of-text */
 
 hb_buffer_t *pHbBuffer = hb_buffer_create();
-static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 #if !HB_VERSION_ATLEAST(1, 1, 0)
+static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs();
 hb_buffer_set_unicode_funcs(pHbBuffer, pHbUnicodeFuncs);
 #endif
 hb_buffer_set_direction(pHbBuffer, bRightToLeft ? 
HB_DIRECTION_RTL: HB_DIRECTION_LTR);
@@ -503,9 +500,6 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 hb_buffer_add_utf16(
 pHbBuffer, reinterpret_cast(pStr), nLength,
 nMinRunPos, nRunLen);
-#if HB_VERSION_ATLEAST(0, 9, 42)
-hb_buffer_set_cluster_level(pHbBuffer, 
HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-#endif
 hb_shape(pHbFont, pHbBuffer, nullptr, 0);
 
 int nRunGlyphCount = hb_buffer_get_length(pHbBuffer);
@@ -554,12 +548,15 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 //   but usually harmless), so we try to sniff what HarfBuzz 
thinks
 //   about this glyph by checking if it gives it a zero advance
 //   width.
-// * If the font has no GDEF table, we then check the unicode 
class
-//   of the glyph. If it is a non spacing mark then the glyph 
is a
-//   diacritic. This is only done if the HarfBuzz version is 
>= 0.9.42
-//   Else, we fallback to setting bDiacritic to true if the x 
advance
-//   of the glyph is zero. This maybe wrong in some cases but 
needs to
-//   be kept until the base version of HarfBuzz can be updated.
+// * If the font has no GDEF table, we just check if the glyph 
has
+//   zero advance width, but this is stupid and can be wrong. A
+//   better way would to check the character's Unicode 
combining
+//   class, but unfortunately HarfBuzz gives combining marks 
the
+//   cluster value of its base character, so nCharPos will be
+//   pointing to the wrong character (but HarfBuzz might change
+//   this in the future).
+//   Newer versions of HarfBuzz can control this behaviour with
+//   hb_buffer_set_cluster_level().
 bool bDiacritic = false;
 if (hb_ot_layout_has_glyph_classes(mpHbFace))
 {
@@ -570,14 +567,9 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 }
 else
 {
-#if HB_VERSION_ATLEAST(0, 9, 42)
-if(hb_unicode_general_category (pHbUnicodeFuncs, aChar) == 
HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)
-bDiacritic = true;
-#else
 // the font lacks GDEF table
 if (pHbPositions[i].x_advance == 0)
 bDiacritic = true;
-#endif
 }
 
 if (bDiacritic)
commit faddf2aefd5874b2bbd6c3b7bbed0812de911f47
Author: Khaled Hosny 
Date:   Tue Oct 11 15:11:58 2016 +0200

Revert "Hack to make Arabic subtending marks work"

This reverts commit 983e03a7d81c0ab24782b28ab899452fa6fd99ac.
  

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

[Ashod Nakashian]

 loolwsd/test/httpcrashtest.cpp |   84 ++---
 loolwsd/test/httpwstest.cpp|   20 +
 2 files changed, 49 insertions(+), 55 deletions(-)

New commits:
commit f3e5fb7d54bbd2da8b6cf5cbb4c5507280fe7deb
Author: Ashod Nakashian 
Date:   Thu May 12 10:59:00 2016 -0400

loolwsd: better crash tests

[tml says: Now (2016-10-11) 'make check' passes here in this
(collabora-online-1-0) branch. Please don't break it.]

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

diff --git a/loolwsd/test/httpcrashtest.cpp b/loolwsd/test/httpcrashtest.cpp
index ce71d66..0ead7ee 100644
--- a/loolwsd/test/httpcrashtest.cpp
+++ b/loolwsd/test/httpcrashtest.cpp
@@ -56,15 +56,9 @@ class HTTPCrashTest : public CPPUNIT_NS::TestFixture
 
 CPPUNIT_TEST_SUITE(HTTPCrashTest);
 
-// This should be the first test:
-CPPUNIT_TEST(testCountHowManyLoolkits);
-
 CPPUNIT_TEST(testBarren);
 CPPUNIT_TEST(testCrashKit);
 
-// This should be the last test:
-CPPUNIT_TEST(testNoExtraLoolKitsLeft);
-
 CPPUNIT_TEST_SUITE_END();
 
 void testCountHowManyLoolkits();
@@ -98,10 +92,12 @@ public:
 
 void setUp()
 {
+testCountHowManyLoolkits();
 }
 
 void tearDown()
 {
+testNoExtraLoolKitsLeft();
 }
 };
 
@@ -127,45 +123,38 @@ void HTTPCrashTest::testBarren()
 {
 killLoKitProcesses();
 
+std::cerr << "Loading after kill." << std::endl;
+
 // Load a document and get its status.
-const std::string documentPath = Util::getTempFilePath(TDOC, 
"hello.odt");
-const std::string documentURL = "file://" + 
Poco::Path(documentPath).makeAbsolute().toString();
+std::string documentPath, documentURL;
+getDocumentPathAndURL("hello.odt", documentPath, documentURL);
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
documentURL);
-Poco::Net::WebSocket socket = *connectLOKit(_uri, request, _response);
+auto socket = connectLOKit(_uri, request, _response);
 
+// First load should fail.
 sendTextFrame(socket, "load url=" + documentURL);
-sendTextFrame(socket, "status");
-CPPUNIT_ASSERT_MESSAGE("cannot load the document " + documentURL, 
isDocumentLoaded(socket));
-
-// 5 seconds timeout
-socket.setReceiveTimeout(500);
-
-std::string status;
-int flags;
-int n;
-do
-{
-char buffer[READ_BUFFER_SIZE];
-n = socket.receiveFrame(buffer, sizeof(buffer), flags);
-std::cout << "Got " << n << " bytes, flags: " << std::hex << flags 
<< std::dec << std::endl;
-if (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != 
Poco::Net::WebSocket::FRAME_OP_CLOSE)
-{
-std::cout << "Received message: " << 
LOOLProtocol::getAbbreviatedMessage(buffer, n) << std::endl;
-const std::string line = LOOLProtocol::getFirstLine(buffer, n);
-const std::string prefix = "status: ";
-if (line.find(prefix) == 0)
+SocketProcessor("Barren", socket, [&](const std::string& msg)
 {
-status = line.substr(prefix.length());
-// Might be too strict, consider something flexible 
instread.
-CPPUNIT_ASSERT_EQUAL(std::string("type=text parts=1 
current=0 width=12808 height=16408"), status);
-break;
-}
-}
-}
-while (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != 
Poco::Net::WebSocket::FRAME_OP_CLOSE);
+const std::string prefix = "status: ";
+if (msg.find(prefix) == 0)
+{
+const auto status = msg.substr(prefix.length());
+CPPUNIT_ASSERT_EQUAL(std::string("type=text parts=1 
current=0 width=12808 height=16408"), status);
+return false;
+}
+else if (msg.find("Service") == 0)
+{
+// Service unavailable. Try again.
+auto socket2 = loadDocAndGetSocket(_uri, documentURL);
+sendTextFrame(socket2, "status");
+const auto status = getResponseLine(socket2, "status");
+CPPUNIT_ASSERT_EQUAL(std::string("type=text parts=1 
current=0 width=12808 height=16408"), status);
+return false;
+}
 
-socket.shutdown();
+return true;
+});
 }
 catch (const Poco::Exception& exc)
 {
@@ -177,27 +166,27 @@ void HTTPCrashTest::testCrashKit()
 {
 try
 {
-int bytes;
-int flags;
-char buffer

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

[Stephan Bergmann]

 accessibility/inc/standard/vclxaccessiblelistitem.hxx|4 ++--
 accessibility/source/standard/vclxaccessiblelistitem.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit afd9bf19aec34475c915ba91f8fdc38b5a68f0b1
Author: Stephan Bergmann 
Date:   Tue Oct 11 16:17:55 2016 +0200

loplugin:refcounting

Change-Id: Ia7ec56c754d6eafcd4c6d981a0d8ca03af23a18e

diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx 
b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index fb5cab4..cbf874e 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -66,7 +66,7 @@ protected:
 /// client id in the AccessibleEventNotifier queue
 sal_uInt32  m_nClientId;
 
-css::uno::Reference< VCLXAccessibleList > m_xParent;
+rtl::Reference< VCLXAccessibleList > m_xParent;
 css::uno::Reference< css::accessibility::XAccessibleContext > 
m_xParentContext;
 
 protected:
@@ -88,7 +88,7 @@ public:
 is our parent accessible object
 */
 VCLXAccessibleListItem(sal_Int32 _nIndexInParent,
-   const css::uno::Reference< VCLXAccessibleList >& 
_xParent);
+   const rtl::Reference< VCLXAccessibleList >& 
_xParent);
 
 voidNotifyAccessibleEvent(  sal_Int16 _nEventId, const 
css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );
 
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index a7e0795..0ee2bb1 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -61,7 +61,7 @@ using namespace ::com::sun::star;
 
 // Ctor() and Dtor()
 
-VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, 
const Reference< VCLXAccessibleList >& _xParent)
+VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 _nIndexInParent, 
const rtl::Reference< VCLXAccessibleList >& _xParent)
 : VCLXAccessibleListItem_BASE(m_aMutex)
 , m_nIndexInParent(_nIndexInParent)
 , m_bSelected(false)
@@ -214,7 +214,7 @@ Reference< XAccessible > SAL_CALL 
VCLXAccessibleListItem::getAccessibleParent(
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-return m_xParent;
+return m_xParent.get();
 }
 
 sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent(  ) 
throw (RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/ado/AConnection.cxx   |2 
 connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx |4 
 connectivity/source/drivers/ado/AUsers.cxx|2 
 connectivity/source/drivers/ado/AView.cxx |4 
 connectivity/source/drivers/ado/AViews.cxx|2 
 connectivity/source/drivers/ado/Aolevariant.cxx   |8 
 connectivity/source/drivers/ado/Awrapado.cxx  |  126 +++---
 connectivity/source/inc/ado/Aolevariant.hxx   |6 
 8 files changed, 77 insertions(+), 77 deletions(-)

New commits:
commit 51e5e4970bda753faf7403cbf3c68ded3ed7a71f
Author: Stephan Bergmann 
Date:   Tue Oct 11 15:39:25 2016 +0200

Replace OLEString operators with proper functions, for clarity

Change-Id: I1fa309d034e1ec94f38d07ede07e691f1484a4f5
Reviewed-on: https://gerrit.libreoffice.org/29697
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/ado/AConnection.cxx 
b/connectivity/source/drivers/ado/AConnection.cxx
index cc94d95..6894db1 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -71,7 +71,7 @@ OConnection::OConnection(ODriver*   _pDriver) 
throw(SQLException, RuntimeExcepti
 hr = pIUnknown->CreateInstanceLic(  pOuter,
 NULL,
 ADOS::IID_ADOCONNECTION_21,
-ADOS::GetKeyStr(),
+ADOS::GetKeyStr().asBSTR(),
 (void**) &pCon);
 
 if( !FAILED( hr ) )
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx 
b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index db6e5d6..e2214a9 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -549,8 +549,8 @@ OUString WpADOCatalog::GetObjectOwner(const OUString& 
_rName, ObjectTypeEnum _eN
 _rVar.setNoArg();
 OLEString aBSTR;
 OLEString sStr1(_rName);
-pInterface->GetObjectOwner(sStr1,_eNum,_rVar,&aBSTR);
-return aBSTR;
+pInterface->GetObjectOwner(sStr1.asBSTR(),_eNum,_rVar,aBSTR.getAddress());
+return aBSTR.asOUString();
 }
 
 void OAdoTable::fillPropertyValues()
diff --git a/connectivity/source/drivers/ado/AUsers.cxx 
b/connectivity/source/drivers/ado/AUsers.cxx
index b9b0a1f..b6876dc 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -60,7 +60,7 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& 
_rForName, const Referen
 m_pCatalog->getConnection()->throwGenericSQLException( 
STR_INVALID_USER_DESCRIPTOR_ERROR,static_cast(this) );
 
 ADOUsers* pUsers = (ADOUsers*)m_aCollection;
-
pUsers->Append(OLEVariant(pUser->getImpl()),OLEString(pUser->getPassword()));
+
pUsers->Append(OLEVariant(pUser->getImpl()),OLEString(pUser->getPassword()).asBSTR());
 
 return createObject( _rForName );
 }
diff --git a/connectivity/source/drivers/ado/AView.cxx 
b/connectivity/source/drivers/ado/AView.cxx
index 0c72bbd..9d276c9 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -88,8 +88,8 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 
nHandle) const
 {
 ADOCommand* pCom = (ADOCommand*)aVar.getIDispatch();
 OLEString aBSTR;
-pCom->get_CommandText(&aBSTR);
-rValue <<= aBSTR.operator OUString();
+pCom->get_CommandText(aBSTR.getAddress());
+rValue <<= aBSTR.asOUString();
 }
 }
 break;
diff --git a/connectivity/source/drivers/ado/AViews.cxx 
b/connectivity/source/drivers/ado/AViews.cxx
index 9702d79..7264bad 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -72,7 +72,7 @@ sdbcx::ObjectType OViews::appendObject( const OUString& 
_rForName, const Referen
 aCommand.put_Name(sName);
 
aCommand.put_CommandText(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND;
 ADOViews* pViews = (ADOViews*)m_aCollection;
-if(FAILED(pViews->Append(OLEString(sName),aCommand)))
+if(FAILED(pViews->Append(OLEString(sName).asBSTR(),aCommand)))
 
ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast(this));
 
 OTables* pTables = 
static_cast(static_cast(m_rParent).getPrivateTables());
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx 
b/connectivity/source/drivers/ado/Aolevariant.cxx
index b351e9e..6556fc6 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connect

[Libreoffice-commits] core.git: 2 commits - extras/source sc/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |5 
 sc/source/ui/inc/content.hxx   |1 
 sc/source/ui/navipi/content.cxx|5 
 sc/source/ui/navipi/navipi.cxx |   18 
 sw/UIConfig_swriter.mk |1 
 sw/inc/cmdid.h |   29 
 sw/inc/helpid.h|   29 
 sw/source/uibase/inc/conttree.hxx  |   18 
 sw/source/uibase/inc/navipi.hxx|   33 -
 sw/source/uibase/inc/utlui.hrc |5 
 sw/source/uibase/utlui/content.cxx |  262 
 sw/source/uibase/utlui/glbltree.cxx|   81 +-
 sw/source/uibase/utlui/navipi.cxx  |  801 ++---
 sw/source/uibase/utlui/navipi.hrc  |2 
 sw/source/uibase/utlui/navipi.src  |  294 -
 sw/uiconfig/swriter/ui/navigatorpanel.ui   |  487 +++
 16 files changed, 1074 insertions(+), 997 deletions(-)

New commits:
commit 045367d9ba43ec6afb003fd9117ae186c7e18e34
Author: Caolán McNamara 
Date:   Tue Oct 11 15:30:15 2016 +0100

Master Document toggle missing if switch to master doc from normal doc

regression since...

commit 20e2d7e7d1c518fe514e8252836c1c728fe3fc27
Author: akki95 
Date:   Sat Jan 30 09:55:41 2016 +0530

tdf#95408 -"Toggle" in Writer Navigator to be more explicit in what it 
toggles

Change-Id: I310eb7bfc39993ba54bbd9eca04ce721c8a68ea6

diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index a6f293b..5d5e021 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -840,7 +840,7 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, 
SfxItemState /*eState*/,
 SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
 m_aContentTree->SetActiveShell(pWrtShell);
 bool bGlobal = IsGlobalDoc();
-
m_aContentToolBox->EnableItem(m_aContentToolBox->GetItemId("toggle"), bGlobal);
+
m_aContentToolBox->ShowItem(m_aContentToolBox->GetItemId("toggle"), bGlobal);
 if ((!bGlobal && IsGlobalMode()) || (!IsGlobalMode() && 
m_pConfig->IsGlobalActive()))
 {
 ToggleTree();
commit 33603a582bdd173a8e85c78bb0e8ef82874b8e59
Author: Caolán McNamara 
Date:   Mon Oct 10 15:09:24 2016 +0100

convert writer navigator to .ui format

Change-Id: I83f834ea050372362b50de61753c2b3e33c67778

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index ecb5b94..3dc6c1b 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -745,6 +745,11 @@
 
+
+
+
 
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 4c60d15..4a673c7 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -129,6 +129,7 @@ public:
 void SetNavigatorDlgFlag(bool isInNavigateDlg){ 
bisInNavigatoeDlg=isInNavigateDlg;};
 virtual voidMouseButtonDown( const MouseEvent& rMEvt ) override;
 virtual voidKeyInput( const KeyEvent& rKEvt ) override;
+virtual SizeGetOptimalSize() const override;
 
 voidInitWindowBits( bool bButtons );
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index b309d59..fd5bb59 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -134,6 +134,11 @@ ScContentTree::ScContentTree(vcl::Window* pParent, 
ScNavigatorDlg* pNavigatorDlg
 pTmpEntry= nullptr;
 }
 
+Size ScContentTree::GetOptimalSize() const
+{
+return LogicToPixel(Size(110, 100), MapUnit::MapAppFont);
+}
+
 ScContentTree::~ScContentTree()
 {
 disposeOnce();
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 2443250..e3782a5 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -83,11 +83,7 @@ ColumnEdit::~ColumnEdit()
 disposeOnce();
 }
 
-VCL_BUILDER_DECL_FACTORY(ColumnEdit)
-{
-(void)rMap;
-rRet = VclPtr::Create(pParent, WB_BORDER | WB_SPIN | WB_REPEAT 
| WB_RIGHT);
-}
+VCL_BUILDER_FACTORY_ARGS(ColumnEdit, WB_BORDER | WB_SPIN | WB_REPEAT | 
WB_RIGHT)
 
 bool ColumnEdit::Notify( NotifyEvent& rNEvt )
 {
@@ -264,11 +260,7 @@ RowEdit::~RowEdit()
 disposeOnce();
 }
 
-VCL_BUILDER_DECL_FACTORY(RowEdit)
-{
-(void)rMap;
-rRet = VclPtr::Create(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | 
WB_RIGHT);
-}
+VCL_BUILDER_FACTORY_ARGS(RowEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT)
 
 bool RowEdit::Notify( NotifyEvent& rNEvt )
 {
@@ -417,9 +409,9 @@ void ScNavigatorDlg::UpdateButtons()
 aTbxCmd->SetItemImage(nDragModeId, Image(ScResId(nImageId)));
 }
 
-ScNavigatorSettings::ScNavigatorSettings() :
-mnRootSelected( ScContentId::ROOT ),
-mnChildSelected( SC_CONTENT_NOCHILD )
+ScNavigatorSettings::ScNavigat

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

[Caolán McNamara]

 basctl/inc/basidesh.hrc |3 +--
 basctl/source/basicide/baside2b.cxx |   19 +++
 basctl/source/basicide/basidesh.src |7 ---
 basctl/source/basicide/bastype3.hxx |2 +-
 basctl/source/basicide/bastypes.cxx |   13 ++---
 5 files changed, 15 insertions(+), 29 deletions(-)

New commits:
commit 583ac140dcf6f11b21bc9c52516ba2bbcbd37a95
Author: Caolán McNamara 
Date:   Tue Oct 11 15:44:37 2016 +0100

de-src solo variable watch editbox

Change-Id: I9e69df546d5d6453fbd89b38d4865c9fd3088678

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 36b09dd..2c6 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -23,7 +23,6 @@
 #include 
 
 #define RID_BASICIDE_OBJECTBAR  ( RID_BASICIDE_START +  0 )
-#define RID_EDT_WATCHEDIT   ( RID_BASICIDE_START +  4 )
 #define RID_POPUP_BRKDLG( RID_BASICIDE_START + 10 )
 #define RID_POPUP_BRKPROPS  ( RID_BASICIDE_START + 11 )
 #define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
@@ -149,4 +148,4 @@
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index c83bc7b..ea89aac 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1559,16 +1559,19 @@ namespace
 const sal_uInt16 ITEM_ID_TYPE = 3;
 }
 
-WatchWindow::WatchWindow (Layout* pParent) :
-DockingWindow(pParent),
-aWatchStr( IDEResId( RID_STR_REMOVEWATCH ) ),
-aXEdit( VclPtr::Create(this, IDEResId( RID_EDT_WATCHEDIT )) 
),
-aRemoveWatchButton( VclPtr::Create(this, IDEResId( 
RID_IMGBTN_REMOVEWATCH )) ),
-aTreeListBox( VclPtr::Create(this, WB_BORDER | WB_3DLOOK 
| WB_HASBUTTONS | WB_HASLINES | WB_HSCROLL | WB_TABSTOP
-  | WB_HASLINESATROOT | WB_HASBUTTONSATROOT) ),
-aHeaderBar( VclPtr::Create( this, WB_BUTTONSTYLE | WB_BORDER ) )
+WatchWindow::WatchWindow (Layout* pParent)
+: DockingWindow(pParent)
+, aWatchStr(IDEResId( RID_STR_REMOVEWATCH))
+, aXEdit(VclPtr::Create(this, WB_BORDER | WB_3DLOOK))
+, aRemoveWatchButton(VclPtr::Create(this, 
IDEResId(RID_IMGBTN_REMOVEWATCH)))
+, aTreeListBox(VclPtr::Create(this, WB_BORDER | 
WB_3DLOOK | WB_HASBUTTONS |
+  WB_HASLINES | 
WB_HSCROLL | WB_TABSTOP |
+  WB_HASLINESATROOT | 
WB_HASBUTTONSATROOT))
+, aHeaderBar(VclPtr::Create(this, WB_BUTTONSTYLE | WB_BORDER))
 {
 aXEdit->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
+aXEdit->SetHelpId(HID_BASICIDE_WATCHWINDOW_EDIT);
+aXEdit->SetSizePixel(aXEdit->LogicToPixel(Size(80, 12), 
MapUnit::MapAppFont));
 aTreeListBox->SetAccessibleName(IDEResId(RID_STR_WATCHNAME).toString());
 
 long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
diff --git a/basctl/source/basicide/basidesh.src 
b/basctl/source/basicide/basidesh.src
index 08a6f72..a9d08c3 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -285,13 +285,6 @@ String RID_STR_SEARCHALLMODULES
 {
 Text [ en-US ] = "Do you want to replace the text in all active modules?" ;
 };
-Edit RID_EDT_WATCHEDIT
-{
-HelpId = HID_BASICIDE_WATCHWINDOW_EDIT ;
-Border = TRUE ;
-SvLook = TRUE ;
-Size = MAP_APPFONT ( 80 , 12 ) ;
-};
 ImageButton RID_IMGBTN_REMOVEWATCH
 {
 HelpId = HID_BASICIDE_REMOVEWATCH ;
diff --git a/basctl/source/basicide/bastype3.hxx 
b/basctl/source/basicide/bastype3.hxx
index 5c88925..580da6a 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -39,7 +39,7 @@ protected:
 DECL_LINK( ImplLoseFocusHdl, Control&, void );
 
 public:
-ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
+ExtendedEdit(vcl::Window* pParent, WinBits nStyle);
 
 voidSetAccHdl( const Link& rLink ) 
{ aAccHdl = rLink; }
 Accelerator&GetAccelerator()  
{ return aAcc; }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 9bff85d..5b0f9de 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -414,12 +414,8 @@ void DockingWindow::DockThis ()
 }
 }
 
-
-// ExtendedEdit
-
-
-ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) :
-Edit( pParent, nRes )
+ExtendedEdit::ExtendedEdit(vcl::Window* pParent, WinBits nStyle)
+: Edit(pParent, nStyle)
 {
 aAcc.SetSelectHdl( LINK( this, ExtendedEdit, EditAccHdl ) );
 Control::SetGetFocusHdl( LINK( this, ExtendedEdit, ImplGetFocusHdl ) );
@@ -432,21 +428,16 @@ IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl, Control&, 
void)
 aLoseFocusHdl.Call( this );
 }
 
-
 IMPL_L

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

[Pranav Kant]

 loolwsd/DocumentBroker.cpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 634aac28db6653bfd7968bd60fe02cd057698a93
Author: Pranav Kant 
Date:   Mon Jul 11 11:57:58 2016 +0530

loolwsd: -Werror=shadow

Change-Id: Ic0bfead873ab7f0b9c177183c0f6d3179d097d96

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 2737320..2bd8716 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -570,7 +570,7 @@ void DocumentBroker::startDestroy(const std::string& id)
 assert(currentSession != _sessions.end());
 
 // Check if session which is being destroyed is last non-readonly session
-bool isLastEditableSession = !currentSession->second->isReadOnly();
+bool lastEditableSession = !currentSession->second->isReadOnly();
 for (auto& it: _sessions)
 {
 if (it.second->getId() == id)
@@ -578,12 +578,12 @@ void DocumentBroker::startDestroy(const std::string& id)
 
 if (!it.second->isReadOnly())
 {
-isLastEditableSession = false;
+lastEditableSession = false;
 }
 }
 
 // Last editable session going away
-_lastEditableSession = isLastEditableSession;
+_lastEditableSession = lastEditableSession;
 
 // Last view going away, can destroy.
 _markToDestroy = (_sessions.size() <= 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 filter/source/msfilter/rtfutil.cxx |8 
 svtools/source/svrtf/rtfout.cxx|8 
 2 files changed, 16 insertions(+)

New commits:
commit 12ec109de01c31605cf412612903190e469be8ff
Author: Stephan Bergmann 
Date:   Tue Oct 11 17:11:38 2016 +0200

Comment about state of non-BMP Unicode chars in RTF

Change-Id: I90051425c52f42f69cd61436979a50b875cca710

diff --git a/filter/source/msfilter/rtfutil.cxx 
b/filter/source/msfilter/rtfutil.cxx
index e5c07e3..32e04fa 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -37,6 +37,14 @@ OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
 return OString(pStr);
 }
 
+// Ideally, this function should work on (sal_uInt32) Unicode scalar values
+// instead of (sal_Unicode) UTF-16 code units.  However, at least "Rich Text
+// Format (RTF) Specification Version 1.9.1" available at
+//  does not
+// look like it allows non-BMP Unicode characters >= 0x1 in the \uN 
notation
+// (it only talks about "Unicode character", but then explains how values of N
+// greater than 32767 will be expressed as negative signed 16-bit numbers, so
+// that smells like \uN is limited to BMP).
 OString OutChar(sal_Unicode c, int* pUCMode, rtl_TextEncoding eDestEnc, bool* 
pSuccess, bool bUnicode)
 {
 if (pSuccess)
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 62979aa..f64c3c8 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -46,6 +46,14 @@ SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, 
sal_uInt8 nLen )
 return rStream.WriteCharPtr( pStr );
 }
 
+// Ideally, this function should work on (sal_uInt32) Unicode scalar values
+// instead of (sal_Unicode) UTF-16 code units.  However, at least "Rich Text
+// Format (RTF) Specification Version 1.9.1" available at
+//  does not
+// look like it allows non-BMP Unicode characters >= 0x1 in the \uN 
notation
+// (it only talks about "Unicode character", but then explains how values of N
+// greater than 32767 will be expressed as negative signed 16-bit numbers, so
+// that smells like \uN is limited to BMP).
 SvStream& Out_Char(SvStream& rStream, sal_Unicode c,
 int *pUCMode, rtl_TextEncoding eDestEnc, bool bWriteHelpFile)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: uitest/calc_tests

[Markus Mohrhard]

 uitest/calc_tests/tdf96453.py |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 70ce443e7b767fceef4a22b07ab371f02f7252e5
Author: Markus Mohrhard 
Date:   Tue Oct 11 17:15:20 2016 +0200

forgot to actually remove the problematic import

Change-Id: Iac96719a36269dec173af4c9d6d7e88d67b5c24d

diff --git a/uitest/calc_tests/tdf96453.py b/uitest/calc_tests/tdf96453.py
index fb8e404..9092d43 100644
--- a/uitest/calc_tests/tdf96453.py
+++ b/uitest/calc_tests/tdf96453.py
@@ -8,7 +8,6 @@
 from uitest.framework import UITestCase
 
 import os
-import pathlib
 
 from uitest.uihelper.common import get_state_as_dict
 from uitest.path import get_srcdir_url
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/uibase/ribbar/inputwin.cxx |   26 +++---
 sw/source/uibase/ribbar/inputwin.hrc |3 ---
 sw/source/uibase/ribbar/inputwin.src |   16 +---
 3 files changed, 16 insertions(+), 29 deletions(-)

New commits:
commit facaeedfef4b63bc15beed303330a42e4c9b1406
Author: Caolán McNamara 
Date:   Tue Oct 11 16:16:38 2016 +0100

de-src solo edits in writer formula bar

Change-Id: Iba5406e1c4e573c198116baed10a9ad6d142a445

diff --git a/sw/source/uibase/ribbar/inputwin.cxx 
b/sw/source/uibase/ribbar/inputwin.cxx
index ffec024..9a29eaf 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -54,19 +54,20 @@
 
 #include 
 
+#define ED_POS  2
 #define ED_FORMULA  3
 
 SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, 
SFX_OBJECTBAR_OBJECT )
 
 SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
-: ToolBox(  pParent ,   SW_RES( RID_TBX_FORMULA )),
-aPos(   VclPtr::Create(this,   SW_RES(ED_POS))),
-aEdit(  VclPtr::Create(this, 
WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION)),
-aPopMenu(   SW_RES(MN_CALC_POPUP)),
-pMgr(nullptr),
-pWrtShell(nullptr),
-pView(nullptr),
-aAktTableName(aEmptyOUStr)
+: ToolBox(pParent, SW_RES(RID_TBX_FORMULA))
+, aPos(VclPtr::Create(this, 
WB_3DLOOK|WB_CENTER|WB_BORDER|WB_READONLY))
+, aEdit(VclPtr::Create(this, 
WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION))
+, aPopMenu(SW_RES(MN_CALC_POPUP))
+, pMgr(nullptr)
+, pWrtShell(nullptr)
+, pView(nullptr)
+, aAktTableName(aEmptyOUStr)
 , m_bDoesUndo(true)
 , m_bResetUndo(false)
 , m_bCallUndo(false)
@@ -76,7 +77,8 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, 
SfxDispatcher* pDispatcher)
 
 FreeResource();
 
-aEdit->SetSizePixel( aEdit->CalcMinimumSize() );
+aEdit->SetSizePixel(aEdit->CalcMinimumSize());
+aPos->SetSizePixel(aPos->LogicToPixel(Size(45, 11), 
MapMode(MapUnit::MapAppFont)));
 
 SfxImageManager* pManager = SfxImageManager::GetImageManager( *SW_MOD() );
 pManager->RegisterToolBox(this);
diff --git a/sw/source/uibase/ribbar/inputwin.hrc 
b/sw/source/uibase/ribbar/inputwin.hrc
index 3d84ae4..6f119d2 100644
--- a/sw/source/uibase/ribbar/inputwin.hrc
+++ b/sw/source/uibase/ribbar/inputwin.hrc
@@ -50,8 +50,6 @@
 #define MN_POP_STATISTICS   30
 #define MN_POP_FUNC 31
 
-#define ED_POS  2
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/ribbar/inputwin.src 
b/sw/source/uibase/ribbar/inputwin.src
index 011cf34..0e00305 100644
--- a/sw/source/uibase/ribbar/inputwin.src
+++ b/sw/source/uibase/ribbar/inputwin.src
@@ -55,14 +55,6 @@ ToolBox RID_TBX_FORMULA
 Text [ en-US ] = "Apply" ;
 };
 };
-Edit ED_POS
-{
-Border = TRUE ;
-Size = MAP_APPFONT ( 45 , 11 ) ;
-ReadOnly = TRUE ;
-SVLook = TRUE ;
-Center = TRUE ;
-};
 };
 
 Menu MN_CALC_POPUP
commit eece14a1be8da75544a587eefcfe8817e0c05fb0
Author: Caolán McNamara 
Date:   Tue Oct 11 16:00:10 2016 +0100

ED_FORMULA resource is unused

Change-Id: I8f0184c585478c59bcf230bc06ba5ba21fb50400

diff --git a/sw/source/uibase/ribbar/inputwin.cxx 
b/sw/source/uibase/ribbar/inputwin.cxx
index cd2347f..ffec024 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -54,6 +54,8 @@
 
 #include 
 
+#define ED_FORMULA  3
+
 SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, 
SFX_OBJECTBAR_OBJECT )
 
 SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
@@ -85,13 +87,13 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, 
SfxDispatcher* pDispatcher)
 pView = pActiveView;
 pWrtShell = pView ? pView->GetWrtShellPtr() : nullptr;
 
-InsertWindow( ED_POS, aPos.get(), ToolBoxItemBits::NONE, 0);
+InsertWindow(ED_POS, aPos.get(), ToolBoxItemBits::NONE, 0);
 SetItemText(ED_POS, SW_RESSTR(STR_ACCESS_FORMULA_TYPE));
 aPos->SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TYPE));
 SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TOOLBAR));
 InsertSeparator ( 1 );
 InsertSeparator ();
-InsertWindow( ED_FORMULA, aEdit.get());
+InsertWindow(ED_FORMULA, aEdit.get());
 SetItemText(ED_FORMULA, SW_RESSTR(STR_ACCESS_FORMULA_TEXT));
 aEdit->SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TEXT));
 SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
diff --git a/sw/source/uibase/ribbar/inputwin.hrc 
b/sw/source/uibase/ribbar/inputwin.hrc
index a361678..3d84ae4 100644
--- a/sw/source/uibase/ribbar/inputwin.hrc
+++ b/sw/source/uibase/ribbar/inputwin.hrc
@@ -51,7 +51,6 @@
 #define MN_POP_FUNC 31
 
 #define ED_POS  2
-#define ED_FORMULA  3
 
 #endif
 
diff --git a/sw/source/uibase/ribbar/inputwin.src 
b/sw/source/uibase/ribbar/inputwin.src
index 03ef36e..011cf34

[Libreoffice-commits] help.git: helpers/help_hid.lst

[Caolán McNamara]

 helpers/help_hid.lst |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5d912ed85e9c4103fe37b129a56493c7c3c5
Author: Caolán McNamara 
Date:   Tue Oct 11 16:19:06 2016 +0100

drop unused HID_CALC_TOOLBOX hid

Change-Id: I08ba38e7446e62fd712e53a1969e38d8b3fb653a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f25231d..e9a1dac 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -877,7 +877,6 @@ HID_BUSINESS_FMT_PAGE_BRAND,54923,
 HID_BUSINESS_FMT_PAGE_CONT,54921,
 HID_BUSINESS_FMT_PAGE_SHEET,54922,
 HID_BUSINESS_FMT_PAGE_TYPE,54924,
-HID_CALC_TOOLBOX,54840,
 HID_CHARMAP_CTL_SHOWSET,33876,
 HID_CHECK_FOR_UPD_CANCEL,34855,
 HID_CHECK_FOR_UPD_CLOSE,34846,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 helpcontent2 |2 +-
 sw/inc/helpid.h  |2 --
 sw/source/uibase/ribbar/inputwin.src |1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit c8054c1d6885067caf557b5b3179975793cf80f7
Author: Caolán McNamara 
Date:   Tue Oct 11 16:19:56 2016 +0100

HID_CALC_TOOLBOX goes nowhere

Change-Id: I812f56c53487b2bf115bc2803337176941baf49b

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 6583313..3319a90 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -148,8 +148,6 @@
 // More Help-IDs
 #define HID_EDIT_FORMULA
"SW_HID_EDIT_FORMULA"
 
-#define HID_CALC_TOOLBOX
"SW_HID_CALC_TOOLBOX"
-
 #define HID_AUTOFORMAT_REJECT   
"SW_HID_AUTOFORMAT_REJECT"
 #define HID_AUTOFORMAT_ACCEPT   
"SW_HID_AUTOFORMAT_ACCEPT"
 #define HID_AUTOFORMAT_EDIT_CHG 
"SW_HID_AUTOFORMAT_EDIT_CHG"
diff --git a/sw/source/uibase/ribbar/inputwin.src 
b/sw/source/uibase/ribbar/inputwin.src
index 0e00305..444c255 100644
--- a/sw/source/uibase/ribbar/inputwin.src
+++ b/sw/source/uibase/ribbar/inputwin.src
@@ -30,7 +30,6 @@ ToolBox RID_TBX_FORMULA
 {
 Pos = MAP_APPFONT ( 0 , 0 ) ;
 Size = MAP_APPFONT ( 600 , 14 ) ;
-HelpID = HID_CALC_TOOLBOX ;
 SVLook = TRUE ;
 Border = TRUE ;
 ItemList =
commit ccafebf67147d272a911b6ff0411249f96ae5864
Author: Caolán McNamara 
Date:   Tue Oct 11 16:19:06 2016 +0100

Updated core
Project: help  5d912ed85e9c4103fe37b129a56493c7c3c5

drop unused HID_CALC_TOOLBOX hid

Change-Id: I08ba38e7446e62fd712e53a1969e38d8b3fb653a

diff --git a/helpcontent2 b/helpcontent2
index b223bd2..5d912ed 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b223bd2e0ccf3c09d69b0cbf4da063f15ca453ef
+Subproject commit 5d912ed85e9c4103fe37b129a56493c7c3c5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 filter/source/msfilter/rtfutil.cxx |3 +++
 svtools/source/svrtf/rtfout.cxx|3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 08bf088959c677e61cb118bf8d0bf092d3f21466
Author: Michael Stahl 
Date:   Tue Oct 11 17:22:36 2016 +0200

improve comment about non-BMP code points in RTF

Change-Id: If906fdea692ca4a4df4f7110f42b7360d8b845da

diff --git a/filter/source/msfilter/rtfutil.cxx 
b/filter/source/msfilter/rtfutil.cxx
index 32e04fa..6b1dd95 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -45,6 +45,9 @@ OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
 // (it only talks about "Unicode character", but then explains how values of N
 // greater than 32767 will be expressed as negative signed 16-bit numbers, so
 // that smells like \uN is limited to BMP).
+// However the "Mathematics" section has an example that shows the code point
+// U+1D44E being encoded as UTF-16 surrogate pair "\u-10187?\u-9138?", so
+// sal_Unicode actually works fine here.
 OString OutChar(sal_Unicode c, int* pUCMode, rtl_TextEncoding eDestEnc, bool* 
pSuccess, bool bUnicode)
 {
 if (pSuccess)
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index f64c3c8..cb722db 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -54,6 +54,9 @@ SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, 
sal_uInt8 nLen )
 // (it only talks about "Unicode character", but then explains how values of N
 // greater than 32767 will be expressed as negative signed 16-bit numbers, so
 // that smells like \uN is limited to BMP).
+// However the "Mathematics" section has an example that shows the code point
+// U+1D44E being encoded as UTF-16 surrogate pair "\u-10187?\u-9138?", so
+// sal_Unicode actually works fine here.
 SvStream& Out_Char(SvStream& rStream, sal_Unicode c,
 int *pUCMode, rtl_TextEncoding eDestEnc, bool bWriteHelpFile)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/uibase/inc/ribbar.hrc  |7 +++--
 sw/source/uibase/ribbar/inputwin.cxx |   20 +--
 sw/source/uibase/ribbar/inputwin.src |   45 ++-
 3 files changed, 29 insertions(+), 43 deletions(-)

New commits:
commit c3a98155ed28bd77eff4de3d80ccbcde1e68c828
Author: Caolán McNamara 
Date:   Tue Oct 11 16:33:17 2016 +0100

de-src writer formula toolbar

Change-Id: I8d4f031053fe819ff92ce1488a24dd3ff9b3ffd8

diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
index fb9c9d9..f44c3f8 100644
--- a/sw/source/uibase/inc/ribbar.hrc
+++ b/sw/source/uibase/inc/ribbar.hrc
@@ -21,8 +21,6 @@
 
 #include "rcid.hrc"
 
-#define RID_TBX_FORMULA (RC_RIBBAR_BEGIN +6)
-#define FT_POS  (RC_RIBBAR_BEGIN +7)
 #define STR_TBL_FORMULA  (RC_RIBBAR_BEGIN +8)
 
 #define RID_DRAW_WIN(RC_RIBBAR_BEGIN + 9)
@@ -50,8 +48,11 @@
 #define ST_INDEX_ENTRY  (RC_RIBBAR_BEGIN + 29)
 #define ST_TABLE_FORMULA(RC_RIBBAR_BEGIN + 30)
 #define ST_TABLE_FORMULA_ERROR  (RC_RIBBAR_BEGIN + 31)
+#define STR_FORMULA_CALC(RC_RIBBAR_BEGIN + 32)
+#define STR_FORMULA_CANCEL  (RC_RIBBAR_BEGIN + 33)
+#define STR_FORMULA_APPLY   (RC_RIBBAR_BEGIN + 34)
 
-#define STR_IMGBTN_START(RC_RIBBAR_BEGIN + 33)
+#define STR_IMGBTN_START(RC_RIBBAR_BEGIN + 35)
 
 #define STR_IMGBTN_NEXT_DOWN(STR_IMGBTN_START + 0)
 #define STR_IMGBTN_PREV_DOWN(STR_IMGBTN_START + 1)
diff --git a/sw/source/uibase/ribbar/inputwin.cxx 
b/sw/source/uibase/ribbar/inputwin.cxx
index 9a29eaf..e45cb05 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -60,7 +60,7 @@
 SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, 
SFX_OBJECTBAR_OBJECT )
 
 SwInputWindow::SwInputWindow(vcl::Window* pParent, SfxDispatcher* pDispatcher)
-: ToolBox(pParent, SW_RES(RID_TBX_FORMULA))
+: ToolBox(pParent, WB_3DLOOK|WB_BORDER)
 , aPos(VclPtr::Create(this, 
WB_3DLOOK|WB_CENTER|WB_BORDER|WB_READONLY))
 , aEdit(VclPtr::Create(this, 
WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION))
 , aPopMenu(SW_RES(MN_CALC_POPUP))
@@ -75,13 +75,21 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, 
SfxDispatcher* pDispatcher)
 bFirst = true;
 bActive = bIsTable = bDelSel = false;
 
-FreeResource();
-
 aEdit->SetSizePixel(aEdit->CalcMinimumSize());
 aPos->SetSizePixel(aPos->LogicToPixel(Size(45, 11), 
MapMode(MapUnit::MapAppFont)));
 
-SfxImageManager* pManager = SfxImageManager::GetImageManager( *SW_MOD() );
+SfxImageManager* pManager = SfxImageManager::GetImageManager(*SW_MOD());
 pManager->RegisterToolBox(this);
+InsertItem(FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC),
+   SW_RESSTR(STR_FORMULA_CALC));
+InsertItem(FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL),
+   SW_RESSTR(STR_FORMULA_CANCEL));
+InsertItem(FN_FORMULA_APPLY, pManager->GetImage(FN_FORMULA_APPLY),
+   SW_RESSTR(STR_FORMULA_APPLY));
+
+SetHelpId(FN_FORMULA_CALC, HID_TBX_FORMULA_CALC);
+SetHelpId(FN_FORMULA_CANCEL, HID_TBX_FORMULA_CANCEL);
+SetHelpId(FN_FORMULA_APPLY, HID_TBX_FORMULA_APPLY);
 
 SwView *pDispatcherView = dynamic_cast(pDispatcher ? 
pDispatcher->GetFrame()->GetViewShell() : nullptr);
 SwView* pActiveView = ::GetActiveView();
@@ -100,10 +108,6 @@ SwInputWindow::SwInputWindow(vcl::Window* pParent, 
SfxDispatcher* pDispatcher)
 aEdit->SetAccessibleName(SW_RESSTR(STR_ACCESS_FORMULA_TEXT));
 SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
 
-SetItemImage( FN_FORMULA_CALC,   pManager->GetImage(FN_FORMULA_CALC   ));
-SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL ));
-SetItemImage( FN_FORMULA_APPLY,  pManager->GetImage(FN_FORMULA_APPLY  ));
-
 SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | 
ToolBoxItemBits::DROPDOWNONLY );
 SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
 
diff --git a/sw/source/uibase/ribbar/inputwin.src 
b/sw/source/uibase/ribbar/inputwin.src
index 444c255..e0de1cd 100644
--- a/sw/source/uibase/ribbar/inputwin.src
+++ b/sw/source/uibase/ribbar/inputwin.src
@@ -26,36 +26,6 @@
 #include "inputwin.hrc"
 #include "access.hrc"
 
-ToolBox RID_TBX_FORMULA
-{
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( 600 , 14 ) ;
-SVLook = TRUE ;
-Border = TRUE ;
-ItemList =
-{
-ToolBoxItem
-{
-Identifier = FN_FORMULA_CALC ;
-HelpId = HID_TBX_FORMULA_CALC ;
-DropDown = TRUE ;
-Text [ en-US ] = "Functions" ;
-};
-ToolBoxItem
-{
-Identifier = FN_FORMULA_CANCEL ;
-HelpId = HID_TBX_FORMULA_CANCEL ;
-Text [ en-US ] = "Cancel" ;
-};
-ToolBoxItem
-{
-Identifier = FN_FORMULA_APPLY ;
- 

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

[Caolán McNamara]

 sd/source/ui/dlg/NavigatorChildWindow.cxx |4 +---
 sd/source/ui/dlg/navigatr.cxx |3 +--
 sd/source/ui/inc/navigatr.hxx |5 +
 sd/source/ui/sidebar/NavigatorWrapper.cxx |4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit d698e6f73a887f77f47d6e811ec3c8b32df59bb6
Author: Caolán McNamara 
Date:   Tue Oct 11 16:36:58 2016 +0100

merge a small piece of code

Change-Id: I3be07e6c54fedc4b4f7ca8fc53cb941e294055bf

diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx 
b/sd/source/ui/dlg/NavigatorChildWindow.cxx
index 2be5175..8a30766 100644
--- a/sd/source/ui/dlg/NavigatorChildWindow.cxx
+++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx
@@ -51,9 +51,7 @@ NavigatorChildWindow::NavigatorChildWindow (
 : SfxChildWindowContext( nId )
 {
 VclPtr pNavWin = VclPtr::Create(
-pParent,
-SdResId( FLT_NAVIGATOR ),
-pBindings);
+pParent, pBindings);
 
 pNavWin->SetUpdateRequestFunctor(
 [pBindings] () { return RequestNavigatorUpdate(pBindings); });
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 7aaf951..225e5c7 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -65,9 +65,8 @@ static const sal_uInt16 nShowAllShapesFilter=2;
  */
 SdNavigatorWin::SdNavigatorWin(
 vcl::Window* pParent,
-const SdResId& rSdResId,
 SfxBindings* pInBindings)
-: vcl::Window( pParent, rSdResId )
+: vcl::Window( pParent, SdResId(FLT_NAVIGATOR) )
 , maToolbox ( VclPtr::Create( this, SdResId( 1 ) ) )
 , maTlbObjects( VclPtr::Create( this, SdResId( TLB_OBJECTS 
) ) )
 , maLbDocs ( VclPtr::Create( this, SdResId( LB_DOCS ) ) )
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index c3df836..830c3cd 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -88,10 +88,7 @@ public:
 update is necessary.  When  the navigator will
 rely on others to trigger updates.
 */
-SdNavigatorWin(
-vcl::Window* pParent,
-const SdResId& rSdResId,
-SfxBindings* pBindings);
+SdNavigatorWin(vcl::Window* pParent, SfxBindings* pBindings);
 void SetUpdateRequestFunctor(const UpdateRequestFunctor& rUpdateRequest);
 virtual ~SdNavigatorWin() override;
 virtual voiddispose() override;
diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx 
b/sd/source/ui/sidebar/NavigatorWrapper.cxx
index eb6fe20..deedf7a 100644
--- a/sd/source/ui/sidebar/NavigatorWrapper.cxx
+++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx
@@ -33,9 +33,7 @@ NavigatorWrapper::NavigatorWrapper (
 : Control(pParent, 0),
   mrViewShellBase(rViewShellBase),
   maNavigator(VclPtr::Create(
-this,
-SdResId(FLT_NAVIGATOR),
-pBindings))
+this, pBindings))
 {
 maNavigator->SetUpdateRequestFunctor(
 [this] () { return this->UpdateNavigator(); });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/src loolwsd/ClientSession.cpp loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/protocol.txt

[László Németh]

 loleaflet/src/core/Socket.js  |   15 ---
 loleaflet/src/layer/tile/TileLayer.js |   16 ++--
 loleaflet/src/map/handler/Map.Keyboard.js |3 ---
 loolwsd/ClientSession.cpp |3 ++-
 loolwsd/DocumentBroker.cpp|8 ++--
 loolwsd/DocumentBroker.hpp|4 
 loolwsd/protocol.txt  |5 +++--
 7 files changed, 41 insertions(+), 13 deletions(-)

New commits:
commit f910dcbf88fa0b83a7f711f2a52d5f8dffe9da1c
Author: László Németh 
Date:   Tue Oct 11 14:15:13 2016 +0200

loleaflet: tile debug: show tile render count and cached tiles

- show total number of the rendered tiles of the document, also
  the difference between the previous number in the client

- show cached tiles in transparent yellow color (in debug build)

- send ping messages after every invalidation message instead of
  keypressing

- fix memory leak: remove unused leaflet rectangle overlays on the
  tiles

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index d26277d..34608e9 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -211,10 +211,13 @@ L.Socket = L.Class.extend({
}
this._map.fire('error', {msg: textMsg});
}
-   else if (textMsg === 'pong' && this._map._docLayer && 
this._map._docLayer._debug) {
+   else if (textMsg.startsWith('pong ') && this._map._docLayer && 
this._map._docLayer._debug) {
var times = this._map._docLayer._debugTimePING;
-   var timeText = 
this._map._docLayer._debugSetTimes(times, +new Date() - times.date);
-   this._map._docLayer._debugDataPING.setPrefix('Server 
ping time: ' + timeText);
+   var timeText = 
this._map._docLayer._debugSetTimes(times, +new Date() - 
this._map._docLayer._debugPINGQueue.shift());
+   this._map._docLayer._debugDataPING.setPrefix('Server 
ping time: ' + timeText +
+   '. Rendered tiles: ' + 
command.rendercount +
+   ', last: ' + (command.rendercount - 
this._map._docLayer._debugRenderCount));
+   this._map._docLayer._debugRenderCount = 
command.rendercount;
}
else if (textMsg.startsWith('statusindicator:')) {
//FIXME: We should get statusindicator when saving too, 
no?
@@ -417,6 +420,12 @@ L.Socket = L.Class.extend({
else if (tokens[i].substring(0, 7) === 'params=') {
command.params = 
tokens[i].substring(7).split(',');
}
+   else if (tokens[i].substring(0, 9) === 'renderid=') {
+   command.renderid = tokens[i].substring(9);
+   }
+   else if (tokens[i].substring(0, 12) === 'rendercount=') 
{
+   command.rendercount = 
parseInt(tokens[i].substring(12));
+   }
}
if (command.tileWidth && command.tileHeight && 
this._map._docLayer) {
var defaultZoom = this._map.options.zoom;
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 452a93c..9672459 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1027,7 +1027,11 @@ L.TileLayer = L.GridLayer.extend({
tile._debugPopup = L.popup({className: 'debug', 
offset: new L.Point(0, 0), autoPan: false, closeButton: false, closeOnClick: 
false})
.setLatLng(new 
L.LatLng(tileBound.getSouth(), tileBound.getWest() + (tileBound.getEast() - 
tileBound.getWest())/5));
this._debugInfo.addLayer(tile._debugPopup);
+   if (this._debugTiles[key]) {
+   
this._debugInfo.removeLayer(this._debugTiles[key]);
+   }
tile._debugTile = L.rectangle(tileBound, 
{color: 'blue', weight: 1, fillOpacity: 0, pointerEvents: 'none'});
+   this._debugTiles[key] = tile._debugTile;
tile._debugTime = this._debugGetTimeArray();
this._debugInfo.addLayer(tile._debugTile);
}
@@ -1038,7 +1042,7 @@ L.TileLayer = L.GridLayer.extend({
'' + 
this._debugSetTimes(tile._debugTime, +new Date() - 
tile._debugTime.date).replace(/, /g, ''));
}
if (tile._debugTile) {
-   tile._debugTile.setStyle({fillOpacity: 0});
+   

Re: minutes of ESC call ...

[Michael Meeks]

On 10/08/2016 06:30 PM, Jan Iversen wrote:
>> Perhaps we can get a non-profit account via TDF ?
> 
> I have a google apps account, for one of my friends, which we can
> use, do you how I can check the limit ?

Call a lot of friends ? or just fire up a lot of browser windows, and
join your own call a lot - that would work too ;-) but check that you
can dial phone lines in too, its something of a fluke that that
continues to work for us via http://g.co/hangouts I suspect.

ATB,

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 loolwsd/TileCache.cpp |   11 ++---
 loolwsd/Util.cpp  |   57 ++
 loolwsd/Util.hpp  |7 ++
 3 files changed, 67 insertions(+), 8 deletions(-)

New commits:
commit 8055dfc089cf860806b987f7aa2dd07dc72d6f26
Author: Tor Lillqvist 
Date:   Tue Oct 11 19:35:16 2016 +0300

Handle disk full situations more gracefully

Introduce new API in our Util namespace to save data to a file
safely. The data is written to a temporary file in the same directory
and after that has succeeded, it is renamed atomicaly to the intended
name. If any step of the saving fails, neither the temporay file or
the intended target (if one exists before) is left behind.

Unlike in the master branch, here we don't show any message to the
users when that happens. At least not yet. Back-porting that full
functionality was harder than expected, and I wanted to get in at
least this fix first, to avoid zero-size cached tiles.

diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 74bafc6..fb32f0c 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -122,11 +122,8 @@ void TileCache::saveTile(int part, int width, int height, 
int tilePosX, int tile
 {
 const std::string fileName = _cacheDir + "/" + cacheFileName(part, width, 
height, tilePosX, tilePosY, tileWidth, tileHeight);
 
-Log::trace() << "Saving cache tile: " << fileName << Log::end;
-
-std::fstream outStream(fileName, std::ios::out);
-outStream.write(data, size);
-outStream.close();
+if (Util::saveDataToFileSafely(fileName, data, size))
+Log::trace() << "Saved cache tile: " << fileName << Log::end;
 }
 
 std::string TileCache::getTextFile(const std::string& fileName)
@@ -193,9 +190,7 @@ void TileCache::saveRendering(const std::string& name, 
const std::string& dir, c
 
 const std::string fileName = dirName + "/" + name;
 
-std::fstream outStream(fileName, std::ios::out);
-outStream.write(data, size);
-outStream.close();
+Util::saveDataToFileSafely(fileName, data, size);
 }
 
 std::unique_ptr TileCache::lookupRendering(const std::string& 
name, const std::string& dir)
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 6bc06cc..8caf37f 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -18,8 +18,10 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -169,6 +171,61 @@ namespace Util
 return std::getenv("DISPLAY") != nullptr;
 }
 
+bool saveDataToFileSafely(std::string fileName, const char *data, size_t 
size)
+{
+const auto tempFileName = fileName + ".temp";
+std::fstream outStream(tempFileName, std::ios::out);
+
+// If we can't create the file properly, just remove it
+if (!outStream.good())
+{
+Log::error("Creating " + tempFileName + " failed, disk full?");
+// Try removing both just in case
+std::remove(tempFileName.c_str());
+std::remove(fileName.c_str());
+return false;
+}
+else
+{
+outStream.write(data, size);
+if (!outStream.good())
+{
+Log::error("Writing to " + tempFileName + " failed, disk 
full?");
+outStream.close();
+std::remove(tempFileName.c_str());
+std::remove(fileName.c_str());
+return false;
+}
+else
+{
+outStream.close();
+if (!outStream.good())
+{
+Log::error("Closing " + tempFileName + " failed, disk 
full?");
+std::remove(tempFileName.c_str());
+std::remove(fileName.c_str());
+return false;
+}
+else
+{
+// Everything OK, rename the file to its proper name
+if (std::rename(tempFileName.c_str(), fileName.c_str()) == 
0)
+{
+Log::debug() << "Renaming " << tempFileName << " to " 
<< fileName << " OK." << Log::end;
+return true;
+}
+else
+{
+Log::error("Renaming " + tempFileName + " to " + 
fileName + " failed, disk full?");
+std::remove(tempFileName.c_str());
+std::remove(fileName.c_str());
+return false;
+}
+}
+}
+}
+}
+
 bool encodeBufferToPNG(unsigned char *pixmap, int width, int height, 
std::vector& output, LibreOfficeKitTileMode mode)
 {
 
diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index 8907d9c..17142f1 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -49,6 +49,13 @@ namespace Util
 
 bool windowingAvailable();
 

[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects

[Michael Stahl]

 bin/check-elf-dynamic-objects |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc47854ebd5c3098965dccdc2cadf3a6f01b0576
Author: Michael Stahl 
Date:   Tue Oct 11 18:03:14 2016 +0200

check-elf-dynamic-objects: OpenSuSE uses DT_RUNPATH, not DT_RPATH

... like Fedora, so check for either.

Change-Id: I0e88c8e6e7634e7cc483474bc3f654e666c3bab2

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 7d444ee..32cff57 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -130,7 +130,7 @@ local file="$1"
 ;;
 esac
 if test "${skip}" = 0 && readelf -d "${file}" &> /dev/null ; then
-rpath=$(readelf -d "${file}" | grep '(RPATH)' || true)
+rpath=$(readelf -d "${file}" | grep '(\(RPATH\|RUNPATH\))' || true)
 neededs=$(readelf -d "${file}" | grep '(NEEDED)' | sed -e 
's/.*\[\(.*\)\]$/\1/')
 neededsinternal=
 for needed in ${neededs}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects

[Michael Stahl]

 bin/check-elf-dynamic-objects |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 207c9a8f25dd705502608fbf82b4915cd6b62998
Author: Michael Stahl 
Date:   Tue Oct 11 19:33:26 2016 +0200

check-elf-dynamic-objects: check sdk/bin too

It takes almost no time, but this way of doing it changes the
interpretation of the -d parameter; not sure how important that is.

Change-Id: I9d29cdf96d7006d5daea00bcc41e613fbd30aac8
Reviewed-on: https://gerrit.libreoffice.org/29707
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 32cff57..f05d513 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -13,7 +13,7 @@
 set -euo pipefail
 
 PARA=1
-check_path="${INSTDIR:-.}/program"
+check_path="${INSTDIR:-.}"
 
 while [ "${1:-}" != "" ]; do
 parm=${1%%=*}
@@ -56,7 +56,7 @@ while [ "${1:-}" != "" ]; do
 done
 
 
-files=$(find "${check_path}" -type f)
+files=$(find "${check_path}/program" "${check_path}/sdk/bin" -type f)
 # all RPATHs should point to ${INSTDIR}/program so that's the files they find
 programfiles=$(basename -a $(echo ${files} | grep -o '/program/[^/]* '))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/ado/ACallableStatement.cxx |   22 ++---
 connectivity/source/drivers/ado/AColumn.cxx|6 -
 connectivity/source/drivers/ado/AConnection.cxx|   34 
 connectivity/source/drivers/ado/ADatabaseMetaData.cxx  |6 -
 connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx  |6 -
 connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx |   40 
+-
 connectivity/source/drivers/ado/AKeys.cxx  |2 
 connectivity/source/drivers/ado/APreparedStatement.cxx |2 
 connectivity/source/drivers/ado/AResultSet.cxx |   26 +++---
 connectivity/source/drivers/ado/AResultSetMetaData.cxx |6 -
 connectivity/source/drivers/ado/AStatement.cxx |4 -
 connectivity/source/drivers/ado/Aolevariant.cxx|   28 ++-
 connectivity/source/inc/ado/Aolevariant.hxx|   21 +
 13 files changed, 92 insertions(+), 111 deletions(-)

New commits:
commit 1e0fa85cd32fbfcdfdbda22d232f49cfa68b7a36
Author: Stephan Bergmann 
Date:   Tue Oct 11 18:16:52 2016 +0200

Replace OLEVariant operators with proper functions, for clarity

* Rename the original getDate (returning double) to getDateAsDouble, to make
  room for the new getDate (returning css::uno::Date).

* Assume the difference between the original 'operator String' (first 
checking
  for VT_BSTR, then for isNull()) and getString (first checking for 
isNull(),
  only then calling 'operator String') was accidental rather than by design.

Change-Id: I6261bdad5c328d6b10e83f2d1664a6c78ec1fed4
Reviewed-on: https://gerrit.libreoffice.org/29705
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx 
b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 2a627a0..4c62f8c 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -61,45 +61,45 @@ sal_Bool SAL_CALL OCallableStatement::wasNull(  ) 
throw(SQLException, RuntimeExc
 sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getBool();
 }
 
 sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getInt8();
 }
 
 Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 
columnIndex ) throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getByteSequence();
 }
 
 css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getDate();
 }
 
 double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getDouble();
 }
 
 
 float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getFloat();
 }
 
 
 sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getInt32();
 }
 
 
@@ -120,28 +120,28 @@ Any SAL_CALL OCallableStatement::getObject( sal_Int32 
/*columnIndex*/, const Ref
 sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getInt16();
 }
 
 
 OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getString();
 }
 
 
  css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getTime();
 }
 
 
  css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 
columnIndex ) throw(SQLException, RuntimeException)
 {
 GET_PARAM()
-return m_aValue;
+return m_aValue.getDateTime();
 }
 
 
diff --git a/connectivity/source/drivers/ado/AColumn.cxx 
b/connectivity/source/drivers/ado/AColumn.cxx
index 98d865c..8f3ddcb 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -244,11 +244,11 @@ void OAdoColumn::fillPropertyValues()
 
 if ( aProps.IsValid() )
 {
-m_IsAutoIncrement = static_cast( OTools::getValue( 
aProps, OUString("Autoincrement") ) ) == 1;
+m_IsAutoIncrement = OTools::getValue( aProps, 
OUString("

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

[Aleksander Machniak]

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

New commits:
commit 6dd2258fbe93f58b8a04627b6b60ff79cb0c3b9d
Author: Aleksander Machniak 
Date:   Mon Oct 10 09:12:01 2016 +0200

Fix WOPI request header: X-WOPIOverride -> X-WOPI-Override

Change-Id: Ibd288beeffecea415c8524dfc03e77e71ba3c10e
Reviewed-on: https://gerrit.libreoffice.org/29662
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 799b783968f86f1c943e17008220bb4741f41b5f)

diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index 9459ccf..3e2d346 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -362,7 +362,7 @@ bool WopiStorage::saveLocalFileToStorage()
 std::unique_ptr 
psession(lcl_getHTTPClientSession(uriObject));
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
uriObject.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
-request.set("X-WOPIOverride", "PUT");
+request.set("X-WOPI-Override", "PUT");
 request.setContentType("application/octet-stream");
 request.setContentLength(size);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Tamsil Amani license statement

[Tamsil Amani]

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

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

[Andras Timar]

 loolwsd/MasterProcessSession.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 521e6644a84e1bf8bf811ebf6c3dd86456639759
Author: Andras Timar 
Date:   Tue Oct 11 22:32:02 2016 +0200

loolwsd: -Werror=shadow

diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index ebcf741..f9b3e43 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -36,13 +36,13 @@ MasterProcessSession::MasterProcessSession(const 
std::string& id,

std::shared_ptr ws,
std::shared_ptr 
docBroker,
std::shared_ptr 
queue,
-   const bool isReadOnly) :
+   const bool readOnly) :
 LOOLSession(id, kind, ws),
 _curPart(0),
 _loadPart(-1),
 _docBroker(docBroker),
 _queue(queue),
-_isReadOnly(isReadOnly)
+_isReadOnly(readOnly)
 {
 Log::info("MasterProcessSession ctor [" + getName() + "].");
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/compiler.cxx |   20 ++--
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 79bf2fd7d6b740fbf2919d33165cb99434bdd550
Author: Kohei Yoshida 
Date:   Sat Oct 1 21:07:20 2016 -0400

tdf#93894: Get column labels to work with formula groups.

Change-Id: Ia2a09981dceae2e9809c76570300de8ca1927c1b
Reviewed-on: https://gerrit.libreoffice.org/29514
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b51c8f4..595059d 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5137,10 +5137,8 @@ bool ScCompiler::HandleColRowName()
 {
 ScSingleRefData aRefData;
 aRefData.InitAddress( aRange.aStart );
-if ( bColName )
-aRefData.SetColRel( true );
-else
-aRefData.SetRowRel( true );
+aRefData.SetColRel( true );
+aRefData.SetRowRel( true );
 aRefData.SetAddress(aRange.aStart, aPos);
 pNew->AddSingleReference( aRefData );
 }
@@ -5148,16 +5146,10 @@ bool ScCompiler::HandleColRowName()
 {
 ScComplexRefData aRefData;
 aRefData.InitRange( aRange );
-if ( bColName )
-{
-aRefData.Ref1.SetColRel( true );
-aRefData.Ref2.SetColRel( true );
-}
-else
-{
-aRefData.Ref1.SetRowRel( true );
-aRefData.Ref2.SetRowRel( true );
-}
+aRefData.Ref1.SetColRel( true );
+aRefData.Ref2.SetColRel( true );
+aRefData.Ref1.SetRowRel( true );
+aRefData.Ref2.SetRowRel( true );
 aRefData.SetRange(aRange, aPos);
 if ( bInList )
 pNew->AddDoubleReference( aRefData );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit c4817ffc47d501e49a1cbdbc9926d7ab8489b08e
Author: Christian Lohmaier 
Date:   Tue Oct 11 21:38:52 2016 +0200

Updated core
Project: translations  4a45b12af9d0be41780e5a29b73e8e595f3f430f

update translations for 5.2.3 rc1

and force-fix errors using pocheck

Change-Id: I3c922e1b91581f1b5cd6a5b8d0662a3e7aba0fae

diff --git a/translations b/translations
index 4eddabe..4a45b12 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4eddabeb0f63e7eb0870de9f69e90efa4f744667
+Subproject commit 4a45b12af9d0be41780e5a29b73e8e595f3f430f
___
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/debian

[Andras Timar]

 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 023f459b2099e68fd25318ae387be5a130dd99e7
Author: Andras Timar 
Date:   Tue Oct 11 23:28:46 2016 +0200

loolwsd: wrong version in debian/control

(cherry picked from commit 32bb382dbd1e8735e9436589d00be148e477c5ca)

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index d06db78..8cb0b4b 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.9), collaboraofficebasis5.1-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-core (>= 5.1.10.9), 
collaboraofficebasis5.1-draw (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.9), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.9), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.9), 
collaboraofficebasis5.1-images (>
 = 5.1.10.9), collaboraofficebasis5.1-impress (>= 5.1.10.9), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.9), collaboraofficebasis5.1-math 
(>= 5.1.10.9), collaboraofficebasis5.1-ogltrans (>= 5.1.10.9), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.9), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.9), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.9), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.9), collaboraofficebasis5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.9), collaboraoffice5.1 
(>= 5.1.10.9), collaboraoffice5.1-base (>= 5.1.10.9), collaboraoffice5.1-calc 
(>= 5.1.10.9), collaboraoffice5.1-dict-en (>= 5.1.10.9), 
collaboraoffice5.1-draw (>= 5.1.10.9), collaboraoffice5.1-debian-menus (>= 
5.1.10.9), collaboraoffice5.1-impress (>= 5.1.10.9), collaboraoffice5.1-math 
(>= 5.1.10.9), collaboraoffice5.1-ure (>= 5.1.10.9), collaboraoffice5.1-writer 
(>= 5.1.10.9), collaboraofficebasis5.1-en-us (>= 5.1
 .10.9), collaboraofficebasis5.1-en-us-base (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-math (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-res (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-writer (>= 5.1.10.9), collaboraoffice5.1-en-us 
(>= 5.1.10.9)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.9), collaboraofficebasis5.1-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-core (>= 5.1.10.9), 
collaboraofficebasis5.1-draw (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.9), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.9), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.9), 
collaboraofficebasis5.1-images (>
 = 5.1.10.9), collaboraofficebasis5.1-impress (>= 5.1.10.9), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.9), collaboraofficebasis5.1-math 
(>= 5.1.10.9), collaboraofficebasis5.1-ogltrans (>= 5.1.10.9), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.9), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.9), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.9), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.9), collaboraofficebasis5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.9), collaboraoffice5.1 
(>= 5.1.10.9), collaboraoffice5.1-base (>= 5.1.10.9), collaboraoffice5.1-calc 
(>= 5.1.10.9), collaboraoffice5.1-dict-en (>= 5.1.10.9), 
collaboraoffice5.1-draw (>= 5.1.10.9), collaboraoffice5.1-debian-menus, 
collaboraoffice5.1-impress (>= 5.1.10.9), collaboraoffice5.1-math (>= 
5.1.10.9), collaboraoffice5.1-ure (>= 5.1.10.9), collaboraoffice5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-en-us (>= 5.1.10.9), collab
 oraofficebasis5.1-en-us-base (>= 5.1.10.9), collaboraofficebasis5.1-en

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - loolwsd/debian

[Andras Timar]

 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32bb382dbd1e8735e9436589d00be148e477c5ca
Author: Andras Timar 
Date:   Tue Oct 11 23:28:46 2016 +0200

loolwsd: wrong version in debian/control

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index d06db78..8cb0b4b 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.9), collaboraofficebasis5.1-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-core (>= 5.1.10.9), 
collaboraofficebasis5.1-draw (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.9), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.9), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.9), 
collaboraofficebasis5.1-images (>
 = 5.1.10.9), collaboraofficebasis5.1-impress (>= 5.1.10.9), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.9), collaboraofficebasis5.1-math 
(>= 5.1.10.9), collaboraofficebasis5.1-ogltrans (>= 5.1.10.9), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.9), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.9), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.9), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.9), collaboraofficebasis5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.9), collaboraoffice5.1 
(>= 5.1.10.9), collaboraoffice5.1-base (>= 5.1.10.9), collaboraoffice5.1-calc 
(>= 5.1.10.9), collaboraoffice5.1-dict-en (>= 5.1.10.9), 
collaboraoffice5.1-draw (>= 5.1.10.9), collaboraoffice5.1-debian-menus (>= 
5.1.10.9), collaboraoffice5.1-impress (>= 5.1.10.9), collaboraoffice5.1-math 
(>= 5.1.10.9), collaboraoffice5.1-ure (>= 5.1.10.9), collaboraoffice5.1-writer 
(>= 5.1.10.9), collaboraofficebasis5.1-en-us (>= 5.1
 .10.9), collaboraofficebasis5.1-en-us-base (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-calc (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-math (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-res (>= 5.1.10.9), 
collaboraofficebasis5.1-en-us-writer (>= 5.1.10.9), collaboraoffice5.1-en-us 
(>= 5.1.10.9)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base (>= 5.1.10.9), collaboraofficebasis5.1-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-core (>= 5.1.10.9), 
collaboraofficebasis5.1-draw (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-beanshell-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-ct2n (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-javascript-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-mediawiki-publisher (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-nlpsolver (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-numbertext (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-pdf-import (>= 5.1.10.9), 
collaboraofficebasis5.1-extension-report-builder (>= 5.1.10.9), 
collaboraofficebasis5.1-gnome-integration (>= 5.1.10.9), 
collaboraofficebasis5.1-graphicfilter (>= 5.1.10.9), 
collaboraofficebasis5.1-images (>
 = 5.1.10.9), collaboraofficebasis5.1-impress (>= 5.1.10.9), 
collaboraofficebasis5.1-librelogo (>= 5.1.10.9), collaboraofficebasis5.1-math 
(>= 5.1.10.9), collaboraofficebasis5.1-ogltrans (>= 5.1.10.9), 
collaboraofficebasis5.1-ooofonts (>= 5.1.10.9), 
collaboraofficebasis5.1-ooolinguistic (>= 5.1.10.9), 
collaboraofficebasis5.1-postgresql-sdbc (>= 5.1.10.9), 
collaboraofficebasis5.1-python-script-provider (>= 5.1.10.9), 
collaboraofficebasis5.1-pyuno (>= 5.1.10.9), collaboraofficebasis5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-xsltfilter (>= 5.1.10.9), collaboraoffice5.1 
(>= 5.1.10.9), collaboraoffice5.1-base (>= 5.1.10.9), collaboraoffice5.1-calc 
(>= 5.1.10.9), collaboraoffice5.1-dict-en (>= 5.1.10.9), 
collaboraoffice5.1-draw (>= 5.1.10.9), collaboraoffice5.1-debian-menus, 
collaboraoffice5.1-impress (>= 5.1.10.9), collaboraoffice5.1-math (>= 
5.1.10.9), collaboraoffice5.1-ure (>= 5.1.10.9), collaboraoffice5.1-writer (>= 
5.1.10.9), collaboraofficebasis5.1-en-us (>= 5.1.10.9), collab
 oraofficebasis5.1-en-us-base (>= 5.1.10.9), collaboraofficebasis5.1-en-us-calc 
(>= 5.1.10.9), collaboraofficebasis5.1-en-us-math (>= 5.1.10.9), 
co

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

[Christian Lohmaier]

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

New commits:
commit 6eef3ed192f4426ab1b8da6bb26ea64bcd5822a4
Author: Christian Lohmaier 
Date:   Tue Oct 11 21:38:52 2016 +0200

Updated core
Project: translations  8e8e7cee18581cfe2923246eba9e0b7edff71326

update translations for 5.2.3 rc1

and force-fix errors using pocheck

Change-Id: I3c922e1b91581f1b5cd6a5b8d0662a3e7aba0fae
(cherry picked from commit 4a45b12af9d0be41780e5a29b73e8e595f3f430f)

diff --git a/translations b/translations
index 3997f3b..8e8e7ce 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3997f3b634be28bfe7ad52abd46067798a8f227a
+Subproject commit 8e8e7cee18581cfe2923246eba9e0b7edff71326
___
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' - extras/source

[Christian Lohmaier]

 extras/source/autocorr/lang/bg/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/ca/DocumentList.xml|   25 +++
 extras/source/autocorr/lang/cs/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/da/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/en-AU/DocumentList.xml |   24 +++
 extras/source/autocorr/lang/en-US/DocumentList.xml |   24 +++
 extras/source/autocorr/lang/es/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/fi/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/fr/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/hr/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/hu/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/is/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/it/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/ja/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/ko/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/lt/DocumentList.xml|   72 +++--
 extras/source/autocorr/lang/nl/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/pt-BR/DocumentList.xml |   24 +++
 extras/source/autocorr/lang/pt/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/ro/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/sk/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/sl/DocumentList.xml|   24 +++
 extras/source/autocorr/lang/sv/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/tr/DocumentList.xml|   12 +++
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |   24 +++
 extras/source/autocorr/lang/zh-TW/DocumentList.xml |   72 -
 26 files changed, 591 insertions(+), 22 deletions(-)

New commits:
commit 3ba71b6ebabcbf15259d6c099293332e239a29df
Author: Christian Lohmaier 
Date:   Tue Oct 11 23:39:34 2016 +0200

update emoji autocorrect files from po-files

Change-Id: I1224534be24c4b401305cc25b01dff404d8d0e23

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index 97a89d9..eea1376 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -19,34 +19,58 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index dbff6d2..f7a1866 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -360,34 +360,58 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
   
@@ -452,6 +476,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index 0703763..5c5c6e5 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -572,34 +572,58 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/da/DocumentList.xml 
b/extras/source/autocorr/lang/da/DocumentList.xml
index 63463d8..3192b46 100644
--- a/extras/source/autocorr/lang/da/DocumentList.xml
+++ b/extras/source/autocorr/lang/da/DocumentList.xml
@@ -624,34 +624,46 @@
   
   
   
+  
+  
+  
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml 
b/extras/source/autocorr/lang/en-AU/DocumentList.xml
index 88406cb..b8568d6 100644
--- a/extras/source/autocorr/lang/en-AU/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml
@@ -827,34 +827,58 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   
+  
   
+  
   
+  
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml 
b/extras/source/autocorr/lang/en-US/DocumentList.xml
index e594a27..19e9f25 100644
--- a/extras/source/autocorr/lang/en-US/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-US/DocumentList.xml
@@ -832,34 +832,58 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
   
+  
   
+  
   
   
   
+  
   
+  
   
+  
   
+  
   
   
+  
   

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

[Christian Lohmaier]

 extras/source/autocorr/lang/bg/DocumentList.xml|   12 
 extras/source/autocorr/lang/ca/DocumentList.xml|   13 
 extras/source/autocorr/lang/cs/DocumentList.xml|   12 
 extras/source/autocorr/lang/da/DocumentList.xml|   12 
 extras/source/autocorr/lang/en-AU/DocumentList.xml |   12 
 extras/source/autocorr/lang/en-US/DocumentList.xml |   12 
 extras/source/autocorr/lang/es/DocumentList.xml|   12 
 extras/source/autocorr/lang/fi/DocumentList.xml|   12 
 extras/source/autocorr/lang/fr/DocumentList.xml|   12 
 extras/source/autocorr/lang/hr/DocumentList.xml|   12 
 extras/source/autocorr/lang/hu/DocumentList.xml|   12 
 extras/source/autocorr/lang/is/DocumentList.xml|   12 
 extras/source/autocorr/lang/it/DocumentList.xml|   12 
 extras/source/autocorr/lang/ja/DocumentList.xml|   12 
 extras/source/autocorr/lang/ko/DocumentList.xml|   12 
 extras/source/autocorr/lang/lt/DocumentList.xml|   72 
 extras/source/autocorr/lang/nl/DocumentList.xml|   12 
 extras/source/autocorr/lang/pt-BR/DocumentList.xml |   12 
 extras/source/autocorr/lang/pt-PT/DocumentList.xml |   12 
 extras/source/autocorr/lang/pt/DocumentList.xml| 2693 +
 extras/source/autocorr/lang/ro/DocumentList.xml|   12 
 extras/source/autocorr/lang/sk/DocumentList.xml|   12 
 extras/source/autocorr/lang/sl/DocumentList.xml|   12 
 extras/source/autocorr/lang/sv/DocumentList.xml|   12 
 extras/source/autocorr/lang/tr/DocumentList.xml|   12 
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |   12 
 extras/source/autocorr/lang/zh-TW/DocumentList.xml |   72 
 27 files changed, 1574 insertions(+), 1552 deletions(-)

New commits:
commit b36479dab027473b6a17d6a729e9d924ae24c4f1
Author: Christian Lohmaier 
Date:   Tue Oct 11 23:43:06 2016 +0200

update emoji autocorrect files from po-files

Change-Id: I76aab4dd7d43d8c3fd7e452891303fa861a5bd21

diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xml
index 348a27a..eea1376 100644
--- a/extras/source/autocorr/lang/bg/DocumentList.xml
+++ b/extras/source/autocorr/lang/bg/DocumentList.xml
@@ -20,45 +20,57 @@
   
   
   
+  
   
+  
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml 
b/extras/source/autocorr/lang/ca/DocumentList.xml
index 2a9722d..f7a1866 100644
--- a/extras/source/autocorr/lang/ca/DocumentList.xml
+++ b/extras/source/autocorr/lang/ca/DocumentList.xml
@@ -361,45 +361,57 @@
   
   
   
+  
   
+  
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
@@ -464,6 +476,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/cs/DocumentList.xml 
b/extras/source/autocorr/lang/cs/DocumentList.xml
index e168d0e..5c5c6e5 100644
--- a/extras/source/autocorr/lang/cs/DocumentList.xml
+++ b/extras/source/autocorr/lang/cs/DocumentList.xml
@@ -573,45 +573,57 @@
   
   
   
+  
   
+  
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/da/DocumentList.xml 
b/extras/source/autocorr/lang/da/DocumentList.xml
index 63463d8..3192b46 100644
--- a/extras/source/autocorr/lang/da/DocumentList.xml
+++ b/extras/source/autocorr/lang/da/DocumentList.xml
@@ -624,34 +624,46 @@
   
   
   
+  
+  
+  
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
   
+  
   
   
+  
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-AU/DocumentList.xml 
b/extras/source/autocorr/lang/en-AU/DocumentList.xml
index d0590bf..b8568d6 100644
--- a/extras/source/autocorr/lang/en-AU/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-AU/DocumentList.xml
@@ -828,45 +828,57 @@
   
   
   
+  
   
+  
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml 
b/extras/source/autocorr/lang/en-US/DocumentList.xml
index 0cac93d..19e9f25 100644
--- a/extras/source/autocorr/lang/en-US/DocumentList.xml
+++ b/extras/source/autocorr/lang/en-US/DocumentList.xml
@@ -833,45 +833,57 @@
   
   
   
+  
   
+  
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
   
+  
   
   
   
+  
   
   
   
+  
   
   
   
diff --git a/extras/source/autoco

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 3306 ++--
 1 file changed, 1702 insertions(+), 1604 deletions(-)

New commits:
commit 29fe57afd79c96c5ff251c2468ababda5e506564
Author: Christian Lohmaier 
Date:   Wed Oct 12 00:08:00 2016 +0200

update credits

Change-Id: I0c5f943ed0d1a607ef86a26602f101f361b0aa2d

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index c084e3c..a91e3b5 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.2.0.4$Linux_X86_64
 
LibreOffice_project/066b007f5ebcc236395c7d282ba488bca67202652012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.2.2.2$Linux_X86_64
 
LibreOffice_project/8f96e87c890bf8fa77463cd4b640a2312823f3ad2012-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
@@ -53,6 +53,7 @@
false
true
true
+   false
false
false
false
@@ -68,7 +69,7 @@
false
false
true
-   5881804
+   6000278
false
false
false
@@ -313,44 +314,41 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  

   
-  
-   
+  
+   
   
   

   
-  
-   
-  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -394,26 +392,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
-   
-  
   

   
@@ -464,31 +459,34 @@
   
   
   
-  
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
-  
+  

   
+  
+   
+   
+  
   

   
@@ -1037,14 +1035,14 @@

   
  Credits
-1190 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-08-08 10:32:31.
+1205 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-10-11 23:43:06.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1064,10 +1062,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 19925Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 20240Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 12505Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 12747Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1075,35 +1073,