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

[Miklos Vajna]

 unotools/source/ucbhelper/XTempFile.hxx |3 ++-
 unotools/source/ucbhelper/xtempfile.cxx |   13 +++--
 2 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit ed21ac627cecc7dd7f416462beb6cf099889e79f
Author: Miklos Vajna 
Date:   Thu Feb 11 08:54:17 2016 +0100

OTempFileService: avoid manually deleting mpTempFile

Change-Id: Ic2f83fd4ff83795a77dd9b97b98e2635e5c447c0

diff --git a/unotools/source/ucbhelper/XTempFile.hxx 
b/unotools/source/ucbhelper/XTempFile.hxx
index 5d54883..f50aeea 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_SOURCE_UCBHELPER_XTEMPFILE_HXX
 #define INCLUDED_UNOTOOLS_SOURCE_UCBHELPER_XTEMPFILE_HXX
 
+#include 
 #include 
 #include 
 #include 
@@ -44,7 +45,7 @@ class OTempFileService : public OTempFileBase
 , public ::cppu::PropertySetMixin< css::io::XTempFile >
 {
 protected:
-::utl::TempFile* mpTempFile;
+std::unique_ptr mpTempFile;
 ::osl::Mutex maMutex;
 SvStream* mpStream;
 bool mbRemoveFile;
diff --git a/unotools/source/ucbhelper/xtempfile.cxx 
b/unotools/source/ucbhelper/xtempfile.cxx
index 888ee86..e0afe6b 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -39,13 +39,12 @@ OTempFileService::OTempFileService(css::uno::Reference< 
css::uno::XComponentCont
 , mbHasCachedPos( false )
 
 {
-mpTempFile = new ::utl::TempFile;
+mpTempFile.reset(new utl::TempFile());
 mpTempFile->EnableKillingFile();
 }
 
 OTempFileService::~OTempFileService ()
 {
-delete mpTempFile;
 }
 
 // XInterface
@@ -248,10 +247,7 @@ throw ( css::io::NotConnectedException, 
css::io::IOException, css::uno::RuntimeE
 mpStream = nullptr;
 
 if ( mpTempFile )
-{
-delete mpTempFile;
-mpTempFile = nullptr;
-}
+mpTempFile.reset(nullptr);
 }
 }
 
@@ -307,10 +303,7 @@ throw ( css::io::NotConnectedException, 
css::io::BufferSizeExceededException, cs
 mpStream = nullptr;
 
 if ( mpTempFile )
-{
-delete mpTempFile;
-mpTempFile = nullptr;
-}
+mpTempFile.reset(nullptr);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Oliver Specht]

 sw/source/core/tox/ToxWhitespaceStripper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5152c43109c9a35f30fc9b0f478c1fbaf01a1143
Author: Oliver Specht 
Date:   Wed Feb 10 16:57:14 2016 +0100

tdf#89505: replace tab character with space in table of contents

the ToxWhitespaceStripper now replaces also tab characters so that
they don't break the formatting

Change-Id: If66aaddcbc0f8c65461f53f07ca7031f8f1d11b4
Reviewed-on: https://gerrit.libreoffice.org/22271
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/sw/source/core/tox/ToxWhitespaceStripper.cxx 
b/sw/source/core/tox/ToxWhitespaceStripper.cxx
index 4918a73..c38079c 100644
--- a/sw/source/core/tox/ToxWhitespaceStripper.cxx
+++ b/sw/source/core/tox/ToxWhitespaceStripper.cxx
@@ -24,7 +24,7 @@ ToxWhitespaceStripper::ToxWhitespaceStripper(const OUString& 
inputString)
 for (sal_Int32 pos = 0; pos < inputString.getLength(); ++pos) {
 sal_Unicode cur = inputString[pos];
 
-if (cur == ' ' || cur == '\n') {
+if (cur == ' ' || cur == '\n' || cur == '\t') {
 // merge consecutive whitespaces (and translate them to spaces)
 if (!lastCharacterWasWhitespace) {
 buffer.append(' ');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Old/Obsolete file format import still needed?

[Tor Lillqvist]

> > we could add a configuration option
>

We don't need more configuration options.


> > to let system administrators disable them all in one go for a secure
> > site, etc.


I think you misunderstand what a typical "system administrator" does, for
the vast majority of our user base (counting just the part of it that even
has hired sysadmins). Hint: They don't build software from sources.

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

Re: Old/Obsolete file format import still needed?

[David Tardon]

Hi,

On Wed, Feb 10, 2016 at 02:20:50PM -0500, Bryan Quigley wrote:
> > Anyhow - I share your concern wrt. the attack surface that all these
> > old file filters provide for us; I attach a prototype patch that adds an
> > 'EXOTIC' annotation to our filter descriptions. It is missing a UI
> > Interaction Handler piece (cf. the hole with the notes and so on in
> > there ;-) - we'll need a new request type I guess.
> >
> > My ideal would be to pop up a dialog saying:
> >
> > "You're asking LibreOffice to open a very unusual file-type.
> >  Unless you are certain that this file is indeed a  >  Word Pro> file it is safest to not open it.
> >
> >  [ ] - never show this again
> >
> >   [ this is an unusual file ] [get me out of here ]"
> >
> > Of some kind =) is that something you'd be interested in working on 
> > ?
> Thanks for the first pass code.  I generally don't find dialouges like
> that to be super useful (many users just click right through).
> However, in labeling them Exotic we could add a configuration option
> to let system administrators disable them all in one go for a secure
> site, etc.  I'll look into that more.

This of course makes the assumption that filters for common formats
(like .doc etc.) do not contain vulnerabilities, which is IMHO just
wishful thinking. IIRC there was exactly 1 CVE for import of non-MS file
format during the ~8 years I have been working on this code base. And I
think the likelihood to encounter a malformed (or even malicious) MS
Word document is far greater than, e.g., Hangul Word or AppleWorks
document. So the "secure site" aspect seems rather dubious to me.

Not to mention that users/admins in different countries (or even in
different professions) may have different ideas about which formats
should be considered "exotic".

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

[Libreoffice-commits] core.git: chart2/source codemaker/source comphelper/source connectivity/source extensions/source i18npool/inc i18npool/source include/comphelper lingucomponent/source linguistic/

[Noel Grandin]

 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx |   10 -
 chart2/source/inc/CommonConverters.hxx   |5 
 chart2/source/tools/CommonConverters.cxx |8 -
 codemaker/source/cppumaker/cpputype.cxx  |   63 
++
 comphelper/source/misc/types.cxx |   21 ---
 connectivity/source/commontools/FValue.cxx   |   19 ---
 extensions/source/propctrlr/eventhandler.cxx |   10 -
 i18npool/inc/localedata.hxx  |6 
 i18npool/source/breakiterator/breakiteratorImpl.cxx  |4 
 i18npool/source/textconversion/textconversionImpl.cxx|4 
 include/comphelper/types.hxx |9 -
 lingucomponent/source/lingutil/lingutil.hxx  |7 -
 linguistic/source/convdiclist.cxx|7 -
 reportdesign/source/core/api/ReportControlModel.cxx  |   21 ---
 reportdesign/source/core/inc/ReportControlModel.hxx  |7 -
 sc/inc/convuno.hxx   |   29 

 sc/inc/dpsave.hxx|4 
 sc/source/core/data/dpsave.cxx   |   19 ---
 sc/source/filter/oox/stylesbuffer.cxx|   13 --
 sfx2/qa/cppunit/test_metadatable.cxx |5 
 sfx2/source/dialog/dinfdlg.cxx   |   13 --
 sfx2/source/doc/SfxDocumentMetaData.cxx  |   13 --
 sfx2/source/doc/oleprops.cxx |   22 ---
 svl/source/items/srchitem.cxx|4 
 svtools/source/misc/templatefoldercache.cxx  |   20 ---
 svx/source/fmcomp/fmgridif.cxx   |2 
 vcl/source/helper/canvastools.cxx|5 
 xmloff/source/style/PageMasterExportPropMapper.cxx   |7 -
 28 files changed, 68 insertions(+), 289 deletions(-)

New commits:
commit 0f8ec3036f44b02aa03795ede3052a790134a90d
Author: Noel Grandin 
Date:   Wed Feb 10 08:43:01 2016 +0200

[API CHANGE] add operator==/!= to UNO structs

this is useful now that we are storing UNO structs in std::vector

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

diff --git 
a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index cedab39..e22ce76 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -44,16 +44,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
 
-namespace com { namespace sun { namespace star { namespace awt {
-
-// this operator is not defined by default
-bool operator!=( const awt::Size & rSize1, const awt::Size & rSize2 )
-{
-return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
-}
-
-} } } }
-
 namespace chart
 {
 namespace wrapper
diff --git a/chart2/source/inc/CommonConverters.hxx 
b/chart2/source/inc/CommonConverters.hxx
index 7b42b7f..46288be 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -134,11 +134,6 @@ OOO_DLLPUBLIC_CHARTTOOLS 
com::sun::star::drawing::Direction3D
 operator-( const com::sun::star::drawing::Position3D& rPos1
, const com::sun::star::drawing::Position3D& rPos2);
 
-/** Position3D == Position3D ?
-*/
-OOO_DLLPUBLIC_CHARTTOOLS
-booloperator==( const com::sun::star::drawing::Position3D& rPos1
-   , const com::sun::star::drawing::Position3D& rPos2);
 
 /** awt::Rect --> awt::Point (2D)
 */
diff --git a/chart2/source/tools/CommonConverters.cxx 
b/chart2/source/tools/CommonConverters.cxx
index 8571f94..436c105 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -360,14 +360,6 @@ drawing::Direction3D  operator-( const 
drawing::Position3D& rPos1
 );
 }
 
-bool operator==( const drawing::Position3D& rPos1
-   , const drawing::Position3D& rPos2)
-{
-return rPos1.PositionX == rPos2.PositionX
-&& rPos1.PositionY == rPos2.PositionY
-&& rPos1.PositionZ == rPos2.PositionZ;
-}
-
 awt::Point Position3DToAWTPoint( const drawing::Position3D& rPos )
 {
 awt::Point aRet;
diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpput

Build fail when building Libreoffice on Windows.

[Paul Blinzer]

Platfom: Windows 10 64bit, running Cygwin 32 LODE build setup to compile
libreoffice.
Default setup of build envrionment as outlined in
https://wiki.documentfoundation.org/Development/BuildingOnWindows

Synced up to git repo today (2/10/2016)
Compilation went well until reaching unit test for ssl check (see below for
output).

Checked my cygwin installation and have openssl  & openssh packages as
indicated in the manual install sections (which I cross-validated).

Checked email list archive and couldn't find any mention, so sending it
out.
Currently debugging the issue, trying to understand the scripts purpose
Anything known already?

Best Regards
Paul


[build PYT] pyuno_pytests_ssl
E
==
ERROR: test_ssl_import (testssl.SSLTest)
--
Traceback (most recent call last):
  File "C:\sources\libo-core\pyuno\qa\pytests\testssl.py", line 6, in
test_ssl_import
import ssl
  File "C:\sources\libo-core\instdir\program\python-core-3.3.0\lib\ssl.py",
line 60, in 
import _ssl # if we can't import it, let the error propagate
ImportError: DLL load failed: The operating system cannot run %1.

--
Ran 1 test in 0.015s

FAILED (errors=1)

Error: a unit test failed, please do one of:
make PythonTest_pyuno_pytests_ssl CPPUNITTRACE="gdb --args"
# for interactive debugging on Linux
make PythonTest_pyuno_pytests_ssl VALGRIND=memcheck
# for memory checking
make PythonTest_pyuno_pytests_ssl DEBUGCPPUNIT=TRUE
# for exception catching

C:/sources/libo-core/solenv/gbuild/PythonTest.mk:35: recipe for target
'C:/sources/libo-core/workdir/PythonTest/pyuno_pytests_ssl/done' failed
make[1]: ***
[C:/sources/libo-core/workdir/PythonTest/pyuno_pytests_ssl/done] Error 1
make[1]: *** Waiting for unfinished jobs
Makefile:249: recipe for target 'build' failed
make: *** [build] Error 2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: loolwsd/MasterProcessSession.cpp loolwsd/TileCache.cpp loolwsd/TileCache.hpp

[Pranav Kant]

 loolwsd/MasterProcessSession.cpp |4 
 loolwsd/TileCache.cpp|9 +
 loolwsd/TileCache.hpp|3 +++
 3 files changed, 16 insertions(+)

New commits:
commit 6a7a014d14ec4142f7c28faa920ffb5871e8f115
Author: Pranav Kant 
Date:   Wed Feb 10 23:21:24 2016 +0530

loolwsd: Remove cached 'status' command output on 'setclientpart'

Otherwise we have a problem when cached information is different than
the actual one maintained by LOKitDocument, keeping the whole
server setup in an inconsistent state.

For example, when client reloads the browser session quickly
after setting the current part (to say 3) of an opened part document.
If the reload occurs soon enough before the 'setclientpart'
message originated from the client is acknowledged by the server,
then the next reload would get the cached 'status' entry asking
the client to set 'currentpart' to something else leading to the
generation of another 'setclientpart' message. This thing would
go on, and we would run into a loop, as I have for the last few
hours.

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

diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp
index 4054f3c..cbe7f76 100644
--- a/loolwsd/MasterProcessSession.cpp
+++ b/loolwsd/MasterProcessSession.cpp
@@ -360,6 +360,10 @@ bool MasterProcessSession::_handleInput(const char 
*buffer, int length)
 
 if (_peer.expired())
 dispatchChild();
+
+if (tokens[0] == "setclientpart")
+_tileCache->removeFile("status.txt");
+
 if (tokens[0] != "requestloksession")
 {
 forwardToPeer(buffer, length);
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 6fdcb45..8a3b408 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -278,6 +278,15 @@ void TileCache::invalidateTiles(const std::string& tiles)
 }
 }
 
+void TileCache::removeFile(const std::string fileName)
+{
+const std::string textFile = cacheDirName(false) + "/" + fileName;
+const std::string editingTextFile = cacheDirName(true) + "/" + fileName;
+
+Util::removeFile(textFile);
+Util::removeFile(editingTextFile);
+}
+
 std::string TileCache::toplevelCacheDirName()
 {
 SHA1Engine digestEngine;
diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp
index 9babf20..4118ff0 100644
--- a/loolwsd/TileCache.hpp
+++ b/loolwsd/TileCache.hpp
@@ -62,6 +62,9 @@ public:
 
 void invalidateTiles(int part, int x, int y, int width, int height);
 
+// Removes the given file from both editing and persistent cache
+void removeFile(const std::string fileName);
+
 private:
 /// Toplevel cache dirname.
 std::string toplevelCacheDirName();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 sd/uiconfig/simpress/ui/slidedesigndialog.ui |  154 +--
 1 file changed, 75 insertions(+), 79 deletions(-)

New commits:
commit a6f876d45bd4e41a7143594a6cb11b6893a0f620
Author: Olivier Hallot 
Date:   Wed Feb 10 21:24:03 2016 -0200

tdf#67343 Standardize order of dialog buttons

Standardize order of OK, Cancel, Help buttons in all dialog windows
Slide Design dialog

Change-Id: I015899fd1b2e27f868c130d4b27b06fa403bb0ce
Reviewed-on: https://gerrit.libreoffice.org/22275
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/sd/uiconfig/simpress/ui/slidedesigndialog.ui 
b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
index 8ff21c3..a959f6f 100644
--- a/sd/uiconfig/simpress/ui/slidedesigndialog.ui
+++ b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
@@ -1,7 +1,8 @@
 
+
 
-  
-  
+  
+  
   
 False
 6
@@ -13,6 +14,78 @@
 False
 vertical
 12
+
+  
+True
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-help
+True
+False
+False
+True
+  
+  
+False
+True
+2
+True
+  
+
+
+  
+_Load...
+True
+True
+True
+True
+  
+  
+False
+True
+3
+  
+
+  
+  
+False
+True
+end
+1
+  
+
 
   
 True
@@ -45,8 +118,6 @@
   
 0
 1
-1
-1
   
 
 
@@ -62,8 +133,6 @@
   
 0
 2
-1
-1
   
 
 
@@ -76,8 +145,6 @@
   
 0
 0
-1
-1
   
 
   
@@ -101,77 +168,6 @@
 0
   
 
-
-  
-True
-False
-end
-
-  
-gtk-ok
-True
-True
-True
-True
-True
-True
-  
-  
-False
-True
-0
-  
-
-
-  
-gtk-cancel
-True
-True
-True
-True
-  
-  
-False
-True
-1
-  
-
-
-  
-gtk-help
-True
-False
-False
-True
-  
-  
-False
-True
-2
-  
-
-
-  
-_Load...
-True
-True
-True
-True
-  
-  
-False
-True
-3
-  
-
-  
-  
-False
-True
-end
-1
-  
-
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 sc/uiconfig/scalc/ui/protectsheetdlg.ui |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

New commits:
commit c5ee428672ec63dc97d7e92f32c112bd9347fdbd
Author: Olivier Hallot 
Date:   Tue Feb 9 23:27:11 2016 -0200

tdf#67343 Standardize order of dialog buttons

Standardize order of OK, Cancel, Help buttons in all dialog windows
Protect sheet dialog

Change-Id: I4549d999a4bb73102eb8ab6b443143956923ae3e
Reviewed-on: https://gerrit.libreoffice.org/22254
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/sc/uiconfig/scalc/ui/protectsheetdlg.ui 
b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
index ee0d7c3..63f35c1 100644
--- a/sc/uiconfig/scalc/ui/protectsheetdlg.ui
+++ b/sc/uiconfig/scalc/ui/protectsheetdlg.ui
@@ -2,6 +2,7 @@
 
 
   
+  
   
 False
 6
@@ -15,7 +16,7 @@
 
   
 False
-start
+end
 
   
 gtk-ok
@@ -112,10 +113,10 @@
 True
 False
 end
-1
 _Password:
 True
 password1
+1
   
   
 0
@@ -127,10 +128,10 @@
 True
 False
 end
-1
 _Confirm:
 True
 password2
+1
   
   
 0
@@ -191,10 +192,10 @@
   
 True
 False
-0
 Allow all users 
of this sheet to:
 True
 checklist:border
+0
   
   
 False
@@ -204,14 +205,14 @@
 
 
   
-True
-False
-True
-True
-
-  
-
-  
+True
+False
+True
+True
+
+  
+
+  
   
 False
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis]

 sc/Library_sc.mk|1 
 sc/inc/markarr.hxx  |1 
 sc/inc/markdata.hxx |9 
 sc/inc/markmulti.hxx|   84 
 sc/inc/segmenttree.hxx  |2 
 sc/source/core/data/column.cxx  |   52 +++--
 sc/source/core/data/column3.cxx |2 
 sc/source/core/data/fillinfo.cxx|   16 -
 sc/source/core/data/markarr.cxx |   11 +
 sc/source/core/data/markdata.cxx|  114 ---
 sc/source/core/data/markmulti.cxx   |  348 
 sc/source/core/data/segmenttree.cxx |2 
 sc/source/core/data/table1.cxx  |   11 -
 sc/source/ui/view/formatsh.cxx  |   11 -
 14 files changed, 539 insertions(+), 125 deletions(-)

New commits:
commit bc20c6d0f397c0c1aef6ef7d6f750c2f81af8db6
Author: Dennis Francis 
Date:   Sat Feb 6 03:12:20 2016 +0530

Refactor ScMarkData for tdf#50916

Made the container for storing multimarks dynamic.
Also let the full row marks to be stored in a dedicated
ScMarkArray object rather than in the multimarks container.

Unit tests for ScMarkData and ScMultiSel will come in a follow up
patch.

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

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index f30bf33..4d6df7a 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -166,6 +166,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/core/data/listenercontext \
 sc/source/core/data/markarr \
 sc/source/core/data/markdata \
+sc/source/core/data/markmulti \
 sc/source/core/data/mtvelements \
 sc/source/core/data/olinetab \
 sc/source/core/data/pagepar \
diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx
index 2988fe4..386b97a 100644
--- a/sc/inc/markarr.hxx
+++ b/sc/inc/markarr.hxx
@@ -41,6 +41,7 @@ friend class ScDocument;// for FillInfo
 
 public:
 ScMarkArray();
+ScMarkArray( ScMarkArray&& rArray );
 ~ScMarkArray();
 voidReset( bool bMarked = false );
 boolGetMark( SCROW nRow ) const;
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 6e3eafc..0392971 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -22,6 +22,7 @@
 
 #include "address.hxx"
 #include "rangelst.hxx"
+#include "markmulti.hxx"
 #include "scdllapi.h"
 
 #include 
@@ -50,7 +51,7 @@ private:
 
 ScRange aMarkRange; // area
 ScRange aMultiRange;// maximum area altogether
-ScMarkArray*pMultiSel;  // multi selection
+ScMultiSel  aMultiSel;  // multi selection
 boolbMarked:1;// rectangle marked
 boolbMultiMarked:1;
 
@@ -72,7 +73,8 @@ public:
 voidResetMark();
 voidSetMarkArea( const ScRange& rRange );
 
-voidSetMultiMarkArea( const ScRange& rRange, bool bMark = true );
+// bSetupMulti must be set to true only for recursive calls to 
SetMultiMarkArea
+voidSetMultiMarkArea( const ScRange& rRange, bool bMark = true, 
bool bSetupMulti = false );
 
 voidMarkToMulti();
 voidMarkToSimple();
@@ -102,7 +104,8 @@ public:
 boolGetMarkingFlag() const  { return bMarking;}
 
 //  for FillInfo / Document etc.
-const ScMarkArray* GetArray() const { return pMultiSel; }
+const ScMultiSel& GetMultiSelData() const   { return aMultiSel;   }
+ScMarkArray GetMarkArray( SCCOL nCol ) const;
 
 boolIsCellMarked( SCCOL nCol, SCROW nRow, bool bNoSimple = false ) 
const;
 voidFillRangeListWithMarks( ScRangeList* pList, bool bClear ) 
const;
diff --git a/sc/inc/markmulti.hxx b/sc/inc/markmulti.hxx
new file mode 100644
index 000..22f0ee5
--- /dev/null
+++ b/sc/inc/markmulti.hxx
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SC_INC_MARKMULTI_HXX
+#define INCLUDED_SC_INC_MARKMULTI_HXX
+
+

[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.

[bugzilla-daemon]

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

--- Comment #43 from aybuke  ---
Hi everyone, 

I sent this patch and it compiled succesfully:
https://gerrit.libreoffice.org/#/c/21958/

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 6 commits - extras/source i18nlangtag/qa i18nlangtag/source include/svtools reportbuilder/java reportdesign/source sfx2/source svx/so

[Oliver Specht]

 extras/source/autocorr/lang/es/DocumentList.xml
  |   33 ++
 i18nlangtag/qa/cppunit/test_languagetag.cxx
  |1 
 i18nlangtag/source/isolang/isolang.cxx 
  |1 
 include/svtools/rtfkeywd.hxx   
  |1 
 reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
  |1 
 
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 |1 
 reportdesign/source/filter/xml/xmlExport.cxx   
  |7 ++
 sfx2/source/dialog/styledlg.cxx
  |2 
 svx/source/sidebar/area/AreaPropertyPanel.cxx  
  |2 
 sw/qa/extras/rtfexport/data/page-background.rtf
  |   30 +
 sw/qa/extras/rtfexport/rtfexport.cxx   
  |7 ++
 sw/qa/extras/rtfimport/data/page-background.rtf
  |   30 -
 sw/qa/extras/rtfimport/rtfimport.cxx   
  |7 --
 sw/source/filter/ww8/docxexport.cxx
  |   16 
 sw/source/filter/ww8/docxexport.hxx
  |3 
 sw/source/filter/ww8/rtfexport.cxx 
  |   24 +++
 sw/source/filter/ww8/wrtww8.cxx
  |   16 
 sw/source/filter/ww8/wrtww8.hxx
  |2 
 18 files changed, 126 insertions(+), 58 deletions(-)

New commits:
commit d4589fb377d14820481b04a59393ee261d921fda
Author: Oliver Specht 
Date:   Tue Feb 2 10:44:40 2016 +0100

tdf#97051: prevent duplicate copy of SfxItemSet

the patch f7424ed710e54bb2437a28380b03ed7c26290edc introduced copying of
the input item set of SfxTabDialog so now the item set of the style must
not be copied anymore.

Change-Id: If4155ee5999f0c5cd2ac754578a2c1b5ec33b14b
Reviewed-on: https://gerrit.libreoffice.org/22022
Reviewed-by: Oliver Specht 
Tested-by: Oliver Specht 
(cherry picked from commit 869c73d0d2512e483ceedcc895b7cb86e0974ab2)
(cherry picked from commit 08004a12fa0d7f08cff53b5cf6b6c2409bd47754)

diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 1735f1b..67bb258 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -43,7 +43,7 @@ SfxStyleDialog::SfxStyleDialog
 */
 
 : SfxTabDialog(pParent, rID, rUIXMLDescription,
-  rStyle.GetItemSet().Clone(), true)
+  &rStyle.GetItemSet(), true)
 , pStyle( &rStyle )
 
 {
commit a438d37224fe86ee3ed280bf0a165d70d265db9e
Author: Michael Stahl 
Date:   Wed Feb 3 22:39:46 2016 +0100

reportbuilder: tdf#92720: add loext namespace

... to allow export of paragraphs in shapes.

(regression from 6acc6c011d3afd6834efeee1b2efe43652a86f2e)

Change-Id: I2c23e686a2cfcd997d3393b0f9fb4cdcab7252b7
(cherry picked from commit 969a760e2bad7f65c28eba425af1751946b09d76)
Reviewed-on: https://gerrit.libreoffice.org/22090
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit c29bc3305e835d6f32195b4d9528e64b64d4019e)

diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
index 2774359..6a7d144 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java
@@ -51,6 +51,7 @@ public class OfficeNamespaces
 public static final String OOREPORT_NS = 
"http://openoffice.org/2005/report";;
 public static final String GRDDL_NS = 
"http://www.w3.org/2003/g/data-view#";;
 public static final String CONFIG = 
"urn:oasis:names:tc:opendocument:xmlns:config:1.0";
+public static final String LOEXT_NS = 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0";
 
 
 private OfficeNamespaces()
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 8518bc6..beffe31 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -383,6 +383,7 @@ public abstract class OfficeDocumentReportTarget extends 
AbstractReportTarget
 rootAttributes.addNamespaceDeclaration("xsd", 
OfficeNamesp

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

[Christian Lohmaier]

Tag 'cp-5.0-24' created by Andras Timar  at 
2016-02-10 20:33 -0800

cp-5.0-24

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.0-24'

[Ricardo Palomares]

Tag 'cp-5.0-24' created by Andras Timar  at 
2016-02-10 20:33 -0800

cp-5.0-24

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.0-24'

[Christian Lohmaier]

Tag 'cp-5.0-24' created by Andras Timar  at 
2016-02-10 20:33 -0800

cp-5.0-24

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

---
 source/text/shared/01/0222.xhp  |2 +-
 source/text/swriter/01/04020100.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'cp-5.0-24' created by Andras Timar  at 
2016-02-10 20:33 -0800

cp-5.0-24

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

Re: Old/Obsolete file format import still needed?

[Michael Meeks]

On Wed, 2016-02-10 at 14:20 -0500, Bryan Quigley wrote:
> Thanks for the first pass code.  I generally don't find dialouges like
> that to be super useful (many users just click right through).

Heh - true; but at least it reduces the severity of any related
security advisory which is pleasant.

> However, in labeling them Exotic we could add a configuration option
> to let system administrators disable them all in one go for a secure
> site, etc.  I'll look into that more.

Right - good thought =) would be easy to do that too; can just
filter[sic] them out of the filter list.

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.1.1' created by Christian Lohmaier 
 at 2016-02-10 20:01 -0800

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

iQIcBAABAgAGBQJWu5cKAAoJEPQ0oe+v7q6jh2cP/381DPkr42Mq/JNaJ5ZawS1m
UYKeZ8g+7MTUk8SXk9rzy63NmwNvS2K3C1gYueHUvJC+Xt0/KkJ9D2Qok53ZlsFk
7fwl8mUWw8+TohP+bHS+S0eh8hpb+EYHpjcD5SWVnxgNfkkG4Lgz+xjxIv3m8PXR
t9xR9zwE5wLyxw5EekYwJVZnGL4/yMO0Ncb1tMXfdttHEf7EzRnEe9TEQ4wEKIuE
K0HssLnH1NEbMePcUjjvRBtTMwvwypS4gmnkpJdD9ahKOgDMLjTcAPALZ6idbjN+
y4kHHSUzpUlMD/IuU/Zd5psyCSk1QCgl4+cVcVj9FdILJFxFwHQCZ1wyeSOx2Z+s
TnqFFjBzU/h9A1KCnyDONfsPV34m1tP5cCFTqox8NnFOnWvYX3ycAmcfeB+QDTNV
YMF2Mpt4D9pLtfhcjuZhFpYgw9Vg+aC9zp+wBg71gCNiafGZ1ZBY6HBhJsM+Ih3Y
wXga1PM7+myUn5aNIh/jrvPTUiI+tqOBIVYwA4CIIW1n8iLAMHh5mC1joxdFqoxK
/U7cBUv2NnNkgb+MXFFDZKxDc7CROtewi++UmtFt3EIABXryCJ7LGf4XQWsEo9fj
ejvHypGV+Yz0SphmNPXKXnAoT7Wpa93vT4G4tgHTzpxgolbFUoNBQlo/6XJtgFEf
2WjrsECmbg/rO2ACVDHt
=/2H5
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.1.1' created by Christian Lohmaier 
 at 2016-02-10 20:01 -0800

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

iQIcBAABAgAGBQJWu5cPAAoJEPQ0oe+v7q6j53gQAIyz1YFg1o8Y57rK3ig/UaNc
frWewjM/xYnH7DaGLxv9VcnW5vWGXOdgVrSf6gMH7ciMkbKDfWApKcaggrufdu97
B7M6J0l4Wj5lt5D261RkWV3R0U93XhnrhBsp2JrLwnH5nH3TtaPIMGj53mw0k6Ao
+ytrBuUuTiVv8maUEuoVTGOTbyx8XQl90ettct1Ps+L5myli3ecQivMIfx2eu8Y5
KrSzXoYLxQ6S6+f41RCXt/ArgHFhNBNgdp9wSk5ivu0g3512nAJKMYsoRN/HEB1w
1RjoYoWavEMyZyrGLy1vKRQ3JmGd21NEvne8dnF7sJwcUT0omNsUUCFbHmSu2TJ0
8tQJN/j43/tsPReUsA169yHMA6zQ43KWkys1obj6AW2EP63Swrfjt2JRVjpoQij3
6NrBS2/lnhFr8u1KHSx4xCNmcDI0yeUSXCBf5U2L7duzXxIMis7KjTgZtfV8iLx1
lKaXIpkCDxgGx8jpaAv6C3crCCNpg6qQjDF6plOH99HytGejiEJQy9E9TsRIUmME
laBfloPXxnyZ2B5qlKgzdC1wxg5247OskrXKs2Flx5oR6idUZxwGN1vdaIIxBBbQ
+XGfQoPLoJYZOIO8U4RLyaMHdZK/7Hp54CHudFilGzKJOvwqzGoN05DUkTQX1nii
t/Y9SX5Vdxpkqco+ty++
=411W
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.1.1' created by Christian Lohmaier 
 at 2016-02-10 20:01 -0800

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

iQIcBAABAgAGBQJWu5cTAAoJEPQ0oe+v7q6jxssP/Rf1vPekt53muO4NNaNc7/bN
uPx+D59zy8K1xHSPDyCBTq0rjBoSvxpPXHoMUYQa6sb5DY/FfkJKlybOpLQxErJy
Yz1lMW/PBsvh5chnEz/jVHLJqyZcpWhpPk5d/i1hzMNfbRd85NSCB51dCB3rqnMG
MTfd6PcT4czDN76oR9dkO3Cf2MwYvXOWkwdP0BtLt4eZx4KjR5eKnr0I+1/LVNPH
LCpGMXOY1MlwBMUHDGFLo2EJJ171CCJbFaJpQR4FKMqcjdnftUZEeC43F3CacVS9
gChubhnUjvmeRcQChsXLRK1Kuc9wjo5jEionKnPnqg7xc05Hmm8Om7KkF14DHTFb
hXFAG2G2Ay/VuU+P5lgGLrW5FOHY2jYVS+yrLttypEmr6gyofWgB9FnWjyr/FOvK
NS1q17hF7tKGtfU0QGpdRFxok22MmfRlIMy1XyGBKWMCM8gCnY0OyK1riLVK9GZS
FQI1bOo2iDuZosCWiuWlzBxL1lgpno+Nue2c3YHegzoKZUWRLHNwwqlLSZZ56sk4
u/dnjGEvKGBAlF7UTmaIvtwbA7mtOXsZEy5FW3iQV/fts/+N54+3G2E36Ew4PAZ7
Oaai9eV9Trk/+um6SyU1FK7b+XOazZpnBBVReGGBPkVIXwkL/GtT0Q458ru/3tNk
LGzG7XIVfL+iBluXLCfh
=QCJQ
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

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

New commits:
commit 8d2968fa91cde3b3a4e6cd5f49f9f4062c88a11a
Author: Christian Lohmaier 
Date:   Wed Feb 10 21:02:25 2016 +0100

bump product version to 5.1.1.1.0+

Change-Id: I2284886e104cd85a02c2a41187c137dc1755d04c

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

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

[Christian Lohmaier]

Tag 'libreoffice-5.1.1.1' created by Christian Lohmaier 
 at 2016-02-10 20:01 -0800

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

iQIcBAABAgAGBQJWu5cWAAoJEPQ0oe+v7q6jd+IP/14rubjLeKju6D0o5vPUnYRl
jV5GGH3D6lHLyoCRzt9g5oAQwsoOq8Wm64cQqatc8pTAdB9jSLmvPqQ2AnqdgxkW
vxej+RzScfeZqHjQK4qWrpfZQxkdukznx76fNCTOGiZ1ewCCDtJU98/1FiabkTOm
H+WtrXp0Turs3RcpV9i7aCSw/FTlK5Swudg5x6E0sOoMKQ6pRk6fXoKb7g1m8Tkc
YqBZpiAXgmfP8iYLbzm9Lfl6UHgHabPFNTdL9RodoSd6zdQaNXB7fj9n0Lti7ELN
N4nmBI5rn0KQwVwnbxzuZ5vmWOX21GzAxmKpIAFkOSyCibxXvm4r+mrPx2ej8Edp
CXwVjr2vvMUd2a4TFgBPaiKrsugyn60i2kYD6Qv6F1ZdX3Wta1XW1MBbjp1Qmsoq
GVIKwTHnMSrF8LJ0Pp5IKO3g9SSr+94lfVfsWZXN6sIPazZ0TTAI/lo3wgiACqNa
6DSfiyqkPw0zPZx+v8q2EDwWe1mTw0CBt99CIQtYAFM6R9ICwFDazSNNsdAy+/tK
w0UMqmtSUqetqDlqVb1cJyv91A96z+4+K1GVv/YL+y1tgDESNeGuhDRN8k6gxxf0
Lg9ATZQV+WXUoPy5x7oivYPHe/3emL1ig0LESt3ITu0BDgJk+cbwB2eTceaBRvJ7
euL3JzRWCskdmZu/ZsHy
=x6bI
-END PGP SIGNATURE-

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

[Bug 97361] Make unittests more pythonic

[bugzilla-daemon]

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

--- Comment #5 from Björn Michaelsen  ---
Matthew Francis gave a great talk in Aarhus on what is possible with the new
PyUNO stuff. Watch it here:

 https://www.youtube.com/watch?v=jS1nnSqGbZM

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Christoph Brill license statement

[Christoph Brill]

Hi,

doesn't CC0 also apply to code as well? In any case I don't claim any
copyright on my code. Anyway here goes:

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.

Best wishes,
Christoph

jan iversen  schrieb am Mi., 10. Feb. 2016
08:15:

> Hi
>
> Just to be sure, with this license statement you can contribute
> documentation but not code, see the step-by-step guide if you want to
> contribute code.
>
> rgds
> jan i.
>
>
> Sent from my iPad, please excuse any misspellings
>
> > On 10 Feb 2016, at 07:56, jan iversen 
> wrote:
> >
> > WELCOME
> > Thanks for your license statement.
> >
> > If you want help to get started or have any questions, then please
> contact me. I am here to help you (and others) in getting their first patch
> submitted.
> >
> > LibreOffice is a very big program and getting it built, setting up
> gerrit, and getting the first patch right can be a bit challenging,
> therefore do not hesitate to email me if you want help.
> >
> > We have made a step by step guide to help you get started:
> >
> https://wiki.documentfoundation.org/Development/GetInvolved/DeveloperStepByStep
> >
> > rgds
> > Jan Iversen.
> >
> > Sent from my iPad, please excuse any misspellings
> >
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Christian Lohmaier]

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

New commits:
commit a7514d1f3aaf75fe94e500a0cf13994871bd95ae
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:57:16 2016 +0100

bump product version to 5.1.2.0.0+

Change-Id: I0a65353978beb0f0660ee14607704b623e441fa9

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

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

[Christian Lohmaier]

New branch 'libreoffice-5-1-1' available with the following commits:
commit 9e8d7633c8634160e673f9fd69d0b42029aa36e5
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:55:00 2016 +0100

Branch libreoffice-5-1-1

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

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

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

Change-Id: I3d90aea713c74ee48d8e512b16c8fe50aef5c31a

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

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

[Christian Lohmaier]

New branch 'libreoffice-5-1-1' available with the following commits:
commit 687dd552797e082c0d652a2b9051bf2a47212689
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:54:42 2016 +0100

Branch libreoffice-5-1-1

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

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

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

Change-Id: Id0e987d9ae3a16150da6a7cd11c75ae33e923d19

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

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

[Christian Lohmaier]

New branch 'libreoffice-5-1-1' available with the following commits:
commit 7b75b9491bd491a90b8085ff5f14bb5ee2948dce
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:54:42 2016 +0100

Branch libreoffice-5-1-1

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

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

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

Change-Id: I3dccb329ec4171a59678103b054a37bf743b5782

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

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

[Christian Lohmaier]

New branch 'libreoffice-5-1-1' available with the following commits:
commit 64bd17c71b522b540987455258131c48879134bb
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:54:42 2016 +0100

Branch libreoffice-5-1-1

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

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

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

Change-Id: Ie85c3e067891f0c443b6f9a45aef7a0a845c993e

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

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

[Christian Lohmaier]

 extras/source/autocorr/lang/es/DocumentList.xml|   33 
 extras/source/autocorr/lang/is/DocumentList.xml|   31 
 extras/source/autocorr/lang/pt/DocumentList.xml| 2326 ++---
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |  143 +
 4 files changed, 1369 insertions(+), 1164 deletions(-)

New commits:
commit 7f02815bf90f4dee5c76f2bdb4fd84f03e27527e
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:48:46 2016 +0100

update emoji autocorrect files from po-files

Change-Id: I9afda5ccefa59c41977244aa40844d6b7d926b13

diff --git a/extras/source/autocorr/lang/es/DocumentList.xml 
b/extras/source/autocorr/lang/es/DocumentList.xml
index 42d05dd..5f9ad7f 100644
--- a/extras/source/autocorr/lang/es/DocumentList.xml
+++ b/extras/source/autocorr/lang/es/DocumentList.xml
@@ -563,6 +563,7 @@
   
   
   
+  
   
   
   
@@ -629,6 +630,7 @@
   
   
   
+  
   
   
   
@@ -746,6 +748,7 @@
   
   
   
+  
   
   
   
@@ -773,6 +776,7 @@
   
   
   
+  
   
   
   
@@ -797,12 +801,14 @@
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
@@ -817,6 +823,7 @@
   
   
   
+  
   
   
   
@@ -861,6 +868,7 @@
   
   
   
+  
   
   
   
@@ -911,6 +919,8 @@
   
   
   
+  
+  
   
   
   
@@ -1004,7 +1014,10 @@
   
   
   
+  
   
+  
+  
   
   
   
@@ -1022,6 +1035,7 @@
   
   
   
+  
   
   
   
@@ -1093,6 +1107,7 @@
   
   
   
+  
   
   
   
@@ -1135,6 +1150,7 @@
   
   
   
+  
   
   
   
@@ -1155,6 +1171,7 @@
   
   
   
+  
   
   
   
@@ -1175,6 +1192,7 @@
   
   
   
+  
   
   
   
@@ -1186,16 +1204,21 @@
   
   
   
+  
   
   
   
   
   
   
+  
+  
+  
   
   
   
   
+  
   
   
   
@@ -1269,6 +1292,7 @@
   
   
   
+  
   
   
   
@@ -1317,6 +1341,7 @@
   
   
   
+  
   
   
   
@@ -1380,6 +1405,7 @@
   
   
   
+  
   
   
   
@@ -1426,6 +1452,7 @@
   
   
   
+  
   
   
   
@@ -1460,9 +1487,11 @@
   
   
   
+  
   
   
   
+  
   
   
   
@@ -1482,9 +1511,11 @@
   
   
   
+  
   
   
   
+  
   
   
   
@@ -1546,6 +1577,7 @@
   
   
   
+  
   
   
   
@@ -1593,6 +1625,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/is/DocumentList.xml 
b/extras/source/autocorr/lang/is/DocumentList.xml
index f94d812..f9c52fb 100644
--- a/extras/source/autocorr/lang/is/DocumentList.xml
+++ b/extras/source/autocorr/lang/is/DocumentList.xml
@@ -77,6 +77,7 @@
   
   
   
+  
   
   
   
@@ -88,6 +89,7 @@
   
   
   
+  
   
   
   
@@ -178,6 +180,7 @@
   
   
   
+  
   
   
   
@@ -214,6 +217,7 @@
   
   
   
+  
   
   
   
@@ -229,8 +233,8 @@
   
   
   
+  
   
-  
   
   
   
@@ -240,6 +244,7 @@
   
   
   
+  
   
   
   
@@ -293,6 +298,8 @@
   
   
   
+  
+  
   
   
   
@@ -341,6 +348,7 @@
   
   
   
+  
   
   
   
@@ -351,6 +359,7 @@
   
   
   
+  
   
   
   
@@ -371,6 +380,7 @@
   
   
   
+  
   
   
   
@@ -390,6 +400,7 @@
   
   
   
+  
   
   
   
@@ -399,6 +410,7 @@
   
   
   
+  
   
   
   
@@ -456,6 +468,7 @@
   
   
   
+  
   
   
   
@@ -488,6 +501,8 @@
   
   
   
+  
+  
   
   
   
@@ -560,16 +575,19 @@
   
   
   
+  
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
@@ -600,11 +618,14 @@
   
   
   
+  
+  
   
   
   
   
   
+  
   
   
   
@@ -684,6 +705,7 @@
   
   
   
+  
   
   
   
@@ -698,6 +720,7 @@
   
   
   
+  
   
   
   
@@ -710,6 +733,7 @@
   
   
   
+  
   
   
   
@@ -867,6 +891,8 @@
   
   
   
+  
+  
   
   
   
@@ -965,6 +991,7 @@
   
   
   
+  
   
   
   
@@ -1016,6 +1043,8 @@
   
   
   
+  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml 
b/extras/source/autocorr/lang/pt/DocumentList.xml
index 5bd26e5..9c148e9 100644
--- a/extras/source/autocorr/lang/pt/DocumentList.xml
+++ b/extras/source/autocorr/lang/pt/DocumentList.xml
@@ -265,1167 +265,1167 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

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

[Christian Lohmaier]

 extras/source/autocorr/lang/es/DocumentList.xml|   33 
 extras/source/autocorr/lang/is/DocumentList.xml|   31 
 extras/source/autocorr/lang/pt/DocumentList.xml| 2326 ++---
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |  143 +
 4 files changed, 1369 insertions(+), 1164 deletions(-)

New commits:
commit d926e9b387dcd615566dbb270702a9d83632bff5
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:48:46 2016 +0100

update emoji autocorrect files from po-files

Change-Id: I9afda5ccefa59c41977244aa40844d6b7d926b13
(cherry picked from commit 7f02815bf90f4dee5c76f2bdb4fd84f03e27527e)

diff --git a/extras/source/autocorr/lang/es/DocumentList.xml 
b/extras/source/autocorr/lang/es/DocumentList.xml
index 42d05dd..5f9ad7f 100644
--- a/extras/source/autocorr/lang/es/DocumentList.xml
+++ b/extras/source/autocorr/lang/es/DocumentList.xml
@@ -563,6 +563,7 @@
   
   
   
+  
   
   
   
@@ -629,6 +630,7 @@
   
   
   
+  
   
   
   
@@ -746,6 +748,7 @@
   
   
   
+  
   
   
   
@@ -773,6 +776,7 @@
   
   
   
+  
   
   
   
@@ -797,12 +801,14 @@
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
@@ -817,6 +823,7 @@
   
   
   
+  
   
   
   
@@ -861,6 +868,7 @@
   
   
   
+  
   
   
   
@@ -911,6 +919,8 @@
   
   
   
+  
+  
   
   
   
@@ -1004,7 +1014,10 @@
   
   
   
+  
   
+  
+  
   
   
   
@@ -1022,6 +1035,7 @@
   
   
   
+  
   
   
   
@@ -1093,6 +1107,7 @@
   
   
   
+  
   
   
   
@@ -1135,6 +1150,7 @@
   
   
   
+  
   
   
   
@@ -1155,6 +1171,7 @@
   
   
   
+  
   
   
   
@@ -1175,6 +1192,7 @@
   
   
   
+  
   
   
   
@@ -1186,16 +1204,21 @@
   
   
   
+  
   
   
   
   
   
   
+  
+  
+  
   
   
   
   
+  
   
   
   
@@ -1269,6 +1292,7 @@
   
   
   
+  
   
   
   
@@ -1317,6 +1341,7 @@
   
   
   
+  
   
   
   
@@ -1380,6 +1405,7 @@
   
   
   
+  
   
   
   
@@ -1426,6 +1452,7 @@
   
   
   
+  
   
   
   
@@ -1460,9 +1487,11 @@
   
   
   
+  
   
   
   
+  
   
   
   
@@ -1482,9 +1511,11 @@
   
   
   
+  
   
   
   
+  
   
   
   
@@ -1546,6 +1577,7 @@
   
   
   
+  
   
   
   
@@ -1593,6 +1625,7 @@
   
   
   
+  
   
   
   
diff --git a/extras/source/autocorr/lang/is/DocumentList.xml 
b/extras/source/autocorr/lang/is/DocumentList.xml
index f94d812..f9c52fb 100644
--- a/extras/source/autocorr/lang/is/DocumentList.xml
+++ b/extras/source/autocorr/lang/is/DocumentList.xml
@@ -77,6 +77,7 @@
   
   
   
+  
   
   
   
@@ -88,6 +89,7 @@
   
   
   
+  
   
   
   
@@ -178,6 +180,7 @@
   
   
   
+  
   
   
   
@@ -214,6 +217,7 @@
   
   
   
+  
   
   
   
@@ -229,8 +233,8 @@
   
   
   
+  
   
-  
   
   
   
@@ -240,6 +244,7 @@
   
   
   
+  
   
   
   
@@ -293,6 +298,8 @@
   
   
   
+  
+  
   
   
   
@@ -341,6 +348,7 @@
   
   
   
+  
   
   
   
@@ -351,6 +359,7 @@
   
   
   
+  
   
   
   
@@ -371,6 +380,7 @@
   
   
   
+  
   
   
   
@@ -390,6 +400,7 @@
   
   
   
+  
   
   
   
@@ -399,6 +410,7 @@
   
   
   
+  
   
   
   
@@ -456,6 +468,7 @@
   
   
   
+  
   
   
   
@@ -488,6 +501,8 @@
   
   
   
+  
+  
   
   
   
@@ -560,16 +575,19 @@
   
   
   
+  
   
   
   
   
+  
   
   
   
   
   
   
+  
   
   
   
@@ -600,11 +618,14 @@
   
   
   
+  
+  
   
   
   
   
   
+  
   
   
   
@@ -684,6 +705,7 @@
   
   
   
+  
   
   
   
@@ -698,6 +720,7 @@
   
   
   
+  
   
   
   
@@ -710,6 +733,7 @@
   
   
   
+  
   
   
   
@@ -867,6 +891,8 @@
   
   
   
+  
+  
   
   
   
@@ -965,6 +991,7 @@
   
   
   
+  
   
   
   
@@ -1016,6 +1043,8 @@
   
   
   
+  
+  
   
   
   
diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml 
b/extras/source/autocorr/lang/pt/DocumentList.xml
index 5bd26e5..9c148e9 100644
--- a/extras/source/autocorr/lang/pt/DocumentList.xml
+++ b/extras/source/autocorr/lang/pt/DocumentList.xml
@@ -265,1167 +265,1167 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2706 ++--
 1 file changed, 1384 insertions(+), 1322 deletions(-)

New commits:
commit 491ea3a5f7bfda69fdd4f3828fe8d75baeed45b6
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:45:24 2016 +0100

update credits

Change-Id: Iee78d25b7488273be7dfc8f9cd143c59b5169734
(cherry picked from commit 068403aba502d48aa3e2b57ef9eb8727e29fc0c9)

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

@@ -16,9 +16,9 @@
  3676
  3471
  501
- 580
- 40479
- 3
+ 686
+ 41697
+ 23202
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4632744
+   4678420
false
false
false
@@ -311,23 +311,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  

   
-  
-   
+  
+   
   
   

   
+  
+   
+  
   

   
@@ -389,24 +389,24 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1029,14 +1029,14 @@

   
  Credits
-1113 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-01-27 01:42:09.
+1122 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-02-10 18:58:30.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1056,10 +1056,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 18973Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19073Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 11191Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 11237Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1067,35 +1067,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7264Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7276Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5364Joined: 
2009-06-19
   
   
-   Miklos 
VajnaCommits: 5267Joined: 
2010-07-29
+   Mi

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

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 2706 ++--
 1 file changed, 1384 insertions(+), 1322 deletions(-)

New commits:
commit 068403aba502d48aa3e2b57ef9eb8727e29fc0c9
Author: Christian Lohmaier 
Date:   Wed Feb 10 20:45:24 2016 +0100

update credits

Change-Id: Iee78d25b7488273be7dfc8f9cd143c59b5169734

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

@@ -16,9 +16,9 @@
  3676
  3471
  501
- 580
- 40479
- 3
+ 686
+ 41697
+ 23202
  0
  0
  false
@@ -68,7 +68,7 @@
false
false
true
-   4632744
+   4678420
false
false
false
@@ -311,23 +311,23 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  

   
-  
-   
+  
+   
   
   

   
+  
+   
+  
   

   
@@ -389,24 +389,24 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1029,14 +1029,14 @@

   
  Credits
-1113 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-01-27 01:42:09.
+1122 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2016-02-10 18:58:30.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1056,10 +1056,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 18973Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 19073Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 11191Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 11237Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1067,35 +1067,35 @@
  
  
   
-   Tor 
LillqvistCommits: 7264Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 7276Joined: 
2010-03-23
   
   
Kohei 
YoshidaCommits: 5364Joined: 
2009-06-19
   
   
-   Miklos 
VajnaCommits: 5267Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 5334Joined: 
2010-07-29
   
   
-   *Noel

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

[Christian Lohmaier]

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

New commits:
commit efa20c6bb5e108982326ce97de18089160ec7c86
Author: Christian Lohmaier 
Date:   Wed Feb 10 18:58:30 2016 +0100

Updated core
Project: translations  95639d3c94590930ca63e5029eea21ea4ba1d8e7

update translations for 5.1.1 rc1

and force-fix errors using pocheck

Change-Id: Id683b299a55c834c69222b37a76361d9ac0804e1
(cherry picked from commit 5eaac2d75c77fe4ba1a3bd3838c8cd1e74a4e2fe)

diff --git a/translations b/translations
index 05e9f60..95639d3 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 05e9f603a6feb911932ca6380bc2f0f12e7596f5
+Subproject commit 95639d3c94590930ca63e5029eea21ea4ba1d8e7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 97361] Make unittests more pythonic

[bugzilla-daemon]

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

--- Comment #4 from jan iversen  ---
This is one of the generic task, where multiple people work in parallel.

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

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

However the unittest are very easy to manage if you follow the step-by-step
guide.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: translations

[Christian Lohmaier]

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

New commits:
commit 7b42b0934bf21ee2f5aabfc7627c9564055f21b4
Author: Christian Lohmaier 
Date:   Wed Feb 10 18:58:30 2016 +0100

Updated core
Project: translations  5eaac2d75c77fe4ba1a3bd3838c8cd1e74a4e2fe

update translations for 5.1.1 rc1

and force-fix errors using pocheck

Change-Id: Id683b299a55c834c69222b37a76361d9ac0804e1

diff --git a/translations b/translations
index 5a84c2a..5eaac2d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5a84c2a7e8df67c4c4c698c00872d2d5c6912161
+Subproject commit 5eaac2d75c77fe4ba1a3bd3838c8cd1e74a4e2fe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Old/Obsolete file format import still needed?

[Bryan Quigley]

>However if the filter is broken, lack significant features or otherwise call 
>for support, that makes it a candidate for removal.
I'll try to find some more in the wild instances of these formats and
determine just how bad the support is.  OS/2 Metafile was the worst in
my previous testing so I'll look there first.

> As JanI says, cf. the ESC minutes - being the swiss-army-knife of file
> formats that loads ~anything you can throw at it is quite important.

Understood.  Sorry I missed those ESC minutes.

> Anyhow - I share your concern wrt. the attack surface that all these
> old file filters provide for us; I attach a prototype patch that adds an
> 'EXOTIC' annotation to our filter descriptions. It is missing a UI
> Interaction Handler piece (cf. the hole with the notes and so on in
> there ;-) - we'll need a new request type I guess.
>
> My ideal would be to pop up a dialog saying:
>
> "You're asking LibreOffice to open a very unusual file-type.
>  Unless you are certain that this file is indeed a   Word Pro> file it is safest to not open it.
>
>  [ ] - never show this again
>
>   [ this is an unusual file ] [get me out of here ]"
>
> Of some kind =) is that something you'd be interested in working on ?
Thanks for the first pass code.  I generally don't find dialouges like
that to be super useful (many users just click right through).
However, in labeling them Exotic we could add a configuration option
to let system administrators disable them all in one go for a secure
site, etc.  I'll look into that more.

Thanks again both,
Bryan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 89657] The lang-pack installation mechanism on OSX unacceptable -- needs refactoring for better installation UX

[bugzilla-daemon]

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

--- Comment #28 from barefootguru  ---
(In reply to V Stuart Foote from comment #27)
> @Chris, want to be a hero to your fellow OS X users?  ;-)
>   
> See Thorsten's code tip in comment 8

Unless the AppleScript will be run automatically, seamlessly, when someone
downloads LO, it's not going to help your average user.

Even my computer-literate friends/family struggle with LO, while managing their
Mac and other apps fine.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 97361] Make unittests more pythonic

[bugzilla-daemon]

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

--- Comment #3 from Gaurav Dhingra  ---
I would like to a work on this, if no one else is working. I am new to the
community.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 89657] The lang-pack installation mechanism on OSX unacceptable -- needs refactoring for better installation UX

[bugzilla-daemon]

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

V Stuart Foote  changed:

   What|Removed |Added

 CC||chris.sherloc...@gmail.com

--- Comment #27 from V Stuart Foote  ---
@Chris, want to be a hero to your fellow OS X users?  ;-)

See Thorsten's code tip in comment 8

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 89657] The lang-pack installation mechanism on OSX unacceptable -- needs refactoring for better installation UX

[bugzilla-daemon]

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

--- Comment #26 from Sierk Bornemann  ---
(In reply to barefootguru from comment #7)
> 3. Have one download which includes all languages, like every other Mac app

+1 (!)



(In reply to steve -_- from comment #16)
> Raising importance to high | major
[...]
> There must be a better way to deal with this situation. I don't think
> ignoring it, will make it go away.

+1 (!)



(In reply to barefootguru from comment #18)
[...]
> I think the current system is unacceptable and user hostile:
> 
> - you shouldn't have to download 2 things to install LO.  Almost no other
> Mac app has this requirement
[...]
> LO needs a single installer or drag-and-drop install, like almost every
> other Mac app.
[...]
> It should be:
> 
> 1. Download LO
> 2. Install LO
> 3. Run LO (LO remembers your language preference)

+1 (!)



(In reply to Frank Fuchs from comment #20)
[...]
> The problem is even worse than barefootguru described: Because the language
> packs are not signed, you have open the language pack (the one within the
> .dmg) with a "right click" and then acknowledge installing from an unsigned
> installation package - something Apple warns you not to do.
> If you look at all these steps needed, I'm fairly sure a "normal" (i.e.
> non-IT) user will have major difficulties and likely fail w/o IT support.
> 
> My 2 cents:
> I think the LO team needs to accept that support for a specific platform
> like OSX requires a "minimum" of platform specific support - and this starts
> with a user-friendly and secure way to install the application in line with
> the operating system's guidelines.
> And: If I look at the Windows version of LO, it certainly uses a lot of
> Windows-specific installation magic (e.g. the registry) to ensure proper
> installation.
> 
> My recommendation:
> If the LO team is unsure about the best "long-term" solution, a "quick fix"
> needs to be provided, soon. I believe an easy one is to provide exactly one
> single *signed* package (including all the language files). While this
> requires somewhat more space on your permanent storage device, I'm firmly
> convinced that this is the lesser evil (esp. taking into account current
> storage medium prices). That'll give everyone enough time to work on a more
> intelligent installation process (maybe like the one on Windows where you
> select what parts of LO and which languages you want to install).

+1 (!)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 89657] The lang-pack installation mechanism on OSX unacceptable -- needs refactoring for better installation UX

[bugzilla-daemon]

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

Sierk Bornemann  changed:

   What|Removed |Added

 Blocks||42082

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

2016 budget proposals

[Florian Effenberger]

Dear community,

the year 2015 is over, and we have achieved a lot of exciting things, 
thanks to your amazing work, dedication, passion and support - thank you 
so much for being part of our community and working with us on the joint 
goal of fostering LibreOffice!


In order to support the community even better, we would like to create a 
better budgetting process, have a concrete plan for 2016 already now, 
with a few "pools" or "buckets" defined, ideally:


1. community events (aimed at getting face-time for community contributors)
2. infrastructure (e.g. compute power/hardware/storage, cloud, VMs),
3. marketing (aimed at representing the project to the outside world)
4. other (anything that does not fit into the above)

The idea is to have a good plan for 2016 already now, while keeping the 
administrative overhead low, and have two authorizers (one of them being 
a board member or deputy, the other one from the wider community) 
responsible for each budget, which means getting receipts, approving and 
tracking expenses, and clarifying questions with Florian or Sophie.


To get a better understanding of your needs, we ask you to send us your 
budget requests within *three weeks* from this e-mail, i.e. by 
2016-03-02 to flo...@documentfoundation.org


While I monitor some of the lists, please always send your 
proposals/requests *directly* to me so they are not lost!


Please let us know your requests for funds *alongside* some items you 
envision to be paid from these funds. The items are not binding, the 
spending in the end is the responsibility of the authorizers, but some 
examples help the board in getting a better understanding of the funds 
required to best match your needs. If possible, please also mention the 
amount of travel costs associated. We'll factor in some margin, but 
concrete numbers and ideas are very much welcome to have a plan for 2016.


As a sample, a request could look like this:

##
We'd like to request a 2016 budget of
1000 € for community events
500 € for infrastructure
1500 € for marketing

Expenses we envision are
1. marketing: attendance at XYZ trade show to show LibreOffice to ABC 
user group (700 € booth costs, 300 € for collaterals and 500 € of 
travel, totalling to 1500 €),
2. community: a community weekend to discuss tasks and ideas (600 € 
hotel, 100 € for snacks and 300 € travel, totalling to 1000 €),

3. infrastructure: dedicated server to QA localized versions (500 €)
##

Alongside that, we will also provide some mechanism in Redmine for 
approvals and tracking of expenses, and will follow-up with details on 
this later on.


Thanks again for all your work, and looking forward to your proposals!

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

[Libreoffice-commits] core.git: 4 commits - xmlsecurity/source

[Miklos Vajna]

 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |4 
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |4 
 xmlsecurity/source/helper/xsecctl.cxx  |   98 +
 xmlsecurity/source/helper/xsecctl.hxx  |3 
 4 files changed, 106 insertions(+), 3 deletions(-)

New commits:
commit 600a7a79ecffc47a68438d308f5829868c2f37e6
Author: Miklos Vajna 
Date:   Wed Feb 10 17:34:21 2016 +0100

xmlsecurity: handle creation of OOXML _xmlsignatures sub-storage

Previously this code worked only for reading, as we assumed if it
doesn't exist, then the storage is not OOXML, either.

With this, DigitalSignaturesDialog::OKButtonHdl() gets a valid storage,
where it'll be able to write the actual signatures.

Change-Id: Iadf63a88c962386abc31225c02398761aea818cb

diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx 
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 1249a8a..46b270e 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -382,7 +382,7 @@ SignatureStreamHelper 
DocumentSignatureHelper::OpenSignatureStream(
 DBG_ASSERT( nOpenMode == css::embed::ElementModes::READ, "Error 
creating signature stream..." );
 }
 }
-else if(xNameAccess->hasByName("_xmlsignatures"))
+else if(xNameAccess->hasByName("[Content_Types].xml"))
 {
 try
 {
@@ -391,7 +391,7 @@ SignatureStreamHelper 
DocumentSignatureHelper::OpenSignatureStream(
 }
 catch (const io::IOException& rException)
 {
-SAL_WARN("xmlsecurity.helper", 
"DocumentSignatureHelper::OpenSignatureStream: " << rException.Message);
+SAL_WARN_IF(nOpenMode != css::embed::ElementModes::READ, 
"xmlsecurity.helper", "DocumentSignatureHelper::OpenSignatureStream: " << 
rException.Message);
 }
 }
 
commit f4b2e2362513e4442fe1d133302bd9b487866c6a
Author: Miklos Vajna 
Date:   Wed Feb 10 16:32:20 2016 +0100

xmlsecurity: fix reading OOXML signature from temp storage

When reading a signature, we just take the ODF signature stream or OOXML
signature storage.

When writing, we write to an ODF temporary stream / OOXML temporary
storage, read it back, and only the signatures dialog close handler
writes the signature back to the original file.

The underlying OOXML temporary storage's stream is the signature stream,
so only try to load signatures from the stream if it's not OOXML,
throwing a ZIP file at an XML parser is not a great idea.

Change-Id: I6e42d117b9c97676aaeaad158e78e39a2c39a5e8

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 41834d7..d3262bb 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -773,7 +773,7 @@ void 
DigitalSignaturesDialog::ImplGetSignatureInformations(bool bUseTempStream)
 
 SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream(
 css::embed::ElementModes::READ, bUseTempStream);
-if ( aStreamHelper.xSignatureStream.is() )
+if ( aStreamHelper.nStorageFormat != embed::StorageFormats::OFOPXML && 
aStreamHelper.xSignatureStream.is() )
 {
 uno::Reference< io::XInputStream > xInputStream( 
aStreamHelper.xSignatureStream, uno::UNO_QUERY );
 maSignatureHelper.ReadAndVerifySignature( xInputStream );
@@ -852,6 +852,8 @@ SignatureStreamHelper 
DigitalSignaturesDialog::ImplOpenSignatureStream(
 OSL_ASSERT(mxTempSignatureStream.is());
 }
 aHelper.xSignatureStream = mxTempSignatureStream;
+if (aHelper.nStorageFormat == embed::StorageFormats::OFOPXML)
+aHelper.xSignatureStorage = mxTempSignatureStorage;
 }
 else
 {
commit d06e6505f454eeff69327b22d5a5592375d31518
Author: Miklos Vajna 
Date:   Wed Feb 10 15:12:26 2016 +0100

xmlsecurity OOXML export: write signature description

Change-Id: I29937cf6baa02bda7821b4bb44c95e5b8a278080

diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index a4ad860..6aec0f6 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -1219,11 +1219,69 @@ void XSecController::exportOOXMLSignature(const 
uno::Reference&
 
 xDocumentHandler->endElement(TAG_OBJECT);
 
+// idOfficeObject
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
 pAttributeList->AddAttribute(ATTR_ID, "idOfficeObject");
 xDocumentHandler->startElement(TAG_OBJECT, 
uno::Reference(pAttributeList.get()));
 }
+xDocumentHandler->startElement(TAG_SIGNATUREPROPERTIES, 
uno::Reference(new SvXMLAttributeList()));
+{
+rtl::Reference pAttributeList(new 
SvXMLAttributeList());
+pAttributeList->AddAttribut

Re: parsing massive ODT doc in Writer?

[Yury]

Jan-Marek Glogowski  fbihome.de> writes:
...

Thank you for your advice, Jan-Marek (didn't notice your previous answer to
me), Oliver and Miklos.

Will have to struggle with the profiling.

-Yury

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

Re: parsing massive ODT doc in Writer?

[Yury]

Oliver Specht  cib.de> writes:

> > On bugzilla I was told to bring the issue here, 
> > because 'it was not for the bugzilla'.

> there's already an issue with the document attached?

Actually, there WAS an issue,
https://bugs.documentfoundation.org/show_bug.cgi?id=96753. It was resolved
as 'invalid'.

> Parsing is probably not slowing down but inserting content into the
> document might take longer while the document grows.

Yes, but stock 5.1.0.* and 4.3.7.2 (locally built) both open this same file
without an issue. If only somebody knowledgeable could, like, make a good guess.

Meanwhile, I'm bracing myself for the attempt to learn profiling, like
Jan-Marek tells me. :)

-Yury

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

Re: New wiki page "Code Conventions"

[jan iversen]

Hi.

The 2 pages are removed from our Wiki.

We need to start on a blank page and decide which conventions we want, of 
course with respect to this existing code base, but without looking at the 
rules that formed that code base.

Sorry for any problems caused.

rgds
jan i.


Sent from my iPad, please excuse any misspellings 

> On 10 Feb 2016, at 16:08, jan iversen  wrote:
> 
> Hi.
> 
> I have copied and updated Code Conventions from the old ref. in OO.
> https://wiki.documentfoundation.org/Development/Code_Conventions
> 
> I am working on Code Style, but that is still work in progress.
> 
> I am pretty sure the "Code Conventions" have changed somewhat, so I highly 
> invite our core developers to look at the page and change what needs to be 
> changed.
> 
> Please remember that with GSoC around the corner, pages like this can save us 
> all quite some work.
> 
> Thanks in advance for your help.
> rgds
> jan i.
> 
> 
> 
> Sent from my iPad, please excuse any misspellings 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/find-german-comments

[Michael Meeks]

 bin/find-german-comments |   21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 25ff833c14b681c37f397199370188196d81371c
Author: Michael Meeks 
Date:   Wed Feb 10 15:21:10 2016 +

find-german-comments: misc. cleanups and fixes for altered tree.

Change-Id: I6d6f3488afd71cb782bd83fea9fa11a2e52d0efe

diff --git a/bin/find-german-comments b/bin/find-german-comments
index ead5851..054f00a8 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -224,6 +224,7 @@ class Parser:
 """
 checks each _tracked_ file in a directory recursively
 """
+# FIXME: eventually should scan .c .mm etc. too ...
 sock = os.popen(r"git ls-files '%s' |egrep '\.(c|h)xx$'" % directory)
 lines = sock.readlines()
 sock.close()
@@ -280,7 +281,9 @@ class Parser:
 "javaunohelper" : 1,
 "jvmaccess" : 1,
 "jvmfwk" : 1,
+"jurt" : 1,
 "l10ntools" : 1,
+"libreofficekit" : 1,
 "lingucomponent" : 1,
 "linguistic" : 1,
 "lotuswordpro" : 1,
@@ -288,6 +291,8 @@ class Parser:
 "o3tl" : 1,
 "odk" : 1,
 "officecfg" : 1,
+"onlineupdate" : 1,
+"opencl" : 1,
 "oox" : 1,
 "package" : 1,
 "postprocess" : 1,
@@ -347,8 +352,10 @@ class Parser:
 "xmlscript" : 1,
 }
 
-if not directory is '.':
-sys.stderr.write("Warning: pass an absolute path to the top-level 
in order to use the faster white-list search\n")
+if directory is '.':
+sys.stderr.write("Overriding the white-list for the current 
directory - pass an absolute path to the top-level for faster global white-list 
searches.\n")
+
+num_checked = 0
 
 for path in lines:
 baseDir = self.first_elem(path)
@@ -357,10 +364,16 @@ class Parser:
 if directory is '.':
 self.check_file(path.strip())
 elif not baseDir in directory_whitelist:
-print ("Missing path %s " % baseDir)
+sys.stderr.write ("\n - Error: Missing path %s -\n\n" % 
baseDir)
+sys.exit(1)
 elif directory_whitelist[baseDir] is 0:
-#print ("Scan path %s " % baseDir)
 self.check_file(path.strip())
+num_checked = num_checked + 1
+elif directory_whitelist[baseDir] is 1:
+sys.stderr.write ("Skipping whitelisted directory %s\n" % 
baseDir)
+directory_whitelist[baseDir] = 2
+
+sys.stderr.write ("Scanned %s files\n" % num_checked)
 
 try:
 Parser()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

severity of bug 56544

[Vincent Lucy]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi,

does anyone know if the bug 56544
(https://bugs.documentfoundation.org/show_bug.cgi?id=56544) is going to
resolve ?
We are many to considere as critical and not "major", it's a real reason
not tu use Linux...

Thanks in advance for your reply.

- -- 
ATD Quart Monde Vincent Lucy
Service informatique du centre national en France

ATD Quart Monde France
63 rue Beaumarchais - 93100 Montreuil
T. 01 42 46 41 45
www.atd-quartmonde.fr 

AGIR TOUS POUR LA DIGNITÉ

-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQEcBAEBCAAGBQJWuy8VAAoJEOO/bfLoag/szLIH/iPytkAfmcp0MQhIffs18LE3
YepKzSSHLQnCCQ8fVavhbE8b9bsI8tvewMv0JL5rR3ZyF2iF5FZEjK2teSwpkKRg
ez+8PjF6NUO0SiU5AkpQHAa3jJW0EUKE+5m5TrlxUvPUqOLn5tVVCDmk4JKVHwbW
hAAIp5qtcbHWqtb11gVdEs+xSFk/9CGZxsPfLyWJmNuhwlogQu2AUG9AFzaFO1GB
Yl4kBB23IqFuCm8O126UYKuPfjYIfnWps6NZZT1d0TShrShQmHmP7W3GLPMSk0sf
03731RNNBqRrVl32J2cIWtDEOLFYihy7Rx84U3i2v9t63Kq3WZ0qhkEtGXKsaUk=
=m43u
-END PGP SIGNATURE-

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

New wiki page "Code Conventions"

[jan iversen]

Hi.

I have copied and updated Code Conventions from the old ref. in OO.
https://wiki.documentfoundation.org/Development/Code_Conventions

I am working on Code Style, but that is still work in progress.

I am pretty sure the "Code Conventions" have changed somewhat, so I highly 
invite our core developers to look at the page and change what needs to be 
changed.

Please remember that with GSoC around the corner, pages like this can save us 
all quite some work.

Thanks in advance for your help.
rgds
jan i.



Sent from my iPad, please excuse any misspellings ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 46037] Clean up uses of comphelper/configurationhelper.hxx

[bugzilla-daemon]

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

--- Comment #31 from Commit Notification 
 ---
Andras Timar committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=76d34bbc2696fdcfe9719f6fa70c4ef81af0c2be

tdf#46037 clean up Options - LibreOffice - Accessibility page

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 46037] Clean up uses of comphelper/configurationhelper.hxx

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:4.2.0 target:4.4.0   |target:4.2.0 target:4.4.0
   ||target:5.2.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jan Holesovsky]

 loleaflet/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 637d60456d6f9c91d23a798f8a4bab5a66bd564b
Author: Jan Holesovsky 
Date:   Wed Feb 10 15:08:41 2016 +0100

loleaflet: bump version after tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 3e88d7f..19e1883 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.4.52
+VERSION=1.4.53
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
commit 701fef3a3a18fb69c2f6e0b1e95bcc6694a05c59
Author: Jan Holesovsky 
Date:   Wed Feb 10 15:08:10 2016 +0100

loleaflet: bump version before tarball

diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index e351e8b..3e88d7f 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
 # ("micro") part: Between releases odd, even for releases (no other
 # changes inbetween).
 
-VERSION=1.4.51
+VERSION=1.4.52
 
 # Version number of the bundled 'draw' thing
 DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 cui/source/options/optaccessibility.cxx |   62 ++--
 cui/source/options/optaccessibility.hxx |3 -
 2 files changed, 36 insertions(+), 29 deletions(-)

New commits:
commit 76d34bbc2696fdcfe9719f6fa70c4ef81af0c2be
Author: Andras Timar 
Date:   Wed Feb 10 10:51:54 2016 +0100

tdf#46037 clean up Options - LibreOffice - Accessibility page

switch to new config access and handle read-only state, too

Change-Id: I499363ae59163ffcea4f7d3b0fe72289b88ffb79
Reviewed-on: https://gerrit.libreoffice.org/22261
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/cui/source/options/optaccessibility.cxx 
b/cui/source/options/optaccessibility.cxx
index 3509d76..fe0e37a 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -20,22 +20,14 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-
-struct SvxAccessibilityOptionsTabPage_Impl
-{
-SvtAccessibilityOptions m_aConfig;
-SvxAccessibilityOptionsTabPage_Impl()
-: m_aConfig(){}
-};
+#include 
 
 SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* 
pParent,
 const SfxItemSet& rSet)
 : SfxTabPage(pParent, "OptAccessibilityPage",
 "cui/ui/optaccessibilitypage.ui", &rSet)
-, m_pImpl(new SvxAccessibilityOptionsTabPage_Impl)
 {
 get(m_pAccessibilityTool, "acctool");
 get(m_pTextSelectionInReadonly, "textselinreadonly");
@@ -59,8 +51,6 @@ 
SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
 
 void SvxAccessibilityOptionsTabPage::dispose()
 {
-delete m_pImpl;
-m_pImpl = nullptr;
 m_pAccessibilityTool.clear();
 m_pTextSelectionInReadonly.clear();
 m_pAnimatedGraphics.clear();
@@ -78,14 +68,20 @@ VclPtr SvxAccessibilityOptionsTabPage::Create( 
vcl::Window* pParent,
 
 bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
 {
-//aConfig.Set... from controls
-
-m_pImpl->m_aConfig.SetIsForPagePreviews( m_pPagePreviews->IsChecked() );
-m_pImpl->m_aConfig.SetIsAllowAnimatedGraphics( 
m_pAnimatedGraphics->IsChecked() );
-m_pImpl->m_aConfig.SetIsAllowAnimatedText( m_pAnimatedTexts->IsChecked() );
-m_pImpl->m_aConfig.SetIsAutomaticFontColor( 
m_pAutomaticFontColor->IsChecked() );
-m_pImpl->m_aConfig.SetSelectionInReadonly( 
m_pTextSelectionInReadonly->IsChecked());
-m_pImpl->m_aConfig.SetAutoDetectSystemHC( m_pAutoDetectHC->IsChecked());
+std::shared_ptr batch( 
comphelper::ConfigurationChanges::create() );
+if ( 
!officecfg::Office::Common::Accessibility::IsForPagePreviews::isReadOnly() )
+
officecfg::Office::Common::Accessibility::IsForPagePreviews::set(m_pPagePreviews->IsChecked(),
 batch);
+if ( 
!officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::isReadOnly()
 )
+
officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::set(m_pAnimatedGraphics->IsChecked(),
 batch);
+if ( 
!officecfg::Office::Common::Accessibility::IsAllowAnimatedText::isReadOnly() )
+
officecfg::Office::Common::Accessibility::IsAllowAnimatedText::set(m_pAnimatedTexts->IsChecked(),
 batch);
+if ( 
!officecfg::Office::Common::Accessibility::IsAutomaticFontColor::isReadOnly() )
+
officecfg::Office::Common::Accessibility::IsAutomaticFontColor::set(m_pAutomaticFontColor->IsChecked(),
 batch);
+if ( 
!officecfg::Office::Common::Accessibility::IsSelectionInReadonly::isReadOnly() )
+
officecfg::Office::Common::Accessibility::IsSelectionInReadonly::set(m_pTextSelectionInReadonly->IsChecked(),
 batch);
+if ( 
!officecfg::Office::Common::Accessibility::AutoDetectSystemHC::isReadOnly() )
+
officecfg::Office::Common::Accessibility::AutoDetectSystemHC::set(m_pAutoDetectHC->IsChecked(),
 batch);
+batch->commit();
 
 AllSettings aAllSettings = Application::GetSettings();
 MiscSettings aMiscSettings = aAllSettings.GetMiscSettings();
@@ -101,15 +97,29 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( 
SfxItemSet* )
 
 void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* )
 {
-//set controls from aConfig.Get...
+m_pPagePreviews->Check( 
officecfg::Office::Common::Accessibility::IsForPagePreviews::get() );
+if( 
officecfg::Office::Common::Accessibility::IsForPagePreviews::isReadOnly() )
+m_pPagePreviews->Disable();
+
+m_pAnimatedGraphics->Check( 
officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::get() );
+if( 
officecfg::Office::Common::Accessibility::IsAllowAnimatedGraphics::isReadOnly() 
)
+m_pAnimatedGraphics->Disable();
+
+m_pAnimatedTexts->Check( 
officecfg::Office::Common::Accessibility::IsAllowAnimatedText::get() );
+if( 
officecfg::Office::Common::Accessibility::IsAllowAnimatedText::isReadOnly() )
+m_pAnimatedTexts->Disable();
+
+m_pAutomaticFontColor->Check( 
officecfg::Office::Common::Accessibility::IsAutomaticFontColor::get() );
+if( 
officecfg::Offic

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

[David Tardon]

 svtools/source/dialogs/prnsetup.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 35b5f9f1359c9467fe5b08cffc65cb2bfcaf93fb
Author: David Tardon 
Date:   Tue Feb 9 10:18:28 2016 +0100

Revert "Related: rhbz#1168756 save chosen printer also in print settings 
dlg"

This is wrong--the printer should not be remembered globally, as it is
only for the current document.

This reverts commit 4bc37b7e804fbfe17f8f516487d16ea23a0b246e.

Change-Id: Ic917470408dbf9ff704e485358463852a45b57a4

diff --git a/svtools/source/dialogs/prnsetup.cxx 
b/svtools/source/dialogs/prnsetup.cxx
index 2540195..8663722 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 
@@ -355,10 +354,6 @@ short PrinterSetupDialog::Execute()
 {
 if ( mpTempPrinter )
 mpPrinter->SetPrinterProps( mpTempPrinter );
-
-vcl::SettingsConfigItem* const pItem = vcl::SettingsConfigItem::get();
-pItem->setValue("PrintDialog", "LastPrinter", mpPrinter->GetName());
-pItem->Commit();
 }
 
 maStatusTimer.Stop();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 loleaflet/src/control/Toolbar.js |6 +-
 loleaflet/src/map/Map.js |2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit b482dfba567b448e8ecbee5e7b0bbbf04fa2c290
Author: Pranav Kant 
Date:   Wed Feb 10 16:49:52 2016 +0530

loleaflet: Fix wrong initializationcomplete signal

This should ideally be fired when we receive 'commandvalues'
command, not 'statechanged'.

Change-Id: I34748979a7606cd50e6965850757eda891a9aa15

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index e001a29..015b0a5 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -94,7 +94,7 @@ L.Map = L.Evented.extend({
}
this._fireInitComplete('updatepermission');
});
-   this.on('commandstatechanged', function(e){
+   this.on('updatetoolbarcommandvalues', function(e){
if (this.initComplete) {
return;
}
commit f41b9c7703c07e6459bca90c7fed5088568d2a0a
Author: Jan Holesovsky 
Date:   Wed Feb 10 14:45:36 2016 +0100

loleaflet: Send 'saveas' with the 'TakeOwnership' option.

So that the .uno:ModifiedStatus works.

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 05bcf8a..1488b7d 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -57,10 +57,14 @@ L.Map.include({
if (options === undefined || options === null) {
options = '';
}
+
+   // TakeOwnership: we are performing a 'real' save-as, the 
document
+   // is just getting a new place, ie. it will get the
+   // '.uno:ModifiedStatus' upon completion.
this._socket.sendMessage('saveas ' +
'url=' + url + ' ' +
'format=' + format + ' ' +
-   'options=' + options);
+   'options=TakeOwnership,' + options);
},
 
applyStyle: function (style, familyName) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 loleaflet/src/control/Toolbar.js |6 +-
 loleaflet/src/map/Map.js |2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7bee4d61c02d28565fa87927d12d0e9e951f4bbf
Author: Pranav Kant 
Date:   Wed Feb 10 16:49:52 2016 +0530

loleaflet: Fix wrong initializationcomplete signal

This should ideally be fired when we receive 'commandvalues'
command, not 'statechanged'.

Change-Id: I34748979a7606cd50e6965850757eda891a9aa15

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 2d0bee3..3819328 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -94,7 +94,7 @@ L.Map = L.Evented.extend({
}
this._fireInitComplete('updatepermission');
});
-   this.on('commandstatechanged', function(e){
+   this.on('updatetoolbarcommandvalues', function(e){
if (this.initComplete) {
return;
}
commit 57afedff2c5fb850b04650d7c6615d71def582a3
Author: Jan Holesovsky 
Date:   Wed Feb 10 14:45:36 2016 +0100

loleaflet: Send 'saveas' with the 'TakeOwnership' option.

So that the .uno:ModifiedStatus works.

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 05bcf8a..1488b7d 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -57,10 +57,14 @@ L.Map.include({
if (options === undefined || options === null) {
options = '';
}
+
+   // TakeOwnership: we are performing a 'real' save-as, the 
document
+   // is just getting a new place, ie. it will get the
+   // '.uno:ModifiedStatus' upon completion.
this._socket.sendMessage('saveas ' +
'url=' + url + ' ' +
'format=' + format + ' ' +
-   'options=' + options);
+   'options=TakeOwnership,' + options);
},
 
applyStyle: function (style, familyName) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: delay 5.1.1 RC1 ...

[Michael Meeks]

Hi Cloph,

On Tue, 2016-02-09 at 15:42 +, Michael Meeks wrote:
>   I'm chasing some really 'interesting' memory corruption at the
> intersection of slideshow and GL transitions

We got it =) and it's a nasty one; hopefully well worth the delay.

So - good to go as/when you are etc.

ATB,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot

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

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

[Stephan Bergmann]

 svl/source/misc/urihelper.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d665191382645b5678aa8acd796b08b0fe43e7c5
Author: Stephan Bergmann 
Date:   Tue Feb 9 11:55:59 2016 +0100

UIDNA_CHECK_CONTEXTO is only available in ICU >= 49

...unlike the rest of the createUTS46Instance stuff, which is available in 
4.6.
While it is desirable to have that check here, it probably doesn't make 
much of
a difference in practice, and Rico Tzschichholz would like to have this 
working
on Ubuntu 12.04, where only ICU 4.8.1 is available.

Change-Id: I5bbd2ed296c6e068e175e7f8353cea37ed4d9e44
(cherry picked from commit f1cb83cef59c3b1d5ee780e8916832483468fab7)
Reviewed-on: https://gerrit.libreoffice.org/7
Tested-by: Jenkins 
Reviewed-by: David Ostrovsky 
Reviewed-by: Miklos Vajna 

diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 0746cb2..a27e5b3 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -761,7 +761,10 @@ OUString URIHelper::resolveIdnaHost(OUString const & url) {
 std::unique_ptr idna(
 icu::IDNA::createUTS46Instance(
 (UIDNA_USE_STD3_RULES | UIDNA_CHECK_BIDI | UIDNA_CHECK_CONTEXTJ
- | UIDNA_CHECK_CONTEXTO),
+#if U_ICU_VERSION_MAJOR_NUM >= 49
+ | UIDNA_CHECK_CONTEXTO
+#endif
+ ),
 e));
 if (U_FAILURE(e)) {
 SAL_WARN("vcl.gdi", "icu::IDNA::createUTS46Instance " << e);
___
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' - libreofficekit/qa vcl/unx

[Michael Stahl]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |4 
 vcl/unx/gtk3/gtk3gtkinst.cxx|4 
 2 files changed, 8 insertions(+)

New commits:
commit 7a555784b23fbeccea10feaebfc66cdbbf8a4584
Author: Michael Stahl 
Date:   Tue Feb 9 14:13:48 2016 +0100

vcl, libreofficekit: gtk_clipboard_wait_for_contents() may return null

Don't crash then.

Change-Id: I4980fe4ea56e023cbf303fa43d1e6b383d983d2e
(cherry picked from commit 678e0ea1472478d248d1a45c1e0ade5ed84f9d46)
Reviewed-on: https://gerrit.libreoffice.org/22235
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index fb97af1..595e677 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -601,6 +601,10 @@ static void doPaste(GtkWidget* pButton, gpointer /*pItem*/)
 if (oTarget)
 {
 GtkSelectionData* pSelectionData = 
gtk_clipboard_wait_for_contents(pClipboard, *oTarget);
+if (!pSelectionData)
+{
+return;
+}
 gint nLength;
 const guchar* pData = 
gtk_selection_data_get_data_with_length(pSelectionData, &nLength);
 bool bSuccess = lok_doc_view_paste(pLOKDocView, "text/html", 
reinterpret_cast(pData), nLength);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f914e45..32e1a57 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -206,6 +206,10 @@ public:
 css::uno::Any aRet;
 GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard,
  it->second);
+if (!data)
+{
+return css::uno::Any();
+}
 gint length;
 const guchar *rawdata = gtk_selection_data_get_data_with_length(data,
 
&length);
___
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/inc vcl/opengl

[Tomaž Vajngerl]

 vcl/inc/opengl/salbmp.hxx |2 --
 vcl/opengl/salbmp.cxx |   23 ++-
 vcl/opengl/scale.cxx  |6 --
 3 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit 30e32035adfb053637ca68127bedd68a938e7332
Author: Tomaž Vajngerl 
Date:   Tue Feb 9 23:23:54 2016 +0100

opengl: remove unneeded mnBufWidth{Height} from OpenGLSalBitmap

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

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

diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 4b34027..8917a5a 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -47,8 +47,6 @@ private:
 sal_uInt16  mnBytesPerRow;
 int mnWidth;
 int mnHeight;
-int mnBufWidth;
-int mnBufHeight;
 std::deque< OpenGLSalBitmapOp* >maPendingOps;
 
 virtual void updateChecksum() const override;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 61d7575..e0205f0 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -113,8 +113,6 @@ OpenGLSalBitmap::OpenGLSalBitmap()
 , mnBytesPerRow(0)
 , mnWidth(0)
 , mnHeight(0)
-, mnBufWidth(0)
-, mnBufHeight(0)
 {
 }
 
@@ -135,8 +133,6 @@ bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, 
long nX, long nY, long
 
 mnWidth = nWidth;
 mnHeight = nHeight;
-mnBufWidth = 0;
-mnBufHeight = 0;
 
 // TODO Check the framebuffer configuration
 mnBits = 32;
@@ -166,8 +162,8 @@ bool OpenGLSalBitmap::Create( const Size& rSize, sal_uInt16 
nBits, const BitmapP
 return false;
 maPalette = rBitmapPalette;
 mnBits = nBits;
-mnWidth = mnBufWidth = rSize.Width();
-mnHeight = mnBufHeight = rSize.Height();
+mnWidth = rSize.Width();
+mnHeight = rSize.Height();
 return false;
 }
 
@@ -201,8 +197,6 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, 
sal_uInt16 nNewBitCount
 mnBytesPerRow = rSourceBitmap.mnBytesPerRow;
 mnWidth = rSourceBitmap.mnWidth;
 mnHeight = rSourceBitmap.mnHeight;
-mnBufWidth = rSourceBitmap.mnBufWidth;
-mnBufHeight = rSourceBitmap.mnBufHeight;
 maPalette = rSourceBitmap.maPalette;
 // execute any pending operations on the source bitmap
 maTexture = rSourceBitmap.GetTexture();
@@ -472,7 +466,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
 VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 
24 bits" );
 
 // convert to 24 bits RGB using palette
-pData = new sal_uInt8[mnBufHeight * mnBufWidth * 3];
+pData = new sal_uInt8[mnHeight * mnWidth * 3];
 bAllocated = true;
 determineTextureFormat(24, nFormat, nType);
 
@@ -481,12 +475,12 @@ GLuint OpenGLSalBitmap::CreateTexture()
 sal_uInt8* pSrcData = maUserBuffer.get();
 sal_uInt8* pDstData = pData;
 
-sal_uInt32 nY = mnBufHeight;
+sal_uInt32 nY = mnHeight;
 while( nY-- )
 {
 pSrcFormat->StartLine( pSrcData );
 
-sal_uInt32 nX = mnBufWidth;
+sal_uInt32 nX = mnWidth;
 if (nFormat == GL_BGR)
 {
 while( nX-- )
@@ -515,7 +509,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
 
 OpenGLVCLContextZone aContextZone;
 
-lclInstantiateTexture(maTexture, mnBufWidth, mnBufHeight, nFormat, nType, 
pData);
+lclInstantiateTexture(maTexture, mnWidth, mnHeight, nFormat, nType, pData);
 
 VCL_GL_INFO("Created texture " << maTexture.Id() << " bits: " << mnBits);
 
@@ -559,9 +553,6 @@ bool OpenGLSalBitmap::ReadTexture()
 size_t nCanary = static_cast(mnBytesPerRow) * mnHeight;
 assert(!memcmp(pData + nCanary, CANARY, sizeof (CANARY)));
 #endif
-
-mnBufWidth = mnWidth;
-mnBufHeight = mnHeight;
 return true;
 }
 else if (mnBits == 1)
@@ -602,8 +593,6 @@ bool OpenGLSalBitmap::ReadTexture()
 nIndex++;
 pData[nIndex] = 0;
 }
-mnBufWidth = mnWidth;
-mnBufHeight = mnHeight;
 return true;
 }
 
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index a971b15e..80bbdd6 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -68,8 +68,6 @@ bool OpenGLSalBitmap::ImplScaleFilter(
 
 mnWidth = nNewWidth;
 mnHeight = nNewHeight;
-mnBufWidth = mnWidth;
-mnBufHeight = mnHeight;
 maTexture = aNewTex;
 
 CHECK_GL_ERROR();
@@ -183,8 +181,6 @@ bool OpenGLSalBitmap::ImplScaleConvolution(

[Libreoffice-commits] core.git: 4 commits - writerfilter/source xmlsecurity/inc xmlsecurity/source

[Miklos Vajna]

 writerfilter/source/filter/WriterFilter.cxx|8 -
 xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx |4 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |2 
 xmlsecurity/source/helper/documentsignaturehelper.cxx  |2 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx   |6 -
 xmlsecurity/source/helper/xsecctl.cxx  |   79 -
 xmlsecurity/source/helper/xsecctl.hxx  |9 +
 xmlsecurity/source/helper/xsecsign.cxx |4 
 8 files changed, 95 insertions(+), 19 deletions(-)

New commits:
commit e6077ccc69c65156476f1855c5c9711814e8e226
Author: Miklos Vajna 
Date:   Wed Feb 10 12:23:56 2016 +0100

xmlsecurity OOXML export: write RelationshipTransform algo arguments

The usual generator/meta stream and the signatures itself are the
excluded ones. It seems everything else has to be listed explicitly.

Change-Id: Ie0f3e161aa0c2e1cb97ad3d9d012ac78078e287a

diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index bc60efd..aa7f7b4 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -31,11 +31,13 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 namespace cssu = com::sun::star::uno;
 namespace cssl = com::sun::star::lang;
@@ -996,6 +998,21 @@ static bool lcl_isOOXMLBlacklist(const OUString& 
rStreamName)
 return std::find_if(vBlacklist.begin(), vBlacklist.end(), [&](const 
OUStringLiteral& rLiteral) { return rStreamName.startsWith(rLiteral); }) != 
vBlacklist.end();
 }
 
+/// Should we intentionally not sign this relation type?
+static bool lcl_isOOXMLRelationBlacklist(const OUString& rRelationName)
+{
+#if !HAVE_BROKEN_STATIC_INITILIZER_LIST
+static
+#endif
+const std::initializer_list vBlacklist =
+{
+
OUStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties";),
+
OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";),
+
OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin";)
+};
+return std::find(vBlacklist.begin(), vBlacklist.end(), rRelationName) != 
vBlacklist.end();
+}
+
 void XSecController::exportOOXMLSignature(const 
uno::Reference& xRootStorage, const 
uno::Reference& xDocumentHandler, const 
SignatureInformation& rInformation)
 {
 uno::Reference 
xHierarchicalStorageAccess(xRootStorage, uno::UNO_QUERY);
@@ -,6 +1128,32 @@ void XSecController::exportOOXMLSignature(const 
uno::Reference&
 pAttributeList->AddAttribute(ATTR_ALGORITHM, 
ALGO_RELATIONSHIP);
 xDocumentHandler->startElement(TAG_TRANSFORM, 
uno::Reference(pAttributeList.get()));
 }
+
+uno::Sequence< uno::Sequence > 
aRelationsInfo = 
comphelper::OFOPXMLHelper::ReadRelationsInfoSequence(xRelStream, aURI, mxCtx);
+for (const uno::Sequence& rPairs : 
aRelationsInfo)
+{
+OUString aId;
+OUString aType;
+for (const beans::StringPair& rPair : rPairs)
+{
+if (rPair.First == "Id")
+aId = rPair.Second;
+else if (rPair.First == "Type")
+aType = rPair.Second;
+}
+
+if (lcl_isOOXMLRelationBlacklist(aType))
+continue;
+
+{
+rtl::Reference pAttributeList(new 
SvXMLAttributeList());
+pAttributeList->AddAttribute(ATTR_XMLNS ":" 
NSTAG_MDSSI, NS_MDSSI);
+pAttributeList->AddAttribute(ATTR_SOURCEID, aId);
+xDocumentHandler->startElement(NSTAG_MDSSI ":" 
TAG_RELATIONSHIPREFERENCE, 
uno::Reference(pAttributeList.get()));
+}
+xDocumentHandler->endElement(NSTAG_MDSSI ":" 
TAG_RELATIONSHIPREFERENCE);
+}
+
 xDocumentHandler->endElement(TAG_TRANSFORM);
 {
 rtl::Reference pAttributeList(new 
SvXMLAttributeList());
diff --git a/xmlsecurity/source/helper/xsecctl.hxx 
b/xmlsecurity/source/helper/xsecctl.hxx
index 8e87e1e..1bcf180 100644
--- a/xmlsecurity/source/helper/xsecctl.hxx
+++ b/xmlsecurity/source/helper/xsecctl.hxx
@@ -84,20 +84,24 @@
 #define TAG_DESCRIPTION "description"
 #define TAG_QUALIFYINGPROPERTIES "QualifyingProperties"
 #define TAG_SIGNEDPROPERTIES "SignedProperties"
+#define TAG_RELATIONSHIPREFERENCE "RelationshipReference"
 
 #define ATTR_XMLNS  "xmlns"
 #define ATTR_ALGORITHM  "Algorithm"
 #define ATTR_URI"URI"
 #define ATTR_ID "Id"
 #define ATTR_TARGET "Target"
+#define ATT

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

[Andras Timar]

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

New commits:
commit 71de03e4b543592f3692b9eb2cfb540577332e04
Author: Andras Timar 
Date:   Wed Feb 10 13:41:26 2016 +0100

Bump version to 5.0-24

Change-Id: I356b373dd2e9a1bee6a5e953a764435104220d7d

diff --git a/configure.ac b/configure.ac
index 72463ee..2cf0c06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.0.10.23],[],[],[https://CollaboraOffice.com/])
+AC_INIT([Collabora Office],[5.0.10.24],[],[],[https://CollaboraOffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 desktop/source/lib/init.cxx   |   42 ++
 include/LibreOfficeKit/LibreOfficeKit.hxx |5 +++
 2 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit 14aa9b0a818ca23efdf07a618ae493c7e7397752
Author: Jan Holesovsky 
Date:   Wed Feb 10 13:26:50 2016 +0100

lok: Introduce a "TakeOwnership" filter option for saveAs().

It is consumed by the saveAs() itself, and when provided, the document
identity changes to the provided pUrl - meaning that '.uno:ModifiedStatus' 
is
triggered as with the "Save As..." in the UI.

This mode must not be used when saving to PNG or PDF.

Change-Id: I11b5aa814476a8dcab9eac5202bd052828ebbd96

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 507e4f8..d5bec92 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -674,6 +674,30 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const 
char* sUrl, const cha
 
 OUString aFilterOptions = getUString(pFilterOptions);
 
+// 'TakeOwnership' == this is a 'real' SaveAs (that is, the document
+// gets a new name).  When this is not provided, the meaning of
+// saveAs() is more like save-a-copy, which allows saving to any
+// random format like PDF or PNG.
+// It is not a real filter option, so we have to filter it out.
+bool bTakeOwnership = false;
+int nIndex = -1;
+if (aFilterOptions == "TakeOwnership")
+{
+bTakeOwnership = true;
+aFilterOptions = "";
+}
+else if ((nIndex = aFilterOptions.indexOf(",TakeOwnership")) >= 0 || 
(nIndex = aFilterOptions.indexOf("TakeOwnership,")) >= 0)
+{
+OUString aFiltered;
+if (nIndex > 0)
+aFiltered = aFilterOptions.copy(0, nIndex);
+if (nIndex + 14 < aFilterOptions.getLength())
+aFiltered = aFiltered + aFilterOptions.copy(nIndex + 14);
+
+bTakeOwnership = true;
+aFilterOptions = aFiltered;
+}
+
 MediaDescriptor aSaveMediaDescriptor;
 aSaveMediaDescriptor["Overwrite"] <<= sal_True;
 aSaveMediaDescriptor["FilterName"] <<= aFilterName;
@@ -691,7 +715,11 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const 
char* sUrl, const cha
 }
 
 uno::Reference xStorable(pDocument->mxComponent, 
uno::UNO_QUERY_THROW);
-xStorable->storeToURL(aURL, 
aSaveMediaDescriptor.getAsConstPropertyValueList());
+
+if (bTakeOwnership)
+xStorable->storeAsURL(aURL, 
aSaveMediaDescriptor.getAsConstPropertyValueList());
+else
+xStorable->storeToURL(aURL, 
aSaveMediaDescriptor.getAsConstPropertyValueList());
 
 return true;
 }
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 1f2311a..84741e0 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -45,6 +45,11 @@ public:
  * @param pUrl the location where to store the document
  * @param pFormat the format to use while exporting, when omitted, then 
deducted from pURL's extension
  * @param pFilterOptions options for the export filter, e.g. SkipImages.
+ *Another useful FilterOption is "TakeOwnership".  It is consumed
+ *by the saveAs() itself, and when provided, the document identity
+ *changes to the provided pUrl - meaning that '.uno:ModifiedStatus'
+ *is triggered as with the "Save As..." in the UI.
+ *"TakeOwnership" mode must not be used when saving to PNG or PDF.
  */
 inline bool saveAs(const char* pUrl, const char* pFormat = NULL, const 
char* pFilterOptions = NULL)
 {
commit 552ae012bd0321995a0b44501704e408f1d9d006
Author: Jan Holesovsky 
Date:   Mon Feb 8 20:09:37 2016 +0100

lok: Interaction handler for saveAs() too.

The LOK does not have to be fully initialized, eg. during the unit tests.

Change-Id: I11bb8db37c92b05e2c1ad06e1a6632db7fb0ea60

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a3174fc..507e4f8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -680,11 +680,15 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<= 
aFilterOptions;
 
 // add interaction handler too
-rtl::Reference const pInteraction(
-new 
LOKInteractionHandler(::comphelper::getProcessComponentContext(), "saveas", 
gImpl, pDocument));
-uno::Reference const 
xInteraction(pInteraction.get());
+if (gImpl)
+{
+// gImpl does not have to exist when running from a unit test
+rtl::Reference const pInteraction(
+new 
LOKInteractionHandler(::comphelper::getProcessComponentContext

Re: Christoph Brill license statement

[jan iversen]

> Hi Jan,
> 
> why should Christoph not be able to share code under CC-0? ("public doma
> in")

I am the wrong person to answer that question, Christoph is the right person to 
answer that.

The current license statement is a significant limitation, and I can only 
suggest (as I have done) that Christoph "upgrades" the license statement, but 
it is not my decision (nor should it be).

rgds
jan i.

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

Re: Christoph Brill license statement

[Dennis Roczek]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi Jan,

why should Christoph not be able to share code under CC-0? ("public doma
in")

Regards,

Dennis Roczek

Am 10.02.2016 um 08:15 schrieb jan iversen:
> Hi
> 
> Just to be sure, with this license statement you can contribute docume
ntation but not code, see the step-by-step guide if you want to contribu
te code.
> 
> rgds
> jan i.
> 
> 
> Sent from my iPad, please excuse any misspellings 
> 
>> On 10 Feb 2016, at 07:56, jan iversen  w
rote:
>>
>> WELCOME
>> Thanks for your license statement.
>>
>> If you want help to get started or have any questions, then please co
ntact me. I am here to help you (and others) in getting their first patc
h submitted.
>>
>> LibreOffice is a very big program and getting it built, setting up ge
rrit, and getting the first patch right can be a bit challenging, theref
ore do not hesitate to email me if you want help.
>>
>> We have made a step by step guide to help you get started:
>> https://wiki.documentfoundation.org/Development/GetInvolved/Developer
StepByStep
>>
>> rgds
>> Jan Iversen.
>>
>> Sent from my iPad, please excuse any misspellings 
>>
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQIcBAEBCAAGBQJWuyicAAoJEM4+Qf3OKrbZXfoQAJBHOANRfNa3/vo8DEEM3NMm
Q/7HDXxTSCwgPiksoZTbskP4U7neXSxlLZ3wuVNwe60YzURjrabpw/tlmH4oD6m/
+WJTmD4pcwvRInF42mw/zHl5ubRnogObocCoU7fDNzNmTa7R2mbXU2DI1KBiPkDP
1Nlq4G50fqOF2b8qrhGZ8gFelpdlEMWyzyQOaj5lNpeJRL36pb1VU7ADRwsptJGl
AEdV4owjSBCKc/kbf5T9TCzmYtrBmYjKBZNDg98P4UYZqdYnt63Yx1uqBrRp+Vqo
jB7IbWQ28qaLq8byTnL6w9NPlABBxSkHM+tC6Bl04V8RwnVndYR9EJYX1Haa7I0Z
TxjO8oxGk+Uw6ybNjqNc1t3G5zAaIuM3ZgLABg0qK92gddZqAdHc+d6E2WN5fZ5p
Y8OnDjY/nGbf4K+zx+6cZ1k37Ah3LX11WWkkNPgZutmkQU0uOt/+pJkKIkea/Lff
9/ZTw4SqWMwwRy4/of7ibE/Ex/QPwa1k3i+DNzb9KZPHOa4ToIZJDuF5PNze2d3d
5EAMSV4O9yf0XolkJSlwoG0rdgKN0h+l7k9fP6Md7Ge6WdnrC3HtL+EAznPxMBWt
/a79ACGltaTSNX+oZMfKb8xqBSnQDKUc8GsnR7jxsq3UkZQUcKar1mA/50sx3+eF
MFNO4kpJUIYvZ9T+ayRw
=VQV7
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Chris Sherlock]

 include/svtools/simptabl.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f956166c3df90485ca17f44c45645364c2f2bda
Author: Chris Sherlock 
Date:   Wed Feb 10 22:24:07 2016 +1100

svtools: missing space between brackets and const in fn sig

Change-Id: I95467b53acf3940260616a747b0806050419953d

diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 7b8816f..fa3fd95 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -114,7 +114,7 @@ public:
 sal_uInt16  GetSortedCol(){ return nSortCol;}
 SvLBoxItem* GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) 
const;
 
-CommandEventGetCommandEvent()const { return aCEvt;}
+CommandEventGetCommandEvent() const { return aCEvt; }
 inline bool IsFocusOnCellEnabled() const { return 
IsCellFocusEnabled(); }
 voidSetCommandHdl( const Link& rLink ) { 
aCommandLink = rLink; }
 
___
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' - download.lst

[Caolán McNamara]

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

New commits:
commit f26f5226542c8a707eda3dcd8a9f81fbbf0342c0
Author: Caolán McNamara 
Date:   Mon Feb 8 09:35:52 2016 +

update graphite to 1.3.5

Change-Id: I3287d51430d7a0901dd8bbf2458b845bcf92a8d2
(cherry picked from commit c64ea526dc71da6e3aad188ac71e58047ed74b5a)
Reviewed-on: https://gerrit.libreoffice.org/22201
Reviewed-by: David Ostrovsky 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 5a38844..e66ccb3 100755
--- a/download.lst
+++ b/download.lst
@@ -53,7 +53,7 @@ export FREETYPE_TARBALL := 
dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.b
 export GLEW_TARBALL := 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GLYPHY_TARBALL := 5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2
-export GRAPHITE_TARBALL := 
5c0c9ac0996fbb4a0e17780ff5441959-graphite2-minimal-1.3.4.tgz
+export GRAPHITE_TARBALL := 
28935e208c311761c29983c739db08d8-graphite2-minimal-1.3.5.tgz
 export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2
 export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock]

 vcl/source/window/event.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit aadc603afeca5657da9903ccb52e89cbb3ba5611
Author: Chris Sherlock 
Date:   Wed Feb 10 21:45:39 2016 +1100

vcl: actually remove ImplTranslateCommandEvent!

Change-Id: Ic120f83c5809074d082a86f677790ce9df35abcb

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index a31c802..04a4a7a 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -350,16 +350,6 @@ static MouseEvent ImplTranslateMouseEvent( const 
MouseEvent& rE, vcl::Window* pS
 return MouseEvent( pDest->ScreenToOutputPixel( aPos ), rE.GetClicks(), 
rE.GetMode(), rE.GetButtons(), rE.GetModifier() );
 }
 
-CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, 
vcl::Window* pSource, vcl::Window* pDest )
-{
-if ( !rCEvt.IsMouseEvent() )
-return rCEvt;
-
-Point aPos = pSource->OutputToScreenPixel( rCEvt.GetMousePosPixel() );
-aPos = pDest->ScreenToOutputPixel( aPos );
-return CommandEvent( aPos, rCEvt.GetCommand(), rCEvt.IsMouseEvent(), 
rCEvt.GetEventData() );
-}
-
 void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
 {
 if( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chris Sherlock]

 vcl/source/window/event.cxx |   33 -
 1 file changed, 24 insertions(+), 9 deletions(-)

New commits:
commit 603ea975c19ac8826bd0cdf27fb59a9a21f765b4
Author: Chris Sherlock 
Date:   Wed Feb 10 21:39:57 2016 +1100

vcl: ImplTranslate(Command|Mouse)Event changes

ImplTranslateCommandEvent is used exactly once, so remove this function.
ImplTranslateMouseEvent is used a few times, make it local to the file and
tweak.
Added comments to both areas explaining what is being done.

Change-Id: I68cd424a1d586df44957a62a66de3c9876ab873e

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index b4e8034..a31c802 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -341,11 +341,13 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent )
 }
 
 
-MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, vcl::Window* 
pSource, vcl::Window* pDest )
+static MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, vcl::Window* 
pSource, vcl::Window* pDest )
 {
+// the mouse event occured in a different window, we need to translate the 
coordinates of
+// the mouse cursor within that (source) window to the coordinates the 
mouse cursor would
+// be in the destination window
 Point aPos = pSource->OutputToScreenPixel( rE.GetPosPixel() );
-aPos = pDest->ScreenToOutputPixel( aPos );
-return MouseEvent( aPos, rE.GetClicks(), rE.GetMode(), rE.GetButtons(), 
rE.GetModifier() );
+return MouseEvent( pDest->ScreenToOutputPixel( aPos ), rE.GetClicks(), 
rE.GetMode(), rE.GetButtons(), rE.GetModifier() );
 }
 
 CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, 
vcl::Window* pSource, vcl::Window* pDest )
@@ -370,13 +372,26 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( 
NotifyEvent& rNEvt )
 
 if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
 {
-if ( rNEvt.GetWindow() == this )
-// not interested in: The event listeners are already called 
in ::Command,
-// and calling them here a second time doesn't make sense
-;
-else
+// not interested: The event listeners are already called in 
::Command,
+// and calling them here a second time doesn't make sense
+if ( rNEvt.GetWindow() != this )
 {
-CommandEvent aCommandEvent = ImplTranslateCommandEvent( 
*pCEvt, rNEvt.GetWindow(), this );
+CommandEvent aCommandEvent;
+
+if ( !pCEvt->IsMouseEvent() )
+{
+aCommandEvent = *pCEvt;
+}
+else
+{
+// the mouse event occured in a different window, we need 
to translate the coordinates of
+// the mouse cursor within that window to the coordinates 
the mouse cursor would be in the
+// current window
+vcl::Window* pSource = rNEvt.GetWindow();
+Point aPos = pSource->OutputToScreenPixel( 
pCEvt->GetMousePosPixel() );
+aCommandEvent = CommandEvent( ScreenToOutputPixel( aPos ), 
pCEvt->GetCommand(), pCEvt->IsMouseEvent(), pCEvt->GetEventData() );
+}
+
 CallEventListeners( VCLEVENT_WINDOW_COMMAND, &aCommandEvent );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 vcl/inc/opengl/salbmp.hxx |2 --
 vcl/opengl/salbmp.cxx |   22 ++
 vcl/opengl/scale.cxx  |6 --
 3 files changed, 6 insertions(+), 24 deletions(-)

New commits:
commit b4c6cf513c5bb0ed02b95bbdbb0879a78c1eca65
Author: Tomaž Vajngerl 
Date:   Tue Feb 9 23:23:54 2016 +0100

opengl: remove unneeded mnBufWidth{Height} from OpenGLSalBitmap

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

diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 7577f9f..69b24a8 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -45,8 +45,6 @@ private:
 sal_uInt16  mnBytesPerRow;
 int mnWidth;
 int mnHeight;
-int mnBufWidth;
-int mnBufHeight;
 std::deque< OpenGLSalBitmapOp* >maPendingOps;
 
 virtual void updateChecksum() const override;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index be5f8f0..07ec676 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -115,8 +115,6 @@ OpenGLSalBitmap::OpenGLSalBitmap()
 , mnBytesPerRow(0)
 , mnWidth(0)
 , mnHeight(0)
-, mnBufWidth(0)
-, mnBufHeight(0)
 {
 }
 
@@ -137,8 +135,6 @@ bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, 
long nX, long nY, long
 
 mnWidth = nWidth;
 mnHeight = nHeight;
-mnBufWidth = 0;
-mnBufHeight = 0;
 
 // TODO Check the framebuffer configuration
 mnBits = 32;
@@ -168,8 +164,8 @@ bool OpenGLSalBitmap::Create( const Size& rSize, sal_uInt16 
nBits, const BitmapP
 return false;
 maPalette = rBitmapPalette;
 mnBits = nBits;
-mnWidth = mnBufWidth = rSize.Width();
-mnHeight = mnBufHeight = rSize.Height();
+mnWidth = rSize.Width();
+mnHeight = rSize.Height();
 return false;
 }
 
@@ -203,8 +199,6 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, 
sal_uInt16 nNewBitCount
 mnBytesPerRow = rSourceBitmap.mnBytesPerRow;
 mnWidth = rSourceBitmap.mnWidth;
 mnHeight = rSourceBitmap.mnHeight;
-mnBufWidth = rSourceBitmap.mnBufWidth;
-mnBufHeight = rSourceBitmap.mnBufHeight;
 maPalette = rSourceBitmap.maPalette;
 // execute any pending operations on the source bitmap
 maTexture = rSourceBitmap.GetTexture();
@@ -474,7 +468,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
 VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 
24 bits" );
 
 // convert to 24 bits RGB using palette
-pData = new sal_uInt8[mnBufHeight * mnBufWidth * 3];
+pData = new sal_uInt8[mnHeight * mnWidth * 3];
 bAllocated = true;
 determineTextureFormat(24, nFormat, nType);
 
@@ -483,12 +477,12 @@ GLuint OpenGLSalBitmap::CreateTexture()
 sal_uInt8* pSrcData = mpUserBuffer.get();
 sal_uInt8* pDstData = pData;
 
-sal_uInt32 nY = mnBufHeight;
+sal_uInt32 nY = mnHeight;
 while( nY-- )
 {
 pSrcFormat->StartLine( pSrcData );
 
-sal_uInt32 nX = mnBufWidth;
+sal_uInt32 nX = mnWidth;
 if (nFormat == GL_BGR)
 {
 while( nX-- )
@@ -517,7 +511,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
 
 OpenGLVCLContextZone aContextZone;
 
-lclInstantiateTexture(maTexture, mnBufWidth, mnBufHeight, nFormat, nType, 
pData);
+lclInstantiateTexture(maTexture, mnWidth, mnHeight, nFormat, nType, pData);
 
 VCL_GL_INFO("Created texture " << maTexture.Id() << " bits: " << mnBits);
 
@@ -566,8 +560,6 @@ bool OpenGLSalBitmap::ReadTexture()
 size_t nCanary = static_cast(mnBytesPerRow) * mnHeight;
 assert(!memcmp(pData + nCanary, CANARY, sizeof (CANARY)));
 #endif
-mnBufWidth = mnWidth;
-mnBufHeight = mnHeight;
 return true;
 }
 else if (mnBits == 1)
@@ -608,8 +600,6 @@ bool OpenGLSalBitmap::ReadTexture()
 nIndex++;
 pData[nIndex] = 0;
 }
-mnBufWidth = mnWidth;
-mnBufHeight = mnHeight;
 return true;
 }
 
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 3f24807..9ba7432 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -68,8 +68,6 @@ bool OpenGLSalBitmap::ImplScaleFilter(
 
 mnWidth = nNewWidth;
 mnHeight = nNewHeight;
-mnBufWidth = mnWidth;
-mnBufHeight = mnHeight;
 maTexture = aNewTex;
 
 CHECK_GL_ERROR();
@@ -183,8 +181,6 @@ bool OpenGLSalBitmap::ImplScaleConvolution(
 
 mnWidth = nNewWidth;
 mnHeight = nNewHeight;
-mnBufWidth = mnWidth;
-mnBufHeight = mnHeight;
 
 CHECK_GL_ERROR();
 return true;
@@ -260,8 +256,6 @@ bool OpenGLSalBitmap::ImplScaleArea( const rtl:

Wiki development/getInvolved

[jan iversen]

Hi

as part of my ongoing efford to lower the ladder for non-committers, I have 
made a major update of
https://wiki.documentfoundation.org/Development/GetInvolved

Basically I have moved the step-by-step guide into getInvolved, with a combined 
content.

There are a couple of links I do not like (coding style etc), and I will make 
our own version of these links.

Please feel free to correct my english etc. directly.

rgds
jan I.


Sent from my iPad, please excuse any misspellings ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - avmedia/source include/svx include/vcl svx/source vcl/source

[Chris Sherlock]

 avmedia/source/viewer/mediawindow_impl.cxx |2 
 include/svx/svdview.hxx|   10 -
 include/vcl/commandevent.hxx   |  259 -
 svx/source/sdr/contact/sdrmediawindow.cxx  |2 
 vcl/source/window/commandevent.cxx |  162 ++
 5 files changed, 208 insertions(+), 227 deletions(-)

New commits:
commit 63fd137cd54fb6df0c812a97d962239b8d0996a0
Author: Chris Sherlock 
Date:   Wed Feb 10 17:04:56 2016 +1100

svx: updated comment function signature return types

Change-Id: I4ebe95660b18fae2339876866cd95c7ca752e63d

diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index eb2b653..614fe1f 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -265,11 +265,11 @@ public:
 // 
 //   simple events:
 //   
-// sal_Bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin);
-// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin);
-// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin);
-// sal_Bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin);
-// sal_Bool Command(const CommandEvent& rCEvt, vcl::Window* pWin);
+// bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin);
+// bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin);
+// bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin);
+// bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin);
+// bool Command(const CommandEvent& rCEvt, vcl::Window* pWin);
 //
 //   Exchange (Clipboard derzeit noch ohne SdrPrivateData):
 //   ~~
commit 3ff9dd6ff36f21d9bea1851cea05a4ed4228722d
Author: Chris Sherlock 
Date:   Wed Feb 10 16:54:47 2016 +1100

vcl: move CommandEvent functions from header to cxx file

Moving functions from commandevent.hxx to commandevent.cxx, this means
they are no longer inline, but there was no clear reason as to why they
were inline in the first place!

I've also reordered the header to ensure that CommandEvent is the first
fully declared class, the data classes get declared after this (hence the
forward declarations). This makes reading this header much easier.

One more small thing: a few if statements had braces in the primary if
block, but not in the else block, which is IMO bad style and can possibly
lead to errors. I've made the else block use braces.

Change-Id: I79b010bd66d3c9f4a74d4fa470f62d0263c811f4

diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index dbf3415..6206abb 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -117,7 +117,7 @@ void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
 void MediaChildWindow::Command( const CommandEvent& rCEvt )
 {
 const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( 
OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
-rCEvt.GetCommand(), 
rCEvt.IsMouseEvent(), rCEvt.GetEventData() );
+  rCEvt.GetCommand(), 
rCEvt.IsMouseEvent(), rCEvt.GetEventData() );
 
 SystemChildWindow::Command( rCEvt );
 GetParent()->Command( aTransformedEvent );
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index a9fef58..9670aea 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -38,6 +38,45 @@
 #define EXTTEXTINPUT_CURSOR_INVISIBLE   ((sal_uInt16)0x0001)
 #define EXTTEXTINPUT_CURSOR_OVERWRITE   ((sal_uInt16)0x0002)
 
+class CommandExtTextInputData;
+class CommandWheelData;
+class CommandScrollData;
+class CommandModKeyData;
+class CommandDialogData;
+class CommandMediaData;
+class CommandSelectionChangeData;
+class CommandSwipeData;
+class CommandLongPressData;
+enum class CommandEventId;
+
+class VCL_DLLPUBLIC CommandEvent
+{
+private:
+Point   maPos;
+void*   mpData;
+CommandEventId  mnCommand;
+boolmbMouseEvent;
+
+public:
+CommandEvent();
+CommandEvent( const Point& rMousePos, 
CommandEventId nCmd,
+  bool bMEvt = false, 
const void* pCmdData = nullptr );
+
+CommandEventId  GetCommand() const { return mnCommand; 
}
+const Point&GetMousePosPixel() const { return 
maPos; }
+boolIsMouseEvent() const { return 
mbMouseEvent; }
+void*   GetEventData() const { return mpData; }
+
+const CommandExtTextInputData*  GetExtTextInputData() const;
+const CommandWheelData* GetWheelData() const

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

[Tor Lillqvist]

 framework/source/helper/persistentwindowstate.cxx |5 +
 framework/source/loadenv/loadenv.cxx  |7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 9ffa0477c32843106da546adf58b2e2ddb565045
Author: Tor Lillqvist 
Date:   Tue Feb 9 14:14:22 2016 +0200

tdf#97435: Avoid persistent window state crack when used from LibreOfficeKit

Change-Id: Icab7dea3cf63f3932b7759acec339b498a8ac9c5
Reviewed-on: https://gerrit.libreoffice.org/22233
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/framework/source/helper/persistentwindowstate.cxx 
b/framework/source/helper/persistentwindowstate.cxx
index ea25343..8853e0a 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -81,6 +82,10 @@ void SAL_CALL PersistentWindowState::initialize(const 
css::uno::Sequence< css::u
 void SAL_CALL PersistentWindowState::frameAction(const 
css::frame::FrameActionEvent& aEvent)
 throw(css::uno::RuntimeException, std::exception)
 {
+// We don't want to do this stuff when being used through LibreOfficeKit
+if( comphelper::LibreOfficeKit::isActive() )
+return;
+
 css::uno::Reference< css::uno::XComponentContext > xContext;
 css::uno::Reference< css::frame::XFrame >  xFrame;
 bool   bRestoreWindowState;
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 4261971..8717bd0 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1744,7 +1745,11 @@ void LoadEnv::impl_applyPersistentWindowState(const 
css::uno::Reference< css::aw
 // and apply it on the window.
 // Do nothing, if no configuration entry exists!
 OUString sWindowState;
-::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, 
sModule, OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES) >>= sWindowState;
+
+// Don't look for persistent window attributes when used through 
LibreOfficeKit
+if( !comphelper::LibreOfficeKit::isActive() )
+comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, 
sModule, OFFICEFACTORY_PROPNAME_WINDOWATTRIBUTES) >>= sWindowState;
+
 if (!sWindowState.isEmpty())
 {
 // SOLAR SAFE ->
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: parsing massive ODT doc in Writer?

[Jan-Marek Glogowski]

Hi Yury

Am 10.02.2016 um 00:33 schrieb Yury Tarasievich:
> A question to developers: what could even cause the drastic slowdown of
> parsing the ODT XML parts or whatever goes in the writer after the ODT
> zip archive is unpacked?
> 
> System is linux amd64, libraries compiled-in are internal.

I guess you won't find much without profiling.

As you're already building LO from source, I already wrote you how to do
the profiling. If you have problems with these instructions or the
analysis of the result, please ask on IRC. See my previous mail for
reference:

https://lists.freedesktop.org/archives/libreoffice/2016-January/072315.html

And as you already wrote, the "stock" build doesn't have these problems,
so IMHO there is not much which can be done by a different developer:

https://lists.freedesktop.org/archives/libreoffice/2016-January/072257.html

The compile options from

https://lists.freedesktop.org/archives/libreoffice/2016-January/072153.html

look generally ok

For the official build options see: distro-configs/README

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

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

[Tomaž Vajngerl]

 vcl/opengl/invert50FragmentShader.glsl |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2dd4e0e22299a5294a7a89560800929dfd39d195
Author: Tomaž Vajngerl 
Date:   Tue Feb 9 22:23:51 2016 +0100

opengl: invert50 shader compilation error

- can't assign vec4 to vec2
- LHS of `&&' must be scalar boolean

Change-Id: I46bef7d41198ed1a33f9c3f7796f25358849852e
(cherry picked from commit 8cf3f7bb7eba6fcddb42b6b789e5e4372a23f6b5)
Reviewed-on: https://gerrit.libreoffice.org/22259
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/vcl/opengl/invert50FragmentShader.glsl 
b/vcl/opengl/invert50FragmentShader.glsl
index 76f3e1f..8fac1cc 100644
--- a/vcl/opengl/invert50FragmentShader.glsl
+++ b/vcl/opengl/invert50FragmentShader.glsl
@@ -10,9 +10,9 @@
 /*precision mediump float;*/
 
 void main() {
-vec2 tex_mod = mod(gl_FragCoord, 2);
-bool bLeft = tex_mod.x > 0 && tex_mod.x < 1;
-bool bTop = tex_mod.y > 0 && tex_mod.y < 1;
+vec2 tex_mod = mod(gl_FragCoord, 2).xy;
+bool bLeft = (tex_mod.x > 0.0) && (tex_mod.x < 1.0);
+bool bTop = (tex_mod.y > 0.0) && (tex_mod.y < 1.0);
 // horrors - where is the XOR operator ?
 if ((bTop && bLeft) || (!bTop && !bLeft))
 gl_FragColor = vec4(255,255,255,0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 framework/source/helper/persistentwindowstate.cxx |5 +
 framework/source/loadenv/loadenv.cxx  |7 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 574482123b0fcd7deed9345fd524e9fc1d8bfb5e
Author: Tor Lillqvist 
Date:   Tue Feb 9 14:14:22 2016 +0200

tdf#97435: Avoid persistent window state crack when used from LibreOfficeKit

Change-Id: Icab7dea3cf63f3932b7759acec339b498a8ac9c5
Reviewed-on: https://gerrit.libreoffice.org/22233
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/framework/source/helper/persistentwindowstate.cxx 
b/framework/source/helper/persistentwindowstate.cxx
index 12bf95d..3cdf500 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -77,6 +78,10 @@ void SAL_CALL PersistentWindowState::initialize(const 
css::uno::Sequence< css::u
 void SAL_CALL PersistentWindowState::frameAction(const 
css::frame::FrameActionEvent& aEvent)
 throw(css::uno::RuntimeException, std::exception)
 {
+// We don't want to do this stuff when being used through LibreOfficeKit
+if( comphelper::LibreOfficeKit::isActive() )
+return;
+
 css::uno::Reference< css::uno::XComponentContext > xContext;
 css::uno::Reference< css::frame::XFrame >  xFrame;
 bool   bRestoreWindowState;
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 323926a..0ebf000 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1724,7 +1725,11 @@ void LoadEnv::impl_applyPersistentWindowState(const 
css::uno::Reference< css::aw
 // and apply it on the window.
 // Do nothing, if no configuration entry exists!
 OUString sWindowState;
-::comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, 
sModule, OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES) >>= sWindowState;
+
+// Don't look for persistent window attributes when used through 
LibreOfficeKit
+if( !comphelper::LibreOfficeKit::isActive() )
+comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg, 
sModule, OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES) >>= sWindowState;
+
 if (!sWindowState.isEmpty())
 {
 // SOLAR SAFE ->
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libo-marketing-priv] Program Committee for LibOCon

[Ani Peter]

Dear Sophie,

I was traveling in Brno for couple of conferences & got back home
yesterday. Hence was not prompt in checking and replying to emails!

If its not too late to join the Program Committee, I would also like to be
part of it and contribute the best way I can

Thanking you
Best regards
Ani


On Tue, Feb 2, 2016 at 4:19 PM, Sophie  wrote:

> Hi all,
>
> As each year, it's time to form the Program Committee. We need at least
> 3 or 4 persons available to review the talks proposed by the community,
> sort and organize them and then manage the conference program.
>
> *Important note*: you need to be available during July and August as
> these are the months during which we set the program.
>
> Thanks in advance to those volunteering
> Cheers
> Sophie
> --
> Sophie Gautier sophie.gaut...@documentfoundation.org
> GSM: +33683901545
> IRC: sophi
> Co-founder - Release coordinator
> The Document Foundation
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tomaž Vajngerl]

 vcl/opengl/invert50FragmentShader.glsl |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8cf3f7bb7eba6fcddb42b6b789e5e4372a23f6b5
Author: Tomaž Vajngerl 
Date:   Tue Feb 9 22:23:51 2016 +0100

opengl: invert50 shader compilation error

- can't assign vec4 to vec2
- LHS of `&&' must be scalar boolean

Change-Id: I46bef7d41198ed1a33f9c3f7796f25358849852e

diff --git a/vcl/opengl/invert50FragmentShader.glsl 
b/vcl/opengl/invert50FragmentShader.glsl
index 76f3e1f..8fac1cc 100644
--- a/vcl/opengl/invert50FragmentShader.glsl
+++ b/vcl/opengl/invert50FragmentShader.glsl
@@ -10,9 +10,9 @@
 /*precision mediump float;*/
 
 void main() {
-vec2 tex_mod = mod(gl_FragCoord, 2);
-bool bLeft = tex_mod.x > 0 && tex_mod.x < 1;
-bool bTop = tex_mod.y > 0 && tex_mod.y < 1;
+vec2 tex_mod = mod(gl_FragCoord, 2).xy;
+bool bLeft = (tex_mod.x > 0.0) && (tex_mod.x < 1.0);
+bool bTop = (tex_mod.y > 0.0) && (tex_mod.y < 1.0);
 // horrors - where is the XOR operator ?
 if ((bTop && bLeft) || (!bTop && !bLeft))
 gl_FragColor = vec4(255,255,255,0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 87813] SIDEBAR: Incorporating the effects list into the animation tab

[bugzilla-daemon]

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

--- Comment #15 from Commit Notification 
 ---
Rishabh committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=a04b458821cd4b34b56f406af4620c8df2d5ea12

tdf#87813: Reduce duplicate code

It will be available in 5.2.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Rishabh]

 sd/source/ui/animations/CustomAnimationPane.cxx |   34 
 1 file changed, 1 insertion(+), 33 deletions(-)

New commits:
commit a04b458821cd4b34b56f406af4620c8df2d5ea12
Author: Rishabh 
Date:   Tue Feb 9 20:18:22 2016 +0530

tdf#87813: Reduce duplicate code

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

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 9535844..f7589cf 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2125,39 +2125,7 @@ IMPL_LINK_NOARG_TYPED(CustomAnimationPane, 
implPropertyHdl, LinkParamNone*, void
 
 IMPL_LINK_NOARG_TYPED(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
 {
-CustomAnimationPresetPtr* pPreset = static_cast< CustomAnimationPresetPtr* 
>(mpLBAnimation->GetSelectEntryData());
-const double fDuration = (*pPreset)->getDuration();
-sal_uInt32 nPos = LISTBOX_ENTRY_NOTFOUND;
-if( fDuration == 5.0 )
-nPos = 0;
-else if( fDuration == 3.0 )
-nPos = 1;
-else if( fDuration == 2.0 )
-nPos = 2;
-else if( fDuration == 1.0 )
-nPos = 3;
-else if( fDuration == 0.5 )
-nPos = 4;
-mpCBSpeed->SelectEntryPos( nPos );
-bool bHasSpeed = (*pPreset)->getDuration() > 0.001;
-mpCBSpeed->Enable( bHasSpeed );
-mpFTSpeed->Enable( bHasSpeed );
-MainSequenceRebuildGuard aGuard( mpMainSequence );
-
-// get selected effect
-EffectSequence::iterator aIter( maListSelection.begin() );
-const EffectSequence::iterator aEnd( maListSelection.end() );
-while( aIter != aEnd )
-{
-CustomAnimationEffectPtr pEffect = (*aIter++);
-
-EffectSequenceHelper* pEffectSequence = pEffect->getEffectSequence();
-if( !pEffectSequence )
-pEffectSequence = mpMainSequence.get();
-
-pEffectSequence->replace( pEffect, *pPreset, fDuration );
-}
-onPreview(true);
+animationChange();
 }
 
 IMPL_LINK_NOARG_TYPED(CustomAnimationPane, UpdateAnimationLB, ListBox&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 97703] EasyHack: Remove empty setUp/tearDown overrides from CppUnit test code

[bugzilla-daemon]

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

Stephan Bergmann  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 97703] New: EasyHack: Remove empty setUp/tearDown overrides from CppUnit test code

[bugzilla-daemon]

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

Bug ID: 97703
   Summary: EasyHack: Remove empty setUp/tearDown overrides from
CppUnit test code
   Product: LibreOffice
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Keywords: difficultyBeginner, easyHack, skillCpp, topicCleanup
  Severity: enhancement
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-b...@lists.freedesktop.org
  Reporter: sberg...@redhat.com
CC: libreoffice@lists.freedesktop.org

Some of our C++ test code using CppUnit needlessly contains empty overrides of
CppUnit::TextFixture::setUp and/or CppUnit::TextFixture::tearDown (e.g.,
).
 These can just be removed.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sal/qa/rtl/random/rtl_random.cxx |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 0c517ab1bf7f17b9d070f0a79fc2e6d637309d11
Author: Stephan Bergmann 
Date:   Wed Feb 10 09:07:07 2016 +0100

loplugin:nullptr, loplugin:override

Change-Id: If4500b8b41915a05a2bfb2c776259f49ad9bfc85

diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 752769f..e3a70e4 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -37,11 +37,11 @@ class createPool : public CppUnit::TestFixture
 {
 public:
 // initialise your test code values here.
-void setUp()
+void setUp() override
 {
 }
 
-void tearDown()
+void tearDown() override
 {
 }
 
@@ -54,7 +54,7 @@ public:
 rtlRandomPool aPool = rtl_random_createPool();
 
 // LLA: seems to be that an other test is not possible for createPool()
-CPPUNIT_ASSERT_MESSAGE("create failed", aPool != NULL);
+CPPUNIT_ASSERT_MESSAGE("create failed", aPool != nullptr);
 
 rtl_random_destroyPool(aPool);
 }
@@ -72,11 +72,11 @@ class destroyPool : public CppUnit::TestFixture
 {
 public:
 // initialise your test code values here.
-void setUp()
+void setUp() override
 {
 }
 
-void tearDown()
+void tearDown() override
 {
 }
 
@@ -84,7 +84,7 @@ public:
 void destroyPool_000()
 {
 // GPF, if failed
-rtl_random_destroyPool(NULL);
+rtl_random_destroyPool(nullptr);
 }
 
 void destroyPool_001()
@@ -92,7 +92,7 @@ public:
 rtlRandomPool aPool = rtl_random_createPool();
 
 // LLA: seems to be that an other test is not possible for createPool()
-CPPUNIT_ASSERT_MESSAGE("create failed", aPool != NULL);
+CPPUNIT_ASSERT_MESSAGE("create failed", aPool != nullptr);
 
 rtl_random_destroyPool(aPool);
 }
@@ -110,11 +110,11 @@ class addBytes : public CppUnit::TestFixture
 {
 public:
 // initialise your test code values here.
-void setUp()
+void setUp() override
 {
 }
 
-void tearDown()
+void tearDown() override
 {
 }
 
@@ -128,10 +128,10 @@ public:
 sal_uInt8   *pBuffer = new sal_uInt8[ nBufLen ];
 memset(pBuffer, 0, nBufLen);
 
-rtlRandomError aError = rtl_random_addBytes(NULL, NULL, 0);
+rtlRandomError aError = rtl_random_addBytes(nullptr, nullptr, 0);
 CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == 
rtl_Random_E_Argument);
 
-/* rtlRandomError */ aError = rtl_random_addBytes(aPool, NULL, 0);
+/* rtlRandomError */ aError = rtl_random_addBytes(aPool, nullptr, 0);
 CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == 
rtl_Random_E_Argument);
 
 /* rtlRandomError */ aError = rtl_random_addBytes(aPool, pBuffer, 
nBufLen);
@@ -244,11 +244,11 @@ class getBytes : public CppUnit::TestFixture
 {
 public:
 // initialise your test code values here.
-void setUp()
+void setUp() override
 {
 }
 
-void tearDown()
+void tearDown() override
 {
 }
 
@@ -261,10 +261,10 @@ public:
 sal_uInt8   *pBuffer = new sal_uInt8[ nBufLen ];
 memset(pBuffer, 0, nBufLen);
 
-rtlRandomError aError = rtl_random_getBytes(NULL, NULL, 0);
+rtlRandomError aError = rtl_random_getBytes(nullptr, nullptr, 0);
 CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == 
rtl_Random_E_Argument);
 
-/* rtlRandomError */ aError = rtl_random_getBytes(aPool, NULL, 0);
+/* rtlRandomError */ aError = rtl_random_getBytes(aPool, nullptr, 0);
 CPPUNIT_ASSERT_MESSAGE("wrong parameter", aError == 
rtl_Random_E_Argument);
 
 /* rtlRandomError */ aError = rtl_random_getBytes(aPool, pBuffer, 
nBufLen);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf87034.rtf   |   13 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |7 +++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 -
 4 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 93faf178195ca974747849879266783884ae27c5
Author: Miklos Vajna 
Date:   Wed Feb 10 08:59:01 2016 +0100

tdf#87034 RTF import: fix multiple superscripts after footnote ...

... in the same paragraph. The intention was to avoid replaying the
supertext buffer and using its contents as a custom footnote mark at the
same time. However, it's enough to check if the buffer is empty to do
so, and that avoids the mis-import of the bugdoc as well.

Change-Id: I1e3b0c7f0c6d8eb8250d8b1d0d7d196039c40e79

diff --git a/sw/qa/extras/rtfimport/data/tdf87034.rtf 
b/sw/qa/extras/rtfimport/data/tdf87034.rtf
new file mode 100644
index 000..16f322c
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf87034.rtf
@@ -0,0 +1,13 @@
+{\rtf1
+\pard\plain A
+{\chftn
+{\footnote\chftn F
+}
+}
+B
+{\super 3}
+C
+{\super 4}
+D
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 1cb27c6b..b5216c9 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2484,6 +2484,13 @@ DECLARE_RTFIMPORT_TEST(testTdf97035, "tdf97035.rtf")
 CPPUNIT_ASSERT_EQUAL(sal_Int16(2299), getProperty< 
uno::Sequence >(xTableRows->getByIndex(1), 
"TableColumnSeparators")[0].Position);
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf87034, "tdf87034.rtf")
+{
+// This was A1BC34D, i.e. the first "super" text portion was mis-imported,
+// and was inserted instead right before the second "super" text portion.
+CPPUNIT_ASSERT_EQUAL(OUString("A1B3C4D"), getParagraph(1)->getString());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 10db153..bf41bbe 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -240,7 +240,6 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
   m_nBackupTopLevelCurrentCellX(0),
   m_aTableBufferStack(1), // create top-level buffer already
   m_aSuperBuffer(),
-  m_bHasFootnote(false),
   m_pSuperstream(nullptr),
   m_nStreamType(0),
   m_nHeaderFooterPositions(),
@@ -1699,7 +1698,6 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword 
nKeyword)
 if (aKeyword.equals("\\ftnalt"))
 nId = NS_ooxml::LN_endnote;
 
-m_bHasFootnote = true;
 if (m_aStates.top().pCurrentBuffer == &m_aSuperBuffer)
 m_aStates.top().pCurrentBuffer = nullptr;
 bool bCustomMark = false;
@@ -6095,10 +6093,8 @@ RTFError RTFDocumentImpl::popState()
 {
 OSL_ASSERT(!m_aStates.empty() && m_aStates.top().pCurrentBuffer == 
nullptr);
 
-if (!m_bHasFootnote)
+if (!m_aSuperBuffer.empty())
 replayBuffer(m_aSuperBuffer, nullptr, nullptr);
-
-m_bHasFootnote = false;
 }
 
 return RTFError::OK;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 3aa75de..830eddd 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -523,7 +523,6 @@ private:
 /// Buffered superscript, till footnote is reached (or not).
 RTFBuffer_t m_aSuperBuffer;
 
-bool m_bHasFootnote;
 /// Superstream of this substream.
 RTFDocumentImpl* m_pSuperstream;
 /// Type of the stream: header, footer, footnote, etc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits