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

2016-03-01 Thread Matteo Casalin 
 include/tools/unqidx.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ad0aec407d09711f58acbacbf6296ca53b760725
Author: Matteo Casalin 
Date:   Wed Mar 2 08:30:10 2016 +0100

Fix error C2057: expected constant expression

Change-Id: Ie345ede60c1204c38a1c157c6335e3ded81fc26f

diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index dd66c300..8e979bf 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_TOOLS_UNQIDX_HXX
 #define INCLUDED_TOOLS_UNQIDX_HXX
 
+#include 
 #include 
-#include 
 #include 
 
 class SAL_WARN_UNUSED TOOLS_DLLPUBLIC UniqueIndexImpl
@@ -28,7 +28,7 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC UniqueIndexImpl
 public:
 typedef sal_uInt32 Index;
 enum {
-IndexNotFound = std::numeric_limits::max()
+IndexNotFound = SAL_MAX_UINT32
 };
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Firebird doesn't support MSVC 2015

2016-03-01 Thread David Ostrovsky 

So, after fixing number of MSVC 14.0 related bugs in FB
module: [1], I filed this bug upstream: [2] and got there
this comment from Egor Pugin:

"I tried to compile fb with MSVC2015. 
After fixing macro issues, you'll see more errors and more serious. The
list of errors is almost endless. (Of course no, but it's huge.) 
There will be errors that can change the runtime behaviour. So, it's
better to coordinate your efforts with FB devs and not do all
yourself." 

I see two options:

* Declare FB only supported on platforms, where it can be built with
current compiler toolchain that is used and decided by this project. 
* Cancel MSVC 14.0 upgrade for now and wait until it's supported by FB
project

* [1] https://gerrit.libreoffice.org/22757
* [2] http://tracker.firebirdsql.org/browse/CORE-5120
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loolwsd/Auth.hpp loolwsd/Capabilities.hpp loolwsd/ChildProcessSession.cpp loolwsd/LoadTest.cpp loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp loolwsd/LOOLWSD.cpp

2016-03-01 Thread Tor Lillqvist 
 loolwsd/Auth.hpp|3 ++-
 loolwsd/Capabilities.hpp|8 +---
 loolwsd/ChildProcessSession.cpp |2 +-
 loolwsd/LOOLBroker.cpp  |   23 ---
 loolwsd/LOOLKit.cpp |   19 ++-
 loolwsd/LOOLWSD.cpp |4 ++--
 loolwsd/LoadTest.cpp|3 ++-
 7 files changed, 34 insertions(+), 28 deletions(-)

New commits:
commit 02913dcbfc6fc63f6d5f9be4271509967f7b2f01
Author: Tor Lillqvist 
Date:   Wed Mar 2 08:47:13 2016 +0200

Use std:: consistently for cstdlib functions

diff --git a/loolwsd/Auth.hpp b/loolwsd/Auth.hpp
index c234243..c968ece 100644
--- a/loolwsd/Auth.hpp
+++ b/loolwsd/Auth.hpp
@@ -11,6 +11,7 @@
 #ifndef INCLUDED_AUTH_HPP
 #define INCLUDED_AUTH_HPP
 
+#include 
 #include 
 
 #include 
@@ -86,7 +87,7 @@ public:
 //TODO: Parse the response.
 /*
 // This is used for the demo site.
-const auto lastLogTime = strtoul(reply.c_str(), nullptr, 0);
+const auto lastLogTime = std::strtoul(reply.c_str(), nullptr, 0);
 if (lastLogTime < 1)
 {
 //TODO: Redirect to login page.
diff --git a/loolwsd/Capabilities.hpp b/loolwsd/Capabilities.hpp
index dc94540..1ebb710 100644
--- a/loolwsd/Capabilities.hpp
+++ b/loolwsd/Capabilities.hpp
@@ -12,6 +12,8 @@
 
 #include 
 
+#include 
+
 #include "Util.hpp"
 
 static
@@ -24,7 +26,7 @@ void dropCapability(cap_value_t capability)
 if (caps == nullptr)
 {
 Log::error("Error: cap_get_proc() failed.");
-exit(1);
+std::exit(1);
 }
 
 char *capText = cap_to_text(caps, nullptr);
@@ -35,13 +37,13 @@ void dropCapability(cap_value_t capability)
 cap_set_flag(caps, CAP_PERMITTED, 
sizeof(cap_list)/sizeof(cap_list[0]), cap_list, CAP_CLEAR) == -1)
 {
 Log::error("Error: cap_set_flag() failed.");
-exit(1);
+std::exit(1);
 }
 
 if (cap_set_proc(caps) == -1)
 {
 Log::error("Error: cap_set_proc() failed.");
-exit(1);
+std::exit(1);
 }
 
 capText = cap_to_text(caps, nullptr);
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 7f037b8..926b4dc 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -313,7 +313,7 @@ ChildProcessSession::ChildProcessSession(const std::string& 
id,
  std::function onUnload) :
 LOOLSession(id, Kind::ToMaster, ws),
 _loKitDocument(loKitDocument),
-_multiView(getenv("LOK_VIEW_CALLBACK")),
+_multiView(std::getenv("LOK_VIEW_CALLBACK")),
 _jailId(jailId),
 _viewId(0),
 _clientPart(0),
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index ddeb815..b119ffd 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -9,6 +9,7 @@
 
 #include 
 
+#include 
 #include 
 
 #include "Common.hpp"
@@ -694,31 +695,31 @@ int main(int argc, char** argv)
 if (loSubPath.empty())
 {
 Log::error("Error: --losubpath is empty");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 if (sysTemplate.empty())
 {
 Log::error("Error: --systemplate is empty");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 if (loTemplate.empty())
 {
 Log::error("Error: --lotemplate is empty");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 if (childRoot.empty())
 {
 Log::error("Error: --childroot is empty");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 if (numPreSpawnedChildren < 1)
 {
 Log::error("Error: --numprespawns is 0");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 const Path pipePath = Path::forDirectory(childRoot + Path::separator() + 
FIFO_PATH);
@@ -726,7 +727,7 @@ int main(int argc, char** argv)
 if ( (readerBroker = open(pipeLoolwsd.c_str(), O_RDONLY) ) < 0 )
 {
 Log::error("Error: failed to open pipe [" + pipeLoolwsd + "] read 
only. Exiting.");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 try
@@ -752,26 +753,26 @@ int main(int argc, char** argv)
 if (mkfifo(pipeBroker.c_str(), 0666) < 0 && errno != EEXIST)
 {
 Log::error("Error: Failed to create pipe FIFO [" + FIFO_BROKER + "].");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 if ((readerChild = open(pipeBroker.c_str(), pipeFlags) ) < 0)
 {
 Log::error("Error: pipe opened for reading.");
-exit(Application::EXIT_SOFTWARE);
+std::exit(Application::EXIT_SOFTWARE);
 }
 
 if ((pipeFlags = fcntl(readerChild, F_GETFL, 0)) < 0)
 {
 Log::error("Error: failed to get pipe flags ["

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

2016-03-01 Thread Tor Lillqvist 
 loolwsd/LOOLBroker.cpp |2 +-
 loolwsd/LOOLWSD.cpp|1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 73282c50d6c39b7b5788bee4c2a0bc01a3887793
Author: Tor Lillqvist 
Date:   Wed Mar 2 08:26:15 2016 +0200

Make preinit the default. Turn off with LOK_NO_PREINIT

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 0ac53c8..ddeb815 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -775,7 +775,7 @@ int main(int argc, char** argv)
 }
 
 // Initialize LoKit and hope we can fork and save memory by sharing pages.
-const bool sharePages = std::getenv("LOK_PREINIT") != nullptr
+const bool sharePages = std::getenv("LOK_NO_PREINIT") == nullptr
   ? globalPreinit(loTemplate)
   : std::getenv("LOK_FORK") != nullptr;
 
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 69a3774..c5d3cc3 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -911,7 +911,6 @@ int LOOLWSD::main(const std::vector& /*args*/)
 return Application::EXIT_USAGE;
 }
 
-//Environment::set("LOK_PREINIT", "1");
 //Environment::set("LOK_FORK", "1");
 //Environment::set("LD_BIND_NOW", "1");
 //Environment::set("LOK_VIEW_CALLBACK", "1");
___
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-4.4' - 23 commits - configure.ac lotuswordpro/qa lotuswordpro/source

2016-03-01 Thread Andras Timar 
 configure.ac  |2 
 lotuswordpro/qa/cppunit/test_lotuswordpro.cxx |4 
 lotuswordpro/source/filter/LotusWordProImportFilter.cxx   |   12 
 lotuswordpro/source/filter/bencont.cxx|   10 
 lotuswordpro/source/filter/bento.hxx  |7 
 lotuswordpro/source/filter/benval.cxx |2 
 lotuswordpro/source/filter/explode.hxx|2 
 lotuswordpro/source/filter/genericfilter.cxx  |2 
 lotuswordpro/source/filter/lwp9reader.cxx |2 
 lotuswordpro/source/filter/lwpbackgroundoverride.hxx  |2 
 lotuswordpro/source/filter/lwpbackgroundstuff.cxx |   25 
 lotuswordpro/source/filter/lwpbackgroundstuff.hxx |2 
 lotuswordpro/source/filter/lwpbreaksoverride.hxx  |2 
 lotuswordpro/source/filter/lwpbulletstylemgr.cxx  |4 
 lotuswordpro/source/filter/lwpcelllayout.cxx  |   34 
 lotuswordpro/source/filter/lwpcelllayout.hxx  |   10 
 lotuswordpro/source/filter/lwpcharborderoverride.hxx  |2 
 lotuswordpro/source/filter/lwpcharsetmgr.cxx  |5 
 lotuswordpro/source/filter/lwpcharsetmgr.hxx  |6 
 lotuswordpro/source/filter/lwpcontent.cxx |   20 
 lotuswordpro/source/filter/lwpcontent.hxx |2 
 lotuswordpro/source/filter/lwpdivinfo.cxx |4 
 lotuswordpro/source/filter/lwpdivinfo.hxx |4 
 lotuswordpro/source/filter/lwpdivopts.hxx |2 
 lotuswordpro/source/filter/lwpdllist.cxx  |4 
 lotuswordpro/source/filter/lwpdllist.hxx  |   12 
 lotuswordpro/source/filter/lwpdoc.cxx |   82 +-
 lotuswordpro/source/filter/lwpdoc.hxx |   25 
 lotuswordpro/source/filter/lwpdocdata.hxx |4 
 lotuswordpro/source/filter/lwpdrawobj.cxx |   38 -
 lotuswordpro/source/filter/lwpdrawobj.hxx |6 
 lotuswordpro/source/filter/lwpfilehdr.cxx |   12 
 lotuswordpro/source/filter/lwpfilter.cxx  |2 
 lotuswordpro/source/filter/lwpfnlayout.cxx|   12 
 lotuswordpro/source/filter/lwpfont.hxx|4 
 lotuswordpro/source/filter/lwpfootnote.cxx|6 
 lotuswordpro/source/filter/lwpfoundry.cxx |   44 -
 lotuswordpro/source/filter/lwpfoundry.hxx |7 
 lotuswordpro/source/filter/lwpframelayout.cxx |  110 +--
 lotuswordpro/source/filter/lwpfrib.cxx|   14 
 lotuswordpro/source/filter/lwpfribbreaks.cxx  |9 
 lotuswordpro/source/filter/lwpfribframe.cxx   |6 
 lotuswordpro/source/filter/lwpfribmark.cxx|6 
 lotuswordpro/source/filter/lwpfribmark.hxx|2 
 lotuswordpro/source/filter/lwpfribptr.cxx |9 
 lotuswordpro/source/filter/lwpfribptr.hxx |2 
 lotuswordpro/source/filter/lwpfribsection.cxx |   84 +-
 lotuswordpro/source/filter/lwpfribtable.cxx   |   22 
 lotuswordpro/source/filter/lwpfribtable.hxx   |2 
 lotuswordpro/source/filter/lwpfribtext.cxx|4 
 lotuswordpro/source/filter/lwpgrfobj.cxx  |   22 
 lotuswordpro/source/filter/lwpgrfobj.hxx  |2 
 lotuswordpro/source/filter/lwpheader.hxx  |3 
 lotuswordpro/source/filter/lwplayout.cxx  |  489 --
 lotuswordpro/source/filter/lwplayout.hxx  |  167 +++-
 lotuswordpro/source/filter/lwplaypiece.hxx|2 
 lotuswordpro/source/filter/lwpmarker.cxx  |8 
 lotuswordpro/source/filter/lwpnotes.cxx   |8 
 lotuswordpro/source/filter/lwpnumberingoverride.hxx   |2 
 lotuswordpro/source/filter/lwpnumericfmt.cxx  |2 
 lotuswordpro/source/filter/lwpnumericfmt.hxx  |   16 
 lotuswordpro/source/filter/lwpobj.cxx |3 
 lotuswordpro/source/filter/lwpobj.hxx |   14 
 lotuswordpro/source/filter/lwpobjfactory.cxx  |   21 
 lotuswordpro/source/filter/lwpobjfactory.hxx  |7 
 lotuswordpro/source/filter/lwpobjhdr.cxx  |   38 -
 lotuswordpro/source/filter/lwpobjid.cxx   |   19 
 lotuswordpro/source/filter/lwpobjid.hxx   |7 
 lotuswordpro/source/filter/lwpobjstrm.cxx |8 
 lotuswordpro/source/filter/lwpobjstrm.hxx |2 
 lotuswordpro/source/filter/lwpoleobject.cxx   |6 
 lotuswordpro/source/filter/lwpoverride.hxx|   20 
 lotuswordpro/source/filter/lwppagelayout.cxx  |   48 -
 lotuswordpro/source/filter/lwppara.cxx|   65 -
 lotuswordp

Libreoffice in indian languages

2016-03-01 Thread sridhar 
 

Hi

 

I am trying to build Libreoffice 5.0.2 user interface in Indian languages.
Some languages are working . I followed same process for Gujarati ,
Malayalam, Marathi , Nepali and Manipuri.

But it's not working. After selecting Language in Languages setting, the
user interface remain in English.

Operating System : Ubuntu 14.04

 

Is anyone can help me in this issue.

 

Regards

 

S. Sridhar


---
[ C-DAC is on Social-Media too. Kindly follow us at:
Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]

This e-mail is for the sole use of the intended recipient(s) and may
contain confidential and privileged information. If you are not the
intended recipient, please contact the sender by reply e-mail and destroy
all copies and the original message. Any unauthorized review, use,
disclosure, dissemination, forwarding, printing or copying of this email
is strictly prohibited and appropriate legal action will be taken.
---

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

[Libreoffice-commits] core.git: 3 commits - include/tools rsc/inc rsc/source tools/source

2016-03-01 Thread Matteo Casalin 
 include/tools/pstm.hxx   |   16 +++-
 include/tools/unqidx.hxx |   49 +--
 rsc/inc/rscdb.hxx|6 ++--
 rsc/inc/rscdef.hxx   |   27 +++--
 rsc/source/parser/rscdb.cxx  |   24 +--
 rsc/source/parser/rsclex.cxx |2 -
 rsc/source/parser/rscyacc.y  |1 
 rsc/source/rsc/rsc.cxx   |   26 ++--
 rsc/source/tools/rscdef.cxx  |   49 ++-
 tools/source/memtools/unqidx.cxx |   36 ++--
 tools/source/ref/pstm.cxx|   14 +--
 11 files changed, 130 insertions(+), 120 deletions(-)

New commits:
commit 0d34f4ac9b17348d7956285c6cefb28bea2537b6
Author: Matteo Casalin 
Date:   Tue Mar 1 23:37:07 2016 +0100

Data member nStartIndex can be const

Change-Id: I94a3bdd01186061fbd95b62494c24a50f0c4866d

diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index c783151..dd66c300 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
@@ -33,7 +33,7 @@ public:
 
 private:
 std::map maMap;
-Index nStartIndex;
+const Index nStartIndex;
 Index nUniqIndex;
 Index nCount;
 
commit f00967cf38ed0c2c197284391fc521825bb3c2ac
Author: Matteo Casalin 
Date:   Tue Mar 1 23:21:02 2016 +0100

sal_uIntPtr/sal_uLong to Index (aka sal_uInt32) in UniqueIndex

Change-Id: I212cb3bb9d920741629fc4564bbd28b393e8fe00

diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index 92b5349..ab75416 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -91,8 +91,6 @@ public:
   SvPersistBase *& rpObj );
 };
 
-typedef std::map PersistBaseMap;
-
 class SvStream;
 
 /** Persistent Stream
@@ -130,12 +128,18 @@ class SvStream;
 */
 class TOOLS_DLLPUBLIC SvPersistStream : public SvStream
 {
+public:
+typedef UniqueIndex::Index Index;
+
+private:
+typedef std::map PersistBaseMap;
+
 SvClassManager &rClassMgr;
 SvStream *  pStm;
 PersistBaseMap  aPTable; // reversed pointer and key
 UniqueIndex
 aPUIdx;
-sal_uIntPtr nStartIdx;
+Index   nStartIdx;
 const SvPersistStream * pRefStm;
 
 virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) override;
@@ -151,13 +155,13 @@ public:
 virtual voidResetError() override;
 
 SvPersistStream( SvClassManager &, SvStream * pStream,
- sal_uInt32 nStartIdx = 1 );
+ Index nStartIdx = 1 );
 virtual ~SvPersistStream();
 
 voidSetStream( SvStream * pStream );
 
-SvPersistBase * GetObject( sal_uIntPtr nIdx ) const;
-sal_uIntPtr GetIndex( SvPersistBase * ) const;
+SvPersistBase * GetObject( Index nIdx ) const;
+Index   GetIndex( SvPersistBase * ) const;
 
 static void WriteCompressed( SvStream & rStm, sal_uInt32 nVal );
 static sal_uInt32   ReadCompressed( SvStream & rStm );
diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx
index 03a30c6..c783151 100644
--- a/include/tools/unqidx.hxx
+++ b/include/tools/unqidx.hxx
@@ -20,45 +20,52 @@
 #define INCLUDED_TOOLS_UNQIDX_HXX
 
 #include 
-#include 
+#include 
 #include 
 
-#define UNIQUEINDEX_ENTRY_NOTFOUND   CONTAINER_ENTRY_NOTFOUND
-
 class SAL_WARN_UNUSED TOOLS_DLLPUBLIC UniqueIndexImpl
 {
+public:
+typedef sal_uInt32 Index;
+enum {
+IndexNotFound = std::numeric_limits::max()
+};
+
 private:
-std::map maMap;
-sal_uIntPtr   nStartIndex;
-sal_uIntPtr   nUniqIndex;
-sal_uIntPtr   nCount;
+std::map maMap;
+Index nStartIndex;
+Index nUniqIndex;
+Index nCount;
 
 public:
-UniqueIndexImpl( sal_uIntPtr _nStartIndex = 0 )
+UniqueIndexImpl( Index _nStartIndex = 0 )
 : maMap(),
   nStartIndex(_nStartIndex), nUniqIndex(_nStartIndex), nCount(0) {}
 
-sal_uIntPtr   Insert( void* p );
+Index Insert( void* p );
 // insert value with key, replacing existing entry if necessary
-void* Remove( sal_uIntPtr aIndex );
-void* Get( sal_uIntPtr aIndex ) const;
+void* Remove( Index aIndex );
+void* Get( Index aIndex ) const;
 
-sal_uIntPtr   GetIndexOf( void* p ) const;
-sal_uIntPtr   FirstIndex() const;
-sal_uIntPtr   LastIndex() const;
-sal_uIntPtr   NextIndex( sal_uIntPtr aCurrIndex ) const;
+Index GetIndexOf( void* p ) const;
+Index FirstIndex() const;
+Index LastIndex() const;
+Index NextIndex( Index aCurrIndex ) const;
 };
 
 template
 class UniqueIndex : private UniqueIndexImpl
 {
 public:
-UniqueIndex( sal_uIntPtr _nStartIndex = 0 ) : 
UniqueIndexImpl(_nStartIndex) {}
+using UniqueIndexImpl::Index;
+using UniqueIndexImpl::IndexNotFound;
+
+UniqueInde

Re: java configure bug on gentoo

2016-03-01 Thread Wols Lists 
On 01/03/16 18:54, Wols Lists wrote:
> On 01/03/16 18:52, julien2412 wrote:
>> Anthonys Lists wrote
>>> ...
>>> So I've debugged it successfully in ./configure, but that appears to be
>>> a generated file, so when I went to test it, it seems to have blown my
>>> changes away! How do I fix ./configure so the changes stick?
>>> ...
>>
>> You can take a look to configure.ac in 
>>
> Thanks. Looking at it now ...
> 
Done and tested. Now trying to submit (unsuccessfully) to gerrit.

I suspect I've got an account (Wol) on there which I can't get in to.
I've created a new account (Wol1) which is working, but I can't submit
my patch because my email address is already attached to another account
so I can't add it to Wol1.

I'd rather use Wol, obviously, but I can't see any way of sorting out
the situation other than getting a gerrit admin to fix things ...

Cheers,
Wol

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

Needed information abut sidebar module

2016-03-01 Thread Pranav Ganorkar 
Hi, I am working on this bug:

https://bugs.documentfoundation.org/show_bug.cgi?id=97885

As stated in the bug, it mentions that somehow the link to the EmptyPanel
got removed. Most likely in this commit:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=536c259cb9644971d0eb0cdfb7d823c5383a5481

But I am not able to figure out how the sidebar was referencing EmptyPanel
previously. But in the commits only the files in core implementation of
sidebar are affected. As this bug is very much related to Draw, it should
be related to the specific implementation to sidebar which is present in
sd/source/ui/sidebar.
correct me if I am wrong. can someone guide me on this. Thanks.

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

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

2016-03-01 Thread Eike Rathke 
 include/svl/srchitem.hxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 02caf16fc7d0455a235341966db89c77cbf1da0d
Author: Eike Rathke 
Date:   Tue Mar 1 20:45:02 2016 +0100

remnants of the past ...

... when OUString had to be automatically converted to String, but
nowadays we can return a const reference instead.

Change-Id: Ic3a68e100bd176b223575da8713c9dbdfe71c3d7

diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx
index 18547bc..472f1ac 100644
--- a/include/svl/srchitem.hxx
+++ b/include/svl/srchitem.hxx
@@ -114,10 +114,10 @@ public:
 SvxSearchCmdGetCommand() const { return m_nCommand; }
 voidSetCommand(SvxSearchCmd nNewCommand) { m_nCommand 
= nNewCommand; }
 
-inline  const OUString  GetSearchString() const;
+inline  const OUString& GetSearchString() const;
 inline  voidSetSearchString(const OUString& rNewString);
 
-inline  const OUString  GetReplaceString() const;
+inline  const OUString& GetReplaceString() const;
 inline  voidSetReplaceString(const OUString& rNewString);
 
 inline  boolGetWordOnly() const;
@@ -200,7 +200,7 @@ public:
 bool HasStartPoint() const;
 };
 
-const OUString SvxSearchItem::GetSearchString() const
+const OUString& SvxSearchItem::GetSearchString() const
 {
 return m_aSearchOpt.searchString;
 }
@@ -210,7 +210,7 @@ void SvxSearchItem::SetSearchString(const OUString& 
rNewString)
 m_aSearchOpt.searchString = rNewString;
 }
 
-const OUString SvxSearchItem::GetReplaceString() const
+const OUString& SvxSearchItem::GetReplaceString() const
 {
 return m_aSearchOpt.replaceString;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/source compilerplugins/clang include/comphelper include/unotools

2016-03-01 Thread Matúš Kukan 
 comphelper/source/inc/comphelper_module.hxx |   14 --
 compilerplugins/clang/refcounting.cxx   |3 --
 include/comphelper/componentmodule.hxx  |   38 
 include/unotools/componentresmodule.hxx |   13 -
 4 files changed, 68 deletions(-)

New commits:
commit 5a1cd2f30d9cc8b9a6ce5eaed06af199080055b7
Author: Matúš Kukan 
Date:   Mon Feb 29 19:46:58 2016 +0100

OSingletonRegistration is dead now

Change-Id: I64a5ffa8790496bd39ba26e0c789db9eedc51071
Reviewed-on: https://gerrit.libreoffice.org/22788
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/comphelper/source/inc/comphelper_module.hxx 
b/comphelper/source/inc/comphelper_module.hxx
index 2364adf..8c587f0 100644
--- a/comphelper/source/inc/comphelper_module.hxx
+++ b/comphelper/source/inc/comphelper_module.hxx
@@ -64,20 +64,6 @@ namespace comphelper { namespace module
 }
 };
 
-/*  */
-template < class TYPE >
-class OSingletonRegistration : public 
::comphelper::OSingletonRegistration< TYPE >
-{
-private:
-typedef ::comphelper::OSingletonRegistration< TYPE > BaseClass;
-
-public:
-OSingletonRegistration() : BaseClass( ComphelperModule::getInstance() )
-{
-}
-};
-
-
 } } // namespace comphelper::module
 
 
diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index 0e899f3..663fcb7 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -112,7 +112,6 @@ static std::vector PROBABLY_GOOD_TEMPLATES = {
 "com::sun::star::uno::Sequence",
 "accessibility::WeakCppRef",
 "dba::OAutoRegistration",
-"dba::OSingletonRegistration",
 "dbp::OMultiInstanceAutoRegistration",
 "dbaui::OMultiInstanceAutoRegistration",
 "dbaxml::OMultiInstanceAutoRegistration",
@@ -120,7 +119,6 @@ static std::vector PROBABLY_GOOD_TEMPLATES = {
 "io_acceptor::ReferenceHash",
 "comphelper::OAutoRegistration",
 "comphelper::OInterfaceCompare",
-"comphelper::module::OSingletonRegistration",
 "comphelper::WeakBag",
 "comphelper::service_decl::class_",
 "comphelper::service_decl::vba_service_class_",
@@ -131,7 +129,6 @@ static std::vector PROBABLY_GOOD_TEMPLATES = {
 "dbmm::OAutoRegistration",
 "pcr::OAutoRegistration",
 "logging::ComponentMethodGuard",
-"logging::OSingletonRegistration",
 "logging::OAutoRegistration",
 "rtl::Reference",
 "sdbtools::OAutoRegistration",
diff --git a/include/comphelper/componentmodule.hxx 
b/include/comphelper/componentmodule.hxx
index 9317916..b14148a 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -202,44 +202,6 @@ namespace comphelper
 );
 }
 
-
-//= OSingletonRegistration
-
-template 
-class OSingletonRegistration
-{
-public:
-/** automatically provides all component information to an OModule 
instance,
-for a singleton component
-
-Assumed that the template argument has the three methods
-
-static OUString 
getImplementationName_static()
-static css::uno::Sequence< OUString > 
getSupportedServiceNames_static()
-static OUString 
getSingletonName_static()
-static css::uno::Reference< css::uno::XInterface 
>
-Create(const css::uno::Reference< 
css::lang::XMultiServiceFactory >&)
-
-
-the instantiation of this object will automatically register the 
class via OModule::registerImplementation.
-
-*/
-OSingletonRegistration( OModule& _rModule );
-};
-
-template 
-
-OSingletonRegistration::OSingletonRegistration( OModule& _rModule )
-{
-_rModule.registerImplementation( ComponentDescription(
-TYPE::getImplementationName_static(),
-TYPE::getSupportedServiceNames_static(),
-&TYPE::Create,
-&::cppu::createSingleComponentFactory
-) );
-}
-
-
 } // namespace comphelper
 
 
diff --git a/include/unotools/componentresmodule.hxx 
b/include/unotools/componentresmodule.hxx
index bc35a6c..c63d10c 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
@@ -121,19 +121,6 @@ namespace utl
 OAutoRegistration() : BaseClass( ModuleClass::getInstance() ) \
 { \
 } \
-}; \
-\
-/*  */ 
\
-template < class TYPE > \
-class OSingletonRegistration : public 
::comphelper::OSingletonRegistration< TYPE > \
-{ \
-private: \
-typedef ::comphelper::OSingletonRegistration< TYPE >BaseClass; \
-\
-public: \
-OSingletonRegistration()

Re: java configure bug on gentoo

2016-03-01 Thread Wols Lists 
On 01/03/16 18:52, julien2412 wrote:
> Anthonys Lists wrote
>> ...
>> So I've debugged it successfully in ./configure, but that appears to be
>> a generated file, so when I went to test it, it seems to have blown my
>> changes away! How do I fix ./configure so the changes stick?
>> ...
> 
> You can take a look to configure.ac in 
> 
Thanks. Looking at it now ...

Cheers,
Wol

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

Re: java configure bug on gentoo

2016-03-01 Thread julien2412 
Anthonys Lists wrote
> ...
> So I've debugged it successfully in ./configure, but that appears to be
> a generated file, so when I went to test it, it seems to have blown my
> changes away! How do I fix ./configure so the changes stick?
> ...

You can take a look to configure.ac in 

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/java-configure-bug-on-gentoo-tp4177108p4177111.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

libreoffice online Chinese input issues

2016-03-01 Thread xipeng 


Hi all, 

I am a developer work on online office, our team selected 
libreoffice online open source framework, but we find it does not support 
Chinese input when edit document online, we want to implement this function, 
hope you can give us some suggestions, any advice will be appreciated.Thank you.

 


Best regards,

Xipeng Song



 

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

java configure bug on gentoo

2016-03-01 Thread Wols Lists 
Just tried to build lo on my system and it blew up with "can't find java
home" - the worst kind of failure in that it didn't succeed, didn't
fail, but thought it had succeeded.

So I've debugged it successfully in ./configure, but that appears to be
a generated file, so when I went to test it, it seems to have blown my
changes away! How do I fix ./configure so the changes stick?

Basically, what happens - and I believe this is not unique to gentoo -
is that the distro replaces the javac, javadoc, and a bunch of other
commands with a script that chooses which version of java to run. With
the result that configure thinks it's found java_home, but it's actually
pointing to a distro script.

What I've found out is that by looking for this at the appropriate
point, and setting java_home to null, the following test seems to detect
java_home correctly. I attach the modified code so someone else can fix
it if they choose, or point me at what to do.

   else
# else warn
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME
is set to /usr - this is very likely to be incorrect" >&5
$as_echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very
likely to be incorrect" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if this is
the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5
$as_echo "$as_me: WARNING: if this is the case, please inform the
correct JAVA_HOME with --with-jdk-home" >&2;}
add_warning "JAVA_HOME is set to /usr - this is very likely
to be incorrect"
add_warning "if this is the case, please inform the correct
JAVA_HOME with --with-jdk-home"
fi
if test "$JAVA_HOME" != "/usr"; then
if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
JAVA_HOME=$(echo $JAVA_HOME | $SED -e
s,/Current/Commands/javac$,/CurrentJDK/Home,)
JAVA_HOME=$(echo $JAVA_HOME | $SED -e
s,/CurrentJDK/Commands/javac$,/CurrentJDK/Home,)
else
JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/bin/javac$,,)
echo 6 JAVA_HOME $JAVA_HOME
if test -f "$JAVA_HOME"; then
JAVA_HOME=""; # certain distros eg gentoo, javac
points to a script that selects java version
echo 6a JAVA_HOME $JAVA_HOME
fi
fi
fi
fi


Basically, the fix is the test (after my "echo 6" debug statement :-) to
see if JAVA_HOME is pointing at a file. The preceding sed command fails
on gentoo (and would produce the wrong result anyway) so you need to
throw away the contents of java_home and let the next test succeed.

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

Collabora Online Chinese support issues

2016-03-01 Thread xipeng 

Hello, 

I am the company's on going development of online office, selected 
Collabora Online open source framework, but does not support Chinese input in 
the source code, we want to achieve this part. We hope you can give some 
suggestions, such as implementation, what position in the original frame to add 
or code, etc.
Thank you, best wishes.

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

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

2016-03-01 Thread Miklos Vajna 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   12 
 sfx2/source/view/classificationhelper.cxx  |6 --
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 9bd334a475e24d8454ef51b4d9aa5bd7668ee58e
Author: Miklos Vajna 
Date:   Tue Mar 1 17:55:43 2016 +0100

sfx2 classification: don't hardcode the policy path

This moves the path from code to configuration, UI is still missing to
actually edit that configuration key though.

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index e06114e..9ce22f1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1580,6 +1580,12 @@
   
   $(insturl)/@LIBO_SHARE_FOLDER@/config/symbol
 
+
+  
+Contains the URL of the current TSCP BAF policy file.
+  
+ 
$BRAND_BASE_DIR/@LIBO_SHARE_FOLDER@/classification/example.xml
+
 
   
 Contains the configuration files. This value cannot be 
changed
@@ -1775,6 +1781,12 @@
   
   $(insturl)/@LIBO_SHARE_FOLDER@/config/symbol
 
+
+  
+Contains the URL of the default TSCP BAF policy file.
+  
+ 
$BRAND_BASE_DIR/@LIBO_SHARE_FOLDER@/classification/example.xml
+
 
   
 Specifies the default directory where the configuration files
diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index 8fc5190..cade650 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -309,14 +310,15 @@ SfxClassificationHelper::Impl::Impl(SfxObjectShell& 
rObjectShell)
 
 void SfxClassificationHelper::Impl::parsePolicy()
 {
-OUString aPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER 
"/classification/example.xml");
+uno::Reference xComponentContext = 
comphelper::getProcessComponentContext();
+OUString aPath = 
officecfg::Office::Common::Path::Current::Classification::get(xComponentContext);
 rtl::Bootstrap::expandMacros(aPath);
 SvStream* pStream = utl::UcbStreamHelper::CreateStream(aPath, 
StreamMode::READ);
 uno::Reference xInputStream(new 
utl::OStreamWrapper(*pStream));
 xml::sax::InputSource aParserInput;
 aParserInput.aInputStream = xInputStream;
 
-uno::Reference xParser = 
xml::sax::Parser::create(comphelper::getProcessComponentContext());
+uno::Reference xParser = 
xml::sax::Parser::create(xComponentContext);
 rtl::Reference xClassificationParser(new 
SfxClassificationParser());
 uno::Reference 
xHandler(xClassificationParser.get());
 xParser->setDocumentHandler(xHandler);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Samuel Mehrbrodt 
 framework/source/uielement/addonstoolbarmanager.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 398fadca9a82917ed865e328ba454d8015803b66
Author: Samuel Mehrbrodt 
Date:   Tue Mar 1 18:09:23 2016 +0100

tdf#98277 Display shortcut only in tooltip, not in toolbutton name

When toolbar buttons have no icon, the text is displayed instead.
In this case the shortcut should not be displayed (only in the tooltip).

Change-Id: I42ac855c8f9bbbad5114b77a29927003b8ca095e

diff --git a/framework/source/uielement/addonstoolbarmanager.cxx 
b/framework/source/uielement/addonstoolbarmanager.cxx
index a7391d1..0154bdd 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -255,10 +255,12 @@ void AddonsToolBarManager::FillToolbar( const Sequence< 
Sequence< PropertyValue
 }
 bAppendSeparator = false;
 
+
+m_pToolBar->InsertItem( nId, aTitle );
+
 OUString 
aShortcut(vcl::CommandInfoProvider::Instance().GetCommandShortcut(aURL, 
m_xFrame));
 if (!aShortcut.isEmpty())
-aTitle += " (" + aShortcut + ")";
-m_pToolBar->InsertItem( nId, aTitle );
+m_pToolBar->SetQuickHelpText(nId, aTitle + " (" + 
aShortcut + ")");
 
 // don't setup images yet, 
AddonsToolbarWrapper::populateImages does that.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Tor Lillqvist 
 loolwsd/Makefile.am |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 78579b3e57536835ba802d6104f3529607d2c41b
Author: Tor Lillqvist 
Date:   Tue Mar 1 18:30:07 2016 +0200

Don't pretend to support non-Linux here either

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index b14f1fd..37ca105 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -44,13 +44,8 @@ clean-cache:
 # installing.
 all-local: loolwsd loolbroker
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
-   if test `uname -s` = Linux; then \
-   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep 
loolbroker; \
-   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
-   else \
-   sudo chown root loolbroker && sudo chmod u+s loolbroker; \
-   sudo chown root loolbroker && sudo chmod u+s loolkit; \
-   fi; \
+   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolbroker; \
+   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
fi
 
 tags:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - canvas/source

2016-03-01 Thread Stephan Bergmann 
 canvas/source/directx/dx_9rm.cxx  |2 --
 canvas/source/directx/dx_sprite.hxx   |3 +++
 canvas/source/directx/dx_spritehelper.cxx |1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9582fd9807854c5ed69d272ecd064d2393ff5ed3
Author: Stephan Bergmann 
Date:   Tue Mar 1 17:19:31 2016 +0100

-Werror,-Wshadow

Change-Id: I007ea13a059d8b067e4819fb61f0ea2e15c638a5

diff --git a/canvas/source/directx/dx_spritehelper.cxx 
b/canvas/source/directx/dx_spritehelper.cxx
index 17c0292..c5352af 100644
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.cxx
@@ -123,7 +123,6 @@ namespace dxcanvas
 SAL_INFO("canva.directx", "SpriteHelper::redraw(): output pos is 
(" <<
  rPos.getX() << "," << rPos.getY() << ")" );
 
-const double   fAlpha( 
getAlpha() );
 const ::basegfx::B2DVector&rSize( 
getSizePixel() );
 const ::basegfx::B2DHomMatrix& rTransform( 
getTransformation() );
 const uno::Reference< rendering::XPolyPolygon2D >& xClip( 
getClip() );
commit 377bb64b543b5cae297f184edaeedab7e0d83658
Author: Stephan Bergmann 
Date:   Tue Mar 1 17:19:12 2016 +0100

-Werror,-Wnon-virtual-dtor

Change-Id: Ibeed52359852451b800e083ddc4c221dea41a294

diff --git a/canvas/source/directx/dx_sprite.hxx 
b/canvas/source/directx/dx_sprite.hxx
index 2c014a5..680a75f 100644
--- a/canvas/source/directx/dx_sprite.hxx
+++ b/canvas/source/directx/dx_sprite.hxx
@@ -37,6 +37,9 @@ namespace dxcanvas
 restoreTextures() call failed.
  */
 virtual void redraw() const = 0;
+
+protected:
+~Sprite() {}
 };
 }
 
commit 6d1a9af30eefe00dd8fc190a2434bc5c19d7584d
Author: Stephan Bergmann 
Date:   Tue Mar 1 17:18:53 2016 +0100

-Werror,-Wunused-macros

Change-Id: I0269ae5c13c75327648c0018007d78dbf37f1648

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 8d697e1..81cecde 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -46,8 +46,6 @@
 #include "dx_impltools.hxx"
 #include "dx_rendermodule.hxx"
 
-
-#define MAX_TEXTURE_SIZE (2048)
 #define MIN_TEXTURE_SIZE (32)
 //#define FAKE_MAX_NUMBER_TEXTURES (2)
 //#define FAKE_MAX_TEXTURE_SIZE (4096)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/LOOLKit.cpp loolwsd/loolwsd.spec.in loolwsd/Makefile.am

2016-03-01 Thread Tor Lillqvist 
 loolwsd/LOOLKit.cpp |   19 ---
 loolwsd/Makefile.am |4 ++--
 loolwsd/debian/loolwsd.postinst |4 ++--
 loolwsd/loolwsd.spec.in |4 ++--
 4 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit d5292541bddfea8317d1996899f86bdab56b5eca
Author: Tor Lillqvist 
Date:   Tue Mar 1 18:22:55 2016 +0200

Revert "Also chown the random devices to root:root and chmod to 666"

Not needed after all. It was a red herring. The device files work fine
even if not owned by root:root and with mode 664. The actual problem
was that I used a file system mounted with nodev when testing loolwsd.

This reverts commit 509314d5598b68fa9a449a1a7348b10f25b7014a

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 6ca626f..f89a324 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -864,30 +864,12 @@ void lokit_main(const std::string& childRoot,
 Log::error("Error: mknod(" + jailPath.toString() + "/dev/random) 
failed.");
 
 }
-if (chmod((jailPath.toString() + "/dev/random").c_str(), 0666) != 0)
-{
-Log::error("Error: chmod(" + jailPath.toString() + "/dev/random, 
0666) failed.");
-
-}
-if (chown((jailPath.toString() + "/dev/random").c_str(), 0, 0) != 0)
-{
-Log::error("Error: chown(" + jailPath.toString() + "/dev/random, 
0, 0) failed.");
-
-}
 if (mknod((jailPath.toString() + "/dev/urandom").c_str(),
   S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | 
S_IWOTH,
   makedev(1, 9)) != 0)
 {
 Log::error("Error: mknod(" + jailPath.toString() + "/dev/urandom) 
failed.");
 }
-if (chmod((jailPath.toString() + "/dev/urandom").c_str(), 0666) != 0)
-{
-Log::error("Error: chmod(" + jailPath.toString() + "/dev/urandom, 
0666) failed.");
-}
-if (chown((jailPath.toString() + "/dev/urandom").c_str(), 0, 0) != 0)
-{
-Log::error("Error: chown(" + jailPath.toString() + "/dev/urandom, 
0, 0) failed.");
-}
 
 Log::info("chroot(\"" + jailPath.toString() + "\")");
 if (chroot(jailPath.toString().c_str()) == -1)
@@ -904,7 +886,6 @@ void lokit_main(const std::string& childRoot,
 
 dropCapability(CAP_SYS_CHROOT);
 dropCapability(CAP_MKNOD);
-dropCapability(CAP_CHOWN);
 dropCapability(CAP_FOWNER);
 
 loKit = lok_init_2(instdir_path.c_str(), "file:///user");
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 802876a..b14f1fd 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -45,8 +45,8 @@ clean-cache:
 all-local: loolwsd loolbroker
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
if test `uname -s` = Linux; then \
-   sudo @SETCAP@ cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
loolbroker; \
-   sudo @SETCAP@ cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
loolkit; \
+   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep 
loolbroker; \
+   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
else \
sudo chown root loolbroker && sudo chmod u+s loolbroker; \
sudo chown root loolbroker && sudo chmod u+s loolkit; \
diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 909332a..bb4f6da 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -4,8 +4,8 @@ set -e
 
 case "$1" in
 configure)
-   setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
/usr/bin/loolkit || true
-   setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
/usr/bin/loolbroker || true
+   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolkit || true
+   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolbroker || 
true
 
adduser --quiet --system --group --home /opt/lool lool
mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 54ddf17..c2d8f5d 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -69,8 +69,8 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 %service_add_pre loolwsd.service
 
 %post
-setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep /usr/bin/loolbroker
-setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep /usr/bin/loolkit
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolbroker
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolkit
 
 getent group %{group} >/dev/null || groupadd -r %{group}
 getent passwd %{owner} >/dev/null || useradd -g %{group} -r %{owner}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: XMLSEC_NO_SIZE_T is /not/ used with MSVC

2016-03-01 Thread Stephan Bergmann 

On 03/01/2016 09:47 AM, Stephan Bergmann wrote:

On 03/01/2016 03:40 AM, Ashod Nakashian wrote:

Perhaps if you shed some light on what you are addressing I might be
able to come with a solution?


What is required is that no xmlsec/* ever get included from outside of
xmlsecurity/xmlsec-wrapper.h (because the latter controls a macro that
the former #if on).  That means that no xmlsec/* may show up in a
precompiled_*.hxx.  Whether or not xmlsecurity/xmlsec-wrapper.h shows up
in a precompiled_*.hxx is irrelevant for correctness, so whichever is
easier to implement in update_pch should be fine.  (I just arbitrarily
did include it in my manual modifications of
xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx to approximate what was
there before.)


Solution got merged as  
"Exclude xmlsec headers from precompiled headers" now.  Thanks!

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

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

2016-03-01 Thread Caolán McNamara 
 qadevOOo/tests/java/ifc/awt/_XWindow.java |   29 +
 vcl/unx/gtk/gtksalmenu.cxx|6 ++
 2 files changed, 11 insertions(+), 24 deletions(-)

New commits:
commit 9f61007bb01ac7f47fa164e4cb252a4338ee9bdc
Author: Caolán McNamara 
Date:   Tue Mar 1 15:49:39 2016 +

valgrind: fix g_variant leak

Change-Id: I6d10c7d20f9bc1dfcaa60ad89a9092fe06922074

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index d828a7c..5634922 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -825,13 +825,19 @@ void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
 if ( bIsSubmenu )
 g_lo_menu_set_submenu_action_to_item_in_section( pMenu, nSection, 
nItemPos, aItemCommand );
 else
+{
 g_lo_menu_set_action_and_target_value_to_item_in_section( pMenu, 
nSection, nItemPos, aItemCommand, pTarget );
+pTarget = nullptr;
+}
 
 g_free( aItemCommand );
 }
 
 if ( aCurrentCommand )
 g_free( aCurrentCommand );
+
+if (pTarget)
+g_variant_unref(pTarget);
 }
 
 GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean 
bGetSubmenu )
commit d45c60daf83003507ff6556e6fbc43ddc8abb673
Author: Caolán McNamara 
Date:   Tue Mar 1 12:03:09 2016 +

coverity#1327140 UrF: Unread field

Change-Id: Iab2d56eae3d068db7347a486e848a1bedb917034

diff --git a/qadevOOo/tests/java/ifc/awt/_XWindow.java 
b/qadevOOo/tests/java/ifc/awt/_XWindow.java
index 472a91d..10498bd 100644
--- a/qadevOOo/tests/java/ifc/awt/_XWindow.java
+++ b/qadevOOo/tests/java/ifc/awt/_XWindow.java
@@ -406,12 +406,10 @@ public class _XWindow extends MultiMethodTest {
 * removeKeyListener()
 */
 public static class TestKeyListener implements XKeyListener {
-public boolean pressed = false;
-public boolean released = false;
-public void keyPressed(KeyEvent e) { pressed = true; }
-public void keyReleased(KeyEvent e) { released = true; }
+public void keyPressed(KeyEvent e) {}
+public void keyReleased(KeyEvent e) {}
 public void disposing(EventObject e) {}
-public void init() { pressed = false; released = false; }
+public void init() {}
 }
 
 private final TestKeyListener kListener = new TestKeyListener();
@@ -445,34 +443,22 @@ public class _XWindow extends MultiMethodTest {
 * removeMouseListener()
 */
 public static class TestMouseListener implements XMouseListener {
-public boolean pressed = false;
-public boolean released = false;
-public boolean entered = false;
-public boolean exited = false;
 
 public void mousePressed(MouseEvent e) {
-pressed = true;
 }
 
 public void mouseReleased(MouseEvent e) {
-released = true;
 }
 
 public void mouseEntered(MouseEvent e) {
-entered = true;
 }
 
 public void mouseExited(MouseEvent e) {
-exited = true;
 }
 
 public void disposing(EventObject e) {}
 
 public void init() {
-pressed = false;
-released = false;
-exited = false;
-entered = false;
 }
 
 }
@@ -508,22 +494,17 @@ public class _XWindow extends MultiMethodTest {
 * removeMouseMotionListener()
 */
 public static class TestMouseMotionListener implements 
XMouseMotionListener {
-public boolean dragged = false;
-public boolean moved = false;
 
 public void mouseDragged(MouseEvent e) {
-dragged = true;
 }
 
 public void mouseMoved(MouseEvent e) {
-moved = true;
 }
 
-public void disposing(EventObject e) {}
+public void disposing(EventObject e) {
+}
 
 public void init() {
-dragged = false;
-moved = false;
 }
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp

2016-03-01 Thread Tor Lillqvist 
 loolwsd/ChildProcessSession.cpp |2 +-
 loolwsd/LOOLBroker.cpp  |8 
 loolwsd/LOOLKit.cpp |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4f701d5d84afa072ef9549b1e500b1eef1e4beff
Author: Tor Lillqvist 
Date:   Tue Mar 1 17:28:42 2016 +0200

Avoid aligning equal signs on sequential lines in a few arbitrary places

If we would use such style, we would need to do it consistently.

diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index ae22965..7f037b8 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -1080,7 +1080,7 @@ bool ChildProcessSession::keyEvent(const char* 
/*buffer*/, int /*length*/, Strin
 
 // Don't close LO window!
 constexpr auto KEY_CTRL = 0x2000;
-constexpr auto KEY_W= 0x0216;
+constexpr auto KEY_W = 0x0216;
 if (keycode == (KEY_CTRL | KEY_W))
 return true;
 
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 5718304..0ac53c8 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -199,7 +199,7 @@ public:
 }
 
 _start = _buffer;
-_end   = _buffer + bytes;
+_end = _buffer + bytes;
 }
 
 if ( _start != _end )
@@ -208,7 +208,7 @@ public:
 while (_start != _end && byteChar != '\r' && byteChar != 
'\n')
 {
 response += byteChar;
-byteChar  = *_start++;
+byteChar = *_start++;
 }
 
 if (byteChar == '\r' && *_start == '\n')
@@ -354,7 +354,7 @@ public:
 pollPipeBroker.revents = 0;
 
 start = buffer;
-end   = buffer;
+end = buffer;
 
 static const std::string thread_name = "brk_pipe_reader";
 
@@ -383,7 +383,7 @@ public:
 continue;
 }
 start = buffer;
-end   = buffer + bytes;
+end = buffer + bytes;
 }
 else
 if (pollPipeBroker.revents & (POLLERR | POLLHUP))
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 10d6ed4..6ca626f 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -956,7 +956,7 @@ void lokit_main(const std::string& childRoot,
 continue;
 }
 start = buffer;
-end   = buffer + bytes;
+end = buffer + bytes;
 }
 else
 if (pollPipeBroker.revents & (POLLERR | POLLHUP))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/Util.cpp loolwsd/Util.hpp

2016-03-01 Thread Tor Lillqvist 
 loolwsd/Util.cpp |2 +-
 loolwsd/Util.hpp |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a959e9900420b86728ce3823366f966d5852a919
Author: Tor Lillqvist 
Date:   Tue Mar 1 17:17:10 2016 +0200

Make declaration of writeFIFO() match definition

diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index 481fe3e..0d4f5d2 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -75,9 +75,9 @@ namespace Util
 /// Call WebSocket::shutdown() ignoring Poco::IOException.
 void shutdownWebSocket(std::shared_ptr ws);
 
-ssize_t writeFIFO(const int pipe, const char* buffer, ssize_t size);
+ssize_t writeFIFO(int pipe, const char* buffer, ssize_t size);
 inline
-ssize_t writeFIFO(const int pipe, const std::string& message)
+ssize_t writeFIFO(int pipe, const std::string& message)
 {
 return writeFIFO(pipe, message.c_str(), message.size());
 }
commit 8bc05765bfca5b5bf5ec7f1c1a77714cccbd1660
Author: Tor Lillqvist 
Date:   Tue Mar 1 17:10:13 2016 +0200

Make writeFIFO() return total number of bytes written if successful

That is probably what was the intent. As originally written, in case
the function encountered partial writers, and had to do several
write() calls, only the number of bytes written by the last one was
returned.

Luckily the actual return value of writeFIFO() is not used
anywhere. It is just tested for being negative.

Still there is the problem that if at first one or several write()
calls succeed but don't write the whole buffer, and then a write()
fails, the caller has no way to know that the buffer has been
partially written. But that is hopefully highly theoretical and there
is no sane way to handle such a situation anyway.

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 05d8032..5a2c864 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -365,7 +365,7 @@ namespace Util
 }
 else
 {
-count = bytes;
+count += bytes;
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/update_pch xmlsecurity/inc

2016-03-01 Thread Ashod Nakashian 
 bin/update_pch  |2 +-
 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx |6 +-
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 2a5b8f34eba2f560759f27bb415dc599e657ab28
Author: Ashod Nakashian 
Date:   Tue Mar 1 08:30:31 2016 -0500

Exclude xmlsec headers from precompiled headers

Internal headers should not be exposed, rather
xmlsec-wrapper.h should be used. Unfortunately,
the latter causes undefined symbols on Linux
when pch is enabled.

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

diff --git a/bin/update_pch b/bin/update_pch
index d910ee1..3c6de78 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -422,7 +422,7 @@ def filter_ignore(line, module):
 ]
 if module == 'xmlsecurity':
 ignore_list += [
-'xmlsec/crypto.h',
+'xmlsec/*',
 'xmlsecurity/xmlsec-wrapper.h',
 ]
 
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx 
b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index 615dc58..38e0e10 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2016-02-06 12:32:41 using:
+ Generated on 2016-02-29 20:17:57 using:
  ./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -172,6 +172,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -190,6 +191,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -302,5 +305,6 @@
 #include 
 #include 
 #include 
+#include 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx 
b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
index acdec5a..0a5a356 100644
--- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2016-01-10 17:36:56 using:
+ Generated on 2016-03-01 08:26:50 using:
  ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -116,7 +116,6 @@
 #include 
 #include 
 #include 
-#include 
 
 // Cleanup windows header macro pollution.
 #if defined(_WIN32) && defined(WINAPI)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 3 commits - loolwsd/LOOLBroker.cpp loolwsd/Util.cpp loolwsd/Util.hpp

2016-03-01 Thread Tor Lillqvist 
 loolwsd/LOOLBroker.cpp |8 
 loolwsd/Util.cpp   |3 +++
 loolwsd/Util.hpp   |8 
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit dc305b2b087a436bd612a9dd24fa4c407e7a1db1
Author: Tor Lillqvist 
Date:   Tue Mar 1 16:43:39 2016 +0200

Don't confuse Poco::Util::Application::ExitCode and EXIT_SUCCESS/FAILURE

The getChildStatus() and getSignalStatus() functions returned the
latter, still the returned values were compared against
Poco::Util::Application::EXIT_OK. (Sure, both Poco's
Application::EXIT_SUCCESS and stdlib.h's EXIT_OK are zero, but that
doesn't mean one should mix them up.)

Also add two comments pondering the meaning of the code.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 0269866..5718304 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -809,7 +809,7 @@ int main(int argc, char** argv)
 
 Log::info("loolbroker is ready.");
 
-int childExitCode = Application::EXIT_OK;
+int childExitCode = EXIT_SUCCESS;
 unsigned timeoutCounter = 0;
 while (!TerminationFlag)
 {
@@ -876,7 +876,7 @@ int main(int argc, char** argv)
 // No child processes
 if (errno == ECHILD)
 {
-if (childExitCode == Application::EXIT_OK)
+if (childExitCode == EXIT_SUCCESS)
 {
 Log::warn("Warn: last child exited successfully, fork new 
one.");
 ++forkCounter;
@@ -890,7 +890,7 @@ int main(int argc, char** argv)
 }
 }
 
-if (forkCounter > 0 && childExitCode == Application::EXIT_OK)
+if (forkCounter > 0 && childExitCode == EXIT_SUCCESS)
 {
 std::lock_guard lock(forkMutex);
 
@@ -917,7 +917,7 @@ int main(int argc, char** argv)
 if (timeoutCounter++ == INTERVAL_PROBES)
 {
 timeoutCounter = 0;
-childExitCode = Application::EXIT_OK;
+childExitCode = EXIT_SUCCESS;
 sleep(MAINTENANCE_INTERVAL);
 }
 }
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index fab7a06..05d8032 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -496,6 +496,7 @@ namespace Util
 retVal = EXIT_SUCCESS;
 break;
 
+// Why are other non-zero exit codes interpreted as success?
 default:
 retVal = EXIT_SUCCESS;
 break;
@@ -522,6 +523,8 @@ namespace Util
 retVal = EXIT_FAILURE;
 break;
 
+// Why are other signals treated as success? Will this function 
ever be called when a
+// child was *not* terminated by a signal?
 default:
 retVal = EXIT_SUCCESS;
 break;
diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index b2e3840..481fe3e 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -116,7 +116,9 @@ namespace Util
 void setTerminationSignals();
 void setFatalSignals();
 
+/// Returns EXIT_SUCCESS or EXIT_FAILURE from 
 int getChildStatus(const int code);
+/// Returns EXIT_SUCCESS or EXIT_FAILURE from 
 int getSignalStatus(const int code);
 
 void requestTermination(const Poco::Process::PID& pid);
commit f560c644714512cd0fe5ef35a093999bb522b32c
Author: Tor Lillqvist 
Date:   Tue Mar 1 16:34:32 2016 +0200

Document where LOOLExitCode comes from

diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index a3c95de..b2e3840 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -24,6 +24,9 @@
 #define LOK_USE_UNSTABLE_API
 #include 
 
+// This is an odd mix of the EExitCodes enum in LibreOffice's 
desktop/source/inc/exithelper.h and
+// then EX_SOFTWARE (= 70) from the (BSD origin) .
+
 enum class LOOLExitCode
 {
 LOOL_NO_ERROR = 0,
commit 248703c6f7d04da47cc3c4742896ff1d010677c1
Author: Tor Lillqvist 
Date:   Tue Mar 1 16:28:56 2016 +0200

Bin leftover declaration of variable that is not defined anywhere

diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index 19eaffe..a3c95de 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -24,9 +24,6 @@
 #define LOK_USE_UNSTABLE_API
 #include 
 
-// Possible states of LOOL processes.
-enum class LOOLState { LOOL_RUNNING, LOOL_STOPPING, LOOL_ABNORMAL };
-
 enum class LOOLExitCode
 {
 LOOL_NO_ERROR = 0,
@@ -42,8 +39,6 @@ enum class LOOLExitCode
 LOOL_EXIT_SOFTWARE = 70
 };
 
-extern volatile LOOLState TerminationState;
-
 /// Flag to stop pump loops.
 extern volatile bool TerminationFlag;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - officecfg/registry sfx2/source sw/sdi sw/source

2016-03-01 Thread Miklos Vajna 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 ++
 sfx2/source/view/classificationcontroller.cxx|   17 
+-
 sw/sdi/_basesh.sdi   |1 
 sw/source/uibase/app/docst.cxx   |4 ++
 4 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 58a22dc030460e7164663ef84acd01f7a993af28
Author: Miklos Vajna 
Date:   Tue Mar 1 15:19:27 2016 +0100

officecfg: add .uno:ClassificationApply tooltip

Change-Id: I03d3cff3365e7ffb6a1218398cb0a6b3de1ce3be

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 1dcf8b8a..b9fd7a4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6015,6 +6015,11 @@
   3D Model...
 
   
+  
+
+  Apply Document Classification
+
+  
 
   
 
commit e0e6d8a5827ce1cbc73caeab10c2e7ba9e66035b
Author: Miklos Vajna 
Date:   Tue Mar 1 14:58:46 2016 +0100

sfx2 classification: select current toolbar listbox entry when state changes

With this, if .uno:ClassificationApply is invoked from e.g. a macro, the
toolbar listbox is updated to reflect the classification of the
document. Previously the listbox wasn't updated.

Change-Id: I45a7c6ee2f3b06e048fa119264c615e78bc46b37

diff --git a/sfx2/source/view/classificationcontroller.cxx 
b/sfx2/source/view/classificationcontroller.cxx
index b05431c..fa54a9b 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -122,7 +122,7 @@ IMPL_LINK_NOARG_TYPED(ClassificationCategoriesController, 
SelectHdl, ListBox&, v
 
 void ClassificationCategoriesController::statusChanged(const 
frame::FeatureStateEvent& /*rEvent*/) throw (uno::RuntimeException, 
std::exception)
 {
-if (!m_pCategories || m_pCategories->GetEntryCount() > 0)
+if (!m_pCategories)
 return;
 
 SfxObjectShell* pObjectShell = SfxObjectShell::Current();
@@ -130,12 +130,15 @@ void 
ClassificationCategoriesController::statusChanged(const frame::FeatureState
 return;
 
 SfxClassificationHelper aHelper(*pObjectShell);
-std::vector aNames = aHelper.GetBACNames();
-for (const OUString& rName : aNames)
-m_pCategories->InsertEntry(rName);
-// Normally VclBuilder::makeObject() does this.
-m_pCategories->EnableAutoSize(true);
-m_pCategories->SetSizePixel(m_pCategories->GetOptimalSize());
+if (m_pCategories->GetEntryCount() == 0)
+{
+std::vector aNames = aHelper.GetBACNames();
+for (const OUString& rName : aNames)
+m_pCategories->InsertEntry(rName);
+// Normally VclBuilder::makeObject() does this.
+m_pCategories->EnableAutoSize(true);
+m_pCategories->SetSizePixel(m_pCategories->GetOptimalSize());
+}
 
 // Restore state based on the doc. model.
 const OUString& rCategoryName = aHelper.GetBACName();
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index 22a5c13..87de494 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -364,6 +364,7 @@ interface BaseTextSelection
 SID_CLASSIFICATION_APPLY
 [
 ExecMethod = Execute ;
+StateMethod = StateStyle ;
 ]
 
  //OS: Selection.Escape gibt es zusaetzlich zu Window.Escape
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index cdd704e..c668078 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -256,6 +256,10 @@ void  SwDocShell::StateStyleSheet(SfxItemSet& rSet, 
SwWrtShell* pSh)
 }
 break;
 
+case SID_CLASSIFICATION_APPLY:
+// Just trigger 
ClassificationCategoriesController::statusChanged().
+rSet.InvalidateItem(nWhich);
+break;
 default:
 OSL_FAIL("Invalid SlotId");
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Stephan van den Akker 
 vcl/qa/cppunit/wmf/data/line_styles.emf |binary
 vcl/qa/cppunit/wmf/wmfimporttest.cxx|   46 
 vcl/source/filter/wmf/enhwmf.cxx|   36 -
 3 files changed, 70 insertions(+), 12 deletions(-)

New commits:
commit 39b1a23c09231bb61c0196d7ab24cb3e0cac9afc
Author: Stephan van den Akker 
Date:   Tue Feb 23 11:13:20 2016 +0100

Improve the import of pen styles from EMF files

Change-Id: I643c29befeb29b7b1cdd66375f661f4adb0e6cfa
Reviewed-on: https://gerrit.libreoffice.org/22638
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 9db34a7712e277389b2041cfbd77a60476d7f7f1)
Reviewed-on: https://gerrit.libreoffice.org/22714
Reviewed-by: Miklos Vajna 

diff --git a/vcl/qa/cppunit/wmf/data/line_styles.emf 
b/vcl/qa/cppunit/wmf/data/line_styles.emf
new file mode 100644
index 000..07b7832
Binary files /dev/null and b/vcl/qa/cppunit/wmf/data/line_styles.emf differ
diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx 
b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 6e595c0..2a1a341 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -43,6 +43,7 @@ public:
 void testNonPlaceableWmf();
 void testSine();
 void testEmfProblem();
+void testEmfLineStyles();
 void testWorldTransformFontSize();
 void testTdf93750();
 
@@ -50,6 +51,7 @@ public:
 CPPUNIT_TEST(testNonPlaceableWmf);
 CPPUNIT_TEST(testSine);
 CPPUNIT_TEST(testEmfProblem);
+CPPUNIT_TEST(testEmfLineStyles);
 CPPUNIT_TEST(testWorldTransformFontSize);
 CPPUNIT_TEST(testTdf93750);
 
@@ -120,6 +122,50 @@ void WmfTest::testEmfProblem()
 assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "right", "1876");
 }
 
+void WmfTest::testEmfLineStyles()
+{
+SvFileStream aFileStream(getFullUrl("line_styles.emf"), StreamMode::READ);
+GDIMetaFile aGDIMetaFile;
+ReadWindowMetafile(aFileStream, aGDIMetaFile);
+
+MetafileXmlDump dumper;
+dumper.filterAllActionTypes();
+dumper.filterActionType(MetaActionType::LINE, false);
+dumper.filterActionType(MetaActionType::LINECOLOR, false);
+xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile);
+
+CPPUNIT_ASSERT (pDoc);
+
+assertXPath(pDoc, "/metafile/line", 4);
+assertXPath(pDoc, "/metafile/linecolor", 5);
+
+assertXPath(pDoc, "/metafile/linecolor[1]", "color", "#ff");
+assertXPath(pDoc, "/metafile/linecolor[2]", "color", "#00ff00");
+assertXPath(pDoc, "/metafile/linecolor[3]", "color", "#408080");
+assertXPath(pDoc, "/metafile/linecolor[4]", "color", "#ff");
+assertXPath(pDoc, "/metafile/linecolor[5]", "color", "#ff");
+
+assertXPath(pDoc, "/metafile/line[1]", "style", "dash");
+assertXPath(pDoc, "/metafile/line[1]", "dashlen", "225");
+assertXPath(pDoc, "/metafile/line[1]", "dotlen", "0");
+assertXPath(pDoc, "/metafile/line[1]", "distance", "100");
+
+assertXPath(pDoc, "/metafile/line[2]", "style", "dash");
+assertXPath(pDoc, "/metafile/line[2]", "dashlen", "0");
+assertXPath(pDoc, "/metafile/line[2]", "dotlen", "30");
+assertXPath(pDoc, "/metafile/line[2]", "distance", "50");
+
+assertXPath(pDoc, "/metafile/line[3]", "style", "dash");
+assertXPath(pDoc, "/metafile/line[3]", "dashlen", "150");
+assertXPath(pDoc, "/metafile/line[3]", "dotlen", "30");
+assertXPath(pDoc, "/metafile/line[3]", "distance", "90");
+
+assertXPath(pDoc, "/metafile/line[4]", "style", "dash");
+assertXPath(pDoc, "/metafile/line[4]", "dashlen", "150");
+assertXPath(pDoc, "/metafile/line[4]", "dotlen", "30");
+assertXPath(pDoc, "/metafile/line[4]", "distance", "50");
+};
+
 void WmfTest::testWorldTransformFontSize()
 {
 SvFileStream aFileStream(getFullUrl("image1.emf"), StreamMode::READ);
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 5904e09..af35d6d 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1008,20 +1008,38 @@ bool EnhWMFReader::ReadEnhWMF()
 aLineInfo.SetWidth( nWidth );
 
 bool bTransparent = false;
-sal_uInt16 nDashCount = 0;
-sal_uInt16 nDotCount = 0;
 
 switch( nStyle & PS_STYLE_MASK )
 {
 case PS_DASHDOTDOT :
-nDotCount++;
+aLineInfo.SetStyle( LINE_DASH );
+aLineInfo.SetDashCount( 1 );
+aLineInfo.SetDotCount( 2 );
+aLineInfo.SetDashLen( 150 );
+aLineInfo.SetDotLen( 30 );
+aLineInfo.SetDistance( 50 );
+break;
 case PS_DASHDOT :
-nDashCount++;
+

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

2016-03-01 Thread Caolán McNamara 
 vcl/inc/unx/gtk/gtkframe.hxx   |4 ++
 vcl/inc/unx/gtk/gtksalmenu.hxx |6 ++--
 vcl/unx/gtk/gtksalframe.cxx|   10 ---
 vcl/unx/gtk3/gtk3gtkframe.cxx  |   57 +++--
 4 files changed, 46 insertions(+), 31 deletions(-)

New commits:
commit 56972b9899b2ec3fdc8c35cb293e0a232d7ffca3
Author: Caolán McNamara 
Date:   Thu Feb 18 21:00:57 2016 +

gtk3: get app menu working again under gtk3

and get it working under wayland too

Reviewed-on: https://gerrit.libreoffice.org/22491
Tested-by: Jenkins 
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 59d978389721c780b1df5e54b833fe75576dd034)

Change-Id: I57592acc4b7ea4a55296541ab4b3bf0c8fd98c5b

loplugin: checkconfigmacros

I suppose

Change-Id: I2821665548077162c4a434876aee407127b312a4
(cherry picked from commit 2f3d85182ff9f2f1174a47b6139f358d232ee5e3)
Reviewed-on: https://gerrit.libreoffice.org/22672
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 20a1e84..1d8334c 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -49,6 +49,8 @@
 #include 
 #include 
 
+#include 
+
 class GtkSalGraphics;
 class GtkSalDisplay;
 
@@ -222,7 +224,7 @@ class GtkSalFrame : public SalFrame
 
 SalMenu*m_pSalMenu;
 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 public:
 void EnsureDbusMenuSynced();
 private:
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 998a925..5d9c262 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -10,15 +10,17 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
 
+#include 
+
 #include 
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
 #include 
 #endif
 
 #include 
 #include 
 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) && \
+#if defined(ENABLE_DBUS) && ENABLE_GIO && \
 (GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 36)
 #  define ENABLE_GMENU_INTEGRATION
 #  include 
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 7a7c293..95fd581 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -38,8 +38,10 @@
 #include 
 #include 
 
+#include 
+
 #include 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 #  include 
 #endif
 #if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above
@@ -432,7 +434,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, 
SalFrameStyleFlags nStyle )
 m_bDefaultPos   = true;
 m_bDefaultSize  = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! 
pParent );
 m_bWindowIsGtkPlug  = false;
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 m_pLastSyncedDbusMenu = nullptr;
 #endif
 Init( pParent, nStyle );
@@ -446,7 +448,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
 GetGenericData()->ErrorTrapPush();
 m_bDefaultPos   = true;
 m_bDefaultSize  = true;
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 m_pLastSyncedDbusMenu = nullptr;
 #endif
 Init( pSysData );
@@ -486,7 +488,7 @@ static void ObjectDestroyedNotify( gpointer data )
 }
 }
 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 void GtkSalFrame::EnsureDbusMenuSynced()
 {
 GtkSalMenu* pSalMenu = static_cast(GetMenu());
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index f3bdfb2..f018576 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -38,7 +38,9 @@
 #include 
 #include 
 
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#include 
+
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 #  include 
 #endif
 #if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above
@@ -479,7 +481,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, 
SalFrameStyleFlags nStyle )
 m_bDefaultPos   = true;
 m_bDefaultSize  = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! 
pParent );
 m_bWindowIsGtkPlug  = false;
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 m_pLastSyncedDbusMenu = nullptr;
 #endif
 Init( pParent, nStyle );
@@ -495,7 +497,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
 GetGenericData()->ErrorTrapPush();
 m_bDefaultPos   = true;
 m_bDefaultSize  = true;
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
 m_pLastSyncedDbusMenu = nullptr;
 #endif
 Init( pSysData );
@@ -503,13 +505,6 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
 
 #ifdef ENABLE_GMENU_INTEGRATION
 
-static void
-gdk_x11_window_set_utf8_property  (GdkWindow *

How are Charities confronting CSE

2016-03-01 Thread Open Forum Events 

Confronting Online Child Sexual Abuse and Exploitation
17th May 2016, Manchester Conference Centre, Manchester

To confront C.S.E. Local Child safeguarding Boards require key agencies to
work effectively together, these include local authorities, health bodies,
the police and others.

As technology develops and the opportunities to learn, socialise,
communicate and be entertained via the internet are exhaustive.
Increasingly young people seem to be becoming more dependent on the
internet to the extent where 75% say they cannot live without it only
increases the challenge faced.

If your job role involves child safeguarding in any degree, the Confronting
Online Child Sexual Abuse and Exploitation conference will serve as a
unique platform to hear from the UK's leading authorities in online abuse
and exploitation. Learn about the very latest information and updated
thinking from expert speakers, including investigators, report authors and
frontline workers.

DELEGATES WILL HEAR FROM

Johnny Gwynne, Director, National Crime Agency’s CEOP Command
(confirmed)
Tink Palmer, Chief Executive of the Marie Collins Foundation (MCF)
(confirmed)
Carron Fox, Research and Policy Officer, Barnardo’s (confirmed)
The Impact of Online Grooming on a Child and the Family (confirmed)
Andy Calvert, Assistant Headteacher, Ilkley Grammar School (confirmed)
Dr Ethel Quayle, Senior Lecturer in Clinical Psychology, University of
Edinburgh (invited)

CONFERENCE TOPICS

Welcome and Overview
The Digital Playground and the Sexual Abuse and Exploitation of Children
– An Overview
Digital Dangers
A dad whose child is a victim of CSE talks candidly about his experience.
Sharing a Learning Experience
What is the Latest Research Revealing

INTERACTIVE WORKSHOP

Tink Palmer, CEO, Marie Collins Foundation, will cover new ways of
protecting children when their abuse has been generated through online
activity.

View Programme at:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=235&F=T
View Overview at:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=349&F=T
Book a Place at:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=369&F=T

DELEGATES WILL HEAR FROM

Johnny Gwynne, Director, National Crime Agency's CEOP Command (confirmed)
Tink Palmer, Chief Executive of the Marie Collins Foundation (MCF)
(confirmed)
Carron Fox, Research and Policy Officer, Barnardo's (confirmed)
The Impact of Online Grooming on a Child and the Family (confirmed)
Andy Calvert, Assistant Headteacher, Ilkley Grammar School (confirmed)
Dr Ethel Quayle, Senior Lecturer in Clinical Psychology, University of
Edinburgh (invited)

CONFERENCE TOPICS

Welcome and Overview
The Digital Playground and the Sexual Abuse and Exploitation of Children -
An Overview
Digital Dangers
A dad whose child is a victim of CSE talks candidly about his experience.
Sharing a Learning Experience
What is the Latest Research Revealing

INTERACTIVE WORKSHOP

Tink Palmer, CEO, Marie Collins Foundation, will cover new ways of
protecting children when their abuse has been generated through online
activity.

View Programme at:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=235&F=T
View Overview at:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=349&F=T
Book a Place at:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=369&F=T

BENEFITS OF ATTENDING

The Confronting Online Child Sexual Abuse and Exploitation conference will
be taking an in-depth look into all the very latest developments in the
battle to combat child sexual abuse and exploitation. Delegates will leave
the day with insight and understanding of the issues coupled with
information and knowledge to address the challenges to better protect
children.

Want to know more:
mailto:l...@openforumconferences.co.uk?subject=More%20Information%20Required:%20COCSAE%202016%20&body=Name:%20%0D%0AContact%20Number:%0D%0AOrganisation:%0D%0ADescription%20of%20enquiry:%0D%0A

Regards,
Luke Boulter

l...@openforumconferences.co.uk
Head of Digital Marketing and Delegate Sales
Open Forum Events

0161 376 9007

This email has been sent to "libreoffice@lists.freedesktop.org" by Open
Forum Events. If you're interested in receiving updates about future events
from Open Forum Events please go to:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=5&F=T

To unsubscribe from receiving further emails from Open Forum Events please
click Unsubscribe at:
http://www.openforumconferences.co.uk/link.php?M=4761090&N=1987&L=6&F=T
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp

2016-03-01 Thread Tor Lillqvist 
 loolwsd/LOOLBroker.cpp |   32 +---
 loolwsd/LOOLKit.cpp|   32 +---
 2 files changed, 26 insertions(+), 38 deletions(-)

New commits:
commit ec33f7b96a0fffd55a7248b084c14d00246e29f8
Author: Tor Lillqvist 
Date:   Tue Mar 1 15:53:35 2016 +0200

Don't use pre-increment when there is no need

We are not interested in the variable being assigned an incremented
value. Its value is not used any more. We are just interested in the
value of the variable plus one. Using pre-increment gives the wrong
impression.

Sure, this is nit-picking.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 74dc6e0..0269866 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -660,32 +660,32 @@ int main(int argc, char** argv)
 if (std::strstr(cmd, "--losubpath=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-loSubPath = std::string(++eq);
+loSubPath = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--systemplate=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-sysTemplate = std::string(++eq);
+sysTemplate = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--lotemplate=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-loTemplate = std::string(++eq);
+loTemplate = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--childroot=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-childRoot = std::string(++eq);
+childRoot = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--numprespawns=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-numPreSpawnedChildren = std::stoi(std::string(++eq));
+numPreSpawnedChildren = std::stoi(std::string(eq+1));
 }
 else if (std::strstr(cmd, "--clientport=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-ClientPortNumber = std::stoll(std::string(++eq));
+ClientPortNumber = std::stoll(std::string(eq+1));
 }
 }
 
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index bc3b567..10d6ed4 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1089,32 +1089,32 @@ int main(int argc, char** argv)
 if (std::strstr(cmd, "--childroot=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-childRoot = std::string(++eq);
+childRoot = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--systemplate=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-sysTemplate = std::string(++eq);
+sysTemplate = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--lotemplate=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-loTemplate = std::string(++eq);
+loTemplate = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--losubpath=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-loSubPath = std::string(++eq);
+loSubPath = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--pipe=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-pipe = std::string(++eq);
+pipe = std::string(eq+1);
 }
 else if (std::strstr(cmd, "--clientport=") == cmd)
 {
 eq = std::strchr(cmd, '=');
-ClientPortNumber = std::stoll(std::string(++eq));
+ClientPortNumber = std::stoll(std::string(eq+1));
 }
 }
 
commit 673b08bb8106698bcce19f5d369bcdf8ee8e6a46
Author: Tor Lillqvist 
Date:   Tue Mar 1 15:48:57 2016 +0200

We know that there is a = in the arg as we found a string that includes it

No need to to test again whether it is found. Also, std::strchr()
works fine.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 480c630..74dc6e0 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -656,42 +656,36 @@ int main(int argc, char** argv)
 for (int i = 0; i < argc; ++i)
 {
 char *cmd = argv[i];
-char *eq  = nullptr;
+char *eq;
 if (std::strstr(cmd, "--losubpath=") == cmd)
 {
-eq = strchrnul(cmd, '=');
-if (*eq)
-loSubPath = std::string(++eq);
+eq = std::strchr(cmd, '=');
+loSubPath = std::string(++eq);
 }
 else if (std::strstr(cmd, "--systemplate=") == cmd)
 {
-eq = strchrnul(cmd, '=');
-if (*eq)
-sysTemplate = std::string(++eq);
+eq = std::strchr(cmd, '=');
+sysTemplate = std::string(++eq);
 }
 else if (std::strstr(cmd, "--lotemplate=") == cmd)
 {
-eq = strchrnul(cmd, '=');
-if (*eq)
-loTemplate

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

2016-03-01 Thread Tor Lillqvist 
 loolwsd/LOOLBroker.cpp |   14 --
 loolwsd/LOOLKit.cpp|   15 ---
 2 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit f8aad3d31fa430586078ec742c51ae79e88c5ac9
Author: Tor Lillqvist 
Date:   Tue Mar 1 15:44:22 2016 +0200

Use the std:: versions of C standard library functions

As mentioned in the coding style part of README.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index c90f5fa..480c630 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -9,6 +9,8 @@
 
 #include 
 
+#include 
+
 #include "Common.hpp"
 #include "Capabilities.hpp"
 #include "Util.hpp"
@@ -655,37 +657,37 @@ int main(int argc, char** argv)
 {
 char *cmd = argv[i];
 char *eq  = nullptr;
-if (strstr(cmd, "--losubpath=") == cmd)
+if (std::strstr(cmd, "--losubpath=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 loSubPath = std::string(++eq);
 }
-else if (strstr(cmd, "--systemplate=") == cmd)
+else if (std::strstr(cmd, "--systemplate=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 sysTemplate = std::string(++eq);
 }
-else if (strstr(cmd, "--lotemplate=") == cmd)
+else if (std::strstr(cmd, "--lotemplate=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 loTemplate = std::string(++eq);
 }
-else if (strstr(cmd, "--childroot=") == cmd)
+else if (std::strstr(cmd, "--childroot=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 childRoot = std::string(++eq);
 }
-else if (strstr(cmd, "--numprespawns=") == cmd)
+else if (std::strstr(cmd, "--numprespawns=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 numPreSpawnedChildren = std::stoi(std::string(++eq));
 }
-else if (strstr(cmd, "--clientport=") == cmd)
+else if (std::strstr(cmd, "--clientport=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 7dc7772..892139c 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -21,8 +21,9 @@
 #include 
 
 #include 
-#include 
+#include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1085,37 +1086,37 @@ int main(int argc, char** argv)
 char *cmd = argv[i];
 char *eq  = nullptr;
 
-if (strstr(cmd, "--childroot=") == cmd)
+if (std::strstr(cmd, "--childroot=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 childRoot = std::string(++eq);
 }
-else if (strstr(cmd, "--systemplate=") == cmd)
+else if (std::strstr(cmd, "--systemplate=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 sysTemplate = std::string(++eq);
 }
-else if (strstr(cmd, "--lotemplate=") == cmd)
+else if (std::strstr(cmd, "--lotemplate=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 loTemplate = std::string(++eq);
 }
-else if (strstr(cmd, "--losubpath=") == cmd)
+else if (std::strstr(cmd, "--losubpath=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 loSubPath = std::string(++eq);
 }
-else if (strstr(cmd, "--pipe=") == cmd)
+else if (std::strstr(cmd, "--pipe=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
 pipe = std::string(++eq);
 }
-else if (strstr(cmd, "--clientport=") == cmd)
+else if (std::strstr(cmd, "--clientport=") == cmd)
 {
 eq = strchrnul(cmd, '=');
 if (*eq)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Tor Lillqvist 
 loolwsd/Util.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cdb0c08bb89e5e7d8c5237beeed0e39513d2b481
Author: Tor Lillqvist 
Date:   Tue Mar 1 15:27:36 2016 +0200

Let's be consistent

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 220f6c1..fab7a06 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -50,7 +50,7 @@ extern "C"
 std::vector *outputp = (std::vector *) 
png_get_io_ptr(png_ptr);
 const size_t oldsize = outputp->size();
 outputp->resize(oldsize + length);
-memcpy(outputp->data() + oldsize, data, length);
+std::memcpy(outputp->data() + oldsize, data, length);
 }
 
 static void user_flush_fn(png_structp)
@@ -443,7 +443,7 @@ namespace Util
  << Util::signalName(signal) << " "
  << strsignal(signal) << Log::end;
 
-if (getenv("LOOL_DEBUG"))
+if (std::getenv("LOOL_DEBUG"))
 {
 Log::error() << "\nSegfault! Attach debugger with:\n"
  << "sudo gdb --pid=" << Poco::Process::id() << "\n or 
\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Tor Lillqvist 
 loolwsd/README |4 
 1 file changed, 4 deletions(-)

New commits:
commit 9cba13a53f398418b3ac0897fecbbc3a6fc0b6ba
Author: Tor Lillqvist 
Date:   Tue Mar 1 15:10:16 2016 +0200

Let's not pretend this could ever run on non-Unix

In fact, it is Linux-specific even, and has never successfully been
run on anything else, even if I tried for fun once to build it on OS
X.

diff --git a/loolwsd/README b/loolwsd/README
index 55a75d1..5d1e081 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -275,10 +275,6 @@ The style is roughly as follows, in rough order of 
importance:
   std;". But it's OK to use "using Poco::Foo;" all over. Maybe that is
   not a good idea? But please no "using" in headers.
 
-- Be as portable as possible, i.e. don't intentionally write Unix-only
-  code if there is a choice. Obviously some parts of the code
-  currently use Unix-only things like chroot() and link() though.
-
 - Member functions use camelCaseWithInitialLowerCase. I don't like
   CamelCaseWithInitialUpperCase.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes17' - slideshow/opengl slideshow/source

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

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

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

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

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

Change-Id: I63f4fda670b86db2ee1ea66d8755d71697fac0c7

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

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

2016-03-01 Thread Miklos Vajna 
 loleaflet/src/control/Control.RowHeader.js |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7c319aab333280bed0ded623e19f58ecbf4a910d
Author: Miklos Vajna 
Date:   Tue Mar 1 11:54:40 2016 +0100

ccu#1573 loleaflet: hide row headers of hidden rows

This is the row equivalent of commit
d14fccb67f558f4d0b4612befa70c768956e0e92 (hide column headers of hidden
columns, 2016-02-26).

diff --git a/loleaflet/src/control/Control.RowHeader.js 
b/loleaflet/src/control/Control.RowHeader.js
index b69bc02..b7a8e72 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -64,8 +64,12 @@ L.Control.RowHeader = L.Control.extend({
text.setAttribute('rel', 'spreadsheet-row-' + content); 
// for easy addressing
text.innerHTML = content;
height = Math.round(converter.call(context, twip).y) - 
1 + 'px';
-   L.DomUtil.setStyle(text, 'line-height', height);
-   L.DomUtil.setStyle(text, 'height', height);
+   if (height === '-1px') {
+   L.DomUtil.setStyle(text, 'display', 'none');
+   } else {
+   L.DomUtil.setStyle(text, 'line-height', height);
+   L.DomUtil.setStyle(text, 'height', height);
+   }
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Miklos Vajna 
 desktop/qa/data/hidden-row.ods  |binary
 desktop/qa/desktop_lib/test_desktop_lib.cxx |   35 
 sc/source/ui/view/tabview.cxx   |3 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit f5005d52389cb7519734b45d6268434ed3604679
Author: Miklos Vajna 
Date:   Tue Mar 1 11:38:19 2016 +0100

ccu#1573 sc lok: fix reporting of hidden row height

For columns we use ScDocument::GetColWidth(), which returns 0 for hidden
columsn. Do the same for rows: so instead of using GetOriginalHeight(),
use GetRowHeight(), and then 0 size will be reported for hidden rows as
well.

(cherry picked from commit 20ad023a918204da922c4c262b50a411f2e2dace)

Change-Id: Ic23b6af744bbc8e194e1906614adebe5ba0c7ced

diff --git a/desktop/qa/data/hidden-row.ods b/desktop/qa/data/hidden-row.ods
new file mode 100644
index 000..25fe898
Binary files /dev/null and b/desktop/qa/data/hidden-row.ods differ
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 3315029..3a0e67b 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -85,6 +85,7 @@ public:
 void testPasteWriter();
 void testPasteWriterJPEG();
 void testRowColumnHeaders();
+void testHiddenRowHeaders();
 void testCommandResult();
 void testWriterComments();
 void testSheetOperations();
@@ -103,6 +104,7 @@ public:
 CPPUNIT_TEST(testPasteWriter);
 CPPUNIT_TEST(testPasteWriterJPEG);
 CPPUNIT_TEST(testRowColumnHeaders);
+CPPUNIT_TEST(testHiddenRowHeaders);
 CPPUNIT_TEST(testCommandResult);
 CPPUNIT_TEST(testWriterComments);
 CPPUNIT_TEST(testSheetOperations);
@@ -521,6 +523,39 @@ void DesktopLOKTest::testRowColumnHeaders()
 }
 }
 
+void DesktopLOKTest::testHiddenRowHeaders()
+{
+LibLODocument_Impl* pDocument = loadDoc("hidden-row.ods");
+
+pDocument->pClass->initializeForRendering(pDocument, nullptr);
+
+boost::property_tree::ptree aTree;
+char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, 
".uno:ViewRowColumnHeaders");
+std::stringstream aStream(pJSON);
+free(pJSON);
+CPPUNIT_ASSERT(!aStream.str().empty());
+
+boost::property_tree::read_json(aStream, aTree);
+sal_Int32 nPrevious = 0;
+bool bFirst = true;
+for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("rows"))
+{
+sal_Int32 nSize = 
OString(rValue.second.get("size").c_str()).toInt32();
+CPPUNIT_ASSERT(nSize > 0);
+
+if (bFirst)
+bFirst = false;
+else
+{
+// nSize was 509, nPrevious was 254, i.e. hidden row wasn't 
reported as 0 height.
+CPPUNIT_ASSERT_EQUAL(nPrevious, nSize);
+break;
+}
+
+nPrevious = nSize;
+}
+}
+
 void DesktopLOKTest::testCommandResult()
 {
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 903013c..c7cf4cb 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2324,7 +2324,8 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle& 
rRectangle)
 long nTotalPixels = 0;
 for (SCROW nRow = 0; nRow <= nEndRow; ++nRow)
 {
-sal_uInt16 nSize = pDoc->GetOriginalHeight(nRow, aViewData.GetTabNo());
+// nSize will be 0 for hidden rows.
+sal_uInt16 nSize = pDoc->GetRowHeight(nRow, aViewData.GetTabNo());
 long nSizePixels = ScViewData::ToPixel(nSize, aViewData.GetPPTY());
 OUString aText = pRowBar[SC_SPLIT_BOTTOM]->GetEntryText(nRow);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Caolán McNamara 
 sc/source/core/data/markmulti.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a03958af8d04889bb6206f620185c87fc1fb27d1
Author: Caolán McNamara 
Date:   Tue Mar 1 11:51:22 2016 +

coverity#1352213 Unchecked return value

Change-Id: Iae1c0a09eae410136569ed1480dbcdfff589f20e

diff --git a/sc/source/core/data/markmulti.cxx 
b/sc/source/core/data/markmulti.cxx
index 07502c1..abbe87e 100644
--- a/sc/source/core/data/markmulti.cxx
+++ b/sc/source/core/data/markmulti.cxx
@@ -143,8 +143,8 @@ bool ScMultiSel::IsAllMarked( SCCOL nCol, SCROW nStartRow, 
SCROW nEndRow ) const
 return true;
 ScMultiSelIter aMultiIter( *this, nCol );
 ScFlatBoolRowSegments::RangeData aRowRange;
-aMultiIter.GetRowSegments().getRangeData( nStartRow, aRowRange );
-return ( aRowRange.mbValue && aRowRange.mnRow2 >= nEndRow );
+bool bRet = aMultiIter.GetRowSegments().getRangeData( nStartRow, 
aRowRange );
+return bRet && aRowRange.mbValue && aRowRange.mnRow2 >= nEndRow;
 }
 
 if ( bHasMarks1 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppCheck Report Update

2016-03-01 Thread Caolán McNamara 
On Sun, 2016-02-28 at 01:35 +, cppcheck.libreoff...@gmail.com 
> Note:
> The script generating this report was run at :
> 2016-28-02_02:35:42 with user buildslave at host vm140 as
> /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s
> /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck
> -w /home/buildslave/tmp/www
> 
> It can be found and improved here:
> https://gerrit.libreoffice.org/gitweb?p=dev-
> tools.git;a=blob;f=cppcheck/cppcheck-report.sh

cppcheck-report.sh (since Feb 15) has --inline-suppr enabled in it so I
would have expected http://dev-builds.libreoffice.org/cppcheck_reports/
master/382.html#line-240 not to appear.

Is that inline suppression markup wrong. Or does something need to be
done to refresh from git the cppcheck-report.sh used to build these
reports ?

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

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

2016-03-01 Thread Eike Rathke 
 sc/source/core/data/document.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 0a5d00507d08179d2511de0b5152e17a238f4a2d
Author: Eike Rathke 
Date:   Mon Feb 29 17:54:50 2016 +0100

fix the "group not recalculated after delete" second part of tdf#97897

If a formula cell group was split during deletion and the group also
listened into the range where a cell was deleted, the group wasn't
notified of the deletion.

Change-Id: I858f5d4c0b647636611133fc32f3df7fbdaf7288
(cherry picked from commit 164419bfe6270015ccf94183c0b6273da7730391)
Reviewed-on: https://gerrit.libreoffice.org/22783
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 5225443..074f5b7 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1817,6 +1817,24 @@ void ScDocument::DeleteArea(
 // Re-start listeners on those top bottom groups that have been split.
 SetNeedsListeningGroups(aGroupPos);
 StartNeededListeners();
+
+// If formula groups were split their listeners were destroyed and may
+// need to be notified now that they're restored, ScTable::DeleteArea()
+// couldn't do that.
+if (!aGroupPos.empty())
+{
+ScRange aRange(nCol1, nRow1, 0, nCol2, nRow2, 0);
+for (SCTAB i = 0; i < static_cast(maTabs.size()); i++)
+{
+if (rMark.GetTableSelect(i))
+{
+aRange.aStart.SetTab(i);
+aRange.aEnd.SetTab(i);
+
+SetDirty( aRange, true);
+}
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - icon-themes/galaxy

2016-03-01 Thread Yousuf Philips 
 icon-themes/galaxy/links.txt |8 
 1 file changed, 8 insertions(+)

New commits:
commit 61213fc0487d0d9e0f637f2e3101612ef11e412a
Author: Yousuf Philips 
Date:   Fri Feb 26 21:55:45 2016 +0400

tdf#94738 Replace symphony icons with galaxy in the sidebar

Change-Id: I37437eb2f3317eb0e7f1f2df995cb58808e10bab
Reviewed-on: https://gerrit.libreoffice.org/22627
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit ecc95bfab89cafa44309aea7bdb9ad05d7def55d)
Reviewed-on: https://gerrit.libreoffice.org/22802

diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 8043b0c..94f1ffd 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -29,6 +29,14 @@ cmd/sc_templatemenu.png cmd/sc_newdoc.png
 cmd/lc_pagesetup.png cmd/lc_setdocumentproperties.png
 cmd/sc_pagesetup.png cmd/sc_setdocumentproperties.png
 
+# sidebar icons
+sfx2/res/symphony/sidebar-navigator-large.png cmd/lc_navigator.png
+sfx2/res/symphony/sidebar-style-large.png cmd/lc_designerdialog.png
+sfx2/res/symphony/sidebar-functions-large.png cmd/lc_insertformula.png
+sfx2/res/symphony/sidebar-gallery-large.png cmd/lc_gallery.png
+sfx2/res/symphony/sidebar-transition-large.png cmd/lc_dia.png
+sfx2/res/symphony/sidebar-animation-large.png cmd/lc_customanimation.png
+
 # paragraph line spacing
 cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Giuseppe Castagno 
 include/sfx2/dinfdlg.hxx   |3 +++
 sfx2/source/dialog/dinfdlg.cxx |   11 +++
 2 files changed, 14 insertions(+)

New commits:
commit 75433880cbb622808c30a91b064a6604fcd0c4a3
Author: Giuseppe Castagno 
Date:   Thu Feb 25 17:15:38 2016 +0100

tdf#98188: Crash when closing File->Properties->CMIS Properties tab

Change-Id: I22e1d6cc1c50b9ae613dab7c253ba21451aac584
Reviewed-on: https://gerrit.libreoffice.org/22704
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit cadc130171a9bd4f1e6930fed09ad2897e9111b5)
Reviewed-on: https://gerrit.libreoffice.org/22785
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index a8b7d04..ec846d6 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -649,6 +649,9 @@ protected:
 
 public:
 SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& );
+virtual ~SfxCmisPropertiesPage();
+virtual void dispose() override;
+
 static VclPtr Create( vcl::Window* pParent, const SfxItemSet* 
);
 };
 
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 6de3b56..f733e59 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2672,6 +2672,17 @@ SfxCmisPropertiesPage::SfxCmisPropertiesPage( 
vcl::Window* pParent, const SfxIte
 {
 }
 
+SfxCmisPropertiesPage::~SfxCmisPropertiesPage()
+{
+disposeOnce();
+}
+
+void SfxCmisPropertiesPage::dispose()
+{
+m_pPropertiesCtrl.ClearAllLines();
+SfxTabPage::dispose();
+}
+
 bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet* rSet )
 {
 const SfxPoolItem* pItem = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Caolán McNamara 
 framework/source/uielement/menubarmanager.cxx |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 42ac7f9cdbf66414cf03657470c2f684836184f4
Author: Caolán McNamara 
Date:   Sun Feb 28 20:27:43 2016 +

language submenu from tools->language->for selection->"languages"...

is always disabled/empty since...

commit a6e8910a3c5d33e671a13559438b7228596b8bca
Date:   Wed Feb 17 12:07:59 2016 +0100

allow disabling file/new, wizards, recent documents menu entries

disabling the dispatches '.uno:AutoPilotMenu' and '.uno:AddDirect' and
.uno:RecentFileList via UNO API now results in disabled
menu entries as expected

Change-Id: Id99be9374306ff8c0cea919ea94ed96f715a8058
Reviewed-on: https://gerrit.libreoffice.org/22422

reverting this hunk restores them again

Change-Id: I029c9c3f25fb593127ee8371b278cee102c65882
Reviewed-on: https://gerrit.libreoffice.org/22750
Reviewed-by: Oliver Specht 
Tested-by: Oliver Specht 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit d7955212492009976764d701bf789e76f5fdfa4a)
Reviewed-on: https://gerrit.libreoffice.org/22760

diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index d66f20b..13e145f 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -872,22 +872,20 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, 
bool )
 xMenuItemDispatch = 
xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
 
 bool bPopupMenu( false );
-if(xMenuItemDispatch != nullptr)
+if ( !pMenuItemHandler->xPopupMenuController.is() 
&&
+ m_xPopupMenuControllerFactory->hasController( 
aItemCommand, m_aModuleIdentifier ) )
 {
-if ( 
!pMenuItemHandler->xPopupMenuController.is() &&
- 
m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier 
) )
-{
-bPopupMenu = CreatePopupMenuController( 
pMenuItemHandler );
-}
-else if ( 
pMenuItemHandler->xPopupMenuController.is() )
-{
-// Force update of popup menu
-
pMenuItemHandler->xPopupMenuController->updatePopupMenu();
-bPopupMenu = true;
-if (PopupMenu*  pThisPopup = 
pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
-pMenu->EnableItem( 
pMenuItemHandler->nItemId, pThisPopup->GetItemCount() != 0 );
-}
+bPopupMenu = CreatePopupMenuController( 
pMenuItemHandler );
 }
+else if ( 
pMenuItemHandler->xPopupMenuController.is() )
+{
+// Force update of popup menu
+
pMenuItemHandler->xPopupMenuController->updatePopupMenu();
+bPopupMenu = true;
+if (PopupMenu*  pThisPopup = 
pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
+pMenu->EnableItem( 
pMenuItemHandler->nItemId, pThisPopup->GetItemCount() != 0 );
+}
+
 lcl_CheckForChildren(pMenu, 
pMenuItemHandler->nItemId);
 
 if ( xMenuItemDispatch.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/AUTHORS loolwsd/LOOLBroker.cpp

2016-03-01 Thread Tor Lillqvist 
 loolwsd/AUTHORS|1 -
 loolwsd/LOOLBroker.cpp |   14 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit aa4fe42d24b61eef86e44851fe044128ca85fca1
Author: Tor Lillqvist 
Date:   Tue Mar 1 13:25:09 2016 +0200

English

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 05124a6..c90f5fa 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -248,12 +248,12 @@ public:
 }
 
 /// Sync ChildProcess instances with its child.
-/// Returns the number of empty childs.
-size_t syncChilds()
+/// Returns the number of empty children.
+size_t syncChildren()
 {
 std::lock_guard lock(forkMutex);
 
-Log::trace("Synching Childs.");
+Log::trace("Synching children.");
 size_t empty_count = 0;
 for (auto it = _childProcesses.begin(); it != _childProcesses.end(); )
 {
@@ -411,7 +411,7 @@ public:
 const auto duration = (std::chrono::steady_clock::now() - 
lastMaintenanceTime);
 if (duration >= std::chrono::seconds(10))
 {
-syncChilds();
+syncChildren();
 lastMaintenanceTime = std::chrono::steady_clock::now();
 }
 
@@ -871,7 +871,7 @@ int main(int argc, char** argv)
 Util::removeFile(childPath, true);
 }
 
-pipeHandler.syncChilds();
+pipeHandler.syncChildren();
 timeoutCounter = 0;
 }
 else if (pid < 0)
@@ -898,13 +898,13 @@ int main(int argc, char** argv)
 {
 std::lock_guard lock(forkMutex);
 
-const int empty = pipeHandler.syncChilds();
+const int empty = pipeHandler.syncChildren();
 const int total = _childProcesses.size();
 
 // Figure out how many children we need. Always create at least as 
many
 // as configured pre-spawn or one more than requested (whichever 
is larger).
 int spawn = std::max(static_cast(forkCounter) + 1, 
numPreSpawnedChildren);
-Log::debug() << "Creating " << spawn << " childs. Current Total: "
+Log::debug() << "Creating " << spawn << (spawn == 1 ? "child" : 
"children") << ". Current total: "
  << total << ", Empty: " << empty << Log::end;
 do
 {
commit 0cf40c50ea6a9fb6da2720ce6d0fb839c8f2e363
Author: Tor Lillqvist 
Date:   Tue Mar 1 13:10:18 2016 +0200

Anybody interested can check git log

diff --git a/loolwsd/AUTHORS b/loolwsd/AUTHORS
index a58d2b8..e69de29 100644
--- a/loolwsd/AUTHORS
+++ b/loolwsd/AUTHORS
@@ -1 +0,0 @@
-Tor Lillqvist  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - desktop/qa libreofficekit/qa sc/source

2016-03-01 Thread Miklos Vajna 
 desktop/qa/data/hidden-row.ods  |binary
 desktop/qa/desktop_lib/test_desktop_lib.cxx |   35 
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |1 
 sc/source/ui/view/tabview.cxx   |3 +
 4 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit 20ad023a918204da922c4c262b50a411f2e2dace
Author: Miklos Vajna 
Date:   Tue Mar 1 11:38:19 2016 +0100

ccu#1573 sc lok: fix reporting of hidden row height

For columns we use ScDocument::GetColWidth(), which returns 0 for hidden
columsn. Do the same for rows: so instead of using GetOriginalHeight(),
use GetRowHeight(), and then 0 size will be reported for hidden rows as
well.

Change-Id: Ic23b6af744bbc8e194e1906614adebe5ba0c7ced

diff --git a/desktop/qa/data/hidden-row.ods b/desktop/qa/data/hidden-row.ods
new file mode 100644
index 000..25fe898
Binary files /dev/null and b/desktop/qa/data/hidden-row.ods differ
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index a562ab2..51b9272 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -80,6 +80,7 @@ public:
 void testPasteWriter();
 void testPasteWriterJPEG();
 void testRowColumnHeaders();
+void testHiddenRowHeaders();
 void testCellCursor();
 void testCommandResult();
 void testWriterComments();
@@ -101,6 +102,7 @@ public:
 CPPUNIT_TEST(testPasteWriter);
 CPPUNIT_TEST(testPasteWriterJPEG);
 CPPUNIT_TEST(testRowColumnHeaders);
+CPPUNIT_TEST(testHiddenRowHeaders);
 CPPUNIT_TEST(testCellCursor);
 CPPUNIT_TEST(testCommandResult);
 CPPUNIT_TEST(testWriterComments);
@@ -548,6 +550,39 @@ void DesktopLOKTest::testRowColumnHeaders()
 }
 }
 
+void DesktopLOKTest::testHiddenRowHeaders()
+{
+LibLODocument_Impl* pDocument = loadDoc("hidden-row.ods");
+
+pDocument->pClass->initializeForRendering(pDocument, nullptr);
+
+boost::property_tree::ptree aTree;
+char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, 
".uno:ViewRowColumnHeaders");
+std::stringstream aStream(pJSON);
+free(pJSON);
+CPPUNIT_ASSERT(!aStream.str().empty());
+
+boost::property_tree::read_json(aStream, aTree);
+sal_Int32 nPrevious = 0;
+bool bFirst = true;
+for (boost::property_tree::ptree::value_type& rValue : 
aTree.get_child("rows"))
+{
+sal_Int32 nSize = 
OString(rValue.second.get("size").c_str()).toInt32();
+CPPUNIT_ASSERT(nSize > 0);
+
+if (bFirst)
+bFirst = false;
+else
+{
+// nSize was 509, nPrevious was 254, i.e. hidden row wasn't 
reported as 0 height.
+CPPUNIT_ASSERT_EQUAL(nPrevious, nSize);
+break;
+}
+
+nPrevious = nSize;
+}
+}
+
 void DesktopLOKTest::testCellCursor()
 {
 LibLODocument_Impl* pDocument = loadDoc("search.ods");
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7918516..9f5d699 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2326,7 +2326,8 @@ OUString ScTabView::getRowColumnHeaders(const Rectangle& 
rRectangle)
 long nTotalPixels = 0;
 for (SCROW nRow = 0; nRow <= nEndRow; ++nRow)
 {
-sal_uInt16 nSize = pDoc->GetOriginalHeight(nRow, aViewData.GetTabNo());
+// nSize will be 0 for hidden rows.
+sal_uInt16 nSize = pDoc->GetRowHeight(nRow, aViewData.GetTabNo());
 long nSizePixels = ScViewData::ToPixel(nSize, aViewData.GetPPTY());
 OUString aText = pRowBar[SC_SPLIT_BOTTOM]->GetEntryText(nRow);
 
commit a531af237d21a9a6597b2766893c909e1ac5cc25
Author: Miklos Vajna 
Date:   Tue Mar 1 11:36:25 2016 +0100

gtktiledviewer: log .uno:ViewRowColumnHeaders command result

Change-Id: I6d71071371ef54f70613246162c893daa56b7bb9

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 7ec2b78..c0d4ac7 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -292,6 +292,7 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* 
pDocView, GdkEventConfi
 ss << "lok::Document::getCommandValues(" << aCommand.str() << ")";
 g_info("%s", ss.str().c_str());
 char* pValues = pDocument->pClass->getCommandValues(pDocument, 
aCommand.str().c_str());
+g_info("lok::Document::getCommandValues() returned '%s'", pValues);
 std::stringstream aStream(pValues);
 free(pValues);
 assert(!aStream.str().empty());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

German community meeting in Essen

2016-03-01 Thread Florian Effenberger 

Hello,

sorry for being late with announcing this, trying to optimize 
communication here in the future to have some better outreach.


The German community will organize a community weekend at Linuxhotel in 
Essen, April 15-17. The agenda is currently in development at 
https://wiki.documentfoundation.org/DE/Arbeitstreffen2016 where you can 
also find further details (the wiki page is in German, as the meeting 
will be held in German language).


We still do have some spare seats, so in case someone is interested, 
please shoot an e-mail *directly* to me (and not via the lists).


Thanks, and sorry again for being a bit late with announcing this,
Florian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: wizards/com

2016-03-01 Thread Caolán McNamara 
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2fb8c4b642bae77e0a515512450129503db5aa38
Author: Caolán McNamara 
Date:   Tue Mar 1 10:53:35 2016 +

coverity#1326385 Dereference null return value

Change-Id: I0097e9759c1ac3a1e03d9c2741c109e147dce540

diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index e6e8c62..d169f7d 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -242,13 +242,16 @@ public class SQLQueryComposer
 }
 }
 
-public StringBuilder getFromClause()
+public StringBuilder getFromClause() throws SQLException
 {
 StringBuilder sFromClause = new StringBuilder("FROM");
 String[] sCommandNames = CurDBMetaData.getIncludedCommandNames();
 for (int i = 0; i < sCommandNames.length; i++)
 {
 CommandName curCommandName = 
getComposedCommandByDisplayName(sCommandNames[i]);
+if (curCommandName == null) {
+throw new SQLException("Error: CommandName unavailable");
+}
 sFromClause.append(" 
").append(curCommandName.getComposedName()).append(" 
").append(quoteName(curCommandName.getAliasName()));
 if (i < sCommandNames.length - 1)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - include/store shell/source sot/source starmath/inc starmath/source store/source svgio/inc svgio/source

2016-03-01 Thread Noel Grandin 
 include/store/store.hxx   |5 +-
 shell/source/unix/sysshell/recently_used_file.cxx |4 +-
 shell/source/unix/sysshell/recently_used_file.hxx |2 -
 sot/source/sdstor/stgdir.cxx  |4 +-
 sot/source/sdstor/stgdir.hxx  |2 -
 starmath/inc/cursor.hxx   |   12 +++---
 starmath/inc/dialog.hxx   |6 +--
 starmath/source/cursor.cxx|   39 +-
 starmath/source/dialog.cxx|   15 +++-
 store/source/storbios.cxx |   35 +--
 store/source/storbios.hxx |   12 --
 svgio/inc/svgio/svgreader/svgmarkernode.hxx   |2 -
 svgio/inc/svgio/svgreader/svgtools.hxx|2 -
 svgio/source/svgreader/svgtools.cxx   |4 +-
 14 files changed, 61 insertions(+), 83 deletions(-)

New commits:
commit 16067d4f903bebc506daa8149f9b15f1f1b4e629
Author: Noel Grandin 
Date:   Tue Mar 1 11:35:26 2016 +0200

loplugin:unuseddefaultparam in shell

Change-Id: Ib14fd4f7f0a23f83801f448aa2c22e550057ec71

diff --git a/shell/source/unix/sysshell/recently_used_file.cxx 
b/shell/source/unix/sysshell/recently_used_file.cxx
index 2bf7d7e..5a9b464 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -99,9 +99,9 @@ void recently_used_file::reset() const
 }
 
 
-void recently_used_file::truncate(off_t length)
+void recently_used_file::truncate()
 {
-if (ftruncate(fileno(file_), length) == -1)
+if (ftruncate(fileno(file_), 0) == -1)
 throw "I/O error: ftruncate failed";
 }
 
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx 
b/shell/source/unix/sysshell/recently_used_file.hxx
index 335361b..88ba5d8 100644
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -39,7 +39,7 @@ public:
 void reset() const;
 
 
-void truncate(off_t length = 0);
+void truncate();
 
 
 size_t read(
commit def71473d25e88729c644e35523d267c8cd04e57
Author: Noel Grandin 
Date:   Tue Mar 1 11:31:10 2016 +0200

loplugin:unuseddefaultparam in sot

Change-Id: I36f88f060377fa754d4a47956932d73c47d14ece

diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 8e8eaa0..e093936 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -261,11 +261,11 @@ bool StgDirEntry::IsDirty()
 
 // Set up a stream.
 
-void StgDirEntry::OpenStream( StgIo& rIo, bool bForceBig )
+void StgDirEntry::OpenStream( StgIo& rIo )
 {
 sal_Int32 nThreshold = (sal_uInt16) rIo.m_aHdr.GetThreshold();
 delete m_pStgStrm;
-if( !bForceBig && m_aEntry.GetSize() < nThreshold )
+if( m_aEntry.GetSize() < nThreshold )
 m_pStgStrm = new StgSmallStrm( rIo, *this );
 else
 m_pStgStrm = new StgDataStrm( rIo, *this );
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index 7878de3..cecbba4 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -78,7 +78,7 @@ public:
 
 bool Commit();
 
-void  OpenStream( StgIo&, bool=false ); // set up an appropriate stream
+void  OpenStream( StgIo& ); // set up an appropriate stream
 void  Close();
 sal_Int32 GetSize();
 bool  SetSize( sal_Int32 );
commit 08e14eb270ef446c68ac27a3bca49494aa02da2d
Author: Noel Grandin 
Date:   Tue Mar 1 11:29:12 2016 +0200

loplugin:unuseddefaultparam in starmath

Change-Id: I740d931c0236c1a4d40013b458f249692695d6e5

diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 761415f..1194967 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -164,11 +164,11 @@ public:
  * This method only work if the caret is inside an SmOperNode, or to the 
right of one.
  * Notice also that this method ignores any selection made.
  *
- * @param bMoveCaret If true that caret will be moved into the limit.
+ * The caret will be moved into the limit.
  *
  * @returns True, if the caret was in a context where this operation was 
possible.
  */
-bool InsertLimit(SmSubSup eSubSup, bool bMoveCaret = true);
+bool InsertLimit(SmSubSup eSubSup);
 
 /** Insert a new row or newline
  *
@@ -217,7 +217,7 @@ public:
 void Draw(OutputDevice& pDev, Point Offset, bool isCaretVisible);
 
 bool IsAtTailOfBracket(SmBracketType eBracketType, SmBraceNode** 
ppBraceNode = nullptr) const;
-void MoveAfterBracket(SmBraceNode* pBraceNode, bool bMoveAnchor = true);
+void MoveAfterBracket(SmBraceNode* pBraceNode);
 
 private:
 friend class SmDocShell;
@@ -414,11 +414,11 @@ public:
 SmNodeListParser(){
 pList = nullptr;
 }
-/** Parse a list of nodes to an expression
+/** Parse a list of nodes to an expression.
  *
- * If bDeleteErrorNo

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

2016-03-01 Thread Caolán McNamara 
 connectivity/source/drivers/firebird/PreparedStatement.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit d7e1e8da8b1a5158c5a89c7016e05588b0461999
Author: Caolán McNamara 
Date:   Tue Mar 1 10:45:06 2016 +

coverity#1352212 Unchecked return value

Change-Id: I75a6853a6708585201dbc4722e7a19cd568a48f7

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index ac2778f..4ecb9b7 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -100,10 +100,11 @@ void OPreparedStatement::ensurePrepared()
 m_pInSqlda = static_cast(calloc(1, XSQLDA_LENGTH(nItems)));
 m_pInSqlda->version = SQLDA_VERSION1;
 m_pInSqlda->sqln = nItems;
-isc_dsql_describe_bind(m_statusVector,
-   &m_aStatementHandle,
-   1,
-   m_pInSqlda);
+aErr = isc_dsql_describe_bind(m_statusVector,
+  &m_aStatementHandle,
+  1,
+  m_pInSqlda);
+SAL_WARN_IF(aErr, "connectivity.firebird", "isc_dsql_describe_bind 
failed");
 }
 
 if (!aErr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com

2016-03-01 Thread Caolán McNamara 
 wizards/com/sun/star/wizards/document/GridControl.java |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 144ce8b3ff38a39507a4167662ef5b4aec63907a
Author: Caolán McNamara 
Date:   Tue Mar 1 10:32:30 2016 +

coverity#1326304 Explicit null dereferenced

Change-Id: I1fba88431ec7e5154f39bb0c76e622c6129011d2

diff --git a/wizards/com/sun/star/wizards/document/GridControl.java 
b/wizards/com/sun/star/wizards/document/GridControl.java
index 4b8f98d..cca5de9 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -51,6 +51,12 @@ public class GridControl extends Shape
 xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, 
oGridModel );
 _xFormName.insertByName(_sname, oGridModel);
 XControlModel xControlModel = UnoRuntime.queryInterface( 
XControlModel.class, oGridModel );
+// test if the interface was available
+if (xControlModel == null) {
+throw new Exception(
+"Error: GridModel does not export XControlModel 
interface");
+}
+
 xControlShape.setControl(xControlModel);
 xPropertySet = UnoRuntime.queryInterface( XPropertySet.class, 
oGridModel );
 oFormHandler.xDrawPage.add(xShape);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Caolán McNamara 
 
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
 |   18 +++---
 1 file changed, 13 insertions(+), 5 deletions(-)

New commits:
commit d112040b7f91415a4f58b9e1a7bd84bd5c914c81
Author: Caolán McNamara 
Date:   Tue Mar 1 10:22:08 2016 +

coverity#1326444 Dereference null return value

Change-Id: I0163b298a3c3359b0f035515408f2a81ef405377

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 019beaf..9cea2df 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -262,6 +262,14 @@ public final class ConverterInfoMgr {
 return null;
 }
 
+static String readLine(BufferedReader br) throws IOException{
+String ret = br.readLine();
+if (ret == null) {
+throw new IOException("short read");
+}
+return ret;
+}
+
 /**
  * Main to let the user specify what plug-ins to register from jarfiles and
  * to display the currently registered plug-ins.
@@ -290,7 +298,7 @@ public final class ConverterInfoMgr {
 System.out.println("(Q)uit\n");
 
 try {
-c = br.readLine().toUpperCase().trim().charAt(0);
+c = readLine(br).toUpperCase().trim().charAt(0);
 } catch(Exception e) {
 System.out.println("Invalid entry");
 System.out.println("Error msg: " + e.getMessage());
@@ -308,7 +316,7 @@ public final class ConverterInfoMgr {
 
 System.out.println("Enter path to jarfile: ");
 try {
-String jarname = br.readLine().trim();
+String jarname = readLine(br).trim();
 cir = new ConverterInfoReader(jarname,validate);
 } catch (RegistryException e) {
 System.out.println("Cannot load plug-in ConverterFactory 
implementation.");
@@ -346,7 +354,7 @@ public final class ConverterInfoMgr {
 }
 
 try {
-String name = br.readLine().trim();
+String name = readLine(br).trim();
 boolean rc = false;
 
 if (c == 'D') {
@@ -380,7 +388,7 @@ public final class ConverterInfoMgr {
 }
 
 try {
-findMimeOne = br.readLine().trim();
+findMimeOne = readLine(br).trim();
 } catch (Exception e) {
 System.out.println("Error adding data to registry");
 System.out.println("Error msg: " + e.getMessage());
@@ -393,7 +401,7 @@ public final class ConverterInfoMgr {
 }
 
 try {
-findMimeTwo = br.readLine().trim();
+findMimeTwo = readLine(br).trim();
 } catch (Exception e) {
 System.out.println("Error adding data to registry");
 System.out.println("Error msg: " + e.getMessage());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Marco Cecchetti 
 sc/source/core/inc/arraysumfunctor.hxx |7 +--
 sc/source/core/tool/scmatrix.cxx   |2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9b7f72203f2b9f6b95d927c695f7f48b86b251ee
Author: Marco Cecchetti 
Date:   Mon Feb 29 22:18:23 2016 +0100

tdf#97369/#97587 - Further fix SUMming in the software interpreter

When SUMming in the software interpreter involved trailing empty
cells, code tried to read beyond numeric array limit.

Change-Id: I50c1148e7e79d02bedb02a771df172035112915c

diff --git a/sc/source/core/inc/arraysumfunctor.hxx 
b/sc/source/core/inc/arraysumfunctor.hxx
index 3955fd9..d94bf74 100644
--- a/sc/source/core/inc/arraysumfunctor.hxx
+++ b/sc/source/core/inc/arraysumfunctor.hxx
@@ -51,12 +51,15 @@ public:
 
 if (hasSSE2)
 {
-while (!isAligned(pCurrent))
+while ( i < mnSize && !isAligned(pCurrent))
 {
 fSum += *pCurrent++;
 i++;
 }
-fSum += executeSSE2(i, pCurrent);
+if( i < mnSize )
+{
+fSum += executeSSE2(i, pCurrent);
+}
 }
 else
 fSum += executeUnrolled(i, pCurrent);
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 6018ca1..e2dde4e 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -3401,7 +3401,7 @@ ScMatrix::IterateResult ScVectorRefMatrix::Sum(bool 
bTextAsZero) const
 {
 return ScMatrix::IterateResult(0.0, 0.0, 0);
 }
-else if (nDataSize > mpToken->GetArrayLength() + mnRowStart)
+else if (nDataSize > mpToken->GetArrayLength() - mnRowStart)
 {
 nDataSize = mpToken->GetArrayLength() - mnRowStart;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Caolán McNamara 
 
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
 |   31 +++---
 1 file changed, 12 insertions(+), 19 deletions(-)

New commits:
commit c900c820a054ff0e8cb45cc7064716f3e53432b8
Author: Caolán McNamara 
Date:   Tue Mar 1 10:13:07 2016 +

coverity#1326460 Dereference null return value

Change-Id: I15e41410064ad6957237e8e79fceb48e152681af

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index acc4d8e..aaa6904 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -73,33 +73,26 @@ public class ConverterInfoReader {
 ParserConfigurationException, org.xml.sax.SAXException,
 RegistryException  {
 
-InputStreamistream;
-InputSourceisource;
-DocumentBuilderFactory builderFactory;
-DocumentBuilderbuilder;
-JarURLConnection   jarConnection;
-JarEntry   jarentry;
-JarFilejarfile;
-URLurl;
-
 converterInfoList = new ArrayList();
 jarfilename   = jar;
 
 // Get Jar via URL
+URL url   = new URL("jar:" + jar + "!/META-INF/converter.xml");
+JarURLConnection jarConnection = 
(JarURLConnection)url.openConnection();
+JarEntry jarentry = jarConnection.getJarEntry();
+JarFile jarfile   = jarConnection.getJarFile();
 
-url   = new URL("jar:" + jar + "!/META-INF/converter.xml");
-jarConnection = (JarURLConnection)url.openConnection();
-jarentry  = jarConnection.getJarEntry();
-jarfile   = jarConnection.getJarFile();
+if (jarfile == null) {
+throw new IOException("Missing jar file");
+}
 
 // Build the InputSource
-
-istream   = jarfile.getInputStream(jarentry);
-isource   = new InputSource(istream);
+InputStream istream = jarfile.getInputStream(jarentry);
+InputSource isource = new InputSource(istream);
 
 // Get the DOM builder and build the document.
 
-builderFactory= DocumentBuilderFactory.newInstance();
+DocumentBuilderFactory builderFactory = 
DocumentBuilderFactory.newInstance();
 
 //DTD validation
 
@@ -108,7 +101,7 @@ public class ConverterInfoReader {
 builderFactory.setValidating(true);
 }
 
-builder = builderFactory.newDocumentBuilder();
+DocumentBuilder builder = builderFactory.newDocumentBuilder();
 document = builder.parse(isource);
 
 // Parse the document.
@@ -249,4 +242,4 @@ public class ConverterInfoReader {
 public Iterator getConverterInfoEnumeration() {
return converterInfoList.iterator();
 }
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Miklos Vajna 
 desktop/source/lib/init.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a57b2fd453c53d6fc1075321cf3b7d4284781e68
Author: Miklos Vajna 
Date:   Tue Mar 1 10:50:29 2016 +0100

ccu#1568 desktop: disable alpha buffer for Calc

As far as I see, the alpha buffer is used for Writer and Impress only,
while it causes problems for Calc hyperlink rendering, so conditionally
disable it.

Change-Id: I4debe6d5c03c4765959158b97bc6da9b3cc817c8

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 520b8ad..8371686 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1006,7 +1006,12 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
 // Allocate a separate buffer for the alpha device.
 std::vector aAlpha(nCanvasWidth * nCanvasHeight);
 memset(aAlpha.data(), 0, nCanvasWidth * nCanvasHeight);
-boost::shared_array aAlphaBuffer(aAlpha.data(), 
NoDelete());
+boost::shared_array aAlphaBuffer;
+
+// No alpha buffer for Calc: it would result in misrendered hyperlinks with
+// pre-cairo headless codepath.
+if (doc_getDocumentType(pThis) != LOK_DOCTYPE_SPREADSHEET)
+aAlphaBuffer.reset(aAlpha.data(), NoDelete());
 
 pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
 Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Caolán McNamara 
 
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
 |   24 +++---
 1 file changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 1fb6a3aa87f6f68194246f8de0d62796a98ddce2
Author: Caolán McNamara 
Date:   Tue Mar 1 09:51:23 2016 +

coverity#1326847 DP: Use doPrivileged

and

coverity#1326848 DP: Use doPrivileged

Change-Id: Ida9706055ade82cdf901f2f78687ee0270b499c4

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
index de377ec..2190ab2 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
@@ -21,6 +21,8 @@ package org.openoffice.xmerge.util.registry;
 import java.lang.reflect.Constructor;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -101,9 +103,14 @@ public class ConverterInfo {
 // Get instance of the PluginFactory.
 
 try {
-URL jarURL = new URL(jarName);
-URLClassLoader loader = new URLClassLoader(new URL[] { jarURL },
-   piClassLoader);
+final URL jarURL = new URL(jarName);
+final URL[] urls = new URL[] { jarURL };
+URLClassLoader loader = AccessController.doPrivileged(
+new PrivilegedAction() {
+public URLClassLoader run() {
+return new URLClassLoader(urls, piClassLoader);
+}
+});
 Class clas = loader.loadClass(piClassImpl);
 Class[] argumentTypes = { 
org.openoffice.xmerge.util.registry.ConverterInfo.class };
 Constructor construct = clas.getConstructor(argumentTypes);
@@ -176,9 +183,14 @@ public class ConverterInfo {
 // Get instance of the PluginFactory.
 
 try {
-URL jarURL = new URL(jarName);
-URLClassLoader loader = new URLClassLoader(new URL[] { jarURL },
-   piClassLoader);
+final URL jarURL = new URL(jarName);
+final URL[] urls = new URL[] { jarURL };
+URLClassLoader loader = AccessController.doPrivileged(
+new PrivilegedAction() {
+public URLClassLoader run() {
+return new URLClassLoader(urls, piClassLoader);
+}
+});
 Class clas = loader.loadClass(piClassImpl);
 Class[] argumentTypes = { 
org.openoffice.xmerge.util.registry.ConverterInfo.class };
 Constructor construct = clas.getConstructor(argumentTypes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-01 Thread Samuel Mehrbrodt 
 framework/source/uielement/addonstoolbarmanager.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3ff17bda5ba3e627e9b996506dc72b68cf67483b
Author: Samuel Mehrbrodt 
Date:   Mon Feb 29 17:46:30 2016 +0100

tdf#98277 Extensions: Display shortcut in toolbar tooltip

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

diff --git a/framework/source/uielement/addonstoolbarmanager.cxx 
b/framework/source/uielement/addonstoolbarmanager.cxx
index afe1551..a7391d1 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -255,6 +255,9 @@ void AddonsToolBarManager::FillToolbar( const Sequence< 
Sequence< PropertyValue
 }
 bAppendSeparator = false;
 
+OUString 
aShortcut(vcl::CommandInfoProvider::Instance().GetCommandShortcut(aURL, 
m_xFrame));
+if (!aShortcut.isEmpty())
+aTitle += " (" + aShortcut + ")";
 m_pToolBar->InsertItem( nId, aTitle );
 
 // don't setup images yet, 
AddonsToolbarWrapper::populateImages does that.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Create a diff document.

2016-03-01 Thread Samuel Mehrbrodt 
Am 01.03.2016 um 09:30 schrieb Miklos Vajna:
> I think the best we have is
> .
We have also
https://wiki.documentfoundation.org/Development/DispatchCommands


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

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

2016-03-01 Thread Miklos Vajna 
 loleaflet/debug/document/document_simple_example.html |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 33d1e1b8889aff3da205e93c4f73cd7120cca5b8
Author: Miklos Vajna 
Date:   Tue Mar 1 10:46:50 2016 +0100

loleaflet: add comment on how to test transparent tiles

diff --git a/loleaflet/debug/document/document_simple_example.html 
b/loleaflet/debug/document/document_simple_example.html
index 482ff48..7934843 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -50,6 +50,8 @@
 
 
 
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/debug loleaflet/dist loleaflet/.eslintignore loleaflet/Makefile loleaflet/spec loleaflet/src

2016-03-01 Thread Jan Holesovsky 
 loleaflet/.eslintignore   |4 
 loleaflet/Makefile|2 
 loleaflet/debug/document/document_simple_example.html |   12 
 loleaflet/dist/contextMenu/jquery.contextMenu.css |  206 +
 loleaflet/dist/contextMenu/jquery.contextMenu.js  | 1898 ++
 loleaflet/dist/contextMenu/jquery.ui.position.min.js  |4 
 loleaflet/dist/loleaflet.html |   10 
 loleaflet/dist/scrollbar/jquery-1.11.0.min.js |4 
 loleaflet/dist/scrollbar/jquery.mCustomScrollbar.css  | 1267 +
 loleaflet/dist/scrollbar/jquery.mCustomScrollbar.js   | 2425 ++
 loleaflet/spec/loadtest.html  |   12 
 loleaflet/src/contextMenu/jquery.contextMenu.css  |  206 -
 loleaflet/src/contextMenu/jquery.contextMenu.js   | 1898 --
 loleaflet/src/contextMenu/jquery.ui.position.min.js   |4 
 loleaflet/src/scrollbar/jquery-1.11.0.min.js  |4 
 loleaflet/src/scrollbar/jquery.mCustomScrollbar.css   | 1267 -
 loleaflet/src/scrollbar/jquery.mCustomScrollbar.js| 2425 --
 17 files changed, 5824 insertions(+), 5824 deletions(-)

New commits:
commit 70a60dbadcad8f2396e3e6cd27112c5e1af17273
Author: Jan Holesovsky 
Date:   Tue Mar 1 10:32:25 2016 +0100

loleaflet: Move the contextMenu to dist/.

diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index ed74152..dfbe7ac 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,2 +1,2 @@
 dist/scrollbar
-src/contextMenu
+dist/contextMenu
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 4cbbcab..8228466 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -19,7 +19,7 @@ dist: all
mkdir loleaflet-$(VERSION)
cp README loleaflet-$(VERSION)
cp reference.html loleaflet-$(VERSION)
-   tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document 
src/contextMenu docs spec \
+   tar cf - dist plugins/draw-$(DRAW_VERSION)/dist debug/document docs 
spec \
node_modules/mocha/mocha.css \
node_modules/mocha/mocha.js \
node_modules/happen/happen.js \
diff --git a/loleaflet/debug/document/document_simple_example.html 
b/loleaflet/debug/document/document_simple_example.html
index e00733f..482ff48 100644
--- a/loleaflet/debug/document/document_simple_example.html
+++ b/loleaflet/debug/document/document_simple_example.html
@@ -16,7 +16,7 @@
 
 
 
-
+
 
 
 
@@ -28,8 +28,8 @@
 http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js";>
 window.jQuery || document.write('