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

[Stephan Bergmann]

 ucb/source/ucp/cmis/auth_provider.hxx  |8 
 ucb/source/ucp/cmis/certvalidation_handler.hxx |8 
 ucb/source/ucp/cmis/cmis_content.hxx   |9 +
 ucb/source/ucp/cmis/cmis_url.cxx   |8 
 4 files changed, 33 insertions(+)

New commits:
commit b48f97a2ec6ec5b53234594e70ccf24db347f976
Author: Stephan Bergmann 
Date:   Tue Jan 31 10:40:54 2017 +0100

Silence GCC 7 warnings in libcmis/libcmis.hxx

Change-Id: If7114da10824300804a882fa31080a17e69fc36b

diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index c2d1e18..4e560d6 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -9,7 +9,15 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#endif
 #include 
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 #include 
 #include 
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx 
b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index dde7b87..9519268 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -12,7 +12,15 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#endif
 #include 
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 #include 
 
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx 
b/ucb/source/ucp/cmis/cmis_content.hxx
index 270a232..96ac275 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -23,7 +23,16 @@
 #include 
 #include 
 #include 
+
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#endif
 #include 
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 #include 
 
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 3fbfce3..6d42172 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -7,7 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
+#endif
 #include 
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 mysqlc/source/mysqlc_general.hxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit f6698138359e1f571aa6a464a40fb3bc85412d3a
Author: Stephan Bergmann 
Date:   Tue Jan 31 10:41:35 2017 +0100

Silence GCC 7 warnings in cppconn/exception.h

Change-Id: Ia924473d3dba11babee23f4137c645b9f8d86a8b

diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 1f60a19..5d0b828 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -25,7 +25,14 @@
 #include 
 #include 
 
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+#endif
 #include 
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 namespace mysqlc_sdbc_driver
 {
___
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/ooxmlexport/data/tdf103976.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   10 ++
 writerfilter/source/dmapper/DomainMapper.cxx |   10 --
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 353a45aa1b1a15047aa2a92c1383996070e87405
Author: Miklos Vajna 
Date:   Tue Jan 31 09:14:11 2017 +0100

tdf#103976 DOCX import: disable incomplete w:before/afterLines style 
handling

Regression from commit 9e7eb63989ef1cf4b9a0e0404b84ef890db3d8e3 (DOCX
import: parse 's w:before/afterLines attribute, 2014-10-17),
the problem is that OOXML has 3 different attributes for the paragraph
bottom margin (and other 3 for the top one), while in Writer we just
have a top margin.

Now the import filter tries to work out which one of these should have
priority and ignore the rest, but this is way more complicated when
style inheritance has to be taken into account as well.

To avoid the regression just restrict w:before/afterLines handling for
the case when it's used as direct formatting, that's why this was
introduced after all.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf103976.docx 
b/sw/qa/extras/ooxmlexport/data/tdf103976.docx
new file mode 100644
index 000..2081fcf
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf103976.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index d7cbdf7..1bb1681 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -209,6 +209,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104150, "tdf104150.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(-1), 
getProperty(xPageStyle, "BackColor"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf103976, "tdf103976.docx")
+{
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+// This was 0, table style inheritance went wrong and w:afterLines had 
priority over w:after.
+CPPUNIT_ASSERT_EQUAL(static_cast(convertTwipToMm100(60)), 
getProperty(getParagraphOfText(1, xCell->getText()), 
"ParaBottomMargin"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index f2a076c..823640c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -377,7 +377,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 break;
 case NS_ooxml::LN_CT_Spacing_beforeLines:
 m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, 
"beforeLines", OUString::number(nIntValue));
-if (m_pImpl->GetTopContext())
+// We would need to make sure that this doesn't overwrite any
+// NS_ooxml::LN_CT_Spacing_before in parent styles before style
+// sheet support can be enabled.
+if (m_pImpl->GetTopContext() && !IsStyleSheetImport())
 m_pImpl->GetTopContext()->Insert(PROP_PARA_TOP_MARGIN, 
uno::makeAny(ConversionHelper::convertTwipToMM100(nIntValue * 
nSingleLineSpacing / 100)), false);
 break;
 case NS_ooxml::LN_CT_Spacing_after:
@@ -388,7 +391,10 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 break;
 case NS_ooxml::LN_CT_Spacing_afterLines:
 m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, 
"afterLines", OUString::number(nIntValue));
-if (m_pImpl->GetTopContext())
+// We would need to make sure that this doesn't overwrite any
+// NS_ooxml::LN_CT_Spacing_after in parent styles before style
+// sheet support can be enabled.
+if (m_pImpl->GetTopContext() && !IsStyleSheetImport())
 m_pImpl->GetTopContext()->Insert(PROP_PARA_BOTTOM_MARGIN, 
uno::makeAny(ConversionHelper::convertTwipToMM100(nIntValue * 
nSingleLineSpacing / 100)), false);
 break;
 case NS_ooxml::LN_CT_Spacing_line: //91434
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 desktop/source/deployment/manager/dp_manager.cxx |   24 +--
 1 file changed, 22 insertions(+), 2 deletions(-)

New commits:
commit b01ec28b6dfa84c9c9f07d08af27a0107a5260a1
Author: Stephan Bergmann 
Date:   Tue Jan 31 11:44:20 2017 +0100

Create missing parent dirs when checking for r/o dir

...can happen when 'unopkg add' is called before soffice had ever been run, 
so
UserInstallation isn't populated yet

Change-Id: I0c6b9444f196da5ad5a32cc90f2e1e2a5dbd0f58

diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index c47aad7..ff675b9 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -278,14 +279,32 @@ void PackageManagerImpl::initRegistryBackends()
  m_xComponentContext ) );
 }
 
+namespace {
+
+osl::FileBase::RC createDirectory(OUString const & url) {
+auto e = osl::Directory::create(url);
+if (e != osl::FileBase::E_NOENT) {
+return e;
+}
+INetURLObject o(url);
+if (!o.removeSegment()) {
+return osl::FileBase::E_INVAL; // anything but E_None/E_EXIST
+}
+e = createDirectory(o.GetMainURL(INetURLObject::DecodeMechanism::NONE));
+if (e != osl::FileBase::E_None && e != osl::FileBase::E_EXIST) {
+return e;
+}
+return osl::Directory::create(url);
+}
+
 // this overcomes previous rumors that the sal API is misleading
 // as to whether a directory is truly read-only or not
-static bool isMacroURLReadOnly( const OUString  )
+bool isMacroURLReadOnly( const OUString  )
 {
 OUString aDirURL( rMacro );
 ::rtl::Bootstrap::expandMacros( aDirURL );
 
-::osl::FileBase::RC aErr = ::osl::Directory::create( aDirURL );
+::osl::FileBase::RC aErr = createDirectory( aDirURL );
 if ( aErr == ::osl::FileBase::E_None )
 return false; // it will be writeable
 if ( aErr != ::osl::FileBase::E_EXIST )
@@ -313,6 +332,7 @@ static bool isMacroURLReadOnly( const OUString  )
 return bError;
 }
 
+}
 
 Reference PackageManagerImpl::create(
 Reference const & xComponentContext,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/swriter/01/05060300.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31cb3368f3f9412c359b58009a8ea0dc9ab75324
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:54:51 2017 +0100

Fix ahelps for FlipVertical and FlipHorizontal UNO commands

These are on the Image toolbar

Change-Id: I9ed0262e9e6e346a8e42dc034c690eb88646a316
Reviewed-on: https://gerrit.libreoffice.org/33730
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/05060300.xhp 
b/source/text/swriter/01/05060300.xhp
index 5fa6cfd..0c0e4d0 100644
--- a/source/text/swriter/01/05060300.xhp
+++ b/source/text/swriter/01/05060300.xhp
@@ -42,12 +42,12 @@
 
 
 Verticallysee bug 106420;Writer uses VERT for HOR 
and HORZ for VERT
-Flips the selected image 
vertically.
+Flips the selected image 
vertically.
 
 
 
 Horizontally
-Flips the selected image 
horizontally.
+Flips the selected 
image horizontally.
 
 
 On all pages
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 768ec4a12aaf0f17b4abbad6b78677b9f6f0ad99
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:54:51 2017 +0100

Updated core
Project: help  31cb3368f3f9412c359b58009a8ea0dc9ab75324

Fix ahelps for FlipVertical and FlipHorizontal UNO commands

These are on the Image toolbar

Change-Id: I9ed0262e9e6e346a8e42dc034c690eb88646a316
Reviewed-on: https://gerrit.libreoffice.org/33730
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index d427d89..31cb336 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d427d899f1228bcb309f349c39c17eb96d80d980
+Subproject commit 31cb3368f3f9412c359b58009a8ea0dc9ab75324
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ideNS Makefile.in

[jan Iversen]

 Makefile.in |   19 
 bin/gbuild-to-ideNS | 1660 
 2 files changed, 1675 insertions(+), 4 deletions(-)

New commits:
commit 8736391f4ddda5bc73221e0762653a721819bcd9
Author: jan Iversen 
Date:   Mon Jan 30 17:29:08 2017 +0100

Gbuild-to-ide, Froze non-active supported generators.

Copied gbuild-to-ide.py from d575e3a14beef8bdd3517c024b9aab8a17b3ef7b
to gbuild-to-ideNS.py

Changed Makefile.in to use gbuild-to-ideNS.py for non-actively
supported platforms.

That way these platform are stable, and not affected of new features.

For now all platforms are still present in gbuild-to-ide and will
have a "does not break" test for all new features.

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

diff --git a/Makefile.in b/Makefile.in
index 5f7b215..63f731c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -414,17 +414,28 @@ $(1)-ide-integration: gbuildtojson $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),python3
 
 endef
 
+define gb_Top_GbuildToIdeIntegrationNS
+$(1)-ide-integration: gbuildtojson $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),python3.all)
+   cd $(SRCDIR) && \
+   $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),PATH="$(INSTROOT_FOR_BUILD)/Frameworks/LibreOfficePython.framework/Versions/Current/bin:$(PATH)")
 \
+   $(SRCDIR)/bin/gbuild-to-ideNS --ide $(1) --make $(MAKE)
+
+endef
+
 $(foreach ide,\
-   codelite \
debug \
-   kdevelop \
vs2013 \
vs2015 \
+   xcode, \
+$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
+
+$(foreach ide,\
+   codelite \
+   kdevelop \
vim \
-   xcode \
qtcreator \
 eclipsecdt,\
-$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
+$(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide
 
 fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg 
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi 
Library_clew Library_gie Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer Executable_epsfuzzer
 
diff --git a/bin/gbuild-to-ideNS b/bin/gbuild-to-ideNS
new file mode 100755
index 000..7de2fb4
--- /dev/null
+++ b/bin/gbuild-to-ideNS
@@ -0,0 +1,1660 @@
+#! /usr/bin/env python3
+# -*- Mode: python; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import argparse
+import os
+import os.path
+import shutil
+import re
+import sys
+import uuid
+import json
+import xml.etree.ElementTree as ET
+import xml.dom.minidom as minidom
+import traceback
+
+
+class GbuildLinkTarget:
+def __init__(self, name, location, include, include_sys, defs, cxxobjects, 
cxxflags, linked_libs):
+(self.name, self.location, self.include, self.include_sys, self.defs, 
self.cxxobjects, self.cxxflags, self.linked_libs) = (
+name, location, include, include_sys, defs, cxxobjects, cxxflags, 
linked_libs)
+
+def short_name(self):
+return self.name
+
+def is_empty(self):
+return not self.include and not self.defs and not self.cxxobjects and 
not self.linked_libs
+
+def __str__(self):
+return '%s at %s with include path: %s, isystem includes: %s, defines: 
%s, objects: %s, cxxflags: %s and linked libs: %s' % (
+self.short_name(), self.location, self.include, self.include_sys, 
self.defs, self.cxxobjects,
+self.cxxflags, self.linked_libs)
+
+
+class GbuildLib(GbuildLinkTarget):
+def __init__(self, name, library, location, include, include_sys, defs, 
cxxobjects, cxxflags, linked_libs):
+GbuildLinkTarget.__init__(self, name, location, include, include_sys, 
defs, cxxobjects, cxxflags, linked_libs)
+self.library = library
+
+def short_name(self):
+"""Return the short name of target based on the Library_* makefile 
name"""
+return 'Library %s' % self.name
+
+def target_name(self):
+return 'Library_%s' % self.library
+
+def library_name(self):
+return self.library
+
+class 

Re: "Insert ODF Track Change Comment"

[Samuel Mehrbrodt]

It was changed in 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=37ad8daabf596e039b4ca62e06e91d5a83128b7c

I don't know why, the "ODF" makes no sense there. We usually don't mention 
which features are exclusive to ODF.
I'll revert that part.

For the translation, I'd just ignore the "ODF".

Regards
Samuel

Am 30.01.2017 um 20:56 schrieb Olivier Hallot:

Hi

Can someone help our translation job with the precise meaning of

"Insert ODF Track Change Comment"

In that case what is the role of 'ODF' in the track change comment? Is it a 
special comment feature?

Ref:

WriterCommands.xcu 
..WriterCommands.UserInterface.Commands..uno:CommentChangeTracking TooltipLabel 
value.text
Localiza??es: WriterCommands.xcu
KeyID: KdBT6

Thank you
Olivier


 Mensagem encaminhada 
Assunto:[libreoffice-documentation] Fwd: [] Unit #117593896 (bg)
Data:   Mon, 30 Jan 2017 14:35:19 +0100
De: Sophie 
Para:   
documentat...@global.libreoffice.org
 




another one


 Message transf?r? 
Sujet : [] Unit #117593896 (bg)
Date : Sat, 28 Jan 2017 22:52:40 -
De : Mihail Balabanov 

R?pondre ? : Mihail Balabanov 

Pour : 
hostmas...@documentfoundation.org

Username: anonymous user
Current URL: IP address: User-Agent:
Unit:
https://translations.documentfoundation.org/bg/libo_ui/translate/officecfg/registry/data/org/openoffice/Office/UI.po#unit=117593896

Source: Insert ODF Track Change Comment

Current translation:  ?? ODF  ?? ?? ???

Your question or comment:
What is meant here? Is it 'an ODF comment for/about a track change', or
'a comment for/about an ODF track change'? Also, shouldn't 'Track
Change' be actually 'Tracked Change'?

--
To unsubscribe e-mail to: 
documentation+unsubscr...@global.libreoffice.org
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://listarchives.libreoffice.org/global/documentation/
All messages sent to this list will be publicly archived and cannot be deleted


--
Samuel Mehrbrodt
Softwareentwickler LibreOffice
---
CIB software GmbH
Gesch?ftsstelle Hamburg
Flachsland 10
22083 Hamburg
---
T +49 (40) / 28 48 42 -224
F +49 (40) / 28 48 42 -100

samuel.mehrbr...@cib.de
www.cib.de
---
Sitz: M?nchen
Registergericht M?nchen, HRB 123286
Gesch?ftsf?hrer: Dipl.-Ing. Ulrich Brandner
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Federico Bassini]

 bin/gbuild-to-ide |   79 +++---
 1 file changed, 34 insertions(+), 45 deletions(-)

New commits:
commit 9f440258b6bdf9b168992f7058f448dac588760c
Author: Federico Bassini 
Date:   Mon Jan 30 22:29:52 2017 +0100

gbuild-to-ide: testVS2013Ide add a function that create .filters file

this patch writes the .filters file, it creates 2 filters:
-headers: place, for each module, the header files contained in 
gbuilparser.modules[][headers]
-sources: place, for each module, the cxx files contained in 
gbuildparser.modules[][]['CXXOBJECTS']

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

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 9a8ce8a..3bf063d 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -150,17 +150,18 @@ class GbuildParser:
 
 def find_all_headers(self):
 
-cmdResult1=subprocess.Popen(('git', 'ls-files'), 
cwd=self.srcdir,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-cmdResult2=subprocess.check_output(('grep', '-i', '-E', 
'".*\.hxx$|.*\.h$|.*\.hpp$"'),cwd=self.srcdir,stdin=cmdResult1.stdout,stderr=subprocess.PIPE)
+cmdResult=subprocess.check_output(['git', 
'ls-files','--','*.h','*.hxx', '*.hpp'], cwd=self.srcdir, 
stderr=subprocess.PIPE,)
+
 
 allfiles={}
-for file in cmdResult2.splitlines():
+for file in cmdResult.splitlines():
 strfile=file.decode()
 modulename=strfile.split('/')[0]
 if not modulename in allfiles:
 allfiles[modulename]=[]
 modulename_len=len(modulename)
 allfiles[modulename].append(strfile[modulename_len + 1:])
+
 self._allheaders = allfiles
 
 def headers_of(self,modulename):
@@ -182,7 +183,7 @@ class IdeIntegrationGenerator:
 
 
 
-class testWinIde(IdeIntegrationGenerator):
+class testVS2013Ide(IdeIntegrationGenerator):
 
 def __init__(self, gbuildparser, ide):
 IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
@@ -226,9 +227,12 @@ class testWinIde(IdeIntegrationGenerator):
 module_directory = os.path.join(self.solution_directory, module)
 if module != 'include':  # FIXME
 for target in self.gbuildparser.modules[module]['targets']:
+
 project_path = os.path.join(module_directory, '%s.vcxproj' 
% target['target_name'])
+
 project_guid = self.write_project(project_path, target)
 p = VisualStudioIntegrationGenerator.Project(project_guid, 
target, project_path)
+self.write_filters(project_path + 
'.filters',target,self.gbuildparser.modules[module]['headers'])
 projects.append(p)
 self.write_solution(os.path.join(module_directory, '%s.sln' % 
module), projects)
 all_projects += projects
@@ -379,22 +383,8 @@ class testWinIde(IdeIntegrationGenerator):
 ET.SubElement(proj_node, '{%s}Import' % ns, 
Project='$(VCTargetsPath)\Microsoft.Cpp.targets')
 ET.SubElement(proj_node, '{%s}ImportGroup' % ns, 
Label='ExtensionTargets')
 self.write_pretty_xml(proj_node, project_path)
-self.write_filters(project_path + '.filters',
-   os.path.join(self.gbuildparser.srcdir, 
os.path.basename(target['location'])),
-   [cxx_node.get('Include') for cxx_node in 
cxxobjects_node.findall('{%s}ClCompile' % ns)],
-   [include_node.get('Include') for include_node in
-includes_node.findall('{%s}ClInclude' % ns)])
-return project_guid
-
-def get_filter(self, module_dir, proj_file):
-return '\\'.join(os.path.relpath(proj_file, 
module_dir).split('/')[:-1])
 
-def get_subfilters(self, proj_filter):
-parts = proj_filter.split('\\')
-subfilters = set([proj_filter])
-for i in range(1, len(parts)):
-subfilters.add('\\'.join(parts[:i]))
-return subfilters
+return project_guid
 
 def write_pretty_xml(self, node, file_path):
 xml_str = ET.tostring(node, encoding='unicode')
@@ -402,36 +392,35 @@ class testWinIde(IdeIntegrationGenerator):
 with open(file_path, 'w') as f:
 f.write(pretty_str.decode())
 
-def add_nodes(self, files_node, module_dir, tag, project_files):
-ns = 'http://schemas.microsoft.com/developer/msbuild/2003'
-filters = set()
-for project_file in project_files:
-file_node = ET.SubElement(files_node, tag, Include=project_file)
-if os.path.commonprefix([module_dir, project_file]) == module_dir:
-project_filter = self.get_filter(module_dir, project_file)
-filter_node = 

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

[aleksandar-stefanovic]

 android/source/src/java/org/libreoffice/LOKitTileProvider.java |   26 
--
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 644d92ada400e335e256215598a532f116438a1f
Author: aleksandar-stefanovic 
Date:   Wed Jan 25 19:50:19 2017 +0100

Removed static context from LOKitTileProvider

Removed references to static context, replaced them with the context
object already available in the class, and changed access levels on
some methods in LOKitTileProvider.

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

diff --git a/android/source/src/java/org/libreoffice/LOKitTileProvider.java 
b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
index a068627..d0fbe94 100644
--- a/android/source/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
@@ -19,7 +19,6 @@ import org.libreoffice.kit.LibreOfficeKit;
 import org.libreoffice.kit.Office;
 import org.mozilla.gecko.gfx.BufferedCairoImage;
 import org.mozilla.gecko.gfx.CairoImage;
-import org.mozilla.gecko.gfx.GeckoLayerClient;
 import org.mozilla.gecko.gfx.IntSize;
 
 import java.nio.ByteBuffer;
@@ -27,7 +26,7 @@ import java.nio.ByteBuffer;
 /**
  * LOKit implementation of TileProvider.
  */
-public class LOKitTileProvider implements TileProvider {
+class LOKitTileProvider implements TileProvider {
 private static final String LOGTAG = 
LOKitTileProvider.class.getSimpleName();
 private static int TILE_SIZE = 256;
 private final float mTileWidth;
@@ -51,7 +50,7 @@ public class LOKitTileProvider implements TileProvider {
  * @param messageCallback - callback for messages retrieved from LOKit
  * @param input - input path of the document
  */
-public LOKitTileProvider(LibreOfficeMainActivity context, 
Document.MessageCallback messageCallback, String input) {
+LOKitTileProvider(LibreOfficeMainActivity context, 
Document.MessageCallback messageCallback, String input) {
 mContext = context;
 mMessageCallback = messageCallback;
 mDPI = LOKitShell.getDpi(mContext);
@@ -59,7 +58,7 @@ public class LOKitTileProvider implements TileProvider {
 mTileHeight = pixelToTwip(TILE_SIZE, mDPI);
 
 LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO");
-LibreOfficeKit.init(LibreOfficeMainActivity.mAppContext);
+LibreOfficeKit.init(mContext);
 
 mOffice = new Office(LibreOfficeKit.getLibreOfficeKitHandle());
 
@@ -100,8 +99,7 @@ public class LOKitTileProvider implements TileProvider {
 
 int parts = mDocument.getParts();
 Log.i(LOGTAG, "Document parts: " + parts);
-
-LibreOfficeMainActivity.mAppContext.getDocumentPartView().clear();
+mContext.getDocumentPartView().clear();
 
 // Writer documents always have one part, so hide the navigation 
drawer.
 if (mDocument.getDocumentType() != Document.DOCTYPE_TEXT) {
@@ -115,10 +113,10 @@ public class LOKitTileProvider implements TileProvider {
 mDocument.setPart(i);
 resetDocumentSize();
 final DocumentPartView partView = new DocumentPartView(i, 
partName);
-
LibreOfficeMainActivity.mAppContext.getDocumentPartView().add(partView);
+mContext.getDocumentPartView().add(partView);
 }
 } else {
-LibreOfficeMainActivity.mAppContext.disableNavigationDrawer();
+mContext.disableNavigationDrawer();
 }
 
 mDocument.setPart(0);
@@ -128,7 +126,7 @@ public class LOKitTileProvider implements TileProvider {
 LOKitShell.getMainHandler().post(new Runnable() {
 @Override
 public void run() {
-
LibreOfficeMainActivity.mAppContext.getDocumentPartViewListAdapter().notifyDataSetChanged();
+
mContext.getDocumentPartViewListAdapter().notifyDataSetChanged();
 }
 });
 }
@@ -160,11 +158,11 @@ public class LOKitTileProvider implements TileProvider {
 }
 }
 
-public static float twipToPixel(float input, float dpi) {
+static float twipToPixel(float input, float dpi) {
 return input / 1440.0f * dpi;
 }
 
-public static float pixelToTwip(float input, float dpi) {
+private static float pixelToTwip(float input, float dpi) {
 return (input / dpi) * 1440.0f;
 }
 
@@ -218,7 +216,7 @@ public class LOKitTileProvider implements TileProvider {
 LOKitShell.getMainHandler().post(new Runnable() {
 @Override
 public void run() {
-
LibreOfficeMainActivity.mAppContext.showAlertDialog(message);
+mContext.showAlertDialog(message);
 }
 });
 }

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 9316e78339ff2763a2e49052c283bff837d2a0da
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:37:46 2017 +0100

Updated core
Project: help  ae83c2d740080cd66029a9cf58457f9711c95b66

Fix ahelp for Insert Section UNO command

This is on the Insert toolbar

Change-Id: I0690631f09fae8f3fca109e7b30b62f0411c4a5b
Reviewed-on: https://gerrit.libreoffice.org/33726
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 8ff48d1..ae83c2d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8ff48d16dbea60ef20ca187f36214e020f73367f
+Subproject commit ae83c2d740080cd66029a9cf58457f9711c95b66
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[aleksandar-stefanovic]

 android/source/src/java/org/libreoffice/LOKitShell.java  |2 
 android/source/src/java/org/libreoffice/LOKitThread.java |   41 
+++---
 android/source/src/java/org/libreoffice/LibreOfficeApplication.java  |8 -
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |6 +
 4 files changed, 22 insertions(+), 35 deletions(-)

New commits:
commit 5f89da97dc7cc7c8f7e9255b6ad41e0a24bf3682
Author: aleksandar-stefanovic 
Date:   Wed Jan 25 16:53:46 2017 +0100

Removed static context from LOKitThread

Moved LOKitThread back to LibreOfficeMainActivity, so that it could
use the context in the constructor. Once the Context became available
in LOKitThread, it was simply a matter of replacing static references
with the one passed in the constructor.

Also changed access levels of some methods in LOKitThread.

Change-Id: I0cc2c846c67b90907cbf3dce363666f9ab02d887
Reviewed-on: https://gerrit.libreoffice.org/33546
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/android/source/src/java/org/libreoffice/LOKitShell.java 
b/android/source/src/java/org/libreoffice/LOKitShell.java
index 3eff5ce..35a8fd0 100644
--- a/android/source/src/java/org/libreoffice/LOKitShell.java
+++ b/android/source/src/java/org/libreoffice/LOKitShell.java
@@ -69,7 +69,7 @@ public class LOKitShell {
  * Make sure LOKitThread is running and send event to it.
  */
 public static void sendEvent(LOEvent event) {
-LibreOfficeApplication.getLoKitThread().queueEvent(event);
+LibreOfficeMainActivity.loKitThread.queueEvent(event);
 }
 
 public static void 
sendThumbnailEvent(ThumbnailCreator.ThumbnailCreationTask task) {
diff --git a/android/source/src/java/org/libreoffice/LOKitThread.java 
b/android/source/src/java/org/libreoffice/LOKitThread.java
index 7db1605..742b1cb 100644
--- a/android/source/src/java/org/libreoffice/LOKitThread.java
+++ b/android/source/src/java/org/libreoffice/LOKitThread.java
@@ -1,6 +1,5 @@
 package org.libreoffice;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.PointF;
 import android.graphics.RectF;
@@ -21,7 +20,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  * Thread that communicates with LibreOffice through LibreOfficeKit JNI 
interface. The thread
  * consumes events from other threads (mainly the UI thread) and acts 
accordingly.
  */
-public class LOKitThread extends Thread {
+class LOKitThread extends Thread {
 private static final String LOGTAG = LOKitThread.class.getSimpleName();
 
 private LinkedBlockingQueue mEventQueue = new 
LinkedBlockingQueue();
@@ -30,8 +29,10 @@ public class LOKitThread extends Thread {
 private InvalidationHandler mInvalidationHandler;
 private ImmutableViewportMetrics mViewportMetrics;
 private GeckoLayerClient mLayerClient;
+private LibreOfficeMainActivity mContext;
 
-public LOKitThread() {
+LOKitThread(LibreOfficeMainActivity context) {
+mContext = context;
 mInvalidationHandler = null;
 TileProviderFactory.initialize();
 }
@@ -160,21 +161,13 @@ public class LOKitThread extends Thread {
 
 private void resumeDocument(String filename, int partIndex){
 
-LibreOfficeMainActivity mainActivity = 
LibreOfficeMainActivity.mAppContext;
+mLayerClient = mContext.getLayerClient();
 
-
-mLayerClient = mainActivity.getLayerClient();
-
-mInvalidationHandler = new InvalidationHandler(mainActivity);
-mTileProvider = TileProviderFactory.create(mainActivity, 
mInvalidationHandler, filename);
+mInvalidationHandler = new InvalidationHandler(mContext);
+mTileProvider = TileProviderFactory.create(mContext, 
mInvalidationHandler, filename);
 
 if (mTileProvider.isReady()) {
-LOKitShell.showProgressSpinner(mainActivity);
-mTileProvider.changePart(partIndex);
-mViewportMetrics = mLayerClient.getViewportMetrics();
-mLayerClient.setViewportMetrics(mViewportMetrics.scaleTo(0.9f, new 
PointF()));
-refresh();
-LOKitShell.hideProgressSpinner(mainActivity);
+changePart(partIndex);
 } else {
 closeDocument();
 }
@@ -186,12 +179,12 @@ public class LOKitThread extends Thread {
  * Change part of the document.
  */
 private void changePart(int partIndex) {
-LOKitShell.showProgressSpinner(LibreOfficeMainActivity.mAppContext);
+LOKitShell.showProgressSpinner(mContext);
 mTileProvider.changePart(partIndex);
 mViewportMetrics = mLayerClient.getViewportMetrics();
 mLayerClient.setViewportMetrics(mViewportMetrics.scaleTo(0.9f, new 
PointF()));
 refresh();
-

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

[Gabor Kelemen]

 source/text/swriter/01/0402.xhp |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit ae83c2d740080cd66029a9cf58457f9711c95b66
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:37:46 2017 +0100

Fix ahelp for Insert Section UNO command

This is on the Insert toolbar

Change-Id: I0690631f09fae8f3fca109e7b30b62f0411c4a5b
Reviewed-on: https://gerrit.libreoffice.org/33726
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/0402.xhp 
b/source/text/swriter/01/0402.xhp
index f14770d..f19d9a2 100644
--- a/source/text/swriter/01/0402.xhp
+++ b/source/text/swriter/01/0402.xhp
@@ -30,14 +30,12 @@
 
 
 
-
 
-
 
 Insert Section
 
 
-Inserts a text 
section at the cursor position in the document. You can also select a block of 
text and then choose this command to create a section. You can use sections to 
insert blocks of text from other documents, to apply custom column layouts, or 
to protect or to hide blocks of text if a condition is met.
+Inserts a text section at the cursor 
position in the document. You can also select a block of text and then choose 
this command to create a section. You can use sections to insert blocks of text 
from other documents, to apply custom column layouts, or to protect or to hide 
blocks of text if a condition is met.
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 include/svtools/sfxecode.hxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e0e3bcfae09d9751d842fb4bda45e2ae367dbb7b
Author: Samuel Mehrbrodt 
Date:   Mon Jan 30 14:46:42 2017 +0100

Translate German comments

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

diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index 4968f0e..723bf7e 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -79,11 +79,11 @@
 #define ERRCODE_SFX_FORMAT_ROWCOL   (ERRCODE_AREA_SFX | 
ERRCODE_CLASS_NONE | 57)
 
 
-//Dies und das
+// Various
 #define ERRCTX_ERROR21
 #define ERRCTX_WARNING  22
 
-//Documentkontexte
+// Document
 #define ERRCTX_SFX_LOADTEMPLATE 1
 #define ERRCTX_SFX_SAVEDOC  2
 #define ERRCTX_SFX_SAVEASDOC3
@@ -91,19 +91,19 @@
 #define ERRCTX_SFX_DOCTEMPLATE  5
 #define ERRCTX_SFX_MOVEORCOPYCONTENTS   6
 
-//Appkontexte
+// Application
 #define ERRCTX_SFX_DOCMANAGER   50
 #define ERRCTX_SFX_OPENDOC  51
 #define ERRCTX_SFX_NEWDOCDIRECT 52
 #define ERRCTX_SFX_NEWDOC   53
 
-//Organizerkontexte
+// Organizer
 #define ERRCTX_SFX_CREATEOBJSH  70
 
-//BASIC-Kontexte
+// BASIC
 #define ERRCTX_SFX_LOADBASIC80
 
-//Addressbook contexts
+// Addressbook
 #define ERRCTX_SFX_SEARCHADDRESS90
 
 #endif // INCLUDED_SVTOOLS_SFXECODE_HXX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: "Insert ODF Track Change Comment"

[Miklos Vajna]

On Mon, Jan 30, 2017 at 05:53:48PM -0200, Olivier Hallot 
 wrote:
> Can someone help our translation job with the precise meaning of
> 
> "Insert ODF Track Change Comment"
> 
> In that case what is the role of 'ODF' in the track change comment? Is
> it a special comment feature?

- open a new writer doc
- edit->track changes->record
- type "asdf"
- edit->track changes->manage

On the "list" tab there is table with a single row. Right click on it->
edit comment.

I think the above term refers to the string you enter there.

So it's a string manually and optionally attached to an automatically
generated tracked change.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Samuel Mehrbrodt]

 include/sfx2/signaturestate.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d595515e9bf93be7008efe87e08752b295f5a1fd
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 09:57:05 2017 +0100

Typo, whitespace fixes

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

diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index 740fd06..a1fd093 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -31,8 +31,8 @@ enum class SignatureState
 INVALID   = 3,
 // signature is OK, but certificate could not be validated
 NOTVALIDATED  = 4,
-//signatur and certificate are ok,but not al files are signed, as was the 
case in
-//OOo 2.x - OOo 3.1.1. This state is only used  together with document 
signatures.
+// signature and certificate are ok, but not all files are signed, as it 
was the case in
+// OOo 2.x - OOo 3.1.1. This state is only used together with document 
signatures.
 PARTIAL_OK= 5
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 4191f6147fe8f598fdc72d97ba7cb3ec773f5c3d
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:45:32 2017 +0100

Updated core
Project: help  d427d899f1228bcb309f349c39c17eb96d80d980

Fix ahelp for InsertCaptionDialog UNO command

This is on the Drawing Object Properties toolbar

Change-Id: I2f50145a75d213914f1b699753f39a19cc4a3b71
Reviewed-on: https://gerrit.libreoffice.org/33728
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index ae83c2d..d427d89 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ae83c2d740080cd66029a9cf58457f9711c95b66
+Subproject commit d427d899f1228bcb309f349c39c17eb96d80d980
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/swriter/01/0406.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d427d899f1228bcb309f349c39c17eb96d80d980
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:45:32 2017 +0100

Fix ahelp for InsertCaptionDialog UNO command

This is on the Drawing Object Properties toolbar

Change-Id: I2f50145a75d213914f1b699753f39a19cc4a3b71
Reviewed-on: https://gerrit.libreoffice.org/33728
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/0406.xhp 
b/source/text/swriter/01/0406.xhp
index c236f02..58f1d3a 100644
--- a/source/text/swriter/01/0406.xhp
+++ b/source/text/swriter/01/0406.xhp
@@ -33,7 +33,7 @@
 
 
 Caption
-Adds a numbered 
caption to a selected image, table, chart, frame, or shape. You can 
also access this command by right-clicking the item that you want to add the 
caption to. 
+Adds a numbered caption to a selected image, 
table, chart, frame, or shape. You can also access this command by 
right-clicking the item that you want to add the caption to. 

 
 
 
@@ -74,4 +74,4 @@
 
 
 
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c53c38c76377028fe4608c21dbde9595dc68914c
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 10:05:02 2017 +

Remove 'ODF' from comment

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index b86a268..b0b6eaf8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -331,7 +331,7 @@
   ~Comment...
 
 
-  Insert ODF Track Change Comment
+  Insert Track Change Comment
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 ucb/source/ucp/cmis/auth_provider.hxx  |2 ++
 ucb/source/ucp/cmis/certvalidation_handler.hxx |2 ++
 ucb/source/ucp/cmis/cmis_content.hxx   |2 ++
 ucb/source/ucp/cmis/cmis_url.cxx   |2 ++
 4 files changed, 8 insertions(+)

New commits:
commit d69bc9c939b94718ac9e17a62f62ae7ae87776e5
Author: Tor Lillqvist 
Date:   Tue Jan 31 12:18:29 2017 +0200

Avoid warning with Clang that doesn't have -Wunused-but-set-parameter

Change-Id: I8d016e9959898a90bff9d1e4734cbef37592a97e

diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index 4e560d6..c7388ef 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -12,8 +12,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include 
 #if defined __GNUC__
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx 
b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 9519268..04dd44f 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -15,8 +15,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include 
 #if defined __GNUC__
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx 
b/ucb/source/ucp/cmis/cmis_content.hxx
index 96ac275..867c5d0 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -27,8 +27,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include 
 #if defined __GNUC__
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 6d42172..927d9db 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -10,8 +10,10 @@
 #if defined __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
+#endif
 #include 
 #if defined __GNUC__
 #pragma GCC diagnostic pop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/ipict/ipict.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit fbb91632da53d2d0770e8fc3126ffe991fbfecff
Author: Caolán McNamara 
Date:   Tue Jan 31 10:15:29 2017 +

we don't actually need width amount of data in advance to fill the width

seeing as we seek from previous position + bytecount on each loop
we can only be sure we go forward the min (+1/+2) for each iteration

Change-Id: I4f1a29d96c43ee8aa858c97405d196b89994669b

diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index 2fa6228..9d94996 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -851,14 +851,10 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , 
bool bBaseAddr, bool bColo
 if (nHeight > pPict->remainingSize() / (sizeof(sal_uInt8) * 
nRowBytes))
 return 0x;
 }
-else if (nRowBytes > 250)
-{
-if (nHeight > pPict->remainingSize() / sizeof(sal_uInt16))
-return 0x;
-}
 else
 {
-if (nHeight > pPict->remainingSize() / sizeof(sal_uInt8))
+size_t nByteCountSize = nRowBytes > 250 ? sizeof(sal_uInt16) : 
sizeof(sal_uInt8);
+if (nHeight > pPict->remainingSize() / nByteCountSize)
 return 0x;
 }
 
@@ -941,7 +937,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , bool 
bBaseAddr, bool bColo
 else
 {
 size_t nByteCountSize = nRowBytes > 250 ? sizeof(sal_uInt16) : 
sizeof(sal_uInt8);
-if (nHeight > pPict->remainingSize() / ((nByteCountSize + 
sizeof(sal_uInt8)) * nWidth))
+if (nHeight > pPict->remainingSize() / nByteCountSize)
 return 0x;
 }
 
@@ -1087,6 +1083,10 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap , 
bool bBaseAddr, bool bColo
 if ( ( pAcc = initBitmap(aBitmap, aPalette) ) == nullptr )
 return 0x;
 
+size_t nByteCountSize = nRowBytes > 250 ? sizeof(sal_uInt16) : 
sizeof(sal_uInt8);
+if (nHeight > pPict->remainingSize() / nByteCountSize)
+return 0x;
+
 std::unique_ptr pScanline(new 
sal_uInt8[static_cast(nWidth) * nCmpCount]);
 for (sal_uInt16 ny = 0; ny < nHeight; ++ny)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 desktop/source/deployment/manager/dp_manager.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 1b12381203c6a059a5c5e38ebebfe703f5b11c01
Author: Stephan Bergmann 
Date:   Tue Jan 31 11:59:33 2017 +0100

Remove meaningless comment

Change-Id: I4385376dffa6b7cbc0da3903f285185a6db928dc

diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index ff675b9..7cfcc98 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -297,8 +297,6 @@ osl::FileBase::RC createDirectory(OUString const & url) {
 return osl::Directory::create(url);
 }
 
-// this overcomes previous rumors that the sal API is misleading
-// as to whether a directory is truly read-only or not
 bool isMacroURLReadOnly( const OUString  )
 {
 OUString aDirURL( rMacro );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - stoc/source

[Michael Stahl]

 stoc/source/corereflection/criface.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 096baf452992b91ce07a3ade9e7b3c0f4283df39
Author: Michael Stahl 
Date:   Thu Jan 26 16:31:42 2017 +0100

stoc: try to throw more informative exceptions

... from IdlInterfaceMethodImpl::invoke(), which is somewhere involved
in BASIC calls.

Change-Id: I739f70fec56ec9e4345511eefe41fd0f8df8bf6f
Reviewed-on: https://gerrit.libreoffice.org/33593
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit 845d4eb7bc20a6eadf08b0fe0939c51c3cbf3a62)
Reviewed-on: https://gerrit.libreoffice.org/33711

diff --git a/stoc/source/corereflection/criface.cxx 
b/stoc/source/corereflection/criface.cxx
index d61123c..36131c1 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -673,7 +673,11 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & 
rObj, Sequence< Any > &
 if (! bAssign)
 {
 IllegalArgumentException aExc(
-"cannot coerce argument type during corereflection 
call!",
+"cannot coerce argument type during corereflection 
call:"
+"\narg no.: " + OUString::number(nPos)
++ " expected: \"" + OUString(pTD->pTypeName)
++ "\" actual: \"" + 
OUString(pCppArgs[nPos].getValueTypeRef()->pTypeName)
++ "\"",
 *o3tl::doAccess(rObj), 
(sal_Int16)nPos );
 
 // cleanup
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC / budget suggestion ranking ...

[Michael Meeks]

Hi Tamas / all,

After some weeks of quiescence, and with 18 ESC types ranking these and
averaging the results (by convention we publish just the average) we
have the attached.

On 30/01/17 22:42, Zolnai Tamás wrote:
>> * TDF / Budgeting / Brainstorming (Thorsten)
>
> When will these scores be public? I'm interested how ranking looks like.

And now some notes to set expectations:

* TDF's discretionary development budget is fairly small
+ I would not expect to see more than a handful of
  these put out to tender.

* The proposals now go into the board's budgeting wringer -
  I'll add the top 15 or so there: if the board thinks
  differently looking from a whole-project basis, we can end up
  with a different ranking.

* Getting Macs for developers to address Mac specific issues
  was very highly rated, but already approved by the board &
  starting to be actioned.

* For items that are not funded - we have a GSOC coming up that
  may be a good fit for some of the smaller items.

HTH,

Michael.

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


esc-2017-budget.ods
Description: application/vnd.oasis.opendocument.spreadsheet
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 ucb/source/ucp/cmis/auth_provider.hxx  |4 ++--
 ucb/source/ucp/cmis/certvalidation_handler.hxx |4 ++--
 ucb/source/ucp/cmis/cmis_content.hxx   |4 ++--
 ucb/source/ucp/cmis/cmis_url.cxx   |4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 01aa52b5e91bac740ad21c31968c834c1530831e
Author: Stephan Bergmann 
Date:   Tue Jan 31 11:55:22 2017 +0100

Work around -Werror,-Wunknown-pragmas

...from GCC < 7 not knowing -Wunused-but-set-parameter

Change-Id: I6494882085ad39df8d7b94fa062a7717bffacadb

diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index c7388ef..bce8468 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -9,7 +9,7 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -17,7 +17,7 @@
 #endif
 #endif
 #include 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx 
b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 04dd44f..e20c926 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -12,7 +12,7 @@
 #ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 #define INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -20,7 +20,7 @@
 #endif
 #endif
 #include 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx 
b/ucb/source/ucp/cmis/cmis_content.hxx
index 867c5d0..370fe31 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -32,7 +32,7 @@
 #endif
 #endif
 #include 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 927d9db..a54a67f 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #ifndef __clang__
@@ -15,7 +15,7 @@
 #endif
 #endif
 #include 
-#if defined __GNUC__
+#if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit c21419eaa36bb1ded18a1769f4d33af0d528f568
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:48:37 2017 +0100

Updated core
Project: help  8ecc94f4f628fc151aabd6d4f3ba5dfe9ff72198

Fix ahelps for Wrap tab page and related UNO commands

These are on the Drawing Object Properties toolbar
and on the drawing objects Properties window - Wrap tab
also some simple drawing objects have an own Wrap window

Change-Id: I18471f402eb109af5936feacb3fdd8e1d1033087
Reviewed-on: https://gerrit.libreoffice.org/33729
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 31cb336..8ecc94f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 31cb3368f3f9412c359b58009a8ea0dc9ab75324
+Subproject commit 8ecc94f4f628fc151aabd6d4f3ba5dfe9ff72198
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 13ac9574aec457be10c4fef56a97dcbf7fdb
Author: Stephan Bergmann 
Date:   Tue Jan 31 10:37:26 2017 +0100

Work around GCC -Wunused-result

(cf.  "(void) cast 
doesn't
suppress __attribute__((warn_unused_result))").  Interestingly, this only 
occurs
with GCC 7, look like 
"warn_unused_result doesn't warn when the result is a class with a 
destructor"
is fixed now.

Change-Id: I7b4a066d0bf59080e47404d718917b5f38a98832

diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx 
b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 216730f..bcdc5c5 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -132,7 +132,8 @@ namespace rtl_OStringBuffer
 
 void ctor_005() {
 rtl::OStringBuffer b1;
-(void)b1.makeStringAndClear();
+auto dummy = b1.makeStringAndClear();
+(void)dummy;
 rtl::OStringBuffer b2(b1);
 (void)b2;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 ucb/source/ucp/cmis/auth_provider.hxx  |2 --
 ucb/source/ucp/cmis/certvalidation_handler.hxx |2 --
 ucb/source/ucp/cmis/cmis_content.hxx   |2 --
 ucb/source/ucp/cmis/cmis_url.cxx   |2 --
 4 files changed, 8 deletions(-)

New commits:
commit c866ace49f4a394185b412559fbcbb67718a2fcf
Author: Stephan Bergmann 
Date:   Tue Jan 31 12:30:13 2017 +0100

Revert "Avoid warning with Clang that doesn't have 
-Wunused-but-set-parameter"

This reverts commit d69bc9c939b94718ac9e17a62f62ae7ae87776e5, which isn't 
needed
any more now that 01aa52b5e91bac740ad21c31968c834c1530831e "Work around
-Werror,-Wunknown-pragmas" makes the whole pragma block conditional on

  __GNUC__ >= 7

(which Clang does not fulfill).

diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index bce8468..77fe436 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -12,10 +12,8 @@
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
-#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
-#endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx 
b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index e20c926..15547858 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -15,10 +15,8 @@
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
-#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
-#endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx 
b/ucb/source/ucp/cmis/cmis_content.hxx
index 370fe31..366b1a4 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -27,10 +27,8 @@
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
-#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
-#endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index a54a67f..8f5f914 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -10,10 +10,8 @@
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
-#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
 #endif
-#endif
 #include 
 #if defined __GNUC__ && __GNUC__ >= 7
 #pragma GCC diagnostic pop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/swriter/01/04020100.xhp |4 ++--
 source/text/swriter/01/05060100.xhp |   34 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit e02e34d2842a5389d13e497c923e0fbb593c42a3
Author: Gabor Kelemen 
Date:   Tue Jan 31 00:25:31 2017 +0100

Fix ahelps on Position and Size tabpage of draw object properties

Change-Id: I62708e3a517f8983d22f90313936d9563dbfe09c
Reviewed-on: https://gerrit.libreoffice.org/33731
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index 9c3135f..db6e0bb 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -34,7 +34,7 @@
 
 
 Type
-Specifies 
the size and the position of the selected object or frame on a 
page.
+Specifies the size and the position of the selected 
object or frame on a page.
 
 
   
@@ -43,7 +43,7 @@
 
 
 Width
-Enter the width 
that you want for the selected object.
+Enter the width that you want for the selected 
object.
 
 Relative
 Calculates the 
width of the selected object as a percentage of the width of the page text 
area.
@@ -53,7 +53,7 @@
 
 
 Height
-Enter the height 
that you want for the selected object.
+Enter the height that you want for the selected 
object.
 
 Relative
 Calculates 
the height of the selected object as a percentage of the height of the page 
text area.
@@ -63,7 +63,7 @@
 
 
 Keep ratio
-Maintains the 
height and width ratio when you change the width or the height 
setting.
+Maintains the height and width ratio when you change 
the width or the height setting.
 
 Original Size
 Resets the 
size settings of the selected object to the original values.
@@ -78,56 +78,56 @@
 
 
 To page
-Anchors the 
selection to the current page.
+Anchors the selection to the current 
page.
 
 
 To paragraph
-Anchors the 
selection to the current paragraph.
+Anchors the selection to the current 
paragraph.
 
 
 To character
-Anchors the 
selection to a character.
+Anchors the selection to a 
character.
 
 
 As character
-Anchors the 
selection as character. The height of the current line is resized to match the 
height of the selection.
+Anchors the selection as character. The height of 
the current line is resized to match the height of the 
selection.
 Position
 Specify the location of the selected object on the current 
page.
 
 
 Horizontal
-Select the 
horizontal alignment option for the object. This option is not 
available if you chose "anchor as character".
+Select the horizontal alignment option for the 
object. This option is not available if you chose "anchor as 
character".
 
 
 by
-Enter the amount 
of space to leave between the left edge of the selected object and the 
reference point that you select in the To box. This option 
is only available if you select "From Left" in the Horizontal 
box.
+Enter the amount of space to leave between the left 
edge of the selected object and the reference point that you select in the 
To box. This option is only available if you select "From 
Left" in the Horizontal box.
 
-
+
 to
-Select the 
reference point for the selected horizontal alignment 
option.
+Select the reference point for the selected 
horizontal alignment option.
 You can see the result of the alignments options that you select in 
the Preview box.
 
 
 Mirror on even pages
-Reverses the 
current horizontal alignment settings on even pages.
+Reverses the current horizontal alignment settings 
on even pages.
 You can also use the Image flip options to adjust the layout of 
objects on even and odd pages.
 
 
 Vertical
-Select the 
vertical alignment option for the object.
+Select the vertical alignment option for the 
object.
 If you anchor an object to a frame with a fixed height, only the 
"Bottom" and "Center" alignment options are available.
 
 
 by
-Enter the amount 
of space to leave between the top edge of the selected object and the reference 
point that you select in the To box. This option is only 
available if you select "From Top" or "From Bottom" (as character) in the 
Vertical box. 
+Enter the amount of space to leave between the top 
edge of the selected object and the reference point that you select in the 
To box. This option is only available if you select "From 
Top" or "From Bottom" (as character) in the Vertical box. 

 
 
 to
-Select the 
reference point for the selected vertical alignment option.
+Select the reference point for the selected vertical 
alignment option.
 
 
 Follow text flow
-Keeps the 
selected object within the layout boundaries of the text that the object is 
anchored to. To place the selected object anywhere in your document, do not 
select this option.
+Keeps the selected object within the layout 
boundaries of the text that the object is anchored to. To place the selected 
object anywhere in your document, do not 

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

[Gabor Kelemen]

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

New commits:
commit 9e0198d62aac3781c1bc1935db9fd0b23e747761
Author: Gabor Kelemen 
Date:   Tue Jan 31 00:26:39 2017 +0100

Oops, wrong ui file name

Change-Id: If697b465ca8c019dbf09ffb3bf9501e08e758f13
Reviewed-on: https://gerrit.libreoffice.org/33732
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/05060200.xhp 
b/source/text/swriter/01/05060200.xhp
index efd64d5..62931ef 100644
--- a/source/text/swriter/01/05060200.xhp
+++ b/source/text/swriter/01/05060200.xhp
@@ -29,7 +29,7 @@
 
 
 
-
+
 
 
 Wrap
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit e1e6cdbb1e9ff37f0bb740a70045c66953bec50c
Author: Gabor Kelemen 
Date:   Tue Jan 31 00:26:39 2017 +0100

Updated core
Project: help  9e0198d62aac3781c1bc1935db9fd0b23e747761

Oops, wrong ui file name

Change-Id: If697b465ca8c019dbf09ffb3bf9501e08e758f13
Reviewed-on: https://gerrit.libreoffice.org/33732
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index e02e34d..9e0198d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e02e34d2842a5389d13e497c923e0fbb593c42a3
+Subproject commit 9e0198d62aac3781c1bc1935db9fd0b23e747761
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit a4caad7486e4d5be6a5c012285d8d07beb5b48ba
Author: Gabor Kelemen 
Date:   Tue Jan 31 00:25:31 2017 +0100

Updated core
Project: help  e02e34d2842a5389d13e497c923e0fbb593c42a3

Fix ahelps on Position and Size tabpage of draw object properties

Change-Id: I62708e3a517f8983d22f90313936d9563dbfe09c
Reviewed-on: https://gerrit.libreoffice.org/33731
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 57c0583..e02e34d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 57c058399077a50156e8f2d26f7b483f49fc3700
+Subproject commit e02e34d2842a5389d13e497c923e0fbb593c42a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit 6e269c12e7f0e522f7316a69ade29ba49a62bc13
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:41:30 2017 +0100

Updated core
Project: help  57c058399077a50156e8f2d26f7b483f49fc3700

Fix ahelp for the Section tab page

Was set for the title instead of the description here

Change-Id: I108ea751c79f9dff0d8ab24205a7e06ca43a9ac3
Reviewed-on: https://gerrit.libreoffice.org/33727
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 8ecc94f..57c0583 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8ecc94f4f628fc151aabd6d4f3ba5dfe9ff72198
+Subproject commit 57c058399077a50156e8f2d26f7b483f49fc3700
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/uiconfig sc/uiconfig sd/uiconfig starmath/uiconfig sw/uiconfig

[Gabor Kelemen]

 chart2/uiconfig/toolbar/drawbar.xml |   28 
 sc/uiconfig/scalc/toolbar/drawbar.xml   |   46 +++---
 sc/uiconfig/scalc/toolbar/drawobjectbar.xml |   34 +-
 sc/uiconfig/scalc/toolbar/extrusionobjectbar.xml|   10 +--
 sc/uiconfig/scalc/toolbar/fontworkobjectbar.xml |2 
 sc/uiconfig/scalc/toolbar/formsnavigationbar.xml|   44 ++---
 sc/uiconfig/scalc/toolbar/graphicobjectbar.xml  |4 -
 sc/uiconfig/scalc/toolbar/mediaobjectbar.xml|2 
 sd/uiconfig/sdraw/toolbar/connectorsbar.xml |   56 -
 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml  |   20 +++---
 sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml|   10 +--
 sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml |2 
 sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml|   44 ++---
 sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml|2 
 sd/uiconfig/sdraw/toolbar/standardbar.xml   |   42 ++---
 sd/uiconfig/sdraw/toolbar/textobjectbar.xml |   48 +++
 sd/uiconfig/sdraw/toolbar/toolbar.xml   |4 -
 sd/uiconfig/sdraw/toolbar/zoombar.xml   |   20 +++---
 sd/uiconfig/simpress/toolbar/commontaskbar.xml  |6 -
 sd/uiconfig/simpress/toolbar/connectorsbar.xml  |   56 -
 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml   |   20 +++---
 sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml |   10 +--
 sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml  |2 
 sd/uiconfig/simpress/toolbar/formsnavigationbar.xml |   44 ++---
 sd/uiconfig/simpress/toolbar/mediaobjectbar.xml |2 
 sd/uiconfig/simpress/toolbar/optionsbar.xml |   26 
 sd/uiconfig/simpress/toolbar/standardbar.xml|2 
 sd/uiconfig/simpress/toolbar/textobjectbar.xml  |   58 +-
 sd/uiconfig/simpress/toolbar/toolbar.xml|6 -
 sd/uiconfig/simpress/toolbar/zoombar.xml|   20 +++---
 starmath/uiconfig/smath/toolbar/standardbar.xml |4 -
 sw/uiconfig/sglobal/toolbar/drawbar.xml |   50 +++
 sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml|   46 +++---
 sw/uiconfig/sglobal/toolbar/extrusionobjectbar.xml  |   10 +--
 sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml   |2 
 sw/uiconfig/sglobal/toolbar/formsnavigationbar.xml  |   44 ++---
 sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml|   22 +++---
 sw/uiconfig/sglobal/toolbar/insertbar.xml   |   36 +--
 sw/uiconfig/sglobal/toolbar/mediaobjectbar.xml  |2 
 sw/uiconfig/sglobal/toolbar/numobjectbar.xml|   22 +++---
 sw/uiconfig/sglobal/toolbar/oleobjectbar.xml|   40 ++--
 sw/uiconfig/sglobal/toolbar/previewobjectbar.xml|   24 +++
 sw/uiconfig/sglobal/toolbar/standardbar.xml |   44 ++---
 sw/uiconfig/sglobal/toolbar/textobjectbar.xml   |2 
 sw/uiconfig/sglobal/toolbar/toolbar.xml |   12 +--
 sw/uiconfig/sweb/toolbar/drawingobjectbar.xml   |   48 +++
 sw/uiconfig/sweb/toolbar/extrusionobjectbar.xml |   10 +--
 sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml  |2 
 sw/uiconfig/sweb/toolbar/formsnavigationbar.xml |   44 ++---
 sw/uiconfig/sweb/toolbar/graphicobjectbar.xml   |   32 +-
 sw/uiconfig/sweb/toolbar/insertbar.xml  |   32 +-
 sw/uiconfig/sweb/toolbar/mediaobjectbar.xml |2 
 sw/uiconfig/sweb/toolbar/numobjectbar.xml   |   22 +++---
 sw/uiconfig/sweb/toolbar/oleobjectbar.xml   |   40 ++--
 sw/uiconfig/sweb/toolbar/previewobjectbar.xml   |   24 +++
 sw/uiconfig/sweb/toolbar/standardbar.xml|   48 +++
 sw/uiconfig/sweb/toolbar/textobjectbar.xml  |   58 +-
 sw/uiconfig/sweb/toolbar/toolbar.xml|   10 +--
 sw/uiconfig/swform/toolbar/drawbar.xml  |   50 +++
 sw/uiconfig/swform/toolbar/drawingobjectbar.xml |   46 +++---
 sw/uiconfig/swform/toolbar/extrusionobjectbar.xml   |   10 +--
 sw/uiconfig/swform/toolbar/fontworkobjectbar.xml|2 
 sw/uiconfig/swform/toolbar/formsnavigationbar.xml   |   44 ++---
 sw/uiconfig/swform/toolbar/graphicobjectbar.xml |   22 +++---
 sw/uiconfig/swform/toolbar/insertbar.xml|   36 +--
 sw/uiconfig/swform/toolbar/mediaobjectbar.xml   |2 
 sw/uiconfig/swform/toolbar/numobjectbar.xml |   22 +++---
 sw/uiconfig/swform/toolbar/oleobjectbar.xml |   40 ++--
 sw/uiconfig/swform/toolbar/previewobjectbar.xml |   24 +++
 sw/uiconfig/swform/toolbar/standardbar.xml  |   44 ++---
 sw/uiconfig/swform/toolbar/textobjectbar.xml|2 
 sw/uiconfig/swform/toolbar/toolbar.xml  |   12 +--
 sw/uiconfig/swreport/toolbar/drawbar.xml|   50 +++
 

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

[Patrick J]

 cppcanvas/source/mtfrenderer/implrenderer.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e3a47c09500828d27c096c5bfb461c61f6e71378
Author: Patrick J 
Date:   Mon Jan 30 18:39:26 2017 +0100

tdf#101638 diameter and radius were mixed up, devide by two

Change-Id: Iaece1ca3439ab3e1029156a5847768728b53b96e
Reviewed-on: https://gerrit.libreoffice.org/33717
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 3d630e6..cdbd5a6 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1993,8 +1993,8 @@ namespace cppcanvas
 ::basegfx::B2DPolygon aPoly(
 ::basegfx::tools::createPolygonFromEllipse(
 aRange.getCenter(),
-aRange.getWidth(),
-aRange.getHeight() ));
+aRange.getWidth() / 2,   // divide by 2 
since createPolygonFromEllipse
+aRange.getHeight() / 2 ));   // expects the 
radius and NOT the diameter!
 aPoly.transform( rStates.getState().mapModeTransform );
 
 createFillAndStroke( aPoly,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 mysqlc/source/mysqlc_preparedstatement.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit ccb1b1251cb7289f554df4cabe08b9ee4524a592
Author: Stephan Bergmann 
Date:   Tue Jan 31 10:55:16 2017 +0100

Work around GCC 7 -Werror=implicit-fallthrough=

This is in !LIBO_INTERNAL_ONLY code, so cannot use SAL_FALLTHROUGH.  And 
even on
current  master, BOOST_FALLTHROUGH does 
not
yet support [[fallthrough]] for GCC 7.

Change-Id: I5306c3949b13c517fe8ef643cf98c2021147617e

diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx 
b/mysqlc/source/mysqlc_preparedstatement.cxx
index eff5040..39edb3e 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -490,7 +490,11 @@ void SAL_CALL 
OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
 setDouble( _parameterIndex, nValue );
 break;
 }
+#if defined __GNUC__ && __GNUC__ >= 7
+[[fallthrough]];
+#else
 BOOST_FALLTHROUGH;
+#endif
 }
 
 case DataType::CHAR:
@@ -517,7 +521,11 @@ void SAL_CALL 
OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
 setFloat(_parameterIndex,nValue);
 break;
 }
+#if defined __GNUC__ && __GNUC__ >= 7
+[[fallthrough]];
+#else
 BOOST_FALLTHROUGH;
+#endif
 }
 
 case DataType::DOUBLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/swriter/01/05060200.xhp |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 8ecc94f4f628fc151aabd6d4f3ba5dfe9ff72198
Author: Gabor Kelemen 
Date:   Mon Jan 30 22:48:37 2017 +0100

Fix ahelps for Wrap tab page and related UNO commands

These are on the Drawing Object Properties toolbar
and on the drawing objects Properties window - Wrap tab
also some simple drawing objects have an own Wrap window

Change-Id: I18471f402eb109af5936feacb3fdd8e1d1033087
Reviewed-on: https://gerrit.libreoffice.org/33729
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/swriter/01/05060200.xhp 
b/source/text/swriter/01/05060200.xhp
index ce48abf..efd64d5 100644
--- a/source/text/swriter/01/05060200.xhp
+++ b/source/text/swriter/01/05060200.xhp
@@ -29,10 +29,11 @@
 
 
 
+
 
 
 Wrap
-Specify the way 
you want text to wrap around an object. You can also specify the 
spacing between the text and the object.
+Specify the way you want 
text to wrap around an object. You can also specify the spacing between 
the text and the object.
 
 
 
@@ -43,7 +44,7 @@
 
 
 None
-Places the object on a separate line in 
the document. The Text in the document appears above and below the object, but 
not on the sides of the object.
+Places the object on a 
separate line in the document. The Text in the document appears above and below 
the object, but not on the sides of the object.
 
 
 
@@ -93,7 +94,7 @@
 
 
 Parallel
-Wraps text on all four sides of the 
border frame of the object.
+Wraps text on all 
four sides of the border frame of the object.
 
 
 
@@ -111,7 +112,7 @@
 
 
 Through
-Places the object in front of the 
text.
+Places the object in 
front of the text.
 
 
 
@@ -129,7 +130,7 @@
 
 
 Optimal
-Automatically wraps text to the left, to the right, or on 
all four sides of the border frame of the object. If the distance between the 
object and the page margin is less than 2 cm, the text is not wrapped. 
+Automatically wraps 
text to the left, to the right, or on all four sides of the border frame of the 
object. If the distance between the object and the page margin is less than 2 
cm, the text is not wrapped. 
 
 
 
@@ -149,17 +150,17 @@
 
 
 First Paragraph
-Starts a new paragraph below the object after you 
press Enter. The space between the paragraphs is determined by the size 
of the object.
+Starts a new 
paragraph below the object after you press Enter. The space between the 
paragraphs is determined by the size of the object.
 
 
 
 In Background
-Moves the selected object to the background. 
This option is only available if you selected the Through wrap 
type.
+Moves the selected 
object to the background. This option is only available if you selected 
the Through wrap type.
 
 
 
 Contour
-Wraps text 
around the shape of the object. This option is not available for the 
Through wrap type, or for frames. To change the contour of 
an object, select the object, and then choose Format - Wrap - 
Edit 
Contour.
+Wraps text around the 
shape of the object. This option is not available for the Through 
wrap type, or for frames. To change the contour of an object, select 
the object, and then choose Format - Wrap - Edit 
Contour.
 
 
 Outside only
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[aleksandar-stefanovic]

 android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java  |   
22 ++-
 android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java |   
24 ---
 android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java |   
31 +-
 3 files changed, 38 insertions(+), 39 deletions(-)

New commits:
commit d339bba78ada3655097e96c82eeb886818ee5080
Author: aleksandar-stefanovic 
Date:   Wed Jan 25 20:28:21 2017 +0100

Removed static context from JavaPanZoomController

Removed static context, and edited the access levels of some methods
in the classes, along with some general code style fixes.

Change-Id: I89c71fa38eaafb5cda721602cfc8dad10ba7d26a
Reviewed-on: https://gerrit.libreoffice.org/33557
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git 
a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java 
b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index fdcdb1b..12c9396 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -5,7 +5,7 @@
 
 package org.mozilla.gecko.gfx;
 
-import android.content.Context;
+import org.libreoffice.LibreOfficeMainActivity;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.DisplayMetrics;
@@ -20,7 +20,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 
 private LayerRenderer mLayerRenderer;
 
-private Context mContext;
+private LibreOfficeMainActivity mContext;
 private IntSize mScreenSize;
 private DisplayPortMetrics mDisplayPort;
 
@@ -50,7 +50,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 private PanZoomController mPanZoomController;
 private LayerView mView;
 
-public GeckoLayerClient(Context context) {
+public GeckoLayerClient(LibreOfficeMainActivity context) {
 // we can fill these in with dummy values because they are always 
written
 // to before being read
 mContext = context;
@@ -65,7 +65,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 
 public void setView(LayerView view) {
 mView = view;
-mPanZoomController = PanZoomController.Factory.create(this, view);
+mPanZoomController = PanZoomController.Factory.create(mContext, this, 
view);
 mView.connect(this);
 }
 
@@ -87,10 +87,6 @@ public class GeckoLayerClient implements PanZoomTarget {
 mPanZoomController.destroy();
 }
 
-public Context getContext() {
-return mContext;
-}
-
 Layer getRoot() {
 return mIsReady ? mRootLayer : null;
 }
@@ -132,7 +128,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 sendResizeEventIfNecessary();
 }
 
-public PanZoomController getPanZoomController() {
+PanZoomController getPanZoomController() {
 return mPanZoomController;
 }
 
@@ -173,7 +169,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 });
 }
 
-void adjustViewport(DisplayPortMetrics displayPort) {
+private void adjustViewport(DisplayPortMetrics displayPort) {
 ImmutableViewportMetrics metrics = getViewportMetrics();
 
 ImmutableViewportMetrics clampedMetrics = metrics.clamp();
@@ -221,7 +217,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 }
 }
 
-DisplayPortMetrics getDisplayPort() {
+private DisplayPortMetrics getDisplayPort() {
 return mDisplayPort;
 }
 
@@ -235,7 +231,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 mRootLayer.endTransaction();
 }
 
-public void geometryChanged() {
+private void geometryChanged() {
 sendResizeEventIfNecessary();
 if (getRedrawHint()) {
 adjustViewport(null);
@@ -342,7 +338,7 @@ public class GeckoLayerClient implements PanZoomTarget {
 }
 
 /* Root Layer Access */
-public void reevaluateTiles() {
+private void reevaluateTiles() {
 mLowResLayer.reevaluateTiles(mViewportMetrics, mDisplayPort);
 mRootLayer.reevaluateTiles(mViewportMetrics, mDisplayPort);
 }
diff --git 
a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java 
b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
index 3987b00..131c534 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
@@ -28,7 +28,7 @@ import java.util.TimerTask;
  * Many ideas are from Joe Hewitt's Scrollability:
  *   https://github.com/joehewitt/scrollability/
  */
-public class JavaPanZoomController
+class JavaPanZoomController
 extends GestureDetector.SimpleOnGestureListener
 implements PanZoomController, 

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

[Takeshi Abe]

 starmath/source/rect.cxx |   41 +
 1 file changed, 17 insertions(+), 24 deletions(-)

New commits:
commit cd2088f1395f84f61af47427bb6376db1765a2d6
Author: Takeshi Abe 
Date:   Tue Jan 31 14:05:53 2017 +0900

starmath: Simplify and micro-optimize lookup in SmIsMathAlpha()

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

diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx
index 66a6c27..aa64894 100644
--- a/starmath/source/rect.cxx
+++ b/starmath/source/rect.cxx
@@ -29,27 +29,26 @@
 #include "smmod.hxx"
 
 #include 
+#include 
 
 
-// '\0' terminated Array with symbol, which should be treat as letters in
-// StarMath Font, (to get a normal (non-clipped) SmRect in contrast to the
-// other operators and symbols).
-static sal_Unicode const aMathAlpha[] =
-{
-MS_ALEPH,   MS_IM,  MS_RE,
-MS_WP,  sal_Unicode(0xE070),MS_EMPTYSET,
-sal_Unicode(0x2113),sal_Unicode(0xE0D6),sal_Unicode(0x2107),
-sal_Unicode(0x2127),sal_Unicode(0x210A),MS_HBAR,
-MS_LAMBDABAR,   MS_SETN,MS_SETZ,
-MS_SETQ,MS_SETR,MS_SETC,
-sal_Unicode(0x2373),sal_Unicode(0xE0A5),sal_Unicode(0x2112),
-sal_Unicode(0x2130),sal_Unicode(0x2131),
-sal_Unicode('\0')
-};
-
 bool SmIsMathAlpha(const OUString )
 // true iff symbol (from StarMath Font) should be treated as letter
 {
+// Set of symbols, which should be treated as letters in StarMath Font
+// (to get a normal (non-clipped) SmRect in contrast to the other operators
+// and symbols).
+static std::unordered_set const aMathAlpha({
+MS_ALEPH,   MS_IM,  MS_RE,
+MS_WP,  sal_Unicode(0xE070),MS_EMPTYSET,
+sal_Unicode(0x2113),sal_Unicode(0xE0D6),sal_Unicode(0x2107),
+sal_Unicode(0x2127),sal_Unicode(0x210A),MS_HBAR,
+MS_LAMBDABAR,   MS_SETN,MS_SETZ,
+MS_SETQ,MS_SETR,MS_SETC,
+sal_Unicode(0x2373),sal_Unicode(0xE0A5),sal_Unicode(0x2112),
+sal_Unicode(0x2130),sal_Unicode(0x2131)
+});
+
 if (rText.isEmpty())
 return false;
 
@@ -59,14 +58,8 @@ bool SmIsMathAlpha(const OUString )
 // is it a greek symbol?
 if (sal_Unicode(0xE0AC) <= cChar  &&  cChar <= sal_Unicode(0xE0D4))
 return true;
-else
-{
-// appears it in 'aMathAlpha'?
-const sal_Unicode *pChar = aMathAlpha;
-while (*pChar  &&  *pChar != cChar)
-pChar++;
-return *pChar != '\0';
-}
+// or, does it appear in 'aMathAlpha'?
+return aMathAlpha.find(cChar) != aMathAlpha.end();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 accessibility/source/extended/AccessibleBrowseBoxBase.cxx |4 
 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx |2 
 accessibility/source/extended/AccessibleGridControl.cxx   |2 
 accessibility/source/extended/textwindowaccessibility.cxx |   42 
+-
 accessibility/source/helper/characterattributeshelper.cxx |   26 +++---
 accessibility/source/standard/vclxaccessibleedit.cxx  |4 
 accessibility/source/standard/vclxaccessibletoolbox.cxx   |6 -
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx   |8 -
 animations/source/animcore/animcore.cxx   |6 -
 avmedia/source/framework/mediaitem.cxx|4 
 avmedia/source/viewer/mediawindow.cxx |2 
 avmedia/source/viewer/mediawindow_impl.cxx|6 -
 12 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit faf9b82d396686bdb8e5cf9200f48f2080d65d3b
Author: Noel Grandin 
Date:   Tue Jan 31 15:45:49 2017 +0200

makeAny->Any in accessibility..avmedia

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

diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 3b17348..e646470 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -315,7 +315,7 @@ void AccessibleBrowseBoxBase::setAccessibleName( const 
OUString& rName )
 
 commitEvent(
 AccessibleEventId::NAME_CHANGED,
-uno::makeAny( maName ),
+uno::Any( maName ),
 aOld );
 }
 
@@ -330,7 +330,7 @@ void AccessibleBrowseBoxBase::setAccessibleDescription( 
const OUString& rDescrip
 
 commitEvent(
 AccessibleEventId::DESCRIPTION_CHANGED,
-uno::makeAny( maDescription ),
+uno::Any( maDescription ),
 aOld );
 }
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index da749b7..d23340a 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -83,7 +83,7 @@ namespace accessibility
 nValue = 2;
 break;
 }
-return makeAny(nValue);
+return Any(nValue);
 }
 
 sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx 
b/accessibility/source/extended/AccessibleGridControl.cxx
index d95a19e..153fb94 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -330,7 +330,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 
_nEventId,const Any& _rNe
 sal_Int32 nColumnCount = m_aTable.GetColumnCount();
 xChild = m_xImpl->m_xTable->getAccessibleChild(nCurrentRow * 
nColumnCount + nCurrentCol);
 }
-m_xImpl->m_xTable->commitEvent(_nEventId, 
makeAny(xChild),_rOldValue);
+m_xImpl->m_xTable->commitEvent(_nEventId, Any(xChild),_rOldValue);
 }
 else if(_nEventId == AccessibleEventId::TABLE_MODEL_CHANGED)
 {
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index 5ee6a1d..5851d53 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -948,21 +948,21 @@ Document::retrieveCharacterAttributes(
 //character font name
 aAttribs[i].Name = "CharFontName";
 aAttribs[i].Handle = -1;
-aAttribs[i].Value = css::uno::makeAny( aFont.GetFamilyName() );
+aAttribs[i].Value = css::uno::Any( aFont.GetFamilyName() );
 aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
 i++;
 
 //character height
 aAttribs[i].Name = "CharHeight";
 aAttribs[i].Handle = -1;
-aAttribs[i].Value = css::uno::makeAny( (sal_Int16)aFont.GetFontHeight() );
+aAttribs[i].Value = css::uno::Any( (sal_Int16)aFont.GetFontHeight() );
 aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
 i++;
 
 //character posture
 aAttribs[i].Name = "CharPosture";
 aAttribs[i].Handle = -1;
-aAttribs[i].Value = css::uno::makeAny( (sal_Int16)aFont.GetItalic() );
+aAttribs[i].Value = css::uno::Any( (sal_Int16)aFont.GetItalic() );
 aAttribs[i].State = css::beans::PropertyState_DIRECT_VALUE;
 i++;
 
@@ -970,7 +970,7 @@ Document::retrieveCharacterAttributes(
 /*
 aAttribs[i].Name = 

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - framework/source include/sal toolkit/source vcl/win

[Thorsten Behrens]

 framework/source/dispatch/dispatchprovider.cxx |1 +
 include/sal/log-areas.dox  |2 ++
 toolkit/source/awt/vclxwindow.cxx  |3 +++
 vcl/win/source/app/salinst.cxx |2 ++
 vcl/win/source/window/salframe.cxx |2 ++
 5 files changed, 10 insertions(+)

New commits:
commit 763669aebf9b93ca8237445d06736f7b0afb27d0
Author: Thorsten Behrens 
Date:   Wed Feb 1 03:29:18 2017 +0100

logging: add some strategic places around vcl messages

Change-Id: I3eb1076a0dd697ceb3b4310444542f324848b358

diff --git a/framework/source/dispatch/dispatchprovider.cxx 
b/framework/source/dispatch/dispatchprovider.cxx
index 949b65d..0bcfc64 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -542,6 +542,7 @@ css::uno::Reference< css::frame::XDispatch > 
DispatchProvider::implts_getOrCreat
 SolarMutexGuard g;
 if ( ! m_xMenuDispatcher.is() )
 {
+SAL_INFO("fwk.dispatch", "setting MenuDispatcher");
 MenuDispatcher* pDispatcher = new MenuDispatcher( 
m_xContext, xOwner );
 m_xMenuDispatcher = css::uno::Reference< 
css::frame::XDispatch >( static_cast< ::cppu::OWeakObject* >(pDispatcher), 
css::uno::UNO_QUERY );
 }
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 99282a5..5316fa3 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -391,6 +391,8 @@ certain functionality.
 @li @c vcl.filter
 @li @c vcl.fonts - font-specific code
 @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
+@li @c vcl.gdi.wndproc - Windows Procedure part of VCL
+@li @c vcl.gdi.opengl - the GDI part of VCL using opengl
 @li @c vcl.gdi.fontmetric
 @li @c vcl.gtk - Gtk+ 2/3 plugin
 @li @c vcl.harfbuzz - HarfBuzz text layout
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index f315f99..716a9c0 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -275,6 +275,8 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks)
 {
 const Reference< uno::XInterface > xKeepAlive( mrAntiImpl );
 
+SAL_INFO("toolkit.controls", "OnProcessCallbacks grabbing solarmutex");
+
 // work on a copy of the callback array
 CallbackArray aCallbacksCopy;
 {
@@ -293,6 +295,7 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks)
 }
 
 {
+SAL_INFO("toolkit.controls", "OnProcessCallbacks relinquished 
solarmutex");
 SolarMutexReleaser aReleaseSolar;
 for (   CallbackArray::const_iterator loop = aCallbacksCopy.begin();
 loop != aCallbacksCopy.end();
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 48d6655..9e238bf 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -664,6 +664,8 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM 
wParam, LPARAM lParam, i
 {
 LRESULT nRet = 0;
 
+SAL_INFO("vcl.gdi.wndproc", "SalComWndProc(nMsg=" << nMsg << ", wParam=" 
<< wParam << ", lParam=" << lParam << ")");
+
 switch ( nMsg )
 {
 case SAL_MSG_PRINTABORTJOB:
diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index 07505d4..55d6d9f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5483,6 +5483,8 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM lP
 static int  bInWheelMsg = FALSE;
 static int  bInQueryEnd = FALSE;
 
+SAL_INFO("vcl.gdi.wndproc", "SalFrameWndProc(nMsg=" << nMsg << ", wParam=" 
<< wParam << ", lParam=" << lParam << ")");
+
 // By WM_CRETAE we connect the frame with the window handle
 if ( nMsg == WM_CREATE )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

What is the best way to pass a flag from a unit test?

[Khaled Hosny]

What the best way to detect, inside VCL, that a given CppunitTest is
being run and do something conditionally? I basically want to detect if
a given class of unit tests is run and disable all font searching and
fallback and just use a hard-coded font name so that the tests are not
affected by what fonts are available or not on the system (or that the
theory).

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

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

[Noel Grandin]

 sc/inc/chartpos.hxx  |   12 ++--
 sc/source/core/tool/chartpos.cxx |   30 +++---
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 256ec177f90d43862a7422f01523d22bdb2cd681
Author: Noel Grandin 
Date:   Tue Jan 31 12:27:01 2017 +0200

convert ScChartGlue to scoped enum

Change-Id: Ia3dd20988d26e23e94581b019ff32c9ebc8663fe
Reviewed-on: https://gerrit.libreoffice.org/33753
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index 664cbc9..8801f2c 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -90,12 +90,12 @@ public:
 }
 };
 
-enum ScChartGlue {
-SC_CHARTGLUE_NA,
-SC_CHARTGLUE_NONE,  // old mimic
-SC_CHARTGLUE_COLS,  // old mimic
-SC_CHARTGLUE_ROWS,
-SC_CHARTGLUE_BOTH
+enum class ScChartGlue {
+NA,
+NONE,  // old mimic
+Cols,  // old mimic
+Rows,
+Both
 };
 
 class ScDocument;
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index fa95a35..ad16dcf 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -45,7 +45,7 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, SCTAB 
nTab,
 SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW 
nEndRowP) :
 pDocument( pDoc ),
 pPositionMap( nullptr ),
-eGlue( SC_CHARTGLUE_NA ),
+eGlue( ScChartGlue::NA ),
 nStartCol(0),
 nStartRow(0),
 bColHeaders( false ),
@@ -60,7 +60,7 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, const 
ScRangeListRef& rR
 aRangeListRef( rRangeList ),
 pDocument( pDoc ),
 pPositionMap( nullptr ),
-eGlue( SC_CHARTGLUE_NA ),
+eGlue( ScChartGlue::NA ),
 nStartCol(0),
 nStartRow(0),
 bColHeaders( false ),
@@ -97,7 +97,7 @@ void ScChartPositioner::SetRangeList( const ScRange& rRange )
 
 void ScChartPositioner::GlueState()
 {
-if ( eGlue != SC_CHARTGLUE_NA )
+if ( eGlue != ScChartGlue::NA )
 return;
 bDummyUpperLeft = false;
 ScRange* pR;
@@ -107,9 +107,9 @@ void ScChartPositioner::GlueState()
 {
 pR = aRangeListRef->front();
 if ( pR->aStart.Tab() == pR->aEnd.Tab() )
-eGlue = SC_CHARTGLUE_NONE;
+eGlue = ScChartGlue::NONE;
 else
-eGlue = SC_CHARTGLUE_COLS;  // several tables column by column
+eGlue = ScChartGlue::Cols;  // several tables column by column
 nStartCol = pR->aStart.Col();
 nStartRow = pR->aStart.Row();
 }
@@ -148,13 +148,13 @@ void ScChartPositioner::GlueState()
 SCCOL nC = nEndCol - nStartCol + 1;
 if ( nC == 1 )
 {
-eGlue = SC_CHARTGLUE_ROWS;
+eGlue = ScChartGlue::Rows;
 return;
 }
 SCROW nR = nEndRow - nStartRow + 1;
 if ( nR == 1 )
 {
-eGlue = SC_CHARTGLUE_COLS;
+eGlue = ScChartGlue::Cols;
 return;
 }
 sal_uLong nCR = (sal_uLong)nC * nR;
@@ -249,17 +249,17 @@ void ScChartPositioner::GlueState()
 if ( bGlue )
 {
 if ( bGlueCols && bGlueRows )
-eGlue = SC_CHARTGLUE_BOTH;
+eGlue = ScChartGlue::Both;
 else if ( bGlueRows )
-eGlue = SC_CHARTGLUE_ROWS;
+eGlue = ScChartGlue::Rows;
 else
-eGlue = SC_CHARTGLUE_COLS;
+eGlue = ScChartGlue::Cols;
 if ( pA[0] != CellState::Occupied )
 bDummyUpperLeft = true;
 }
 else
 {
-eGlue = SC_CHARTGLUE_NONE;
+eGlue = ScChartGlue::NONE;
 }
 }
 
@@ -293,7 +293,7 @@ void ScChartPositioner::CheckColRowHeaders()
 }
 else
 {
-bool bVert = (eGlue == SC_CHARTGLUE_NONE || eGlue == 
SC_CHARTGLUE_ROWS);
+bool bVert = (eGlue == ScChartGlue::NONE || eGlue == 
ScChartGlue::Rows);
 for ( size_t i = 0, nRanges = aRangeListRef->size();
   (i < nRanges) && (bColStrings || bRowStrings);
   ++i
@@ -335,7 +335,7 @@ const ScChartPositionMap* 
ScChartPositioner::GetPositionMap()
 
 void ScChartPositioner::CreatePositionMap()
 {
-if ( eGlue == SC_CHARTGLUE_NA && pPositionMap )
+if ( eGlue == ScChartGlue::NA && pPositionMap )
 {
 pPositionMap.reset();
 }
@@ -357,7 +357,7 @@ void ScChartPositioner::CreatePositionMap()
 
 GlueState();
 
-const bool bNoGlue = (eGlue == SC_CHARTGLUE_NONE);
+const bool bNoGlue = (eGlue == ScChartGlue::NONE);
 ColumnMap* pCols = new ColumnMap;
 SCROW nNoGlueRow = 0;
 for ( size_t i = 0, nRanges = aRangeListRef->size(); i < nRanges; ++i )
@@ -469,7 +469,7 @@ void ScChartPositioner::CreatePositionMap()
 
 void ScChartPositioner::InvalidateGlue()
 

[Libreoffice-commits] core.git: bridges/source shell/source

[Stephan Bergmann]

 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx |2 +-
 shell/source/backends/macbe/macbackend.mm |3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 5a3722b23023ef65a11305148c916ee978f1bc6b
Author: Stephan Bergmann 
Date:   Wed Feb 1 08:27:50 2017 +0100

loplugin:stringconstant

Change-Id: Ic22b9c0c245cca23770a05518534a666e00f9f3e

diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
index 9770dba..def0bf5 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx
@@ -427,7 +427,7 @@ void unoInterfaceProxyDispatch(
 default:
 {
 ::com::sun::star::uno::RuntimeException aExc(
-OUString("illegal member type description!"),
+"illegal member type description!",
 ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >() );
 
 Type const & rExcType = cppu::UnoType::get();
diff --git a/shell/source/backends/macbe/macbackend.mm 
b/shell/source/backends/macbe/macbackend.mm
index 4a4df42..1e95e90 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -195,8 +195,7 @@ void MacOSXBackend::setPropertyValue(
 rtl::OUString const &, css::uno::Any const &)
 {
 throw css::lang::IllegalArgumentException(
-rtl::OUString(
-"setPropertyValue not supported"),
+"setPropertyValue not supported",
 static_cast< cppu::OWeakObject * >(this), -1);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 sot/source/base/formats.cxx | 2496 +---
 1 file changed, 1231 insertions(+), 1265 deletions(-)

New commits:
commit 0d17c4fa4994debb1a0d653ad9fb816c46623a57
Author: Jochen Nitschke 
Date:   Tue Jan 31 12:51:16 2017 +0100

inline macros

move static arrays to anonymous namespace
try creating the SotAction arrays at compile time with constexpr

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

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 6ff84b1..64a19aa 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -39,9 +39,9 @@ struct SotAction_Impl
 SotExchangeActionFlags nFlags; // Action Id
 sal_uInt8  nContextCheckId;// additional check of content 
in clipboard
 
-SotAction_Impl(SotClipboardFormatId _nFormatId, sal_uInt16 _nAction, 
SotExchangeActionFlags _nFlags, sal_uInt8 _nContextCheckId)
+SAL_CONSTEXPR SotAction_Impl(SotClipboardFormatId _nFormatId, sal_uInt16 
_nAction, SotExchangeActionFlags _nFlags, sal_uInt8 _nContextCheckId)
 : nFormatId(_nFormatId), nAction(_nAction), nFlags(_nFlags), 
nContextCheckId(_nContextCheckId) {}
-SotAction_Impl(SotClipboardFormatId _nFormatId, sal_uInt16 _nAction)
+SAL_CONSTEXPR SotAction_Impl(SotClipboardFormatId _nFormatId, sal_uInt16 
_nAction)
 : nFormatId(_nFormatId), nAction(_nAction), 
nFlags(SotExchangeActionFlags::NONE), nContextCheckId(0) {}
 };
 
@@ -69,7 +69,8 @@ struct SotDestinationEntry_Impl
 const SotAction_Impl*   aLinkActions;
 };
 
-
+namespace
+{
 /*
 Ueber diese Tabelle erfolgt die Zuordnung von Destination, vorhandenen
 Datenformaten sowie gewuenschter Aktion zu einer Aktion und dem in
@@ -85,1267 +86,1237 @@ struct SotDestinationEntry_Impl
 Format-Prioritaet sortiert. Eintrag Null hat die hoechste Prioritaet.
 */
 
-#define EXCHG_EMPYT_ARRAY \
-static SotAction_Impl const aEmptyArr[] = \
-{ \
-{ static_cast(0x), 0 }   
   \
-};
-
-#define EXCHG_DEST_DOC_OLEOBJ_ARRAY \
-static SotAction_Impl const aEXCHG_DEST_DOC_OLEOBJ_Def[] =\
-{   \
-{ SotClipboardFormatId::INET_IMAGE, EXCHG_IN_ACTION_LINK },
  \
-{ SotClipboardFormatId::NETSCAPE_IMAGE, EXCHG_IN_ACTION_LINK },
  \
-{ SotClipboardFormatId::FILE_LIST, EXCHG_IN_ACTION_LINK }, 
\
-{ SotClipboardFormatId::SIMPLE_FILE, EXCHG_IN_ACTION_LINK },   
   \
-{ SotClipboardFormatId::NETSCAPE_BOOKMARK, EXCHG_IN_ACTION_LINK }, 
  \
-{ SotClipboardFormatId::FILEGRPDESCRIPTOR, EXCHG_IN_ACTION_LINK, 
SotExchangeActionFlags::NONE, FILEGRPDSC_ONLY_URL },   \
-{ SotClipboardFormatId::UNIFORMRESOURCELOCATOR, EXCHG_IN_ACTION_LINK 
},   \
-{ static_cast(0x), 0 }   
   \
-};  \
-static SotAction_Impl const aEXCHG_DEST_DOC_OLEOBJ_Move[] =   \
-{   \
-{ SotClipboardFormatId::SVIM, EXCHG_OUT_ACTION_INSERT_IMAGEMAP },  
  \
-{ static_cast(0x), 0 }   
   \
-};  \
-static SotAction_Impl const aEXCHG_DEST_DOC_OLEOBJ_Link[] =   \
-{   \
-{ SotClipboardFormatId::INET_IMAGE, 
EXCHG_OUT_ACTION_INSERT_INTERACTIVE },   \
-{ SotClipboardFormatId::NETSCAPE_IMAGE, 
EXCHG_OUT_ACTION_INSERT_INTERACTIVE },   \
-{ SotClipboardFormatId::FILE_LIST, EXCHG_OUT_ACTION_INSERT_INTERACTIVE 
},  \
-{ SotClipboardFormatId::SIMPLE_FILE, 
EXCHG_OUT_ACTION_INSERT_INTERACTIVE },   \
-{ SotClipboardFormatId::NETSCAPE_BOOKMARK, 
EXCHG_OUT_ACTION_INSERT_INTERACTIVE },\
-{ SotClipboardFormatId::FILEGRPDESCRIPTOR, 
EXCHG_OUT_ACTION_INSERT_INTERACTIVE, SotExchangeActionFlags::NONE, 
FILEGRPDSC_ONLY_URL },\
-{ SotClipboardFormatId::UNIFORMRESOURCELOCATOR, 
EXCHG_OUT_ACTION_INSERT_INTERACTIVE },\
-{ SotClipboardFormatId::SVIM, EXCHG_OUT_ACTION_INSERT_IMAGEMAP },  
  \
-{ static_cast(0x), 0 }   
   \
-};
-
-#define EXCHG_DEST_CHARTDOC_OLEOBJ_ARRAY   

[Libreoffice-commits] dev-tools.git: esc-reporting/license-analyze.py

[jan Iversen]

 esc-reporting/license-analyze.py |  252 +++
 1 file changed, 252 insertions(+)

New commits:
commit cc88d54feff23c168ee07ca7914cc1eb7fbfedcc
Author: jan Iversen 
Date:   Wed Feb 1 07:52:42 2017 +0100

esc-mentoring

added license-analyze.
This script checks for consistency between the different
license files.

Remark, this script controls the requiremnt from gitdm-config,
as well as esc-mentoring. But do not check the requirements from
the foundation.

diff --git a/esc-reporting/license-analyze.py b/esc-reporting/license-analyze.py
new file mode 100755
index 000..584d5c6
--- /dev/null
+++ b/esc-reporting/license-analyze.py
@@ -0,0 +1,252 @@
+#!/usr/bin/env python3
+#
+# 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/.
+#
+
+
+
+### DESCRIPTION
+#
+# This program controls the license files:
+# 1) loads aliases, license*, domain-map
+# 2) write sorted versions of aliases (special handling due to ' ' seperator) 
and license*
+# 3) look for and load wiki.txt
+# 4) check consistency
+# 5) write newwiki.txt with wiki updates
+# 6) write warnings about inconsistences
+#
+
+
+
+import sys
+import csv
+import io
+import os
+import operator
+import datetime
+import collections
+
+
+
+def load_alias(homeDir):
+rawData = collections.OrderedDict()
+tmpData = collections.OrderedDict()
+fileName = homeDir + 'aliases'
+
+try:
+with open(fileName, 'r') as fp:
+for line in fp:
+line = line[:-1]
+if line.startswith('#') or line.startswith(' ') or len(line) 
== 0:
+continue
+if line.startswith('"'):
+x = line.index('"', 1)
+result = [line[1:x], line[x+2:]]
+else:
+result = line.split(' ')
+if result[0] in tmpData:
+print('>>> aliases ' + result[0] + ' DUPLICATED')
+if result[1] in tmpData:
+print('>>> aliases ' + result[0] + ' Target also alias')
+if result[0].lower() != result[0]:
+print('>>> aliases ' + result[0] + ' Alias contains 
capital letters')
+if result[1].lower() != result[1]:
+print('>>> aliases ' + result[1] + ' Target contains 
capital letters')
+if result[0] == result[1]:
+print('>>> aliases ' + result[0] + ' Target == Alias')
+for i in tmpData:
+if result[0] == tmpData[i]:
+print('>>> aliases ' + result[0] + ' Alias also 
target')
+break
+tmpData[result[0]] = result[1]
+oldTarget = ''
+doSort = False
+for entry in tmpData:
+if tmpData[entry] < oldTarget:
+doSort = True
+break
+oldTarget = tmpData[entry]
+if doSort:
+s = [(k, tmpData[k]) for k in sorted(tmpData, key=tmpData.get)]
+for i in s:
+rawData[i[0]] = i[1]
+with open(fileName, 'w') as fp:
+for entry in rawData:
+if ' ' in entry:
+print('"' + entry + '" ' + rawData[entry], file=fp)
+else:
+print(entry + ' ' + rawData[entry], file=fp)
+else:
+rawData = tmpData
+except Exception as e:
+  print('>>> Error load file ' + fileName + ' due to ' + str(e))
+  rawData = None
+return rawData
+
+
+
+def load_domainmap(homeDir):
+rawData = []
+fileName = homeDir + 'domain-map'
+try:
+with open(fileName, 'r') as fp:
+for line in fp:
+line = line[:-1]
+if line.startswith('#') or line.startswith(' ') or len(line) 
== 0:
+continue
+if '\t' in line:
+mail = line[:line.index('\t')]
+else:
+mail = line[:line.index(' ')]
+if '@' in mail and mail not in rawData:
+if mail.lower() != mail:
+print('>>> domain-map ' + mail + ' mail contains 
capital letters')
+rawData.append(mail)
+except Exception as e:
+  print('Error load file ' + fileName + ' due to ' + str(e))
+  rawData = None
+return rawData
+
+
+
+def load_licensePersonal(homeDir):
+rawData = collections.OrderedDict()
+fileName = homeDir + 'licensePersonal.csv'
+orgText = []
+try:
+with open(fileName, 'r') as fp:
+for line in fp:
+line = line[:-1]
+orgText.append(line)
+  

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Federico Bassini]

 bin/gbuild-to-ide |   40 +++-
 1 file changed, 23 insertions(+), 17 deletions(-)

New commits:
commit 6f08c430353b36d219c284a87f014985b00af06c
Author: Federico Bassini 
Date:   Tue Jan 31 08:53:10 2017 +0100

gbuild-to-ide: VSGenerator and testVs2013 with relative links

VisualStudio2013IntegrationGenerator  recently doesn't work
with the new relative paths in GbuilParser.
this patch does this, now it works fine with all relative paths.
what is missing it's in the .vcxproj:




these still work with absolute path but i start now on working this

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

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 3bf063d..f9ca375 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -353,33 +353,36 @@ class testVS2013Ide(IdeIntegrationGenerator):
 nmake_rebuild_node = ET.SubElement(conf_node, 
'{%s}NMakeReBuildCommandLine' % ns)
 nmake_rebuild_node.text = cfg_targets['rebuild'] % nmake_params
 nmake_output_node = ET.SubElement(conf_node, '{%s}NMakeOutput' % 
ns)
-nmake_output_node.text = os.path.join(self.gbuildparser.instdir, 
'program', 'soffice.exe')
+nmake_output_node.text = os.path.join('../..', 'program', 
'soffice.exe')
 nmake_defs_node = ET.SubElement(conf_node, 
'{%s}NMakePreprocessorDefinitions' % ns)
 nmake_defs_node.text = ';'.join(list(target['DEFS']) + 
['$(NMakePreprocessorDefinitions)'])
 include_path_node = ET.SubElement(conf_node, '{%s}IncludePath' % 
ns)
-include_path_node.text = ';'.join(target['include'] + 
['$(IncludePath)'])
+includes=[os.path.join('../..',elem) if elem[1] != ':'  else elem 
for elem in target['include'] ]
+include_path_node.text = ';'.join(includes + ['$(IncludePath)'])
 
 ET.SubElement(proj_node, '{%s}ItemDefinitionGroup' % ns)
 
 cxxobjects_node = ET.SubElement(proj_node, '{%s}ItemGroup' % ns)
 for cxxobject in target['CXXOBJECTS']:
-cxxabspath = os.path.join(self.gbuildparser.srcdir + '/' + 
target['module'], cxxobject)
-cxxfile = cxxabspath
-if os.path.isfile(cxxabspath):
-ET.SubElement(cxxobjects_node, '{%s}ClCompile' % ns, 
Include=cxxabspath)
+cxxrelpath= 
os.path.join('../..',target['location'].split('/')[-1], cxxobject)
+cxxabspath = 
os.path.join(self.gbuildparser.srcdir,target['location'].split('/')[-1], 
cxxobject)
+cxxfile = cxxabspath + '.cxx'
+if os.path.isfile(cxxfile):
+ET.SubElement(cxxobjects_node, '{%s}ClCompile' % ns, 
Include=cxxrelpath + '.cxx')
 else:
 print('Source %s in project %s does not exist' % (cxxfile, 
target['target_name']))
 
 includes_node = ET.SubElement(proj_node, '{%s}ItemGroup' % ns)
 for cxxobject in target['CXXOBJECTS']:
-include_abs_path = os.path.join(self.gbuildparser.srcdir + '/' + 
target['module'], cxxobject)
+include_rel_path = 
os.path.join('../..',target['location'].split('/')[-1], cxxobject)
+include_abs_path = 
os.path.join(self.gbuildparser.srcdir,target['location'].split('/')[-1], 
cxxobject)
 hxxfile = include_abs_path + '.hxx'
 if os.path.isfile(hxxfile):
-ET.SubElement(includes_node, '{%s}ClInclude' % ns, 
Include=hxxfile)
+ET.SubElement(includes_node, '{%s}ClInclude' % ns, 
Include=include_rel_path + '.hxx')
 # Few files have corresponding .h files
 hfile = include_abs_path + '.h'
 if os.path.isfile(hfile):
-ET.SubElement(includes_node, '{%s}ClInclude' % ns, 
Include=hfile)
+ET.SubElement(includes_node, '{%s}ClInclude' % ns, 
Include=include_rel_path + '.h')
 ET.SubElement(proj_node, '{%s}Import' % ns, 
Project='$(VCTargetsPath)\Microsoft.Cpp.targets')
 ET.SubElement(proj_node, '{%s}ImportGroup' % ns, 
Label='ExtensionTargets')
 self.write_pretty_xml(proj_node, project_path)
@@ -826,33 +829,36 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 nmake_rebuild_node = ET.SubElement(conf_node, 
'{%s}NMakeReBuildCommandLine' % ns)
 nmake_rebuild_node.text = cfg_targets['rebuild'] % nmake_params
 nmake_output_node = ET.SubElement(conf_node, '{%s}NMakeOutput' % 
ns)
-nmake_output_node.text = os.path.join(self.gbuildparser.instdir, 
'program', 'soffice.exe')
+nmake_output_node.text = os.path.join('../..', 'program', 
'soffice.exe')
 nmake_defs_node = ET.SubElement(conf_node, 
'{%s}NMakePreprocessorDefinitions' % ns)
 

Wrong WOPI Host

[Lars Müller]

Hello,

Ich running Nextcloud Witz collabora/Code 2.0.

When i try to enter the Office Software the docker logs give me following
error:

wsd-00026-0028 20:48:23.631719 [ client_ws_0007 ] ERR
ClientRequestHandler::handleClientRequest: Exception: Invalid URI.|
wsd/LOOLWSD.cpp:1245

The Google chrome console give me this error:

WebSocket connection to
'wss://office.domain.tld/lool/%3Fpermission%3Dedit/ws' failed: Invalid
frame header

At the nextcloud Backend the URL "https://office.domain.tld; is set.

I start the docker container with "docker run -t -d -p 127.0.0.1:9980:9980
-e "domain=office.larsmueller.net" --restart-always --cap-add MKNOD
collabora/code".

Can anyone help?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: compilerplugins/clang cppuhelper/source cui/source forms/source reportdesign/source sc/qa sd/source sw/qa sw/source xmloff/source

[Noel Grandin]

 compilerplugins/clang/stringconstant.cxx  |   11 ++-
 compilerplugins/clang/test/stringconstant.cxx |3 +++
 cppuhelper/source/unourl.cxx  |   25 ++---
 cui/source/tabpages/tpbitmap.cxx  |2 +-
 forms/source/component/GroupManager.cxx   |2 +-
 reportdesign/source/ui/report/ViewsWindow.cxx |2 +-
 sc/qa/extras/check_data_pilot_table.cxx   |2 +-
 sc/qa/extras/scdatapilottableobj.cxx  |2 +-
 sc/qa/extras/scnamedrangeobj.cxx  |2 +-
 sc/qa/extras/sctablesheetsobj.cxx |2 +-
 sd/source/ui/dlg/navigatr.cxx |2 +-
 sw/qa/core/uwriter.cxx|2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx|4 ++--
 sw/source/filter/basflt/iodetect.cxx  |8 
 sw/source/uibase/dochdl/gloshdl.cxx   |2 +-
 sw/source/uibase/uiview/view.cxx  |2 +-
 xmloff/source/forms/elementimport.cxx |2 +-
 17 files changed, 41 insertions(+), 34 deletions(-)

New commits:
commit dce867e8c4863c969eea3515a988630b74708a43
Author: Noel Grandin 
Date:   Tue Jan 31 13:24:13 2017 +0200

loplugin:stringconstant handle calls to constructors with one arg

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

diff --git a/compilerplugins/clang/stringconstant.cxx 
b/compilerplugins/clang/stringconstant.cxx
index 32382461..9ae672a 100644
--- a/compilerplugins/clang/stringconstant.cxx
+++ b/compilerplugins/clang/stringconstant.cxx
@@ -66,6 +66,10 @@ bool hasOverloads(FunctionDecl const * decl, unsigned 
arguments) {
 if (f != nullptr && f->getMinRequiredArguments() <= arguments
 && f->getNumParams() >= arguments)
 {
+auto consDecl = dyn_cast(f);
+if (consDecl && consDecl->isCopyConstructor()) {
+break;
+}
 ++n;
 if (n == 2) {
 return true;
@@ -1058,12 +1062,17 @@ bool 
StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) {
 return true;
 }
 
-std::string file(compiler.getSourceManager().getFilename(
+StringRef file(compiler.getSourceManager().getFilename(
 
compiler.getSourceManager().getSpellingLoc(expr->getLocStart(;
 if (file == SRCDIR 
"/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx")
 {
 return true;
 }
+// there is some template magic here I don't know how to work around
+if (file.startswith(SRCDIR "/connectivity"))
+{
+return true;
+}
 if (isInUnoIncludeFile(expr->getLocStart())) {
 return true;
 }
diff --git a/compilerplugins/clang/test/stringconstant.cxx 
b/compilerplugins/clang/test/stringconstant.cxx
index f2cf48c..392567f 100644
--- a/compilerplugins/clang/test/stringconstant.cxx
+++ b/compilerplugins/clang/test/stringconstant.cxx
@@ -18,6 +18,7 @@ extern void foo(OUString const &); // expected-error {{extern 
prototype in main
 
 struct Foo {
 Foo(OUString const &, int) {}
+Foo(OUString const &) {}
 };
 
 int main() {
@@ -57,6 +58,8 @@ int main() {
 foo(OUString("xxx")); // expected-error {{in call of 'foo', replace 
'OUString' constructed from a string literal directly with the string literal 
[loplugin:stringconstant}}
 Foo aFoo(OUString("xxx"), 1); // expected-error {{in call of 'Foo::Foo', 
replace 'OUString' constructed from a string literal directly with the string 
literal}}
 (void)aFoo;
+Foo aFoo2(OUString("xxx")); // expected-error {{in call of 'Foo::Foo', 
replace 'OUString' constructed from a string literal directly with the string 
literal}}
+(void)aFoo2;
 }
 
 
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index b73f176..8895119 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -79,7 +79,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & 
rDescriptor)
 case STATE_NAME0:
 if (bEnd || !isAlphanum(c))
 throw rtl::MalformedUriException(
-rtl::OUString("UNO URL contains bad descriptor name"));
+"UNO URL contains bad descriptor name");
 nStart = i;
 eState = STATE_NAME;
 break;
@@ -93,13 +93,13 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & 
rDescriptor)
 }
 else if (!isAlphanum(c))
 throw rtl::MalformedUriException(
-rtl::OUString("UNO URL contains bad descriptor name"));
+"UNO URL contains bad descriptor name");
 break;
 
 case STATE_KEY0:
 if (bEnd || !isAlphanum(c))
 throw rtl::MalformedUriException(
-   

Re: build breaks in embeddedobj/source/msole/olemisc.cxx

[Khaled Hosny]

On Fri, Jan 20, 2017 at 08:20:54PM +0100, Regina Henschel wrote:
> Hi Khaled,
> 
> Khaled Hosny schrieb:
> > On Fri, Jan 20, 2017 at 04:55:56PM +0100, Regina Henschel wrote:
> > > Hi,
> > > 
> > > Khaled Hosny schrieb:
> > > 
> > > > Hmm, interesting. They don’t fail for me or in the CI builds, I wonder
> > > > what is different on your system that would cause most of the tests to
> > > > fail?
> > > > 
> > > 
> > > Can you tell me, what is relevant for the tests? Then I can post 
> > > information
> > > about my system.
> > 
> > I’m still to get to the bottom of these tests, but my hunch is that they
> > are very sensitive to fonts, since the file used seem to use all sorts
> > of fonts that might or might not always be installed. So have you done
> > anything unusual with the fonts on your system?
> 
> "ClearType" is activated on my system.
> 
> I've got about 350 fonts, a lot of them with the common four font faces.
> These include the fonts, which you get from Windows to support Asian
> languages.
> 
> The text size in Windows for the screen is set to 125%.
> 
> I've got a "ATI Radeon HD 3200 Graphics" on board graphics card and use it
> in 1920 x 1080.
> 
> I don't know, whether this is "unusual".

Does not sound suspicious, but again I’m yet to get to the bottom of
what making theses tests fail on some platforms, so I don’t even know
what to look for yet.

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

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

[Jochen Nitschke]

 sd/source/filter/ppt/ppt97animations.cxx |   37 +++
 sd/source/filter/ppt/ppt97animations.hxx |3 --
 2 files changed, 4 insertions(+), 36 deletions(-)

New commits:
commit 27832947f0d9406c1757182ffa57262f3f03af4b
Author: Jochen Nitschke 
Date:   Wed Feb 1 01:00:03 2017 +0100

defaults are good enough ..

for copy ctor/assignment and dtor.
inline MEMBER_CONSTRUCTOR_LIST macro

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

diff --git a/sd/source/filter/ppt/ppt97animations.cxx 
b/sd/source/filter/ppt/ppt97animations.cxx
index d06f8bf..6806939 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -51,44 +51,15 @@ void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn )
 rIn.ReadUChar( nUnknown2 );
 }
 
-#define MEMBER_CONSTRUCTOR_LIST() \
-m_aAtom() \
-, m_aSoundFileUrl() \
-, m_bDirtyCache(true) \
-, m_aPresetId() \
-, m_aSubType() \
-, m_bHasSpecialDuration(false) \
-, m_fDurationInSeconds(0.001)
-
 Ppt97Animation::Ppt97Animation( SvStream& rInputStream )
-: MEMBER_CONSTRUCTOR_LIST()
+: m_aAtom()
+, m_bDirtyCache(true)
+, m_bHasSpecialDuration(false)
+, m_fDurationInSeconds(0.001)
 {
  m_aAtom.ReadStream( rInputStream );
 }
 
-Ppt97Animation::Ppt97Animation( const Ppt97Animation& rAnimation )
-: MEMBER_CONSTRUCTOR_LIST()
-{
-*this = rAnimation;
-}
-
-Ppt97Animation& Ppt97Animation::operator= ( const Ppt97Animation& rAnimation )
-{
-m_aAtom = rAnimation.m_aAtom;
-m_aSoundFileUrl = rAnimation.m_aSoundFileUrl;
-m_bDirtyCache = rAnimation.m_bDirtyCache;
-m_aPresetId = rAnimation.m_aPresetId;
-m_aSubType = rAnimation.m_aSubType;
-m_bHasSpecialDuration = rAnimation.m_bHasSpecialDuration;
-m_fDurationInSeconds = rAnimation.m_fDurationInSeconds;
-
-return *this;
-}
-
-Ppt97Animation::~Ppt97Animation()
-{
-}
-
 bool Ppt97Animation::operator < ( const Ppt97Animation& rAnimation ) const
 {
 return m_aAtom.nOrderID < rAnimation.m_aAtom.nOrderID;
diff --git a/sd/source/filter/ppt/ppt97animations.hxx 
b/sd/source/filter/ppt/ppt97animations.hxx
index eb2079e..daa61ed 100644
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -88,11 +88,8 @@ class Ppt97Animation
 public: //public methods
 explicit Ppt97Animation( SvStream& rIn );
 
-Ppt97Animation( const Ppt97Animation& rAnimation );
-Ppt97Animation& operator= ( const Ppt97Animation& rAnimation );
 bool operator < ( const Ppt97Animation& rAnimation ) const;//later is 
greater
 bool operator > ( const Ppt97Animation& rAnimation ) const;//later is 
greater
-~Ppt97Animation();
 
 //get methods
 bool HasEffect() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 include/sfx2/infobar.hxx   |5 +
 sfx2/source/dialog/infobar.cxx |   18 ++
 sfx2/source/view/viewfrm.cxx   |2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 0cd819b68ced2a95a127a246c0558153fbdbcae2
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 09:35:05 2017 +0100

Add helper methods to get common colors to SfxInfoBar

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

diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index 8cd6d6c..97671a9 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -69,6 +69,11 @@ class SfxInfoBarWindow : public vcl::Window
  */
 void addButton(PushButton* pButton);
 
+// Colors
+static basegfx::BColor getSuccessColor();
+static basegfx::BColor getDangerColor();
+static basegfx::BColor getWarningColor();
+
 private:
 DECL_LINK( CloseHandler, Button*, void );
 };
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index d8fce1f..4d5ba01 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -254,6 +254,24 @@ void SfxInfoBarWindow::Resize()
 m_pMessage->SetPosSizePixel(aMessagePosition, aMessageSize);
 }
 
+basegfx::BColor SfxInfoBarWindow::getSuccessColor()
+{
+// Green
+return basegfx::BColor(0.0, 0.5, 0.0);
+}
+
+basegfx::BColor SfxInfoBarWindow::getWarningColor()
+{
+// Orange
+return basegfx::BColor(1.0, 0.5, 0.0);
+}
+
+basegfx::BColor SfxInfoBarWindow::getDangerColor()
+{
+// Red
+return basegfx::BColor(0.5, 0.0, 0.0);
+}
+
 IMPL_LINK_NOARG(SfxInfoBarWindow, CloseHandler, Button*, void)
 {
 static_cast(GetParent())->removeInfoBar(this);
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index ffa0d41..a7f1d6a 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1181,7 +1181,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 
 SignatureState nSignatureState = 
GetObjectShell()->GetDocumentSignatureState();
 if (nSignatureState == SignatureState::BROKEN) {
-basegfx::BColor aBackgroundColor = basegfx::BColor(0.5, 
0.0, 0.0);
+basegfx::BColor aBackgroundColor = 
SfxInfoBarWindow::getWarningColor();
 auto pInfoBar = AppendInfoBar("signature", 
SfxResId(STR_SIGNATURE_BROKEN), );
 VclPtrInstance xBtn(());
 xBtn->SetText(SfxResId(STR_SIGNATURE_SHOW));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sfx2/source/inc/objshimp.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95db32acabaae2a1d32874ecb8429e828c52a7ae
Author: Michael Stahl 
Date:   Tue Jan 31 13:13:26 2017 +0100

sfx2: fix comment copypasta

Change-Id: Iebb5f51afe6f32883a535656d8b9e1f0ec678050

diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 9a3b5c1..52fbb44 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -94,7 +94,7 @@ struct SfxObjectShell_Impl : public 
::sfx2::IMacroDocumentAccess
 bUseUserData:1,
 bUseThumbnailSave:1,
 bSaveVersionOnClose:1,
-m_bSharedXMLFlag:1, // whether the flag should be 
stored in xml file
+m_bSharedXMLFlag:1, // whether the document should be 
edited in shared mode
 m_bAllowShareControlFileClean:1, // whether the flag 
should be stored in xml file
 m_bConfigOptionsChecked:1; // whether or not the user 
options are checked after the Options dialog is closed.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source include/sfx2 include/svtools sfx2/source svx/source uui/source

[Samuel Mehrbrodt]

 dbaccess/source/core/dataaccess/ModelImpl.cxx |5 -
 dbaccess/source/core/dataaccess/ModelImpl.hxx |1 -
 include/sfx2/docmacromode.hxx |   18 --
 include/sfx2/objsh.hxx|2 +-
 include/sfx2/sfx.hrc  |2 ++
 include/svtools/sfxecode.hxx  |1 -
 sfx2/source/doc/docmacromode.cxx  |4 
 sfx2/source/doc/objmisc.cxx   |   17 +++--
 sfx2/source/inc/objshimp.hxx  |1 -
 sfx2/source/view/view.src |   10 ++
 sfx2/source/view/viewfrm.cxx  |   12 
 svx/source/src/errtxt.src |4 
 uui/source/iahndl.cxx |   10 +++---
 13 files changed, 31 insertions(+), 56 deletions(-)

New commits:
commit 2dff5e856ab343b1296f63d645c47382493fe2fe
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 09:07:14 2017 +0100

tdf#105566 Show InfoBar when signature is invalid

gpg4libre

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

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 545b1c9..8c94d9a 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1335,11 +1335,6 @@ bool ODatabaseModelImpl::hasTrustedScriptingSignature( 
bool /*bAllowUIToAddAutho
 return false;
 }
 
-void ODatabaseModelImpl::showBrokenSignatureWarning( const Reference< 
XInteractionHandler >& /*_rxInteraction*/ ) const
-{
-OSL_FAIL( "ODatabaseModelImpl::showBrokenSignatureWarning: signatures 
can't be broken - we do not support them!" );
-}
-
 void ODatabaseModelImpl::storageIsModified()
 {
 setModified( true );
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx 
b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 71ecca9..fb02e0e 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -467,7 +467,6 @@ public:
 virtual css::uno::Reference< css::document::XEmbeddedScripts > 
getEmbeddedDocumentScripts() const override;
 virtual SignatureState getScriptingSignatureState() override;
 virtual bool hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ) 
override;
-virtual void showBrokenSignatureWarning( const css::uno::Reference< 
css::task::XInteractionHandler >& _rxInteraction ) const override;
 
 // IModifiableDocument
 virtual void storageIsModified() override;
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 01a1d7a..e2ffeab 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -149,24 +149,6 @@ namespace sfx2
 virtual bool
 hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ) = 
0;
 
-/** shows a warning that the document's signature is broken
-
-Here, a similar note applies as to getScriptingSignatureState: 
This method doesn't
-really belong here. It's just there because 
SfxObjectShell_Impl::bSignatureErrorIsShown
-is not accessible where the method is called.
-So, once the signature handling has been oursourced from 
SfxObjectShell/_Impl, so it
-is re-usable in non-SFX contexts as well, this method here is also 
unneeded, probably.
-
-@param _rxInteraction
-the interaction handler to use for showing the warning. It is 
exactly the same
-as passed to DocumentMacroMode::adjustMacroMode, so it is 
 if and
-only if the instance passed to that method was .
-*/
-virtual void
-showBrokenSignatureWarning(
-const css::uno::Reference< 
css::task::XInteractionHandler >& _rxInteraction
-) const = 0;
-
 protected:
 ~IMacroDocumentAccess() {}
 };
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 7a2e133..bd96409 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -684,7 +684,7 @@ public:
 SAL_DLLPRIVATE void InitOwnModel_Impl();
 SAL_DLLPRIVATE void BreakMacroSign_Impl( bool bBreakMacroSing );
 SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl();
-SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl( const 
css::uno::Reference< css::task::XInteractionHandler >& xHandler );
+SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl();
 SAL_DLLPRIVATE static SignatureState ImplCheckSignaturesInformation(
 const css::uno::Sequence< 
css::security::DocumentSignatureInformation >& aInfos );
 SAL_DLLPRIVATE void CheckEncryption_Impl( const css::uno::Reference< 

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py

[jan Iversen]

 esc-reporting/esc-analyze.py |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bd5992e381753f11164c38cdac70970e98b09f52
Author: jan Iversen 
Date:   Tue Jan 31 13:11:39 2017 +0100

esc-mentoring, update to match change in aliases.

The new aliases can contain # lines for comment
skipping these lines.

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 2921beb..dd58527 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -74,6 +74,8 @@ def util_load_csv(fileName, split):
 line = line[:-1]
 if len(line) == 0:
   continue
+if line[0] == '#':
+  continue
 x = line.split(split)
 if split == ';' and len(x) != 3:
   raise Exception('misformed entry ' + line + ' in filename ' + 
fileName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 96f597acf70ce52f2bdb59c85dd052be54b8d629
Author: Pranav Kant 
Date:   Tue Jan 31 19:35:49 2017 +0530

gtktiledviewer: gtk version checks

There is no major harm in excluding these lines of code on
platforms with older gtk.

Change-Id: Ica3f1e2b4f60f0bab55254632663ace7b4c61d4d

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 4307426..675341f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -258,8 +258,9 @@ static void userPromptDialog(GtkWidget* pDocView, const 
std::string& aTitle, std
 for (const auto& entry : aEntries)
 {
 GtkWidget* pEntry = gtk_entry_new();
+#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pEntry), entry.first.c_str());
-
+#endif
 gtk_container_add(GTK_CONTAINER(pEntryArea), pEntry);
 }
 
@@ -447,9 +448,11 @@ gboolean CommentsSidebar::docConfigureEvent(GtkWidget* 
pDocView, GdkEventConfigu
 gtk_container_add(GTK_CONTAINER(rWindow.m_pMainHBox), 
rWindow.m_pCommentsSidebar->m_pMainVBox);
 
 rWindow.m_pCommentsSidebar->m_pViewAnnotationsButton = 
gtk_button_new_with_label(".uno:ViewAnnotations");
+#if GTK_CHECK_VERSION(3,12,0)
 // Hack to make sidebar grid wide enough to not need any 
horizontal scrollbar
 
gtk_widget_set_margin_start(rWindow.m_pCommentsSidebar->m_pViewAnnotationsButton,
 20);
 
gtk_widget_set_margin_end(rWindow.m_pCommentsSidebar->m_pViewAnnotationsButton, 
20);
+#endif
 
gtk_container_add(GTK_CONTAINER(rWindow.m_pCommentsSidebar->m_pMainVBox), 
rWindow.m_pCommentsSidebar->m_pViewAnnotationsButton);
 
g_signal_connect(rWindow.m_pCommentsSidebar->m_pViewAnnotationsButton, 
"clicked", G_CALLBACK(CommentsSidebar::unoViewAnnotations), nullptr);
 
@@ -691,15 +694,21 @@ static void addMoreUnoParam(GtkWidget* /*pWidget*/, 
gpointer userdata)
 
 GtkWidget* pTypeEntry = gtk_entry_new();
 gtk_box_pack_start(GTK_BOX(pParamContainer), pTypeEntry, TRUE, TRUE, 2);
+#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pTypeEntry), "Param type (Eg. 
boolean, string etc.)");
+#endif
 
 GtkWidget* pNameEntry = gtk_entry_new();
 gtk_box_pack_start(GTK_BOX(pParamContainer), pNameEntry, TRUE, TRUE, 2);
+#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pNameEntry), "Param name");
+#endif
 
 GtkWidget* pValueEntry = gtk_entry_new();
 gtk_box_pack_start(GTK_BOX(pParamContainer), pValueEntry, TRUE, TRUE, 2);
+#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pValueEntry), "Param value");
+#endif
 
 GtkWidget* pRemoveButton = 
gtk_button_new_from_icon_name("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
 g_signal_connect(pRemoveButton, "clicked", G_CALLBACK(removeUnoParam), 
pUnoParamAreaBox);
@@ -942,8 +951,9 @@ static void unoCommandDebugger(GtkWidget* pButton, gpointer 
/* pItem */)
 
 GtkWidget* pUnoCmdEntry = gtk_entry_new ();
 gtk_box_pack_start(GTK_BOX(pUnoCmdAreaBox), pUnoCmdEntry, TRUE, TRUE, 2);
+#if GTK_CHECK_VERSION(3,2,0)
 gtk_entry_set_placeholder_text(GTK_ENTRY(pUnoCmdEntry), "UNO command (Eg. 
Bold, Italic etc.)");
-
+#endif
 GtkWidget* pUnoParamAreaBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 gtk_box_pack_start(GTK_BOX(pDialogMessageArea), pUnoParamAreaBox, TRUE, 
TRUE, 2);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/globstr.hrc |  ++---
 1 file changed, 555 insertions(+), 556 deletions(-)

New commits:
commit 5e1cfb2b55f19f5db24c1e05ef6eefb58df1bbe6
Author: Eike Rathke 
Date:   Tue Jan 31 15:40:59 2017 +0100

renumber global string IDs and close gaps

Eliminating 11 unused IDs that occupied empty elements in the string
table. Also moved STR_ERR_NAME_INVALID_CELL_REF to the proper position.

Change-Id: I2534476895edb438c7404d781781e6088adf0385

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 3b3cef6..94b4fed 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -106,615 +106,614 @@
 #define STR_BOX_YNI 66
 #define STR_NO_REF_TABLE67
 
-#define STR_PIVOT_TOTAL 79
-#define STR_PIVOT_DATA  80
-
-#define STR_PIVOT_INVALID_DBAREA81 // tabvwsh3.cxx
-
-#define STR_TABLE   82
-#define STR_COLUMN  83
-#define STR_ROW 84
-#define STR_LOAD_DOC85
-#define STR_SAVE_DOC86
-
-#define STR_ERR_INVALID_TABREF  87
-#define STR_AREA_ALREADY_INSERTED   88
-#define STR_INVALID_TABREF  89
-#define STR_INVALID_QUERYAREA   90
-
-#define STR_REIMPORT_EMPTY  91
-#define STR_NOMULTISELECT   92
-#define STR_FILL_SERIES_PROGRESS93 // documen3.cxx
-
-#define STR_UNKNOWN_FILTER  94
-
-#define STR_DATABASE_NOTFOUND   95
-
-#define STR_COND_AND96
-
-#define STR_UNDO_PRINTRANGES97
-
-#define STR_UNDO_DEC_INDENT 98
-#define STR_UNDO_INC_INDENT 99
-#define STR_UNDO_THESAURUS  100
-
-#define STR_FILL_TAB101
-#define STR_NO_VALUE102 /* moved to compiler.src, keep 
define! */
-#define STR_UPDATE_SCENARIO 103
-#define STR_ERR_NEWSCENARIO 104
-#define STR_SCENARIO105
-#define STR_PIVOT_TABLE 106
-#define STR_NEWTABNAMENOTUNIQUE 107
-
-#define STR_FUN_TEXT_SUM108
-#define STR_FUN_TEXT_COUNT  109
-#define STR_FUN_TEXT_AVG110
-#define STR_FUN_TEXT_MEDIAN 544
-#define STR_FUN_TEXT_MAX111
-#define STR_FUN_TEXT_MIN112
-#define STR_FUN_TEXT_PRODUCT113
-#define STR_FUN_TEXT_STDDEV 114
-#define STR_FUN_TEXT_VAR115
-#define STR_DOC_STAT116
-
-#define STR_DBNAME_IMPORT   117
-
-#define STR_NOCHARTATCURSOR 118
-#define STR_NOAREASELECTED  119
-#define STR_INVALIDTABNAME  120
-
-#define STR_PIVOT_NOTFOUND  121
-#define STR_ERROR_STR   122
-#define STR_NV_STR  123 /* moved to compiler.src, keep 
define! */
-#define STR_EMPTYDATA   124
-#define STR_PIVOT_NODATA125
-#define STR_PIVOT_MOVENOTALLOWED126
-
-#define STR_PRINT_INVALID_AREA  127
-
-#define STR_PAGESTYLE   128
-#define STR_HEADER  129
-#define STR_FOOTER  130
-
-#define STR_TEXTATTRS   131
-
-#define STR_HFCMD_DELIMITER 132
-#define STR_HFCMD_PAGE  133
-#define STR_HFCMD_PAGES 134
-#define STR_HFCMD_DATE  135
-#define STR_HFCMD_TIME  136
-#define STR_HFCMD_FILE  137
-#define STR_HFCMD_TABLE 138
-
-#define STR_PROTECTIONERR   139
-
-#define STR_PAGEHEADER  140
-#define STR_PAGEFOOTER  141
-#define STR_PAGE142
-#define STR_LONG_ERR_ILL_ARG143
-#define STR_LONG_ERR_ILL_PAR144
-#define STR_LONG_ERR_ILL_FPO145
-#define STR_LONG_ERR_ILL_CHAR   146
-#define STR_LONG_ERR_ILL_SEP147
-#define STR_LONG_ERR_PAIR   148
-#define STR_LONG_ERR_OP_EXP 149
-#define STR_LONG_ERR_VAR_EXP150
-#define STR_LONG_ERR_CODE_OVF   151
-#define STR_LONG_ERR_STR_OVF152
-#define STR_LONG_ERR_STACK_OVF  153
-#define STR_LONG_ERR_MATRIX_SIZE154
-#define STR_LONG_ERR_SYNTAX 155
-#define STR_LONG_ERR_CIRC_REF   156
-#define STR_LONG_ERR_NO_NAME157
-#define STR_LONG_ERR_NO_REF 158
-#define STR_LONG_ERR_NO_CONV159
-#define STR_LONG_ERR_NO_VALUE   160
-#define STR_LONG_ERR_NV 161
-
-#define STR_GRIDCOLOR   162
-#define STR_MERGE_NOTEMPTY  163
-#define STR_CELL_FILTER 164
-
-#define STR_TARGETNOTFOUND  165
-
-#define STR_INVALID_EPS 166
-#define STR_TABLE_OP167 // documen4.cxx
-#define STR_UNDO_TABOP  168
-
-#define STR_INVALID_AFNAME  169
-
-#define STR_AREA170
-#define STR_YES 171
-#define STR_NO  172
-#define STR_PROTECTION  173
-#define STR_FORMULAS174
-#define STR_HIDE175
-#define STR_PRINT   

[Libreoffice-commits] core.git: canvas/source drawinglayer/source framework/source include/basegfx include/comphelper sd/source svx/source

[Noel Grandin]

 canvas/source/opengl/ogl_canvascustomsprite.cxx|8 
 canvas/source/opengl/ogl_canvashelper.cxx  |1 -
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx |2 --
 framework/source/jobs/helponstartup.cxx|1 -
 include/basegfx/matrix/b2dhommatrix.hxx|2 +-
 include/basegfx/polygon/b2dpolygon.hxx |2 +-
 include/basegfx/range/b2drange.hxx |2 +-
 include/basegfx/range/b3drange.hxx |2 +-
 include/basegfx/vector/b3dvector.hxx   |2 +-
 include/comphelper/sequenceashashmap.hxx   |2 +-
 sd/source/ui/presenter/PresenterCanvas.cxx |2 --
 svx/source/engine3d/float3d.cxx|2 --
 svx/source/sdr/contact/viewcontactofe3dsphere.cxx  |1 -
 13 files changed, 6 insertions(+), 23 deletions(-)

New commits:
commit 0681a6ee2813dd5e8bcf5053cc1f0a2f6b4f8c97
Author: Noel Grandin 
Date:   Tue Jan 31 14:04:06 2017 +0200

more SAL_WARN_UNUSED

Change-Id: Idf44fe0302b4504c443f083e527b63b2461ada85

diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx 
b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index d166598..2a794ad 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -195,14 +195,6 @@ namespace oglcanvas
 ::basegfx::triangulator::triangulate(
 
::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(mxClip)));
 
-basegfx::B2DPolygon rTriangleList(
-basegfx::tools::clipTriangleListOnRange(
-rTriangulatedPolygon,
-basegfx::B2DRange(
-0,0,
-aSpriteSizePixel.getX(),
-aSpriteSizePixel.getY(;
-
 glBegin(GL_TRIANGLES);
 for( sal_uInt32 i=0; i());
-::comphelper::SequenceAsHashMap lJobConfig   = 
lArgs.getUnpackedValueOrDefault("JobConfig", css::uno::Sequence< 
css::beans::NamedValue >());
 
 // check for right environment.
 // If it's not a DocumentEvent, which triggered this job,
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx 
b/include/basegfx/matrix/b2dhommatrix.hxx
index 51479aa..524be07 100644
--- a/include/basegfx/matrix/b2dhommatrix.hxx
+++ b/include/basegfx/matrix/b2dhommatrix.hxx
@@ -29,7 +29,7 @@ namespace basegfx
 class B2DTuple;
 class Impl2DHomMatrix;
 
-class BASEGFX_DLLPUBLIC B2DHomMatrix
+class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2DHomMatrix
 {
 public:
 typedef o3tl::cow_wrapper< Impl2DHomMatrix > ImplType;
diff --git a/include/basegfx/polygon/b2dpolygon.hxx 
b/include/basegfx/polygon/b2dpolygon.hxx
index 4e868c1..b4a44e0 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -41,7 +41,7 @@ namespace basegfx
 
 namespace basegfx
 {
-class BASEGFX_DLLPUBLIC B2DPolygon

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/std.mk |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 2e244d879126f681488a99b0eb86c3ec2c2170f8
Author: Stephan Bergmann 
Date:   Tue Jan 31 13:47:23 2017 +0100

Allow some OO_SDK_*_HOME to be empty

...in which case the corresponding tool is located on the PATH

Change-Id: I4242180fbbc829f11aa1a12cf1e6b9f0a21ab7c6

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index ac2d4aa..e69fc3e 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -73,9 +73,21 @@ DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
 SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
 SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
 SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
+ifneq "$(OO_SDK_ZIP_HOME)" ""
 SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
+else
+SDK_ZIP=zip
+endif
+ifneq "$(OO_SDK_CAT_HOME)" ""
 SDK_CAT="$(OO_SDK_CAT_HOME)/cat"
+else
+SDK_CAT=cat
+endif
+ifneq "$(OO_SDK_SED_HOME)" ""
 SDK_SED="$(OO_SDK_SED_HOME)/sed"
+else
+SDK_SED=sed
+endif
 IDLC="$(OO_SDK_HOME)/bin/idlc"
 CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
 JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 include/sfx2/sfx.hrc |2 ++
 sfx2/source/view/view.src|   10 ++
 sfx2/source/view/viewfrm.cxx |   27 ---
 3 files changed, 36 insertions(+), 3 deletions(-)

New commits:
commit 2499ecc4050a308dd52df0ca32e2d97dff9e40df
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 10:47:47 2017 +0100

tdf#105566 Show InfoBar also for signed docs with warnings

gpg4libre

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

diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 25e8355..2cd1da9 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -122,6 +122,8 @@
 #define STR_READONLY_PDF(RID_SFX_START+138)
 #define STR_SIGNATURE_BROKEN(RID_SFX_START+139)
 #define STR_SIGNATURE_SHOW  (RID_SFX_START+140)
+#define STR_SIGNATURE_NOTVALIDATED  (RID_SFX_START+141)
+#define STR_SIGNATURE_PARTIAL_OK(RID_SFX_START+142)
 #define STR_ACCTITLE_PRODUCTIVITYTOOLS  (RID_SFX_START+157)
 
 #define SFX_THUMBNAIL_TEXT  (RID_SFX_START+158)
diff --git a/sfx2/source/view/view.src b/sfx2/source/view/view.src
index 56b7fba..9507e0b 100644
--- a/sfx2/source/view/view.src
+++ b/sfx2/source/view/view.src
@@ -145,6 +145,16 @@ String STR_SIGNATURE_BROKEN
 Text[ en-US ] = "Document has an invalid signature.";
 };
 
+String STR_SIGNATURE_NOTVALIDATED
+{
+Text[ en-US ] = "Signature is ok, but the certificate could not be 
validated.";
+};
+
+String STR_SIGNATURE_PARTIAL_OK
+{
+Text[ en-US ] = "Signature is ok, but the document is only partially 
signed.";
+};
+
 String STR_SIGNATURE_SHOW
 {
 Text[ en-US ] = "Show signatures";
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index a7f1d6a..dd6e317 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1180,9 +1180,30 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, 
const SfxHint& rHint )
 rBind.Invalidate( SID_EDITDOC );
 
 SignatureState nSignatureState = 
GetObjectShell()->GetDocumentSignatureState();
-if (nSignatureState == SignatureState::BROKEN) {
-basegfx::BColor aBackgroundColor = 
SfxInfoBarWindow::getWarningColor();
-auto pInfoBar = AppendInfoBar("signature", 
SfxResId(STR_SIGNATURE_BROKEN), );
+basegfx::BColor aBackgroundColor;
+OUString sMessage("");
+
+switch (nSignatureState)
+{
+case SignatureState::BROKEN:
+sMessage = SfxResId(STR_SIGNATURE_BROKEN);
+aBackgroundColor = SfxInfoBarWindow::getDangerColor();
+break;
+case SignatureState::NOTVALIDATED:
+sMessage = SfxResId(STR_SIGNATURE_NOTVALIDATED);
+aBackgroundColor = SfxInfoBarWindow::getWarningColor();
+break;
+case SignatureState::PARTIAL_OK:
+sMessage = SfxResId(STR_SIGNATURE_PARTIAL_OK);
+aBackgroundColor = SfxInfoBarWindow::getWarningColor();
+break;
+default:
+break;
+}
+
+if (!sMessage.isEmpty())
+{
+auto pInfoBar = AppendInfoBar("signature", sMessage, 
);
 VclPtrInstance xBtn(());
 xBtn->SetText(SfxResId(STR_SIGNATURE_SHOW));
 xBtn->SetSizePixel(xBtn->GetOptimalSize());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sfx2/source/view/viewfrm.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f921476a3a943db5a67884ff77b1ffd22622ca60
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 12:42:47 2017 +0100

Use white font for colored InfoBars

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

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index dd6e317..3249078 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1181,6 +1181,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 
 SignatureState nSignatureState = 
GetObjectShell()->GetDocumentSignatureState();
 basegfx::BColor aBackgroundColor;
+basegfx::BColor aForegroundColor(1.0, 1.0, 1.0);
 OUString sMessage("");
 
 switch (nSignatureState)
@@ -1203,7 +1204,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 
 if (!sMessage.isEmpty())
 {
-auto pInfoBar = AppendInfoBar("signature", sMessage, 
);
+auto pInfoBar = AppendInfoBar("signature", sMessage, 
, );
 VclPtrInstance xBtn(());
 xBtn->SetText(SfxResId(STR_SIGNATURE_SHOW));
 xBtn->SetSizePixel(xBtn->GetOptimalSize());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

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

New commits:
commit d7b0c600e0873c2924089e024e59083b9957899a
Author: Andras Timar 
Date:   Tue Jan 31 14:46:45 2017 +0100

Bump version to 5.1-18

Change-Id: Ic9e56e274182749915a350f396c0f1a2548303b8

diff --git a/configure.ac b/configure.ac
index 592da09..cfb844d 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.1.10.17],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.1.10.18],[],[],[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.1' - officecfg/registry

[Samuel Mehrbrodt]

 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab757c9b8f1e3c87c1cb0e651402c1d66100d1ad
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 15:27:41 2017 +0100

tdf#96011 Document is not focused when opening a second window

This reverts commit fa52e16b3fb1b8b051f8f64a52c126ba3cbf4d54.

Change-Id: Icddfc787a3300b54fea7393c07a7058711d582d6
Reviewed-on: https://gerrit.libreoffice.org/33757
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 6bf85a2..140a960 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -27,7 +27,7 @@
 
 
   
-false
+true
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/CustomTarget_build-examples.mk odk/Module_odk.mk

[Stephan Bergmann]

 odk/CustomTarget_build-examples.mk |  117 +
 odk/Module_odk.mk  |6 +
 2 files changed, 123 insertions(+)

New commits:
commit 0270018b683b2734ba60771e777aa71f873f7252
Author: Stephan Bergmann 
Date:   Tue Jan 31 13:52:45 2017 +0100

Build the ODK examples during subsequentcheck

...at least on Linux for now

Change-Id: Id9d909a3b071c37ba0cd29bbff0edb83d937145f

diff --git a/odk/CustomTarget_build-examples.mk 
b/odk/CustomTarget_build-examples.mk
new file mode 100644
index 000..7a1b490
--- /dev/null
+++ b/odk/CustomTarget_build-examples.mk
@@ -0,0 +1,117 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 
100 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,odk/build-examples))
+
+my_example_dirs = \
+CLI/CSharp/Spreadsheet \
+CLI/VB.NET/WriterDemo \
+DevelopersGuide/BasicAndDialogs/ToolkitControls \
+DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp \
+DevelopersGuide/Components/CppComponent \
+DevelopersGuide/Database/DriverSkeleton \
+DevelopersGuide/Extensions/DialogWithHelp \
+DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp \
+DevelopersGuide/ProfUNO/CppBinding \
+DevelopersGuide/ProfUNO/SimpleBootstrap_cpp \
+OLE/activex \
+cpp/DocumentLoader \
+cpp/complextoolbarcontrols \
+cpp/counter \
+cpp/remoteclient \
+python/toolpanel \
+
+
+#cpp/custompanel \
+
+
+ifeq ($(ENABLE_JAVA),TRUE)
+my_example_dirs += \
+DevelopersGuide/BasicAndDialogs/CreatingDialogs \
+DevelopersGuide/Charts \
+DevelopersGuide/Components/Addons/JobsAddon \
+DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java \
+DevelopersGuide/Components/JavaComponent \
+DevelopersGuide/Components/SimpleLicense \
+DevelopersGuide/Components/Thumbs \
+DevelopersGuide/Components/dialogcomponent \
+DevelopersGuide/Config \
+DevelopersGuide/Database \
+DevelopersGuide/Drawing \
+DevelopersGuide/FirstSteps \
+DevelopersGuide/Forms \
+DevelopersGuide/GUI \
+DevelopersGuide/OfficeBean \
+DevelopersGuide/OfficeDev \
+DevelopersGuide/OfficeDev/Clipboard \
+DevelopersGuide/OfficeDev/DesktopEnvironment \
+DevelopersGuide/OfficeDev/DisableCommands \
+DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter \
+DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection \
+DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java \
+DevelopersGuide/OfficeDev/Linguistic \
+DevelopersGuide/OfficeDev/PathSettings \
+DevelopersGuide/OfficeDev/PathSubstitution \
+DevelopersGuide/OfficeDev/TerminationTest \
+DevelopersGuide/ProfUNO/InterprocessConn \
+DevelopersGuide/ProfUNO/Lifetime \
+DevelopersGuide/ProfUNO/SimpleBootstrap_java \
+DevelopersGuide/ScriptingFramework/SayHello \
+DevelopersGuide/ScriptingFramework/ScriptSelector \
+DevelopersGuide/Spreadsheet \
+DevelopersGuide/Text \
+DevelopersGuide/UCB \
+java/DocumentHandling \
+java/Drawing \
+java/Inspector \
+java/MinimalComponent \
+java/PropertySet \
+java/Spreadsheet \
+java/Text \
+java/ToDo \
+
+endif
+
+#java/ConverterServlet \
+#java/EmbedDocument/Container1 \
+#java/EmbedDocument/EmbeddedObject \
+#java/NotesAccess \
+#java/Storage \
+
+
+.PHONY: $(call gb_CustomTarget_get_target,odk/build-examples)
+
+$(call gb_CustomTarget_get_target,odk/build-examples): \
+$(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
+   (. $< \
+&& export \
+UserInstallation=$(call gb_Helper_make_url,$(call 
gb_CustomTarget_get_workdir,odk/build-examples)/user) \
+$(foreach my_dir,$(my_example_dirs), \
+&& (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
+&& printf 'yes\n' | make))) \
+>$(call gb_CustomTarget_get_workdir,odk/build-examples)/log 2>&1 \
+|| (RET=$$? \
+&& cat $(call gb_CustomTarget_get_workdir,odk/build-examples)/log \
+&& exit $$RET)
+
+$(call gb_CustomTarget_get_workdir,odk/build-examples)/setsdkenv: \
+$(SRCDIR)/odk/config/setsdkenv_unix.sh.in | \
+$(call gb_CustomTarget_get_workdir,odk/build-examples)/.dir
+   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
+   sed -e 's!@OO_SDK_NAME@!sdk!' \
+-e 's!@OO_SDK_HOME@!$(INSTDIR)/$(SDKDIRNAME)!' \
+-e 's!@OFFICE_HOME@!$(INSTDIR)!' -e 's!@OO_SDK_MAKE_HOME@!!' \
+-e 's!@OO_SDK_ZIP_HOME@!!' -e 's!@OO_SDK_CAT_HOME@!!' \
+

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

[Samuel Mehrbrodt]

 xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1478f81f236b88377293432a642def218e228145
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 13:50:20 2017 +0100

tdf#105637 Digital signatures dialog has unnessary labels

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

diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui 
b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
index d79d7e9..31bec83 100644
--- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
+++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
@@ -194,7 +194,7 @@
 
 
   
-True
+True
 False
 Description
   
@@ -205,7 +205,7 @@
 
 
   
-True
+True
 False
 Signature 
type
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Usage of ActiveX in Libre Office

[Lionel Elie Mamane]

I think what he meant is that rewriting their ERP to another API to
drive LibreOffice would be quite some work for them, and not gonna
happen except if forced kicking and screaming.

In principle, I like to support these kinds of universal (in this case
"universal on a platform") APIs; are we deprecating / yanking only
ActiveX or the whole COM Automation / OLE / ... bridge (insofar as
these differ, I'm a bit lost in the Microsoft terminology)?

On Fri, Jan 27, 2017 at 09:19:33PM +0100, Heiko Tietze wrote:
> It would be much nicer to have a Pascal bridge rather than to support
> the proprietary ActiveX protocol. Some references are on the
> Freepascal wiki http://wiki.freepascal.org/Office_Automation
> 
> 2017-01-23 15:42 GMT+01:00  :
> > We are recently switched from AOO to LO. In the release notes a possible
> > removal of ActiveX is announced.
> > You are asking for information about the use case so here we are:
> >
> > We are using in our company a selfmade ERP system which is grown for more
> > than 15 years now. For historical reasons the system is written in Delphi.
> > At the beginning MS Office was used as "office frontend", since about 10
> > years OOo/AOO/LO. The main workflow is using calc for business calculation
> > and writer as a kind of report tool. Most information from the main database
> > is delivered via ActiveX to calc. After working in calc the information are
> > read back and used to create documents in writer. The complete project and
> > document management (and many more) is done by our ERP.
> >
> > I know there are others and probably more elegant ways and about once a year
> > we are discussing to change that and finding the "big solution" - but this
> > is a huge and expensive project.
> >
> > Removing ActiveX from LO will be a showstopper and nail us to the last
> > supported release - or bring us back to AOO, who knows.
> >
> > Best regards
> > Joergen Pisarz
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/libreoffice
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Mike Kaganski]

 sw/qa/extras/uiwriter/data/tdf105625.fodt |8 
 sw/qa/extras/uiwriter/data/tdf90362.fodt  |6 ++-
 sw/qa/extras/uiwriter/uiwriter.cxx|   26 +--
 sw/source/core/crsr/pam.cxx   |   52 ++
 4 files changed, 54 insertions(+), 38 deletions(-)

New commits:
commit f72b866c9cf4f07fce6744fbf482c4c6488106e2
Author: Mike Kaganski 
Date:   Tue Jan 31 00:32:48 2017 +0300

tdf#105625: allow editing around field marks

This commit fixes commit aa799f64723933bbb46544f835a970cfcbb90384,
and partially reverts commits bd505fdb9f669f365ff39b0ef46f0742c638e333
and 9104d5e8905c2ec2b576b5ca452d3e23de49 that seem unnecessary
now. Unit test included, the existing unit tests of partially
reverted commits are kept.

Change-Id: I2a02cda546f5d484553c3b9467993fca36dae140
Reviewed-on: https://gerrit.libreoffice.org/33722
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/uiwriter/data/tdf105625.fodt 
b/sw/qa/extras/uiwriter/data/tdf105625.fodt
new file mode 100644
index 000..44c0577
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf105625.fodt
@@ -0,0 +1,8 @@
+
+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">
+ 
+  
+   
+  
+ 
+
\ No newline at end of file
diff --git a/sw/qa/extras/uiwriter/data/tdf90362.fodt 
b/sw/qa/extras/uiwriter/data/tdf90362.fodt
index bf74255..97db3d5 100644
--- a/sw/qa/extras/uiwriter/data/tdf90362.fodt
+++ b/sw/qa/extras/uiwriter/data/tdf90362.fodt
@@ -3,8 +3,10 @@
  
   
Before
-   
+   
+Inside
+   
After
   
  
-
+
\ No newline at end of file
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 0ddc439..da819d4 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -226,6 +226,7 @@ public:
 void testTdf35021_tabOverMarginDemo();
 void testTdf104492();
 void testTdf105417();
+void testTdf105625();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -346,6 +347,7 @@ public:
 CPPUNIT_TEST(testTdf35021_tabOverMarginDemo);
 CPPUNIT_TEST(testTdf104492);
 CPPUNIT_TEST(testTdf105417);
+CPPUNIT_TEST(testTdf105625);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3030,17 +3032,21 @@ void SwUiWriterTest::testTdf88899()
 
 void SwUiWriterTest::testTdf90362()
 {
-// First check if the end of the second paragraph is indeed protected.
 SwDoc* pDoc = createDoc("tdf90362.fodt");
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+uno::Reference 
xComponentContext(comphelper::getProcessComponentContext());
+// Ensure correct initial setting
+comphelper::ConfigurationHelper::writeDirectKey(xComponentContext, 
"org.openoffice.Office.Writer/", "Cursor/Option", "IgnoreProtectedArea", 
css::uno::Any(false), comphelper::EConfigurationModes::Standard);
+// First check if the end of the second paragraph is indeed protected.
 pWrtShell->EndPara();
 pWrtShell->Down(/*bSelect=*/false);
 CPPUNIT_ASSERT_EQUAL(true, pWrtShell->HasReadonlySel());
 
 // Then enable ignoring of protected areas and make 

[Libreoffice-commits] libvisio.git: 2 commits - src/lib

[Fridrich Štrba]

 src/lib/VSDContentCollector.cpp |  504 +---
 src/lib/VSDContentCollector.h   |2 
 src/lib/VSDTypes.h  |5 
 src/lib/VSDXMLParserBase.cpp|1 
 src/lib/libvisio_utils.cpp  |1 
 5 files changed, 374 insertions(+), 139 deletions(-)

New commits:
commit 94f36d00499808d7588a0970ce0dc7470d1245c7
Author: Fridrich Å trba 
Date:   Tue Jan 31 17:12:11 2017 +0100

Refactoring to get the text encoding from the font information

Change-Id: I2261310cf4ef2635e44cc80db809e7ca9fc4409f

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index eb9a366..e201809 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -256,7 +256,14 @@ void libvisio::VSDContentCollector::_flushShape()
   if (m_currentForeignData.size() && 
m_currentForeignProps["librevenge:mime-type"] && m_foreignWidth != 0.0 && 
m_foreignHeight != 0.0)
 numForeignElements++;
   if (!m_currentText.empty())
-numTextElements++;
+  {
+if ((m_currentText.m_format == VSD_TEXT_UTF16
+ && (m_currentText.m_data.size() >= 2 && 
(m_currentText.m_data.getDataBuffer()[0] || 
m_currentText.m_data.getDataBuffer()[1])))
+|| m_currentText.m_data.getDataBuffer()[0])
+{
+  numTextElements++;
+}
+  }
 
   if (numPathElements+numForeignElements+numTextElements > 1)
   {
@@ -591,6 +598,19 @@ void libvisio::VSDContentCollector::_flushText()
   /* Do not output empty text objects. */
   if (m_currentText.empty() || m_misc.m_hideText)
 return;
+  else
+// Check whether the buffer contains only the terminating NULL character
+  {
+if (m_currentText.m_format == VSD_TEXT_UTF16)
+{
+  if (m_currentText.m_data.size() < 2)
+return;
+  else if (!(m_currentText.m_data.getDataBuffer()[0]) && 
!(m_currentText.m_data.getDataBuffer()[1]))
+return;
+}
+else if (!(m_currentText.m_data.getDataBuffer()[0]))
+  return;
+  }
 
   /* Fill the text object/frame properties */
   double xmiddle = m_txtxform ? m_txtxform->width / 2.0 : m_xform.width / 2.0;
@@ -679,172 +699,381 @@ void libvisio::VSDContentCollector::_flushText()
   unsigned charNumRemaining(charIt->charCount);
   unsigned tabNumRemaining(tabIt->m_numChars);
 
+  std::vector sOutputVector;
   librevenge::RVNGString sOutputText;
 
-  /* Iterate over the text character by character */
-  librevenge::RVNGString::Iter textIt(m_currentText);
-  for (textIt.rewind(); textIt.next();)
+  // Unfortunately, we have to handle the unicode formats differently then the 
8-bit formats
+  if (m_currentText.m_format == VSD_TEXT_UTF8 || m_currentText.m_format == 
VSD_TEXT_UTF16)
   {
-/* Any character will cause a paragraph to open if it is not yet opened. */
-if (!isParagraphOpened)
+std::vector tmpBuffer(m_currentText.m_data.size());
+memcpy([0], m_currentText.m_data.getDataBuffer(), 
m_currentText.m_data.size());
+librevenge::RVNGString textString;
+appendCharacters(textString, tmpBuffer, m_currentText.m_format);
+/* Iterate over the text character by character */
+librevenge::RVNGString::Iter textIt(textString);
+for (textIt.rewind(); textIt.next();)
 {
-  librevenge::RVNGPropertyList paraProps;
-  _fillParagraphProperties(paraProps, *paraIt);
+  /* Any character will cause a paragraph to open if it is not yet opened. 
*/
+  if (!isParagraphOpened)
+  {
+librevenge::RVNGPropertyList paraProps;
+_fillParagraphProperties(paraProps, *paraIt);
+
+if (m_textBlockStyle.defaultTabStop > 0.0)
+  paraProps.insert("style:tab-stop-distance", 
m_textBlockStyle.defaultTabStop);
+
+_fillTabSet(paraProps, *tabIt);
 
-  if (m_textBlockStyle.defaultTabStop > 0.0)
-paraProps.insert("style:tab-stop-distance", 
m_textBlockStyle.defaultTabStop);
+VSDBullet bullet;
+_bulletFromParaFormat(bullet, *paraIt);
 
-  _fillTabSet(paraProps, *tabIt);
+/* Bullet definition changed with regard to the last paragraph style. 
*/
+if (bullet != currentBullet)
+{
+  /* If the previous paragraph style had a bullet, close the list 
level. */
+  if (!!currentBullet)
+m_shapeOutputText->addCloseUnorderedListLevel();
 
-  VSDBullet bullet;
-  _bulletFromParaFormat(bullet, *paraIt);
+  currentBullet = bullet;
+  /* If the current paragraph style has a bullet, open a new list 
level. */
+  if (!!currentBullet)
+  {
+librevenge::RVNGPropertyList bulletList;
+_listLevelFromBullet(bulletList, currentBullet);
+m_shapeOutputText->addOpenUnorderedListLevel(bulletList);
+  }
+}
 
-  /* Bullet definition changed with regard to the last paragraph style. */
-  if (bullet != currentBullet)
+if (!currentBullet)
+  m_shapeOutputText->addOpenParagraph(paraProps);
+ 

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

[Vitaliy Anderson]

 unotools/source/config/compatibility.cxx |   33 ++-
 1 file changed, 11 insertions(+), 22 deletions(-)

New commits:
commit aaf41776b992a4552764f0fdf91671ffebc618fa
Author: Vitaliy Anderson 
Date:   Tue Jan 31 05:11:12 2017 -0800

Compatibility options refactoring. Part 1 small fix

SvtCompatibilityOptions_Impl::impl_GetPropertyNames() solve problem with 
wrong lProperties names

Change-Id: I0b71a80d542d8175c3f6e6cdf5fe857143714acb
Reviewed-on: https://gerrit.libreoffice.org/33752
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/unotools/source/config/compatibility.cxx 
b/unotools/source/config/compatibility.cxx
index b13972b..58522ac 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -145,17 +145,6 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
 
*//*-*/
 Sequence< OUString > impl_GetPropertyNames( Sequence< OUString >& 
rItems );
 
-
/*-
-@short  expand the list for all well known properties to 
destination
-@seealsomethod impl_GetPropertyNames()
-
-@param  "lSource"  ,   original list
-@param  "lDestination" ,   destination of operation
-@return A list of configuration key names is returned.
-
*//*-*/
-static void impl_ExpandPropertyNames( const Sequence< OUString >& 
lSource,
-  Sequence< OUString >& 
lDestination );
-
 private:
 std::vector< SvtCompatibilityEntry > m_aOptions;
 SvtCompatibilityEntrym_aDefOptions;
@@ -292,29 +281,29 @@ Sequence< OUString > 
SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen
 {
 // First get ALL names of current existing list items in configuration!
 rItems = GetNodeNames( SETNODE_ALLFILEFORMATS );
+
 // expand list to result list ...
 Sequence< OUString > lProperties( rItems.getLength() * ( 
SvtCompatibilityEntry::getElementCount() - 1 ) );
-impl_ExpandPropertyNames( rItems, lProperties );
-// Return result.
-return lProperties;
-}
 
-void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames(
-const Sequence< OUString >& lSource, Sequence< OUString >& lDestination )
-{
-sal_Int32 nSourceCount = lSource.getLength();
+sal_Int32 nSourceCount = rItems.getLength();
+sal_Int32 nDestStep= 0;
 // Copy entries to destination and expand every item with 2 supported sub 
properties.
 for ( sal_Int32 nSourceStep = 0; nSourceStep < nSourceCount; ++nSourceStep 
)
 {
 OUString sFixPath;
 sFixPath = SETNODE_ALLFILEFORMATS;
 sFixPath += PATHDELIMITER;
-sFixPath += lSource[ nSourceStep ];
+sFixPath += rItems[ nSourceStep ];
 sFixPath += PATHDELIMITER;
-
 for ( int i = static_cast(SvtCompatibilityEntry::Index::Module); 
i < static_cast(SvtCompatibilityEntry::Index::INVALID); ++i )
-lDestination[ i - 1 ] = sFixPath + SvtCompatibilityEntry::getName( 
SvtCompatibilityEntry::Index(i) );
+{
+lProperties[ nDestStep ] = sFixPath + 
SvtCompatibilityEntry::getName( SvtCompatibilityEntry::Index(i) );
+nDestStep++;
+}
 }
+
+// Return result.
+return lProperties;
 }
 
 namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_pctfuzzer.mk vcl/Module_vcl.mk vcl/workben

[Caolán McNamara]

 Makefile.in |2 -
 Repository.mk   |1 
 vcl/Executable_pctfuzzer.mk |   47 
 vcl/Module_vcl.mk   |1 
 vcl/workben/pctfuzzer.cxx   |   24 ++
 5 files changed, 74 insertions(+), 1 deletion(-)

New commits:
commit fedbbc5e3f22baab26adf3e5f921f8cebe7a4bf9
Author: Caolán McNamara 
Date:   Sat Jan 28 12:42:02 2017 +

add pct fuzzer

Change-Id: I6a1787b484479268223fb59bf510c20be833d4d0

diff --git a/Makefile.in b/Makefile.in
index 63f731c..ae769dc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -437,7 +437,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg 
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi 
Library_clew Library_gie Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer Executable_epsfuzzer
+fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg 
StaticLibrary_findsofficepath Library_tl Rdb_services udkapi offapi 
Library_clew Library_gie Library_reflection Library_invocadapt 
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader 
Library_gcc3_uno instsetoo_native more_fonts StaticLibrary_fuzzer 
Executable_wmffuzzer Executable_jpgfuzzer Executable_giffuzzer 
Executable_xbmfuzzer Executable_xpmfuzzer Executable_pngfuzzer 
Executable_bmpfuzzer Executable_svmfuzzer Executable_pcdfuzzer 
Executable_dxffuzzer Executable_metfuzzer Executable_ppmfuzzer 
Executable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index d196c5c..a74522c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -107,6 +107,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,ppmfuzzer) \
$(call gb_Helper_optional,FUZZERS,psdfuzzer) \
$(call gb_Helper_optional,FUZZERS,epsfuzzer) \
+   $(call gb_Helper_optional,FUZZERS,pctfuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_pctfuzzer.mk b/vcl/Executable_pctfuzzer.mk
new file mode 100644
index 000..670a7fe
--- /dev/null
+++ b/vcl/Executable_pctfuzzer.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+include $(SRCDIR)/vcl/commonfuzzer.mk
+
+$(eval $(call gb_Executable_Executable,pctfuzzer))
+
+$(eval $(call gb_Executable_use_api,pctfuzzer,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,pctfuzzer,\
+   $(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,pctfuzzer,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,pctfuzzer,\
+   $(fuzzer_libraries) \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,pctfuzzer,\
+findsofficepath \
+ulingu \
+fuzzer \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,pctfuzzer,\
+   vcl/workben/pctfuzzer \
+))
+
+$(eval $(call gb_Executable_add_libs,pctfuzzer,\
+   -lFuzzingEngine \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index cd6c5ab..3cd29db 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -120,6 +120,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
 Executable_ppmfuzzer \
 Executable_psdfuzzer \
 Executable_epsfuzzer \
+Executable_pctfuzzer \
 ))
 endif
 
diff --git a/vcl/workben/pctfuzzer.cxx b/vcl/workben/pctfuzzer.cxx
new file mode 100644
index 000..08cf4be
--- /dev/null
+++ b/vcl/workben/pctfuzzer.cxx
@@ -0,0 +1,24 @@
+/* -*- 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 

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

[Samuel Mehrbrodt]

 sfx2/source/view/viewfrm.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 057990769325b2f3dd2f198a9bf76a0a85447bb7
Author: Samuel Mehrbrodt 
Date:   Tue Jan 31 14:22:36 2017 +0100

tdf#105566 Close Infobar after clicking action button

gpg4libre

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

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3249078..5e74b85 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1350,6 +1350,7 @@ IMPL_LINK_NOARG(SfxViewFrame, SwitchReadOnlyHandler, 
Button*, void)
 
 IMPL_LINK_NOARG(SfxViewFrame, SignDocumentHandler, Button*, void)
 {
+RemoveInfoBar("signature");
 GetDispatcher()->Execute(SID_SIGNATURE);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: minutes of ESC call ...

[Michael Meeks]

Hi David,

On 27/01/17 06:07, David Ostrovsky wrote:
> On Thu Jan 26 15:49:52 UTC 2017, Michael Meeks wrote:
>>+ love a queue that auto-merged when CI succeeds (Michael)
> 
> The missing bits for that feature were finalized and merged during
> recent Gerrit hackathon and will be included in the upcoming release
> 2.14. ETA is June 2017.
> 
> https://gerrit-review.googlesource.com/#/c/79760/

Awesome =)

> I have another topic, updating our gerrit instance to 2.13.5,
> from 2.11.8. There are a lot of improvements.

Sounds like we should discuss that at FOSDEM =)

Thanks !

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: include/sfx2 sfx2/source

[Caolán McNamara]

 include/sfx2/sidebar/SidebarController.hxx |6 +-
 sfx2/source/sidebar/SidebarController.cxx  |   12 
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 3e27ba70ce212642026874ba73021930a06cdbbd
Author: Caolán McNamara 
Date:   Tue Jan 31 14:29:18 2017 +

Resolves: tdf#104884 print preview replaces the frame controller

so the sidebar is listening to the old controller which has been 
disposed[1] so
when print preview exits and yet another controller replaces the print 
preview
one then the sidebar still doesn't listen to the current one.

framework broadcasts COMPONENT_DETACHING/COMPONENT_REATTACHED around these
changes, so if we listen to them we can keep attached to whatever is the
current component

[1] note that ContextChangeEventMultipler doesn't inform clients that the
controller has been disposed, this remains unchanged here

Change-Id: I141509d4a262307afd7dcfc3d77de6cdd6dbfa5f
Reviewed-on: https://gerrit.libreoffice.org/33758
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index e648b2b..5832f21 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -45,7 +45,8 @@ typedef cppu::WeakComponentImplHelper <
 css::ui::XContextChangeEventListener,
 css::beans::XPropertyChangeListener,
 css::ui::XSidebar,
-css::frame::XStatusListener
+css::frame::XStatusListener,
+css::frame::XFrameActionListener
 > SidebarControllerInterfaceBase;
 
 class SfxSplitWindow;
@@ -97,6 +98,9 @@ public:
 // frame::XStatusListener
 virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& 
rEvent) override;
 
+// frame::XFrameActionListener
+virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& 
rEvent) override;
+
 // ui::XSidebar
 virtual void SAL_CALL requestLayout() override;
 
diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 4e275a5..4a6ec25 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -126,6 +126,7 @@ rtl::Reference SidebarController::create(
 new SidebarController(pParentWindow, rxFrame));
 
 registerSidebarForFrame(instance.get(), rxFrame->getController());
+rxFrame->addFrameActionListener(instance.get());
 // Listen for window events.
 instance->mpParentWindow->AddEventListener(LINK(instance.get(), 
SidebarController, WindowEventHandler));
 
@@ -236,6 +237,7 @@ void SAL_CALL SidebarController::disposing()
 if (!xController.is())
 xController = mxCurrentController;
 
+mxFrame->removeFrameActionListener(this);
 unregisterSidebarForFrame(this, xController);
 
 if (mxReadOnlyModeDispatch.is())
@@ -1316,6 +1318,16 @@ void SidebarController::FadeIn()
 mpSplitWindow->FadeIn();
 }
 
+void SidebarController::frameAction(const css::frame::FrameActionEvent& rEvent)
+{
+if (rEvent.Frame == mxFrame)
+{
+if (rEvent.Action == css::frame::FrameAction_COMPONENT_DETACHING)
+unregisterSidebarForFrame(this, mxFrame->getController());
+else if (rEvent.Action == css::frame::FrameAction_COMPONENT_REATTACHED)
+registerSidebarForFrame(this, mxFrame->getController());
+}
+}
 
 } } // end of namespace sfx2::sidebar
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - desktop/inc desktop/qa desktop/source include/LibreOfficeKit sfx2/source

[Jan Holesovsky]

 desktop/inc/lib/init.hxx|4 --
 desktop/qa/desktop_lib/test_desktop_lib.cxx |   45 -
 desktop/source/lib/init.cxx |   50 +++-
 include/LibreOfficeKit/LibreOfficeKit.h |   10 -
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   10 -
 sfx2/source/view/lokhelper.cxx  |   14 ++-
 6 files changed, 24 insertions(+), 109 deletions(-)

New commits:
commit 20910ea89efb01406e35e9d942613123f78b637f
Author: Jan Holesovsky 
Date:   Tue Jan 31 17:33:49 2017 +0100

Replace a terribly expensive json parsing with a peek for the value.

We should reduce the amount of callbacks from the core in the first place, 
so
that we don't have to deduplicate this much here, but this already helps a
lot.

Change-Id: Idf4a3681ac0f47536e00c1d97152f3f8bb99894b

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 57067fa..d879798 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -446,10 +446,26 @@ bool lcl_isViewCallbackType(const int type)
 
 int lcl_getViewId(const std::string& payload)
 {
-boost::property_tree::ptree aTree;
-std::stringstream aStream(payload);
-boost::property_tree::read_json(aStream, aTree);
-return aTree.get("viewId");
+// this is a cheap way how to get the viewId from a JSON message; proper
+// parsing is terribly expensive, and we just need the viewId here
+size_t viewIdPos = payload.find("viewId");
+if (viewIdPos == std::string::npos)
+return 0;
+
+size_t numberPos = payload.find(":", viewIdPos + 6);
+if (numberPos == std::string::npos)
+return 0;
+
+for (++numberPos; numberPos < payload.length(); ++numberPos)
+{
+if (payload[numberPos] == ',' || payload[numberPos] == '}' || 
(payload[numberPos] >= '0' && payload[numberPos] <= '9'))
+break;
+}
+
+if (numberPos < payload.length() && payload[numberPos] >= '0' && 
payload[numberPos] <= '9')
+return std::stoi(payload.substr(numberPos));
+
+return 0;
 }
 
 }  // end anonymous namespace
commit 230f04e92d3a3c492e12e0ef2392fc45c73dd762
Author: Jan Holesovsky 
Date:   Tue Jan 31 16:47:54 2017 +0100

Build the json message a much less expensive way.

Change-Id: I10911deb52f6a0c65262f9d6af459cf6ddd2fae9

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 4aa35af..bfcd000 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -9,8 +9,6 @@
 
 #include 
 
-#include 
-
 #include 
 
 #include 
@@ -112,14 +110,10 @@ bool SfxLokHelper::getViewIds(int* pArray, size_t nSize)
 
 void SfxLokHelper::notifyOtherView(SfxViewShell* pThisView, SfxViewShell* 
pOtherView, int nType, const OString& rKey, const OString& rPayload)
 {
-boost::property_tree::ptree aTree;
-aTree.put("viewId", SfxLokHelper::getView(pThisView));
-aTree.put(rKey.getStr(), rPayload.getStr());
-aTree.put("part", pThisView->getPart());
-aTree.put(rKey.getStr(), rPayload.getStr());
-std::stringstream aStream;
-boost::property_tree::write_json(aStream, aTree);
-OString aPayload = aStream.str().c_str();
+OString aPayload = OString("{ \"viewId\": \"") + 
OString::number(SfxLokHelper::getView(pThisView)) +
+"\", \"part\": \"" + OString::number(pThisView->getPart()) +
+"\", \"" + rKey + "\": \"" + rPayload + "\" }";
+
 pOtherView->libreOfficeKitViewCallback(nType, aPayload.getStr());
 }
 
commit be71e2b860e8ec5debc60bdcbda3e3fa5f8cd528
Author: Jan Holesovsky 
Date:   Fri Jan 27 19:19:43 2017 +0100

Revert "Lok: support for batch API calls"

This was for the moment removed from the online.git, so let's disable the 
API
bits too before it shows this is really necessary.  Reverts also:
Revert "Lok: unittest batch API"

Change-Id: I7bf3fe62d1e73b6f233992d51f587868a78f4bec

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index bfe9954..302f54d 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -41,10 +41,6 @@ namespace desktop {
 void setEventLatch(const bool bEventLatch)
 {
 m_bEventLatch = bEventLatch;
-if (!IsActive())
-{
-Start();
-}
 }
 
 bool isEventLatchOn() const { return m_bEventLatch; }
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index a1a769b..4312089 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -96,7 +96,6 @@ public:
 void testContextMenuImpress();
 void testNotificationCompression();
 void testTileInvalidationCompression();
-void testBatching();
 void testPartInInvalidation();
 void testRedlineWriter();
 void testTrackChanges();

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

[Olivier]

 sd/uiconfig/simpress/ui/sidebarslidebackground.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9d846e6adc29a9f5cc5166193219ddadc95955b
Author: Olivier 
Date:   Tue Jan 31 10:58:01 2017 -0200

tdf#105623 - Two labels for the same function

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

diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui 
b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 5025ede..260154a 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -207,7 +207,7 @@
 
 
   
-Close Master 
Slide
+Close Master 
View
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libmwaw filter/source

[David Tardon]

 download.lst |6 
 external/libmwaw/0001-fix-build-with-MSVC.patch.1|  113 +--
 external/libmwaw/Library_mwaw.mk |1 
 filter/source/config/fragments/filters/PowerPoint3.xcu   |2 
 filter/source/config/fragments/types/impress_PowerPoint3.xcu |2 
 5 files changed, 22 insertions(+), 102 deletions(-)

New commits:
commit bc4097ed5619ee7457aef250dc25eee934f79e75
Author: David Tardon 
Date:   Tue Jan 31 10:52:25 2017 +0100

upload libmwaw 0.3.10

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

diff --git a/download.lst b/download.lst
index dd2a24d..4717e22 100644
--- a/download.lst
+++ b/download.lst
@@ -105,9 +105,9 @@ export MDNSRESPONDER_MD5SUM := 
940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := d8532ad5630d3f3b2189a7ec5639151b
-export MWAW_VERSION_MICRO := 9
-export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
+export MWAW_MD5SUM := 2a84cd13bca3563f5b55fef25412cb9b
+export MWAW_VERSION_MICRO := 10
+export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := 231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz
diff --git a/external/libmwaw/0001-fix-build-with-MSVC.patch.1 
b/external/libmwaw/0001-fix-build-with-MSVC.patch.1
index ab60358..881fb92 100644
--- a/external/libmwaw/0001-fix-build-with-MSVC.patch.1
+++ b/external/libmwaw/0001-fix-build-with-MSVC.patch.1
@@ -1,106 +1,25 @@
-From ae8f006018f6cfc79b86f327116f6ceed71692f9 Mon Sep 17 00:00:00 2001
+From 3d7479236e565c974a1f6e04d6cd1139bca5cb58 Mon Sep 17 00:00:00 2001
 From: David Tardon 
-Date: Wed, 23 Nov 2016 09:06:35 +0100
+Date: Tue, 31 Jan 2017 14:49:05 +0100
 Subject: [PATCH] fix build with MSVC
 
 ---
- src/lib/PowerPoint3Parser.cxx | 30 +++---
- 1 file changed, 15 insertions(+), 15 deletions(-)
+ src/lib/PowerPoint1Parser.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/lib/PowerPoint3Parser.cxx b/src/lib/PowerPoint3Parser.cxx
-index 9ecbe1b..51348d6 100644
 a/src/lib/PowerPoint3Parser.cxx
-+++ b/src/lib/PowerPoint3Parser.cxx
-@@ -1076,15 +1076,15 @@ bool PowerPoint3Parser::readDocInfo(MWAWEntry const 
)
-   f << "],";
-   for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2));
-   if (!m_state->m_isMacFile) {
--std::swap(dim[0],dim[1]);
--std::swap(dim[2],dim[3]);
-+std::swap(dim[0],dim[1]);
-+std::swap(dim[2],dim[3]);
-   }
-   MWAWBox2i pageBox(MWAWVec2i(dim[1],dim[0]),MWAWVec2i(dim[3],dim[2]));
-   f << "dim[page]=" << pageBox << ",";
-   for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2));
-   if (!m_state->m_isMacFile) {
--std::swap(dim[0],dim[1]);
--std::swap(dim[2],dim[3]);
-+std::swap(dim[0],dim[1]);
-+std::swap(dim[2],dim[3]);
-   }
-   MWAWBox2i 
paperBox=MWAWBox2i(MWAWVec2i(dim[0],dim[1]),MWAWVec2i(dim[2],dim[3]));
-   f << "dim[paper]=" << paperBox << ",";
-@@ -1673,16 +1673,16 @@ bool PowerPoint3Parser::readSlideFormats(MWAWEntry 
const , std::vectorreadLong(2));
--if (!isMacFile) std::swap(dim[0],dim[1]);
-+if (!isMacFile) std::swap(dim[0],dim[1]);
- f << "dim0=" << MWAWVec2i(dim[1], dim[0]) << ",";
- format.m_gradientOffset=int(input->readLong(2));
- if (format.m_gradientOffset) f << "grad[col,offset]=" << 
format.m_gradientOffset << ",";
- for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2));
--if (!isMacFile) std::swap(dim[0],dim[1]);
-+if (!isMacFile) std::swap(dim[0],dim[1]);
- format.m_margins=MWAWVec2i(dim[1], dim[0]);
- f << "box[margins]=" << format.m_margins << ",";
- for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2));
--if (!isMacFile) std::swap(dim[0],dim[1]);
-+if (!isMacFile) std::swap(dim[0],dim[1]);
- format.m_shadowOffset=MWAWVec2i(dim[1], dim[0]);
- if (format.m_shadowOffset!=MWAWVec2i(0,0))
-   f << "shadow[offset]=" << format.m_shadowOffset << ",";
-@@ -1727,15 +1727,15 @@ bool PowerPoint3Parser::readSlidePolygons(MWAWEntry 
const , std::vectorreadLong(2));
- if (!isMacFile) {
--  std::swap(dim[0],dim[1]);
--  std::swap(dim[2],dim[3]);
-+  std::swap(dim[0],dim[1]);
-+  std::swap(dim[2],dim[3]);
+diff --git a/src/lib/PowerPoint1Parser.cxx b/src/lib/PowerPoint1Parser.cxx
+index 2f735dc..e57eb65 100644
+--- a/src/lib/PowerPoint1Parser.cxx
 b/src/lib/PowerPoint1Parser.cxx
+@@ -807,7 +807,7 @@ bool 

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

[Eike Rathke]

 sc/source/ui/condformat/condformatdlg.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d9423d80e7a2c8dc323027425780a17e76b6d0c6
Author: Eike Rathke 
Date:   Mon Jan 30 18:11:49 2017 +0100

Resolves: tdf#105410 do not crash on a deleted format

... if the last condition was deleted and the Manage list is to be
updated. The format is gone.

Change-Id: I0fc056b5c75849197f351871b0d05e5015d0d1bf
(cherry picked from commit e32c8293709d4940ccf9f3def963e5a87925e583)
Reviewed-on: https://gerrit.libreoffice.org/33713
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 37bf0b2..b2c0a1c 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -635,9 +635,12 @@ void ScCondFormatDlg::OkPressed()
 nKey = pList->getMaxKey() + 1;
 }
 
-pFormat->SetKey(nKey);
 pList->erase(nKey);
-pList->InsertNew(pFormat);
+if (pFormat)
+{
+pFormat->SetKey(nKey);
+pList->InsertNew(pFormat);
+}
 mpViewData->GetViewShell()->GetPool().Put(*mpDlgItem);
 
 SetDispatcherLock( false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/condformat/condformatdlg.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 9b227212f648ecdd88926cbcbb6144f254b96223
Author: Eike Rathke 
Date:   Mon Jan 30 18:11:49 2017 +0100

Resolves: tdf#105410 do not crash on a deleted format

... if the last condition was deleted and the Manage list is to be
updated. The format is gone.

Change-Id: I0fc056b5c75849197f351871b0d05e5015d0d1bf
(cherry picked from commit e32c8293709d4940ccf9f3def963e5a87925e583)
Reviewed-on: https://gerrit.libreoffice.org/33714
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index c5f4870..6f9cfbe 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -632,9 +632,12 @@ void ScCondFormatDlg::OkPressed()
 nKey = pList->getMaxKey() + 1;
 }
 
-pFormat->SetKey(nKey);
 pList->erase(nKey);
-pList->InsertNew(pFormat);
+if (pFormat)
+{
+pFormat->SetKey(nKey);
+pList->InsertNew(pFormat);
+}
 mpViewData->GetViewShell()->GetPool().Put(*mpDlgItem);
 
 SetDispatcherLock( false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/sidebar/SidebarController.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 21f632d327a08fbe4c57b937745e5dee9006cfe2
Author: Caolán McNamara 
Date:   Tue Jan 31 20:45:10 2017 +

SolarMutexGuard for ImplDbgTestSolarMutex assert in 
JunitTest_dbaccess_complex

Change-Id: Ic2109abdec0ad3305c2720ac9012585cd7ceb25b

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 4a6ec25..84e1526 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -193,6 +193,7 @@ void 
SidebarController::unregisterSidebarForFrame(SidebarController* pController
 
 void SidebarController::disposeDecks()
 {
+SolarMutexGuard aSolarMutexGuard;
 mpCurrentDeck.clear();
 maFocusManager.Clear();
 mpResourceManager->disposeDecks();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk include/sfx2 officecfg/registry

[Maxim Monastirsky]

 basctl/UIConfig_basicide.mk  |
1 
 basctl/inc/basidesh.hrc  |
1 
 basctl/source/basicide/baside2.cxx   |
2 
 basctl/source/basicide/baside2.hrc   |   
31 -
 basctl/source/basicide/baside2b.cxx  |
2 
 basctl/source/basicide/basides1.cxx  |   
37 +
 basctl/source/basicide/basidesh.src  |   
62 --
 basctl/source/basicide/bastype2.cxx  |
2 
 basctl/source/basicide/bastype3.cxx  |
2 
 basctl/source/basicide/bastypes.cxx  |   
54 
 basctl/source/basicide/macrodlg.cxx  |
2 
 basctl/source/basicide/moduldl2.cxx  |
2 
 basctl/uiconfig/basicide/popupmenu/tabbar.xml|   
22 +++
 include/sfx2/sfxcommands.h   |
6 
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu|   
25 
 officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu |
5 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |
3 
 17 files changed, 101 insertions(+), 158 deletions(-)

New commits:
commit f3ba0c5d4dfc44f72aa7d4809c062227649f098f
Author: Maxim Monastirsky 
Date:   Wed Feb 1 01:25:36 2017 +0200

Convert RID_POPUP_TABBAR to xml

Change-Id: Ic4587b8e244c52089692908fe0d10e363b5ed4fb

diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index f79d9ce..97ced73 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE))
 
 $(eval $(call gb_UIConfig_add_popupmenufiles,modules/BasicIDE,\
basctl/uiconfig/basicide/popupmenu/dialog \
+   basctl/uiconfig/basicide/popupmenu/tabbar \
 ))
 
 $(eval $(call gb_UIConfig_add_menubarfiles,modules/BasicIDE,\
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 34f8d3a..fea24c0 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -23,7 +23,6 @@
 #include 
 
 #define RID_BASICIDE_OBJECTBAR  ( RID_BASICIDE_START +  0 )
-#define RID_POPUP_TABBAR( RID_BASICIDE_START + 12 )
 
 #define RID_BMP_REMOVEWATCH ( RID_BASICIDE_START +  8 )
 #define RID_BMP_INSTALLATION( RID_BASICIDE_START + 20 )
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 675a0ea..aa6b7b0 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -25,7 +25,7 @@
 #include "docsignature.hxx"
 
 #include "helpid.hrc"
-#include "baside2.hrc"
+#include 
 
 #include 
 #include 
diff --git a/basctl/source/basicide/baside2.hrc 
b/basctl/source/basicide/baside2.hrc
deleted file mode 100644
index 038b35c..000
--- a/basctl/source/basicide/baside2.hrc
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- 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 BASCTL_BASIDE2_HRC
-#define BASCTL_BASIDE2_HRC
-
-#include 
-
-// Diese Dateien enthaelt nur die lokalen ID's.
-
-// RID_POPUP_TABBAR
-#define RID_INSERT  1
-
-#endif // BASCTL_BASIDE2_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 56e4280..72d656f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -22,7 +22,7 @@
 #include 
 
 #include "helpid.hrc"
-#include "baside2.hrc"
+#include 
 
 #include "baside2.hxx"
 #include "brkdlg.hxx"
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 251c916..1fe82da 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -30,6 +30,7 @@
 
 #include 
 #include 

[Libreoffice-bugs] [Bug 105598] Can't write in LibreOffice native command

[bugzilla-daemon]

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

Julien Nabet  changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

--- Comment #2 from Julien Nabet  ---
Quoting from email received in private:
" I just type 'test' in writer and try to save it.

 test.txt will work
 test.odt will fail, as any other file."

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

[Libreoffice-bugs] [Bug 105561] Entries of LibreOffice modules does not appear in context menus of corresponding MS Office files

[bugzilla-daemon]

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

--- Comment #5 from Marcin  ---
One more important information I forgot to write: on all computers there is MS
Office installed and MS apps are defaults for corresponding files.

Of course problem does not occur when LibreOffice is the only office suite.

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

[Libreoffice-bugs] [Bug 105566] Show InfoBar when document has invalid signature

[bugzilla-daemon]

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

Samuel Mehrbrodt (CIB)  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |s.mehrbr...@gmail.com
   |desktop.org |

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

[Libreoffice-ux-advise] [Bug 105566] Show InfoBar when document has invalid signature

[bugzilla-daemon]

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

Samuel Mehrbrodt (CIB)  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |s.mehrbr...@gmail.com
   |desktop.org |

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

[Libreoffice-bugs] [Bug 36867] [EDITING] Not currently possible to undo wrong autocapitalization in Calc

[bugzilla-daemon]

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

--- Comment #13 from ge.hu...@gmx.net ---
Nuisance still with us in 

Version: 5.2.2.2
Build-ID: 1:5.2.2-0ubuntu2
CPU-Threads: 2; BS-Version: Linux 4.8; UI-Render: Standard; 
Gebietsschema: de-DE (de_DE.UTF-8)

Writing BVordG into an empty cell of a new document autocorrects to BvordG.
CTRL+Z wipes the whole cell clean instead of only reversing the autocorrect.

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

[Libreoffice-bugs] [Bug 104757] ODBC data source: data to table returns no data. Column headings work but no data in tables.

[bugzilla-daemon]

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

--- Comment #8 from Alex Thurgood  ---
No repro with

Version: 5.3.0.2
Build ID: 5ad7b2889021c491af62f7930a4b1cb631392f16
CPU Threads: 2; OS Version: Mac OS X 10.12.2; UI Render: default; Layout
Engine: new; 
Locale: fr-FR (fr_FR.UTF-8); Calc: group


using an ODBC connection (MyODBC conenctor) to a mysql remote instance on OSX.


I can drag and drop either a tuple of data or the whole contents of a table or
query into the Writer document and have it displayed as a table.

This seems to be Windows only, and linked to Access databases via ODBC.
Changing title to reflect that.

I don't have such a test setup.

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

[Libreoffice-bugs] [Bug 87351] [META] Conditional formatting bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=87351
Bug 87351 depends on bug 96453, which changed state.

Bug 96453 Summary: FORMATTING: Removed Conditional Formatting comes back.
https://bugs.documentfoundation.org/show_bug.cgi?id=96453

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-bugs] [Bug 105633] New: Increased CPU usage while hoovering over a drop-down menu with OpenGL enabled

[bugzilla-daemon]

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

Bug ID: 105633
   Summary: Increased CPU usage while hoovering over a drop-down
menu with OpenGL enabled
   Product: LibreOffice
   Version: 5.0.2.2 release
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: minor
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: tele...@surfxs.nl

Description:
The CPU usage when hoovering over a drop-down menu has increased between
LibO5.0.0.5 and LibO5.0.2.2 and is noticeable ever since. It probably also
happens without OpenGL enabled, but is more noticeable with OpenGL enabled.

Steps to Reproduce:
1. Open Writer
2. Enable OpenGL (for best resuls) -> Options -> View
3. Click (for example) Menu -> Insert and hoover over the items within. Monitor
CPU usage

Actual Results:  
CPU usage lies around the around 12-15% (but probably depending on system
specs)

Expected Results:
CPU usage is around 4% on my system with Lib5.0.0.5


Reproducible: Always

User Profile Reset: No

Additional Info:
Found in:
Version: 5.4.0.0.alpha0+
Build ID: b41186a2fc49e440890b8c86e5367352ffaf9cd6
CPU Threads: 4; OS Version: Windows 6.19; UI Render: GL; 
TinderBox: Win-x86@42, Branch:master, Time: 2017-01-26_01:50:40
Locale: nl-NL (nl_NL); Calc: CL

and in
Version: 5.0.6.3
Build ID: 490fc03b25318460cfc54456516ea2519c11d1aa-GL
Locale: en-US (nl_NL)

and more prone in
Version: 5.0.2.2
Build ID: 37b43f919e4de5eeaca9b9755ed688758a8251fe-GL
Locale: en-US (nl_NL)

but not in
Version: 5.0.0.5
Build ID: 1b1a90865e348b492231e1c451437d7a15bb262b
Locale: en-US (nl_NL)


User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:45.0) Gecko/20100101
Firefox/45.0

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

[Libreoffice-bugs] [Bug 105605] [META] Digital signatures bugs and enhancements

[bugzilla-daemon]

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

Samuel Mehrbrodt (CIB)  changed:

   What|Removed |Added

 Depends on||42316


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=42316
[Bug 42316] Creating a new document from a template removes the signature from
all Macros
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 105605] [META] Digital signatures bugs and enhancements

[bugzilla-daemon]

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

Samuel Mehrbrodt (CIB)  changed:

   What|Removed |Added

 Depends on||58442


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=58442
[Bug 58442] If Microsoft Word adds another signature to document originally
signed by LibreOffice it causes LibreOffice to prompt saying file is corrupt
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 42316] Creating a new document from a template removes the signature from all Macros

[bugzilla-daemon]

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

Samuel Mehrbrodt (CIB)  changed:

   What|Removed |Added

 CC||s.mehrbr...@gmail.com
 Blocks||105605


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=105605
[Bug 105605] [META] Digital signatures bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 31379] wrong headline number in table of contents (TOC) for specific file (converted from Word)

[bugzilla-daemon]

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

Timur  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=67
   ||036

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

[Libreoffice-bugs] [Bug 67036] FILEOPEN Content of Table of Content not imported (.doc)

[bugzilla-daemon]

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

Timur  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=31
   ||379

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

[Libreoffice-bugs] [Bug 105591] MacOS: A small but noticeable delay when opening About screen

[bugzilla-daemon]

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

--- Comment #2 from Alex Thurgood  ---
Hmm, all previous versions seem slow to do this to me compared to LO330, so a
bit hard for me to confirm this one relative to 5.0.x

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

[Libreoffice-bugs] [Bug 105565] Insert "Curves" not available on notebookbar "Insert" item

[bugzilla-daemon]

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

--- Comment #3 from Heiko Tietze  ---
Sure, curves are simple and useful objects. But shapes in general have to be
controlled from the sidebar, IMHO. However, there might be some workflows where
shapes in the toolbar, with a collapsed sidebar for instance, make sense.

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

[Libreoffice-ux-advise] [Bug 105565] Insert "Curves" not available on notebookbar "Insert" item

[bugzilla-daemon]

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

--- Comment #3 from Heiko Tietze  ---
Sure, curves are simple and useful objects. But shapes in general have to be
controlled from the sidebar, IMHO. However, there might be some workflows where
shapes in the toolbar, with a collapsed sidebar for instance, make sense.

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

[Libreoffice-bugs] [Bug 105620] Cairo pattern to be filled into path is placed incorrectly

[bugzilla-daemon]

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

Xisco Faulí  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

--- Comment #3 from Xisco Faulí  ---
I've just found the gerrit patch: https://gerrit.libreoffice.org/#/c/33723/

Moving to NEW

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

[Libreoffice-bugs] [Bug 101231] index-entry shall get same highlite-color as its corresponding header when changed

[bugzilla-daemon]

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

Heiko Tietze  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |INSUFFICIENTDATA

--- Comment #3 from Heiko Tietze  ---
(In reply to V Stuart Foote from comment #1)
> Can you elaborate further...

Apparently not, so closing it because of INSUFFICIENTDATA.

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

[Libreoffice-ux-advise] [Bug 101231] index-entry shall get same highlite-color as its corresponding header when changed

[bugzilla-daemon]

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

Heiko Tietze  changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |INSUFFICIENTDATA

--- Comment #3 from Heiko Tietze  ---
(In reply to V Stuart Foote from comment #1)
> Can you elaborate further...

Apparently not, so closing it because of INSUFFICIENTDATA.

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

[Libreoffice-bugs] [Bug 58476] Adding a signature to a document already signed by MS Word invalidates the MS Word signature

[bugzilla-daemon]

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

Samuel Mehrbrodt (CIB)  changed:

   What|Removed |Added

 CC||s.mehrbr...@gmail.com
 Blocks||105605


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=105605
[Bug 105605] [META] Digital signatures bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs