[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/sifr icon-themes/tango officecfg/registry sw/uiconfig

[Yousuf Philips]

 icon-themes/breeze/links.txt |2 
 icon-themes/sifr/links.txt   |4 
 icon-themes/tango/links.txt  |3 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   20 ++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   67 
+-
 sw/uiconfig/swriter/menubar/menubar.xml  |   27 
++--
 6 files changed, 108 insertions(+), 15 deletions(-)

New commits:
commit 67d245adca298134fc8ab4364acbe880b4e0911a
Author: Yousuf Philips 
Date:   Fri Dec 15 01:54:52 2017 +0400

tdf#91781 Round of improvements to Writer's menus for 6.0

Change-Id: I17c1edc2e14146144868df51a1f5a71e323eead6
Reviewed-on: https://gerrit.libreoffice.org/46451
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 314c6f4fd05b..a12de86cda03 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -708,6 +708,8 @@ cmd/sc_presentation.png cmd/sc_dia.png
 # Style
 cmd/lc_editstyled.png cmd/lc_editstyle.png
 cmd/sc_editstyled.png cmd/sc_editstyle.png
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
 
 # Outline
 cmd/lc_outlineright.png cmd/lc_decrementlevel.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 08af510ca16f..e2dae945a9ca 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -218,3 +218,7 @@ cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
 cmd/sc_bulletliststyle.png cmd/sc_defaultbullet.png
 cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
 cmd/sc_numberliststyle.png cmd/sc_defaultnumbering.png
+
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e73922a59a92..b483e5fa819d 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -624,3 +624,6 @@ cmd/sc_formatframemenu.png cmd/sc_inserttextframe.png
 cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
 cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
 
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0c70d811a465..2b0cf5aee382 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2643,7 +2643,7 @@
   
   
 
-  Doc~ument...
+  Text from File...
 
 
   1
@@ -2779,6 +2779,17 @@
   1
 
   
+  
+
+  Styles
+
+
+  .uno:DesignerDialog
+
+
+  1
+
+  
   
 
   Demote
@@ -4806,6 +4817,11 @@
   Send via ~Bluetooth...
 
   
+  
+
+  ~Export As
+
+  
   
 
   PDF
@@ -4839,7 +4855,7 @@
   EPUB
 
 
-  ~Export as EPUB...
+  Export as E~PUB...
 
 
   Export as EPUB
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 23964bfe7fdb..a1443cfc70ca 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -55,7 +55,7 @@
   
   
 
-  ~Hidden Paragraphs
+  Field ~Hidden Paragraphs
 
 
   8
@@ -1346,7 +1346,7 @@
   
   
 
-  Lin~ks...
+  Lin~ks to External Files...
 
   
   
@@ -3148,17 +3148,55 @@
   11
 
   
+  
+
+  Alphabet Uppercase List
+
+  
+  
+
+  Alphabet Uppercase List
+
+
+  Alphabet Uppercase List Style
+
+
+  .uno:StyleApply?Style:string=Numbering 
ABC&FamilyName:string=NumberingStyles
+
+
+  11
+
+  
+  
+
+  Alphabet Lowercase List
+
+  
+  
+
+  Alphabet Lowercase List
+
+
+  Alphabet Lowercase List Style
+
+
+  .uno:StyleApply?Style:string=Numbering 
abc&FamilyName:string=NumberingStyles
+
+
+  11
+
+  
   
 
-  Roman List
+  Roman Uppercase List
 
   
   
 
-  Roman List
+  Roman Upper

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/xcellrangeaddressable.hxx|   34 +++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv  |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |1 
 qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable.java   |   48 
--
 sc/qa/extras/sccellcursorobj.cxx|7 +
 sc/qa/extras/sccellrangeobj.cxx |7 +
 sc/qa/extras/sctablesheetobj.cxx|7 +
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xcellrangeaddressable.cxx |   33 ++
 11 files changed, 86 insertions(+), 55 deletions(-)

New commits:
commit b92af3c7b4f8ad91891c2159b35070fe4a1bf2db
Author: Jens Carl 
Date:   Fri Dec 15 21:38:49 2017 +

tdf#45904 Move _XCellRangeAddressable Java test to C++

Change-Id: Ic3c1e6d793d4405c2dc4b8e7d1d7b87ed94fc6c3
Reviewed-on: https://gerrit.libreoffice.org/46579
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/xcellrangeaddressable.hxx 
b/include/test/sheet/xcellrangeaddressable.hxx
new file mode 100644
index ..0819b34c155d
--- /dev/null
+++ b/include/test/sheet/xcellrangeaddressable.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XCELLRANGEADDRESSABLE_HXX
+#define INCLUDED_TEST_SHEET_XCELLRANGEADDRESSABLE_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCellRangeAddressable
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetRangeAddress();
+
+protected:
+~XCellRangeAddressable() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XCELLRANGEADDRESSABLE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 5a4f7a7ae293..1fa333cd889b 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -586,7 +586,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
 qadevOOo/tests/java/ifc/sheet/_XCalculatable \
-qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 81bda88aa988..d95c2f6d4327 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -41,7 +41,6 @@
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance"
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules"
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation"
-"ScCellCursorObj";"com::sun::star::sheet::XCellRangeAddressable";"getRangeAddress()"
 "ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoStart()"
 "ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoEnd()"
 "ScCellCursorObj";"com::sun::star::table::XCellCursor";"gotoNext()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index e018f5e09ef8..7be5d04df577 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -41,7 +41,6 @@
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsCharacterDistance"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsForbiddenRules"
 
"ScCellRangeObj";"com::sun::star::style::CharacterPropertiesAsian";"ParaIsHangingPunctuation"
-"ScCellRangeObj";"com::sun::star::sheet::XCellRangeAddressable";"getRangeAddress()"
 
"ScCellRangeObj";"com::sun::star::util::XReplaceable";"createReplaceDescriptor()"
 "ScCellRangeObj";"com::sun::star::util::XReplaceable";"replaceAll()"
 
"ScCellRangeObj";"com::sun::star::chart::XChartData";"addChartDataChangeEventListener()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTab

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

[Eike Rathke]

 include/svl/nfkeytab.hxx|6 +
 svl/source/numbers/zforscan.cxx |  143 
 2 files changed, 51 insertions(+), 98 deletions(-)

New commits:
commit 2557c07688bdf5a37980503d051c5f75e8d33d80
Author: Eike Rathke 
Date:   Fri Dec 15 21:40:28 2017 +0100

Move init of keywords around, preset with English, localized case by case

This way we can't forget an sKeyword element and need to care only
about the exceptions. Adds a slight penalty for German in that it
has 25 keywords initialized twice, but..

Change-Id: I99ba228ef8b1517a32ce98a9c79cfbe2b1d0b340
Reviewed-on: https://gerrit.libreoffice.org/46575
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index 458e400ea6ab..ddffc030d482 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -120,6 +120,12 @@ public:
 const OUString & operator[] (Keywords_t::size_type n) const { return 
m_keywords[n]; }
 
 Keywords_t::size_type size() const { return m_keywords.size(); }
+
+NfKeywordTable& operator=( const NfKeywordTable& r )
+{
+m_keywords = r.m_keywords;
+return *this;
+}
 };
 
 #endif // INCLUDED_SVL_NFKEYTAB_HXX
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 98948da642ea..3937896bce70 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -121,22 +121,7 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( 
SvNumberFormatter* pFormatterP )
 bConvertMode = false;
 mbConvertForExcelExport = false;
 bConvertSystemToSystem = false;
-
-sKeyword[NF_KEY_E] = sEnglishKeyword[NF_KEY_E];// Exponent
-sKeyword[NF_KEY_AMPM] =  sEnglishKeyword[NF_KEY_AMPM]; // AM/PM
-sKeyword[NF_KEY_AP] =sEnglishKeyword[NF_KEY_AP];   // AM/PM short
-sKeyword[NF_KEY_MI] =sEnglishKeyword[NF_KEY_MI];   // Minute
-sKeyword[NF_KEY_MMI] =   sEnglishKeyword[NF_KEY_MMI];  // Minute 02
-sKeyword[NF_KEY_S] = sEnglishKeyword[NF_KEY_S];// Second
-sKeyword[NF_KEY_SS] =sEnglishKeyword[NF_KEY_SS];   // Second 02
-sKeyword[NF_KEY_Q] = sEnglishKeyword[NF_KEY_Q];// Quarter 
short 'Q'
-sKeyword[NF_KEY_QQ] =sEnglishKeyword[NF_KEY_QQ];   // Quarter long
-sKeyword[NF_KEY_NN] =sEnglishKeyword[NF_KEY_NN];   // Day of week 
short
-sKeyword[NF_KEY_NNN] =   sEnglishKeyword[NF_KEY_NNN];  // Day of week 
long
-sKeyword[NF_KEY_] =  sEnglishKeyword[NF_KEY_]; // Day of week 
long incl. separator
-sKeyword[NF_KEY_WW] =sEnglishKeyword[NF_KEY_WW];   // Week of year
-sKeyword[NF_KEY_CCC] =   sEnglishKeyword[NF_KEY_CCC];  // Currency 
abbreviation
-bKeywordsNeedInit = true;// locale dependent keywords
+bKeywordsNeedInit = true;// locale dependent and not locale 
dependent keywords
 bCompatCurNeedInit = true;   // locale dependent compatibility 
currency strings
 
 if ( bStandardColorNeedInitialization )
@@ -296,32 +281,6 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 const LanguageTag& rLoadedLocale = pLocaleData->getLoadedLanguageTag();
 LanguageType eLang = rLoadedLocale.getLanguageType( false);
 
-i18n::NumberFormatCode aFormat = xNFC->getFormatCode( NF_NUMBER_STANDARD, 
rLoadedLocale.getLocale() );
-sNameStandardFormat = lcl_extractStandardGeneralName( aFormat.Code );
-sKeyword[NF_KEY_GENERAL] = pCharClass->uppercase( sNameStandardFormat );
-
-// preset new calendar keywords
-sKeyword[NF_KEY_AAA] =   sEnglishKeyword[NF_KEY_AAA];
-sKeyword[NF_KEY_] =  sEnglishKeyword[NF_KEY_];
-sKeyword[NF_KEY_EC] =sEnglishKeyword[NF_KEY_EC];
-sKeyword[NF_KEY_EEC] =   sEnglishKeyword[NF_KEY_EEC];
-sKeyword[NF_KEY_G] = sEnglishKeyword[NF_KEY_G];
-sKeyword[NF_KEY_GG] =sEnglishKeyword[NF_KEY_GG];
-sKeyword[NF_KEY_GGG] =   sEnglishKeyword[NF_KEY_GGG];
-sKeyword[NF_KEY_R] = sEnglishKeyword[NF_KEY_R];
-sKeyword[NF_KEY_RR] =sEnglishKeyword[NF_KEY_RR];
-
-// Thai T NatNum special. Other locale's small letter 't' results in upper
-// case comparison not matching but length does in conversion mode. Ugly.
-if (eLang == LANGUAGE_THAI)
-{
-sKeyword[NF_KEY_THAI_T] = "T";
-}
-else
-{
-sKeyword[NF_KEY_THAI_T] = sEnglishKeyword[NF_KEY_THAI_T];
-}
-
 bool bL10n = (meKeywordLocalization != KeywordLocalization::EnglishOnly);
 if (bL10n)
 {
@@ -377,7 +336,38 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 }
 }
 
-if ( bL10n && eLang.anyOf(
+// Init the current NfKeywordTable with English keywords.
+sKeyword = sEnglishKeyword;
+
+// Set the uppercase localized General name, e.g. Standard -> STANDARD
+i18n::NumberFormatCode aFormat = xNFC->getFormatCode( NF_NUMBER_STANDARD, 
rLoadedLocale.g

Re: Unit test PythonTest_solenv_python failing on Linux on est_gbuildtojson

[slacka]

I'm still getting the same failure and same  "[Errno 6] No such device or
address: '/core/xmlsecurity/qa/unit/signing/data/S.gpg-agent'")]

Was this a blind fix? If so, you need anything else from me?



--
Sent from: http://nabble.documentfoundation.org/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/source/core/tool/token.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cef05fdcf8453cf6a799234de55182d5f51dde70
Author: Eike Rathke 
Date:   Sat Dec 16 01:36:16 2017 +0100

Blacklist CELL() and INFO() for threading

They access one utl::TransliterationWrapper via
ScCellKeywordTranslator::transKeyword() for the localized
keywords.

Change-Id: Ia3c1ec8def761b3448d6be4c81d42723e1a28ea2

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 40f302ef85ef..f94fb6ddfdcd 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1345,7 +1345,9 @@ void ScTokenArray::CheckForThreading( OpCode eOp  )
 ocTableOp,
 ocVLookup,
 ocHLookup,
-ocMatch
+ocMatch,
+ocCell,
+ocInfo
 });
 
 // We only call this if it was already disabled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

compilation error

[la.jolie@paquerette]

Hello,

I'm compiling Lool thanks to this script
https://github.com/husisusi/officeonlin-install.sh.

My system is a VPS with Debian 9.

My new attempt (after 3 months) to recompile lool generates now an error.

I found that this commit is the cause:
https://github.com/LibreOffice/core/commit/0f455f2309d018906e147269f839f52aa22eaf6a

Part of the log where the error is throwned (I can send the full log)
-
[build CXX] vcl/unx/generic/printer/jobdata.cxx
[build CXX] vcl/unx/generic/printer/ppdparser.cxx
[build CXX] vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
[build CXX] vcl/unx/generic/window/screensaverinhibitor.cxx
[build CXX] vcl/null/printerinfomanager.cxx
[build CXX] vcl/headless/svpframe.cxx
[build CXX] vcl/headless/svpbmp.cxx
[build CXX] vcl/headless/svpgdi.cxx
[build CXX] vcl/headless/svpdata.cxx
[build CXX] vcl/headless/svpdummies.cxx
[build CXX] vcl/headless/svpinst.cxx
/opt/libreoffice2/vcl/null/printerinfomanager.cxx: In constructor
‘psp::PrinterInfoManager::PrinterInfoManager(psp::PrinterInfoManager::Type)’:
/opt/libreoffice2/vcl/null/printerinfomanager.cxx:47:33: error: call of
overloaded ‘unique_ptr(NULL)’ is ambiguous
 m_aSystemDefaultPaper( "A4" )
 ^
In file included from /usr/include/c++/6/memory:81:0,
 from
/opt/libreoffice2/include/i18nlangtag/languagetag.hxx:19,
 from /opt/libreoffice2/include/tools/resmgr.hxx:23,
 from /opt/libreoffice2/include/tools/rc.hxx:23,
 from /opt/libreoffice2/include/vcl/outdev.hxx:26,
 from /opt/libreoffice2/include/vcl/window.hxx:25,
 from /opt/libreoffice2/include/vcl/vclevent.hxx:26,
 from /opt/libreoffice2/include/vcl/helper.hxx:26,
 from
/opt/libreoffice2/include/vcl/printerinfomanager.hxx:27,
 from /opt/libreoffice2/vcl/null/printerinfomanager.cxx:20:
/usr/include/c++/6/bits/unique_ptr.h:359:7: note: candidate:
std::unique_ptr<_Tp, _Dp>::unique_ptr(const std::unique_ptr<_Tp, _Dp>&)
[with _Tp = psp::SystemQueueInfo; _Dp =
std::default_delete] 
   unique_ptr(const unique_ptr&) = delete;
   ^~
/usr/include/c++/6/bits/unique_ptr.h:209:7: note: candidate:
std::unique_ptr<_Tp, _Dp>::unique_ptr(std::unique_ptr<_Tp, _Dp>&&) [with
_Tp = psp::SystemQueueInfo; _Dp = std::default_delete]
   unique_ptr(unique_ptr&& __u) noexcept
   ^~
/usr/include/c++/6/bits/unique_ptr.h:204:17: note: candidate: constexpr
std::unique_ptr<_Tp, _Dp>::unique_ptr(std::nullptr_t) [with _Tp =
psp::SystemQueueInfo; _Dp = std::default_delete;
std::nullptr_t = std::nullptr_t]
   constexpr unique_ptr(nullptr_t) noexcept : unique_ptr() { }
 ^~
/usr/include/c++/6/bits/unique_ptr.h:170:7: note: candidate:
std::unique_ptr<_Tp, _Dp>::unique_ptr(std::unique_ptr<_Tp,
_Dp>::pointer) [with _Tp = psp::SystemQueueInfo; _Dp =
std::default_delete; std::unique_ptr<_Tp,
_Dp>::pointer = psp::SystemQueueInfo*]
   unique_ptr(pointer __p) noexcept
   ^~
/usr/include/c++/6/bits/unique_ptr.h: In instantiation of ‘void
std::default_delete<_Tp>::operator()(_Tp*) const [with _Tp =
psp::SystemQueueInfo]’:
/usr/include/c++/6/bits/unique_ptr.h:239:17:   required from
‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp =
psp::SystemQueueInfo; _Dp = std::default_delete]’
/opt/libreoffice2/vcl/null/printerinfomanager.cxx:47:33:   required from
here
/usr/include/c++/6/bits/unique_ptr.h:74:22: error: invalid application
of ‘sizeof’ to incomplete type ‘psp::SystemQueueInfo’
  static_assert(sizeof(_Tp)>0,
  ^
/opt/libreoffice2/solenv/gbuild/LinkTarget.mk:189 : la recette pour la
cible
« /opt/libreoffice2/workdir/CxxObject/vcl/null/printerinfomanager.o » a
échouée
make[1]: ***
[/opt/libreoffice2/workdir/CxxObject/vcl/null/printerinfomanager.o] Erreur 1
make[1]: *** Attente des tâches non terminées
Makefile:263 : la recette pour la cible « build » a échouée
make: *** [build] Erreur 2

---


Any idea on what the problem is?

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

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/xcellformatrangessupplier.hxx|   34 
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv  |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |1 
 qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier.java   |   83 
--
 sc/qa/extras/sccellcursorobj.cxx|9 -
 sc/qa/extras/sccellrangeobj.cxx |7 
 sc/qa/extras/sctablesheetobj.cxx|9 -
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/xcellformatrangessupplier.cxx |   39 
 11 files changed, 94 insertions(+), 92 deletions(-)

New commits:
commit 96f8861a29ebf650dedcbee71b8360133c0ceabb
Author: Jens Carl 
Date:   Fri Dec 15 20:52:32 2017 +

tdf#45904 Move _XCellFormatRangesSupplier Java test to C++

Change-Id: I95c20893878385ef173875956d3d7166b0e9e563
Reviewed-on: https://gerrit.libreoffice.org/46578
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/xcellformatrangessupplier.hxx 
b/include/test/sheet/xcellformatrangessupplier.hxx
new file mode 100644
index ..1f2f6d3794b6
--- /dev/null
+++ b/include/test/sheet/xcellformatrangessupplier.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XCELLFORMATRANGESSUPPLIER_HXX
+#define INCLUDED_TEST_SHEET_XCELLFORMATRANGESSUPPLIER_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XCellFormatRangesSupplier
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetCellFormatRanges();
+
+protected:
+~XCellFormatRangesSupplier() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XCELLFORMATRANGESSUPPLIER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 6f07cb3ab936..5a4f7a7ae293 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -586,7 +586,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
 qadevOOo/tests/java/ifc/sheet/_XCalculatable \
-qadevOOo/tests/java/ifc/sheet/_XCellFormatRangesSupplier \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeAddressable \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
 qadevOOo/tests/java/ifc/sheet/_XCellRangeFormula \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index e6b2ef052fd0..81bda88aa988 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -209,7 +209,6 @@
 
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()"
 
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()"
 
"ScCellCursorObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()"
-"ScCellCursorObj";"com::sun::star::sheet::XCellFormatRangesSupplier";"getCellFormatRanges()"
 
"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToCurrentRegion()"
 
"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToCurrentArray()"
 
"ScCellCursorObj";"com::sun::star::sheet::XSheetCellCursor";"collapseToMergedArea()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
index deddc503556a..e018f5e09ef8 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv
@@ -204,7 +204,6 @@
 
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"setRowDescriptions()"
 
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"getColumnDescriptions()"
 
"ScCellRangeObj";"com::sun::star::chart::XChartDataArray";"setColumnDescriptions()"
-"ScCellRangeObj";"com::sun::star::sheet::XCellFormatRangesSupplier";"getCellFormatRanges()"
 
"ScCellRangeObj";"com::sun::star::util::XModifyBroadcaster#optional";"addModifyListener()"
 
"ScCellRangeObj";"com::sun::star::util::XModifyBroadcaster#optional";"removeModifyListener()"
 "ScCellRangeObj";"com::sun::star::util::XImportable";"createImportDescriptor()"
diff --git a/qadevOOo/objdsc/sc/com.sun.

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - download.lst

[Eike Rathke]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddf51b30fede3a6c9de57a289f48523a448a6855
Author: Eike Rathke 
Date:   Fri Dec 15 19:32:22 2017 +0100

Update language-subtag-registry-2017-12-14

(cherry picked from commit 29055defc8a5e62279bab66faa4ccc191004a918)

 Conflicts:
download.lst

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

diff --git a/download.lst b/download.lst
index a8a2f0be90c3..55704b5a1c02 100644
--- a/download.lst
+++ b/download.lst
@@ -115,8 +115,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export JPEG_TURBO_SHA256SUM := 
41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c
 export JPEG_TURBO_TARBALL := libjpeg-turbo-1.5.1.tar.gz
-export LANGTAGREG_SHA256SUM := 
d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
-export LANGTAGREG_TARBALL := language-subtag-registry-2017-08-15.tar.bz2
+export LANGTAGREG_SHA256SUM := 
0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362
+export LANGTAGREG_TARBALL := language-subtag-registry-2017-12-14.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

AW: AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Juergen Funk Mailinglist]

Hi Mike,

exactly the same


juergen


-Ursprüngliche Nachricht-
Von: Mike Kaganski [mailto:mike.kagan...@collabora.com] 
Gesendet: Freitag, 15. Dezember 2017 11:23
An: Juergen Funk Mailinglist ; 
libreoffice@lists.freedesktop.org
Betreff: Re: AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

On 12/15/2017 12:53 PM, Juergen Funk Mailinglist wrote:
> Hi Mike
>
>> 1. Creating a redirect at TDF side imposes additional load to our 
>> server infrastructure; 2. Users will depend on reliability of TDF 
>> servers wrt this (in terms of their state, correctness of the link, 
>> and also possible man-in-the-middle problems with modified links 
>> pointing to malware) - note that LO downloads themselves are served 
>> from multiple mirrors, but this kind of redirection can't work using 
>> mirrors
> I have mean directly from Microsoft not from TDF.

As I mentioned, there's no "Latest VS 2015 redist" static link on their side. 
Only "VS 2015 redist version X.Y.Z", which is the same as embedding this 
specific version into installer.

Also: at the time of creating the installer, we could possibly check that our 
embedded redist is ~current, so users would have reasonably low chance to get 
update request related to newly installed software (taking into account our 
rate of releases). OTOH, if a user chooses to download and install an 
out-of-date version, then it's not unexpected that, e.g., LibreOffice itself 
would warn about "newer version available"; so I don't see anything unexpected 
here on redist side as well.

--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Blurry icons on HiDPI display (GNU/Linux)

[Paul Menzel]

Dear LibreOffice folks,


Running LibreOffice 5.4.4.1 with GTK+ 3.22.26 on the HiDPI/4K monitor 
Dell U2718Q the icons in the toolbar are blurry as can be seen on the 
attached image.


```
$ libreoffice --version
LibreOffice 5.4.4.1 40m0(Build:1)

$ env | grep GDK
GDK_SCALE=2
GDK_DPI_SCALE=-1
```

Is that expected?


Kind regards,

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - cui/uiconfig

[heiko tietze]

 cui/uiconfig/ui/optgeneralpage.ui |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit bd260a59cfdd050db3aa9a641ef0fa09efcedf5b
Author: heiko tietze 
Date:   Fri Dec 15 13:24:57 2017 +0100

tdf#114484 - Make internal file and print dialogs obsolete

Checkbox hidden in options dialog

Change-Id: I918b328dec1a4fbb4ebbcc538ffa902160ee0b9b
Reviewed-on: https://gerrit.libreoffice.org/46546
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit 65ee299a0c0e9044d809e58c3c5e75d05ad76f0e)
Reviewed-on: https://gerrit.libreoffice.org/46551
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 986edb599dfd..b0d0484f91c8 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -57,7 +57,6 @@
 
 
   
-True
 False
 0
 none
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

10 new defect(s) introduced to LibreOffice found with Coverity Scan.
2 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 10 of 10 defect(s)


** CID 1426171:(FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1916 in 
SwTiledRenderingTest::testDocumentRepair()()
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1917 in 
SwTiledRenderingTest::testDocumentRepair()()
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1932 in 
SwTiledRenderingTest::testDocumentRepair()()
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1933 in 
SwTiledRenderingTest::testDocumentRepair()()



*** CID 1426171:(FORWARD_NULL)
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1916 in 
SwTiledRenderingTest::testDocumentRepair()()
1910 std::unique_ptr pItem1;
1911 std::unique_ptr pItem2;
1912 
pView1->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem1);
1913 
pView2->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem2);
1914 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem1.get()));
1915 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem2.get()));
>>> CID 1426171:(FORWARD_NULL)
>>> Dynamic cast to pointer "dynamic_cast >> *>(pItem1.get())" can return "NULL".
1916 CPPUNIT_ASSERT_EQUAL(false, dynamic_cast< const SfxBoolItem* 
>(pItem1.get())->GetValue());
1917 CPPUNIT_ASSERT_EQUAL(false, dynamic_cast< const SfxBoolItem* 
>(pItem2.get())->GetValue());
1918 }
1919 
1920 // Insert a character in the second view.
1921 SfxLokHelper::setView(nView2);
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1917 in 
SwTiledRenderingTest::testDocumentRepair()()
1911 std::unique_ptr pItem2;
1912 
pView1->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem1);
1913 
pView2->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem2);
1914 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem1.get()));
1915 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem2.get()));
1916 CPPUNIT_ASSERT_EQUAL(false, dynamic_cast< const SfxBoolItem* 
>(pItem1.get())->GetValue());
>>> CID 1426171:(FORWARD_NULL)
>>> Dynamic cast to pointer "dynamic_cast >> *>(pItem2.get())" can return "NULL".
1917 CPPUNIT_ASSERT_EQUAL(false, dynamic_cast< const SfxBoolItem* 
>(pItem2.get())->GetValue());
1918 }
1919 
1920 // Insert a character in the second view.
1921 SfxLokHelper::setView(nView2);
1922 pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'u', 0);
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1932 in 
SwTiledRenderingTest::testDocumentRepair()()
1926 std::unique_ptr pItem1;
1927 std::unique_ptr pItem2;
1928 
pView1->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem1);
1929 
pView2->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem2);
1930 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem1.get()));
1931 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem2.get()));
>>> CID 1426171:(FORWARD_NULL)
>>> Dynamic cast to pointer "dynamic_cast >> *>(pItem1.get())" can return "NULL".
1932 CPPUNIT_ASSERT_EQUAL(true, dynamic_cast< const SfxBoolItem* 
>(pItem1.get())->GetValue());
1933 CPPUNIT_ASSERT_EQUAL(true, dynamic_cast< const SfxBoolItem* 
>(pItem2.get())->GetValue());
1934 }
1935 
1936 comphelper::LibreOfficeKit::setActive(false);
1937 }
/sw/qa/extras/tiledrendering/tiledrendering.cxx: 1933 in 
SwTiledRenderingTest::testDocumentRepair()()
1927 std::unique_ptr pItem2;
1928 
pView1->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem1);
1929 
pView2->GetViewFrame()->GetBindings().QueryState(SID_DOC_REPAIR, pItem2);
1930 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem1.get()));
1931 CPPUNIT_ASSERT(dynamic_cast< const SfxBoolItem* 
>(pItem2.get()));
1932 CPPUNIT_ASSERT_EQUAL(true, dynamic_cast< const SfxBoolItem* 
>(pItem1.get())->GetValue());
>>> CID 1426171:(FORWARD_NULL)
>>> Dynamic cast to pointer "dynamic_cast >> *>(pItem2.get())" can return "NULL".
1933 CPPUNIT_ASSERT_EQUAL(true, dynamic_cast< const SfxBoolItem* 
>(pItem2.get())->GetValue());
1934 }
1935 
1936 comphelper::LibreOfficeKit::setActive(false);
1937 }
1938 

** CID 1426170:(FORWARD_NULL)
/sc/qa/unit/tiledrendering/tiledrendering.cxx: 1449 in 
::S

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

[Miklos Vajna]

 include/svtools/htmlkywd.hxx|4 
 sw/qa/extras/htmlexport/data/hello.html |8 
 sw/qa/extras/htmlexport/htmlexport.cxx  |   17 +
 sw/source/filter/html/wrthtml.cxx   |   15 ---
 sw/source/filter/html/wrthtml.hxx   |2 ++
 5 files changed, 43 insertions(+), 3 deletions(-)

New commits:
commit aad9c6da5154a89c6ef02214d1122d4b444eea23
Author: Miklos Vajna 
Date:   Fri Dec 15 17:24:41 2017 +0100

sw HTML export: add a filter option to produce XHTML

Add initial support for writing XHTML markup as part of the HTML filter.
This already emits valid XHTML for hello world documents.

Times for 100 hello world inputs: 16032 -> 9957 ms is spent in ODT-load
+ export + close (62% of original).

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

diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 4cc24949fe2d..37a77d938a51 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -24,6 +24,9 @@
 
 #define OOO_STRING_SVTOOLS_HTML_doctype40 \
 "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\""
+#define OOO_STRING_SVTOOLS_XHTML_doctype11 \
+"html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" " \
+"\"http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd\"";
 
 // these are only switched on
 #define OOO_STRING_SVTOOLS_HTML_area "area"
@@ -507,6 +510,7 @@
 #define OOO_STRING_SVTOOLS_HTML_O_format "format"
 #define OOO_STRING_SVTOOLS_HTML_O_frame "frame"
 #define OOO_STRING_SVTOOLS_HTML_O_lang "lang"
+#define OOO_STRING_SVTOOLS_XHTML_O_lang "xml:lang"
 #define OOO_STRING_SVTOOLS_HTML_O_method "method"
 #define OOO_STRING_SVTOOLS_HTML_O_rel "rel"
 #define OOO_STRING_SVTOOLS_HTML_O_rev "rev"
diff --git a/sw/qa/extras/htmlexport/data/hello.html 
b/sw/qa/extras/htmlexport/data/hello.html
new file mode 100644
index ..bc4180d17bf7
--- /dev/null
+++ b/sw/qa/extras/htmlexport/data/hello.html
@@ -0,0 +1,8 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+
+  
+Title of document
+  
+  hello world
+
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 1ea03e880de7..74ffc3818685 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -48,6 +48,8 @@ private:
 setFilterOptions("SkipImages");
 else if (getTestName().indexOf("EmbedImages") != -1)
 setFilterOptions("EmbedImages");
+else if (getTestName().indexOf("XHTML") != -1)
+setFilterOptions("XHTML");
 else
 setFilterOptions("");
 
@@ -306,6 +308,21 @@ DECLARE_HTMLEXPORT_TEST(testEmbedImagesEnabled, 
"textAndImage.docx")
 assertXPath(pDoc, "/html/body/p/img", "src", 
"data:image/png;base64,iVBORw0KGgoNSUhEUgAAADAwCAYAAABXAvmHCXBIWXMAAA3ZAAAN2QHmodeGAAAFyUlEQVR4nO1Za2gcVRQ+szuzO9ndZtfEktY2tVorVdNKxRpQweqPmh/B1w8JhCL4R4RYiPhCfKFEfwX/2VYULJIqJFDqg4KC1EaoEoyGhFJClBgbN+a9z9ndeXnOzJ3szCbbQuY2i5ADh5udmXvP953z3cdMRNM04f9sYq0B+LVNArW2TQJXM0EQdmKTQL+Mi4V2PWJwJ4CgBUkKdImi9F48HpGikTptfj4l19fLX2cyxeeQyALPeNwJxOOx/r17djz6+afdsX233QBg5CCXWYS3es62n/js4mXkdyeSmOMVjysBURQ7djVvbRv87p2oLJUAtHmLQDSUg963W8MhMSscPzXWh48e4RaT10BkKJkXens6orKYRvBZC7zlut2+231r6MOTI4exCgmswjKPmFwJFIvFu+5pqbczr7vB22QkMwd7d8vK2Hj+AD5+gUdMrgRCUnD+yt9T8ZubGsrAHSKMTHK2SDGTvGJyJaBp2g/9Z4abH7j7YMjJupvA0Mgi5BVDxUcneMXkSiCTVV/75ItLTx1qCTR2PpbwEJiYTMHjXamcUjSfMTmeIH0TwAm5H5s96JPou3N57f3n3xh99URfuL79IVmOR1UYGlXUL89phqrCabuLcAjbRvQCcjlfMwII5PCWaPib1ntv0S4O/Skn4jHhjn27FMPQ4d/ZJePjgWzJNExBDCW0gwciWp0ceLpQLHaMjM3UNTeZhcU0CLGI8FE2b75SEwJhSWx/ueuR6JvdD8Kx18+Yl/4oCN8PHEP9KyibAoC50krO76Hf/4EjnUkYHYDY+F8A93XCszhUbQiQSUHcsPQFJINz00TX5hhodCJS2WpLIAbBD
 
ARAkMN+o/OYxEYeQS0y0Gz3rQTtJmQs+0ftMp8EDFsm+qLdmvhbn7cBr8o+k5Se5oOcGZ8K6E4FBHb+8ejfS0jLcYBdNn4SInBm0CuhSiIkMc7fEPxLiIDqKgMZYgQqdA86F7Brmf8KmCQhzV6BKLvWHGBy2QDzEKAtEpsgu04eoMvsNqVRY62OO6hhXbXAsieIhL60AbDLZhFA3AQa6w8xsN9hybegy+wZAkspzaAvk2OfTFhaIcds4z+SiQiEABLwrejb0ZvQ8VBvESJiDkgigbPQIjGLfoU9U1NzZCKBnW0iEkEPu+6RUWqJCAGuQ4+CXaXIxsJdbQSSdE27iyMTEjG+jVsSIrBEziFCz1IViOBOzYD6C8OgPvEwSIPDYDYkvJJK4nx+qReMvg9W+oOEo2UVEEbGAcYmrMwovgjQZEQZlRgJhwBVIs6c5EQZp2yHGDHygK7Dzz/9Bvtbj8I2/Ft5EVv34HO4PZw97w24rdFqCvcfhZIQgEJOgSd9EUDwjoQINA1/I5QrILN7QZc7RtnWMjk4zn634QGtzT04ZhoQYEDH2gYD5esBAUo5xYz7Ab5CAGx9Oxp3iDQwAtJV+jp9qlo2b7cpnPYNXri0Ygex+r53OJKQiYPReypJiDROmqQDC8khAXYVnNXIWSeFa4F3E1hKewmwQUIYt+D39dLaB9ggJRyQCBQYGZoLtKzS8uosq4Eq46wJwiGwnFmzj8rj3dizE7MJXQS7EhQ+BTaRm8CeHzSZSVZO9t0VWWVZtr5UIUDzz1jZ0XkQsBDZWdFwcOfokAV79yVJUTVirn4kLQnKc8lLoHoFqJI70BcwDj2lrZdI1cPcGrKir8oRKFeAwEcZKfJVExJXKGuiVyFwO/o0+gx6ipby9UjqmqdRlhmSVRGDpKEsF2dnpi/NdPxIVfZdTlukiECw4hYBpaQYbBzn0MifgCeqnSF3EIVViGQwfbIfSl/9CCoDA5PT1vjJ3lOw/fQ5Kw
 
mmqtESav39K7rKXF/vhPb9PoBxVUaiZ2YBBtGdsxQZZfmX5AK0oFtAwc76FPbj8nLM5dMiy14aiXwLthyc5dZgm9UUjzhrGddvo4yIDtfzHbLCNv9LWWvbJFBr2yRQa/sP25

[Libreoffice-commits] online.git: common/Util.hpp tools/map.cpp

[Michael Meeks]

 common/Util.hpp |   82 -
 tools/map.cpp   |  111 ++--
 2 files changed, 109 insertions(+), 84 deletions(-)

New commits:
commit 864b07f5b341956a660dbd37cd13d64daee416d0
Author: Michael Meeks 
Date:   Fri Dec 15 18:18:23 2017 +

Annotate string pointers in hex dumps to make sense of memory.

Change-Id: I7934ccf379dbca9862ddb911865aaeff692261bf

diff --git a/common/Util.hpp b/common/Util.hpp
index 0fc56eb9..01b0018b 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -133,55 +133,69 @@ namespace Util
 // Extract all json entries into a map.
 std::map JsonToMap(const std::string& 
jsonString);
 
+/// Dump a lineof data as hex
+inline std::string stringifyHexLine(
+const std::vector &buffer,
+unsigned int offset,
+const unsigned int width = 32)
+{
+char scratch[64];
+std::stringstream os;
+
+for (unsigned int i = 0; i < width; i++)
+{
+if (i && (i % 8) == 0)
+os << " ";
+if ((offset + i) < buffer.size())
+sprintf (scratch, "%.2x ", (unsigned char)buffer[offset+i]);
+else
+sprintf (scratch, "   ");
+os << scratch;
+}
+os << " | ";
+
+for (unsigned int i = 0; i < width; i++)
+{
+if ((offset + i) < buffer.size() && ::isprint(buffer[offset+i]))
+sprintf (scratch, "%c", buffer[offset+i]);
+else
+sprintf (scratch, ".");
+os << scratch;
+}
+
+return os.str();
+}
+
 /// Dump data as hex and chars to stream
 inline void dumpHex (std::ostream &os, const char *legend, const char 
*prefix,
  const std::vector &buffer, bool skipDup = true,
  const unsigned int width = 32)
 {
-unsigned int i, j;
+unsigned int j;
 char scratch[64];
+int skip = 0;
+std::string lastLine;
 
 os << legend;
 for (j = 0; j < buffer.size() + width - 1; j += width)
 {
-if (skipDup)
-{
-int skip = 0;
-while (j >= width && j < buffer.size() - width &&
-   !memcmp(&buffer[j], &buffer[j-width], width))
-{
-skip++;
-j += width;
-}
-if (skip > 1)
-{
-j -= width;
-os << "... dup " << skip - 1 << "...\n";
-}
-}
-
 sprintf (scratch, "%s0x%.4x  ", prefix, j);
 os << scratch;
-for (i = 0; i < width; i++)
-{
-if (i && (i % 8) == 0)
-os << " ";
-if ((j + i) < buffer.size())
-sprintf (scratch, "%.2x ", (unsigned char)buffer[j+i]);
-else
-sprintf (scratch, "   ");
-os << scratch;
-}
-os << " | ";
 
-for (i = 0; i < width; i++)
-{
-if ((j + i) < buffer.size() && ::isprint(buffer[j+i]))
-sprintf (scratch, "%c", buffer[j+i]);
+std::string line = stringifyHexLine(buffer, j, width);
+if (skipDup && lastLine == line)
+skip++;
+else {
+if (skip > 0)
+{
+os << "... dup " << skip - 1 << "...";
+skip = 0;
+}
 else
-sprintf (scratch, ".");
-os << scratch;
+os << line;
 }
+lastLine.swap(line);
+
 os << "\n";
 }
 os.flush();
diff --git a/tools/map.cpp b/tools/map.cpp
index 35375282..468e986e 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -98,49 +99,6 @@ static int openPid(unsigned proc_id, const char *name)
 return fd;
 }
 
-static std::vector lineBreak(std::string str)
-{
-std::vector lines;
-while (str.size())
-{
-size_t idx = str.find('\n');
-if (idx != std::string::npos) {
-lines.push_back(str.substr(0,idx));
-str = str.substr(idx+1);
-}
-}
-lines.push_back(str);
-
-return lines;
-}
-
-static void dumpDiff(const std::string &pageStr, const std::string &parentStr)
-{
-std::vector page = lineBreak(pageStr);
-std::vector parent = lineBreak(parentStr);
-assert(page.size() == parent.size());
-for (size_t i = 0; i < page.size(); ++i)
-{
-printf("%s\n", page[i].c_str());
-if (page[i] != parent[i])
-{
-printf ("");
-ass

Infra call on Mon, Dec 18 at 17:30 UTC

[Guilhem Moulin]

Hi there,

The next infra call will take place at `date -d 'Mon Dec 18 17:30:00 UTC 2017'`
(18:30:00 Berlin time).

See https://pad.documentfoundation.org/p/infra for details; agenda TBA.

See you there!
Cheers,
-- 
Guilhem.


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

[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/qa include/unotools unotools/source

[Stephan Bergmann]

 dbaccess/CppunitTest_dbaccess_firebird_test.mk |1 
 dbaccess/qa/unit/dbtest_base.cxx   |   29 +++--
 dbaccess/qa/unit/firebird.cxx  |3 +-
 include/unotools/tempfile.hxx  |5 +---
 unotools/source/ucbhelper/tempfile.cxx |9 +++
 5 files changed, 41 insertions(+), 6 deletions(-)

New commits:
commit 15d134b4f57e66faa8bcf538a08db98dc9204c54
Author: Stephan Bergmann 
Date:   Fri Dec 15 15:26:27 2017 +0100

Make temp copy of dbaccess/qa/unit/data/firebird_empty.odb for testing

...in CppunitTest_dbaccess_firebird_test.  Otherwise, the test would fail 
with

> Test name: FirebirdTest::testEmptyDBConnection
> An uncaught exception of type com.sun.star.sdbc.SQLException
> - The connection can not be established. No storage or URL was given.

if dbaccess/qa/unit/data/firebird_empty.odb is read-only, as
DocumentStorageAccess::impl_openSubStorage_nothrow
(dbaccess/source/core/dataaccess/ModelImpl.cxx) takes
m_pModelImplementation->m_bDocumentReadOnly into account and returns a null
xStorage.

Adds a move ctor to utl::TempFile (thus causing copy ctor and copy 
assignment op
to be implicitly deleted), but leaves any move assignment op undeclared for 
now,
as none happens to be needed (yet).

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

diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk 
b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index 5652e6622d76..5065520993e2 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -25,6 +25,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,dbaccess_firebird_test, \
 svt \
 test \
 unotest \
+utl \
 xo \
 ))
 
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 86914faee5c2..3541715f6b49 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -7,9 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
+
 #include 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -25,20 +29,41 @@ class DBTestBase
 public:
 DBTestBase() : UnoApiTest("dbaccess/qa/unit/data") {};
 
+utl::TempFile createTempCopy(OUString const & pathname);
+
 uno::Reference< XOfficeDatabaseDocument >
 getDocumentForFileName(const OUString &sFileName);
 
+uno::Reference getDocumentForUrl(OUString const & 
url);
+
 uno::Reference< XConnection >
 getConnectionForDocument(
 uno::Reference< XOfficeDatabaseDocument > const & xDocument);
 };
 
+utl::TempFile DBTestBase::createTempCopy(OUString const & pathname) {
+OUString url;
+createFileURL(pathname, url);
+utl::TempFile tmp;
+tmp.EnableKillingFile();
+auto const e = osl::File::copy(url, tmp.GetURL());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+(OUStringToOString("<" + url + "> -> <" + tmp.GetURL() + ">", 
RTL_TEXTENCODING_UTF8)
+ .getStr()),
+osl::FileBase::E_None, e);
+return tmp;
+}
+
 uno::Reference< XOfficeDatabaseDocument >
 DBTestBase::getDocumentForFileName(const OUString &sFileName)
 {
 OUString sFilePath;
 createFileURL(sFileName, sFilePath);
-uno::Reference< lang::XComponent > xComponent (loadFromDesktop(sFilePath));
+return getDocumentForUrl(sFilePath);
+}
+
+uno::Reference DBTestBase::getDocumentForUrl(OUString 
const & url) {
+uno::Reference< lang::XComponent > xComponent (loadFromDesktop(url));
 CPPUNIT_ASSERT(xComponent.is());
 
 uno::Reference< XOfficeDatabaseDocument > xDocument(xComponent, UNO_QUERY);
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index 16a4fb60e800..f7361ac76548 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -51,8 +51,9 @@ void FirebirdTest::setUp()
  */
 void FirebirdTest::testEmptyDBConnection()
 {
+auto const tmp = createTempCopy("firebird_empty.odb");
 uno::Reference< XOfficeDatabaseDocument > xDocument =
-getDocumentForFileName("firebird_empty.odb");
+getDocumentForUrl(tmp.GetURL());
 
 getConnectionForDocument(xDocument);
 
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 9f5ac4c45dab..791b51573f29 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -49,9 +49,6 @@ class UNOTOOLS_DLLPUBLIC TempFile
 boolbIsDirectory;
 boolbKillingFileEnabled;
 
-TempFile( const TempFile& ) = delete;
-TempFile& operator=(const TempFile&) = delete;
-
 public:
 /**
 Create a temporary file or directory, in the default 
tempfile folder or if possible in a given folder.
@@ -72,6 +69,8 @@ public:
 TempF

[Libreoffice-commits] core.git: sal/rtl udkapi/com

[Andrea Gelmini]

 sal/rtl/strimp.cxx  |2 +-
 udkapi/com/sun/star/lang/RegistryServiceManager.idl |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b846d11fed926864a80183f4572016946fa6fdc5
Author: Andrea Gelmini 
Date:   Fri Dec 15 20:04:11 2017 +0100

Fix typos

Change-Id: I061839727b3fd078284117fca3ea53413af7bcf0
Reviewed-on: https://gerrit.libreoffice.org/46574
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sal/rtl/strimp.cxx b/sal/rtl/strimp.cxx
index a739bda8f155..ed0d333639d2 100644
--- a/sal/rtl/strimp.cxx
+++ b/sal/rtl/strimp.cxx
@@ -109,7 +109,7 @@ void SAL_CALL rtl_alloc_preInit (sal_Bool start) 
SAL_THROW_EXTERN_C()
 rtl_allocateString = rtl_allocateMemory;
 rtl_freeString = rtl_freeMemory;
 
-// TODO: also re-intialize main allocator as well.
+// TODO: also re-initialize main allocator as well.
 }
 }
 
diff --git a/udkapi/com/sun/star/lang/RegistryServiceManager.idl 
b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
index f0b0b7a0dbae..bae17cc68ea4 100644
--- a/udkapi/com/sun/star/lang/RegistryServiceManager.idl
+++ b/udkapi/com/sun/star/lang/RegistryServiceManager.idl
@@ -48,7 +48,7 @@ published service RegistryServiceManager
 */
 service com::sun::star::lang::ServiceManager;
 
-/** The first two arguments of the intitialization arguments reference:
+/** The first two arguments of the initialization arguments reference:
 
 a simple registry
 (com::sun::star::registry::XSimpleRegistry),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang configure.ac external/boost external/clucene external/liborcus external/mdds unotools/source

[Stephan Bergmann]

 compilerplugins/clang/reservedid.cxx|1 +
 configure.ac|7 +--
 external/boost/StaticLibrary_boost_date_time.mk |7 +++
 external/boost/StaticLibrary_boost_locale.mk|3 ++-
 external/clucene/Library_clucene.mk |6 ++
 external/liborcus/Library_orcus-parser.mk   |6 ++
 external/liborcus/Library_orcus.mk  |6 ++
 external/mdds/UnpackedTarball_mdds.mk   |1 +
 external/mdds/c++17.patch   |   22 ++
 unotools/source/i18n/resmgr.cxx |2 ++
 10 files changed, 58 insertions(+), 3 deletions(-)

New commits:
commit c5f6043b0f2c4cb521e8694dbf3dd355042fd704
Author: Stephan Bergmann 
Date:   Fri Dec 15 11:05:00 2017 +0100

Enable C++17 for clang-cl, too

Similar to libc++ in C++17 mode, some types like std::auto_ptr are indeed
removed in C++17 mode by default, and need _HAS_AUTO_PTR_ETC=1 to be enabled
(see 
).

Unlike libc++, also std::binary_function and std::unary_function are removed
(and need the same _HAS_AUTO_PTR_ETC=1 to enable).  So either set that flag 
to
make external code build, or use patches (for external/mdds) to make 
externals'
files included in LO proper still work there.

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

diff --git a/compilerplugins/clang/reservedid.cxx 
b/compilerplugins/clang/reservedid.cxx
index ad1dcece0037..82bbc7ea033c 100644
--- a/compilerplugins/clang/reservedid.cxx
+++ b/compilerplugins/clang/reservedid.cxx
@@ -69,6 +69,7 @@ void ReservedId::run() {
 && id != "_ATL_STATIC_REGISTRY"
 // extensions/source/activex/StdAfx2.h
 && id != "_GLIBCXX_CDTOR_CALLABI"
+&& id != "_HAS_AUTO_PTR_ETC" // unotools/source/i18n/resmgr.cxx
 && id != "_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" // 
unotools/source/i18n/resmgr.cxx
 && id != "_MAX_PATH" // Windows
 && id != "_POSIX_SOURCE"
diff --git a/configure.ac b/configure.ac
index 6645af1aab51..bd5f184f66ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6037,11 +6037,11 @@ libo_FUZZ_ARG_ENABLE(c++17,
 )
 
 CXXFLAGS_CXX11=
-if test "$COM" = MSC; then
+if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
 AC_MSG_CHECKING([whether $CXX supports C++11])
 AC_MSG_RESULT(yes)
 # MSVC supports (a subset of) CXX11 without any switch
-elif test "$GCC" = "yes"; then
+elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 HAVE_CXX11=
 AC_MSG_CHECKING([whether $CXX supports C++17, C++14, or C++11])
 dnl But only use C++17 if the gperf that is being used knows not to emit
@@ -6052,6 +6052,9 @@ elif test "$GCC" = "yes"; then
 my_flags="-std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z $my_flags"
 fi
 for flag in $my_flags; do
+if test "$COM" = MSC; then
+flag="-Xclang $flag"
+fi
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS $flag -Werror"
 if test "$SYSTEM_LIBCMIS" = TRUE; then
diff --git a/external/boost/StaticLibrary_boost_date_time.mk 
b/external/boost/StaticLibrary_boost_date_time.mk
index ef97e25c8823..9f871ee164fe 100644
--- a/external/boost/StaticLibrary_boost_date_time.mk
+++ b/external/boost/StaticLibrary_boost_date_time.mk
@@ -18,6 +18,13 @@ $(eval $(call gb_StaticLibrary_add_defs,boost_date_time,\
-DBOOST_ALL_NO_LIB \
 ))
 
+# Needed when building against MSVC in C++17 mode, as
+# workdir/UnpackedTarball/boost/boost/numeric/conversion/detail/converter.hpp 
uses
+# std::unary_function:
+$(eval $(call gb_StaticLibrary_add_defs,boost_date_time, \
+-D_HAS_AUTO_PTR_ETC=1 \
+))
+
 $(eval $(call gb_StaticLibrary_use_external,boost_date_time,boost_headers))
 
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_date_time,cpp))
diff --git a/external/boost/StaticLibrary_boost_locale.mk 
b/external/boost/StaticLibrary_boost_locale.mk
index b6734d149c14..520131fb9174 100644
--- a/external/boost/StaticLibrary_boost_locale.mk
+++ b/external/boost/StaticLibrary_boost_locale.mk
@@ -18,9 +18,10 @@ $(eval $(call gb_StaticLibrary_add_defs,boost_locale,\
-DBOOST_ALL_NO_LIB -DBOOST_LOCALE_NO_WINAPI_BACKEND 
-DBOOST_LOCALE_NO_POSIX_BACKEND -DBOOST_USE_WINDOWS_H \
 ))
 
-# Needed when building against libc++ in C++17 mode, as Boost 1.65.1
+# Needed when building against MSVC resp. libc++ in C++17 mode, as Boost 1.65.1
 # workdir/UnpackedTarball/boost/boost/locale/generator.hpp contains 
"std::auto_ptr d;":
 $(eval $(call gb_StaticLibrary_add_defs,boost_locale, \
+-D_HAS_AUTO_PTR_ETC=1 \
 -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR \
 ))
 
diff --git a/external/clucene/Library_clucene.mk 

[Libreoffice-commits] core.git: sc/CppunitTest_sc_chart2dataprovider.mk sc/inc sc/Module_sc.mk sc/qa

[Vasily Melenchuk]

 sc/CppunitTest_sc_chart2dataprovider.mk|  122 +++
 sc/Module_sc.mk|1 
 sc/inc/chart2uno.hxx   |2 
 sc/qa/unit/chart2dataprovider.cxx  |  129 +
 sc/qa/unit/data/ods/chart2dataprovider.ods |binary
 5 files changed, 253 insertions(+), 1 deletion(-)

New commits:
commit be46bc5d20ad82be1d9c8513a83584ecee9edbc2
Author: Vasily Melenchuk 
Date:   Wed Nov 29 16:29:52 2017 +0300

tdf#113861: Unittest for chart datatable labels expansion

Change-Id: I4ed9019fc1e637e344ab1cb80f650b32aa034a9a
Reviewed-on: https://gerrit.libreoffice.org/45670
Reviewed-on: https://gerrit.libreoffice.org/46541
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/CppunitTest_sc_chart2dataprovider.mk 
b/sc/CppunitTest_sc_chart2dataprovider.mk
new file mode 100644
index ..7ef131b7f147
--- /dev/null
+++ b/sc/CppunitTest_sc_chart2dataprovider.mk
@@ -0,0 +1,122 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_chart2dataprovider))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_chart2dataprovider, \
+sc/qa/unit/chart2dataprovider \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_chart2dataprovider, \
+   boost_headers \
+   mdds_headers \
+   libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_chart2dataprovider, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sc \
+scqahelper \
+sfx \
+sot \
+subsequenttest \
+svl \
+svt \
+svx \
+svxcore \
+   test \
+tk \
+tl \
+ucbhelper \
+   unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_chart2dataprovider,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_chart2dataprovider))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_chart2dataprovider))
+$(eval $(call gb_CppunitTest_use_vcl,sc_chart2dataprovider))
+
+$(eval $(call gb_CppunitTest_use_components,sc_chart2dataprovider,\
+   basic/util/sb \
+chart2/source/chartcore \
+chart2/source/controller/chartcontroller \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+embeddedobj/util/embobj \
+eventattacher/source/evtatt \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/source/search/i18nsearch \
+i18npool/util/i18npool \
+linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+scaddins/source/analysis/analysis \
+scaddins/source/datefunc/date \
+sc/util/sc \
+sc/util/scfilt \
+sfx2/util/sfx \
+sot/util/sot \
+svl/util/svl \
+svl/source/fsstor/fsstorage \
+svtools/util/svt \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+uui/util/uui \
+xmloff/util/xo \
+xmlsecurity/util/xmlsecurity \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_CppunitTest_use_components,sc_chart2dataprovider,\
+xmlsecurity/util/xsec_xmlsec.windows \
+))
+else
+$(eval $(call gb_CppunitTest_use_components,sc_chart2dataprovider,\
+xmlsecurity/util/xsec_xmlsec \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_chart2dataprovider))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2a06f629bb46..bfdf6f277aa3 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_datapilottablesobj \
CppunitTest_sc_databaserangesobj \
CppunitTest_sc_consolidationdescriptorobj \
+   CppunitTest_sc_chart2dataprovider \
 ))
 
 $(eval $(call gb_Module_add_perfcheck_targets,sc,\
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 795561b642fa..fb19a502a4c9 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -53,7 +53,7 @@
 class ScDocument;
 
 // DataProvider
-class ScChart2DataProvider : public
+class SC_DLLPUBLIC ScChart2DataProvider : public
 ::cppu::WeakImplHelper<
 css::chart2::data::XDataProvider,
 css::chart2::data::XSheetDa

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 14/f7045e998e64589483fa99b06bb4805477dad3

[Michael Stahl]

 14/f7045e998e64589483fa99b06bb4805477dad3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ec193f559fa29d01a630251059fd4dff1c8ae6ad
Author: Michael Stahl 
Date:   Fri Dec 15 21:31:46 2017 +0100

Notes added by 'git notes add'

diff --git a/14/f7045e998e64589483fa99b06bb4805477dad3 
b/14/f7045e998e64589483fa99b06bb4805477dad3
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/14/f7045e998e64589483fa99b06bb4805477dad3
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 53/d9f415b2985f3784fabc9e72c3b486dad5efc8

[Michael Stahl]

 53/d9f415b2985f3784fabc9e72c3b486dad5efc8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ce2b49ce011c08643f8c5fa255f01d94e637d62c
Author: Michael Stahl 
Date:   Fri Dec 15 21:30:29 2017 +0100

Notes added by 'git notes add'

diff --git a/53/d9f415b2985f3784fabc9e72c3b486dad5efc8 
b/53/d9f415b2985f3784fabc9e72c3b486dad5efc8
new file mode 100644
index ..1fe89963d814
--- /dev/null
+++ b/53/d9f415b2985f3784fabc9e72c3b486dad5efc8
@@ -0,0 +1 @@
+reject: convenient workarounds in the build system for toolchain bugs is the 
road to a hell of buggy toolchains
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst

[Eike Rathke]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e54cf7833b31ea27b61c8ee5adcc90c77b2b3b7
Author: Eike Rathke 
Date:   Fri Dec 15 19:32:22 2017 +0100

Update language-subtag-registry-2017-12-14

Change-Id: Ieab59f83159cc95faa8119b7b43779329c0a4869
(cherry picked from commit 29055defc8a5e62279bab66faa4ccc191004a918)
Reviewed-on: https://gerrit.libreoffice.org/46572
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index c0ef0d9abe7e..7f8ae9c6e9ec 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.2.tar.gz
-export LANGTAGREG_SHA256SUM := 
d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
-export LANGTAGREG_TARBALL := language-subtag-registry-2017-08-15.tar.bz2
+export LANGTAGREG_SHA256SUM := 
0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362
+export LANGTAGREG_TARBALL := language-subtag-registry-2017-12-14.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
___
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.3' - cui/source sfx2/source svtools/source tools/source

[Michael Meeks]

 cui/source/factory/cuiresmgr.cxx |5 +++--
 sfx2/source/bastyp/sfxresid.cxx  |5 +++--
 svtools/source/misc/svtresid.cxx |5 +++--
 tools/source/rc/resmgr.cxx   |4 
 4 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit d93718ff92e485ebcd014713574be596b8815ff8
Author: Michael Meeks 
Date:   Fri Dec 15 14:22:10 2017 +

Handle resmgr lifecycle with vcl's de-init more cleanly.

Change-Id: Iee5f54edc09d0df7062ffdcb301876fcec791373
Reviewed-on: https://gerrit.libreoffice.org/46562
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/cui/source/factory/cuiresmgr.cxx b/cui/source/factory/cuiresmgr.cxx
index e61da43b6710..48e942a90685 100644
--- a/cui/source/factory/cuiresmgr.cxx
+++ b/cui/source/factory/cuiresmgr.cxx
@@ -21,15 +21,16 @@
 #include 
 #include 
 #include 
+#include 
 
 // struct DialogsResMgr --
 ResMgr* CuiResMgr::GetResMgr()
 {
-static std::unique_ptr pResMgr;
+static vcl::DeleteOnDeinit pResMgr(nullptr);
 
 const LanguageTag& rLocale = Application::GetSettings().GetUILanguageTag();
 
-if (!pResMgr || pResMgr->GetLocale() != rLocale)
+if (!pResMgr.get() || pResMgr.get()->GetLocale() != rLocale)
 {
 pResMgr.reset(ResMgr::CreateResMgr("cui", rLocale));
 }
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 40f02c4c3caa..a90d67adee41 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -21,8 +21,9 @@
 #include 
 #include 
 #include 
+#include 
 
-static std::unique_ptr pMgr;
+static vcl::DeleteOnDeinit pMgr(nullptr);
 
 SfxResId::SfxResId( sal_uInt16 nId ) :
 ResId( nId, *GetResMgr() )
@@ -33,7 +34,7 @@ ResMgr* SfxResId::GetResMgr()
 {
 const LanguageTag& rLocale = Application::GetSettings().GetUILanguageTag();
 
-if (!pMgr || pMgr->GetLocale() != rLocale)
+if (!pMgr.get() || pMgr.get()->GetLocale() != rLocale)
 pMgr.reset(ResMgr::CreateResMgr("sfx", rLocale));
 
 return pMgr.get();
diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx
index e727d95ce461..fa7261f6979e 100644
--- a/svtools/source/misc/svtresid.cxx
+++ b/svtools/source/misc/svtresid.cxx
@@ -21,14 +21,15 @@
 #include 
 #include 
 #include 
+#include 
 
-static std::unique_ptr pMgr;
+static vcl::DeleteOnDeinit pMgr(nullptr);
 
 namespace
 {
 ResMgr* getResMgr(const LanguageTag& aLocale)
 {
-if (!pMgr || pMgr->GetLocale() != aLocale)
+if (!pMgr.get() || pMgr.get()->GetLocale() != aLocale)
 pMgr.reset(ResMgr::CreateResMgr("svt", aLocale));
 
 return pMgr.get();
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index daea1b5bde64..31c4765f0304 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -838,10 +838,6 @@ ResMgr::ResMgr( InternalResMgr * pImpMgr )
 
 ResMgr::~ResMgr()
 {
-// our container was freed by DestroyAllResMgr
-if (!pResMgrMutex)
-return;
-
 osl::Guard aGuard( getResMgrMutex() );
 
 ResMgrContainer::get().freeResMgr( pImpRes );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 icon-themes/elementary_svg/cmd/32/helpindex.svg
   |  138 -
 icon-themes/elementary_svg/cmd/de/lc_numberformatdecimal.svg   
   |2 
 icon-themes/elementary_svg/cmd/de/lc_numberformatthousands.svg 
   |2 
 icon-themes/elementary_svg/cmd/de/sc_numberformatdecimal.svg   
   |2 
 icon-themes/elementary_svg/cmd/de/sc_numberformatthousands.svg 
   |2 
 icon-themes/elementary_svg/cmd/helpindex.svg   
   |1 
 icon-themes/elementary_svg/cmd/lc_advancedmode.svg 
   |  856 ---
 icon-themes/elementary_svg/cmd/lc_autosum.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc_backward.svg 
   |  780 ---
 icon-themes/elementary_svg/cmd/lc_basicstepinto.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_basicstepout.svg 
   |2 
 icon-themes/elementary_svg/cmd/lc_basicstepover.svg
   |  911 
 icon-themes/elementary_svg/cmd/lc_beforeobject.svg 
   |  775 ---
 icon-themes/elementary_svg/cmd/lc_behindobject.svg 
   |  775 ---
 icon-themes/elementary_svg/cmd/lc_bringtofront.svg 
   |  804 ---
 icon-themes/elementary_svg/cmd/lc_changecasetolower.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_changecasetoupper.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_dbviewfunctions.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc_editglossary.svg 
   |2 
 icon-themes/elementary_svg/cmd/lc_emphasischarstyle.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_euroconverter.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_fontworksameletterheights.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_formattedfield.svg   
   |2 
 icon-themes/elementary_svg/cmd/lc_forward.svg  
   |  780 ---
 icon-themes/elementary_svg/cmd/lc_glueeditmode.svg 
   | 1096 --
 icon-themes/elementary_svg/cmd/lc_gluepercent.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc_graphicfilterpopart.svg  
   |  819 ---
 icon-themes/elementary_svg/cmd/lc_groupbox.svg 
   |  142 -
 icon-themes/elementary_svg/cmd/lc_grow.svg 
   |2 
 icon-themes/elementary_svg/cmd/lc_heading1parastyle.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_heading2parastyle.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_heading3parastyle.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_heading4parastyle.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_heading5parastyle.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_heading6parastyle.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_hyphenate.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_insertfootnote.svg   
   |2 
 icon-themes/elementary_svg/cmd/lc_insertformula.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_insertmath.svg   
   |2 
 icon-themes/elementary_svg/cmd/lc_insertmultiindex.svg 
   |2 
 icon-themes/elementary_svg/cmd/lc_insertsymbol.svg 
   |2 
 icon-themes/elementary_svg/cmd/lc_italic.svg   
   |2 
 icon-themes/elementary_svg/cmd/lc_matchgroup.svg   
   |2 
 icon-themes/elementary_svg/cmd/lc_numberformatdecdecimals.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc_numberformatdecimal.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc_numberformatincdecimals.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc_numberformatpercent.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc_numberformatscientific.svg   
   |2 
 icon-themes/elementary_svg/cmd/lc_numberformatstandard.svg 
   |2 
 icon-themes/elementary_svg/cmd/lc_numberformatthousands.svg
   |2 
 icon-themes/elementary_svg/cmd/lc_numberliststyle.svg  
   |2 
 icon-themes/elementary_svg/cmd/lc

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

[Mike Kaganski]

 basic/source/classes/sbunoobj.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 8de8e0ce218dbb9e74d2a41517d5f6b1d36f478f
Author: Mike Kaganski 
Date:   Fri Dec 15 13:26:28 2017 +0200

Get rid of loop counter variable

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

diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 3c223f3010e7..829db9b695e4 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -880,10 +880,7 @@ Type getUnoTypeForSbxValue( const SbxValue* pVal )
 // this one - otherwise the whole will be considered as 
Any-Sequence
 bool bNeedsInit = true;
 
-sal_Int32 nSize = nUpper - nLower + 1;
-sal_Int32 aIdx[1];
-aIdx[0] = nLower;
-for (sal_Int32 i = 0; i < nSize; ++i, ++aIdx[0])
+for (sal_Int32 aIdx[1] = { nLower }; aIdx[0] <= nUpper; 
++aIdx[0])
 {
 SbxVariableRef xVar = pArray->Get32(aIdx);
 Type aType = getUnoTypeForSbxValue( xVar.get() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst

[Eike Rathke]

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 29055defc8a5e62279bab66faa4ccc191004a918
Author: Eike Rathke 
Date:   Fri Dec 15 19:32:22 2017 +0100

Update language-subtag-registry-2017-12-14

Change-Id: Ieab59f83159cc95faa8119b7b43779329c0a4869

diff --git a/download.lst b/download.lst
index b1ccc5016b64..120e5211eb8c 100644
--- a/download.lst
+++ b/download.lst
@@ -120,8 +120,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.2.tar.gz
-export LANGTAGREG_SHA256SUM := 
d6a97fc8da5ae54d867e7f1b65ffb51e816cadd11714e45fc23ee0abf81a51ab
-export LANGTAGREG_TARBALL := language-subtag-registry-2017-08-15.tar.bz2
+export LANGTAGREG_SHA256SUM := 
0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362
+export LANGTAGREG_TARBALL := language-subtag-registry-2017-12-14.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Eike Rathke]

 sc/source/core/tool/dbdata.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1aa8011d9186dc4d221469058a9fcaf5a93ae765
Author: Eike Rathke 
Date:   Fri Dec 15 16:27:54 2017 +0100

Resolves: tdf#113537 don't keep nEndRow=MAXROW if data ends above

Change-Id: I186034cada9718c067fa4dc7f72e2ca55ac06f83
(cherry picked from commit fa100e0abc83b876ca18b4178c44fb1dfc452a5d)
Reviewed-on: https://gerrit.libreoffice.org/46565
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 020b2daed980..0b7ebd3b6bfe 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -624,7 +624,12 @@ void ScDBData::ExtendDataArea(const ScDocument* pDoc)
 SCCOL nOldCol1 = nStartCol, nOldCol2 = nEndCol;
 SCROW nOldEndRow = nEndRow;
 pDoc->GetDataArea(nTable, nStartCol, nStartRow, nEndCol, nEndRow, false, 
true);
-nEndRow = std::max(nEndRow, nOldEndRow);
+// nOldEndRow==MAXROW may easily happen when selecting whole columns and
+// setting an AutoFilter (i.e. creating an anonymous database-range). We
+// certainly don't want to iterate over nearly a million empty cells, but
+// keep only an intentionally user selected range.
+if (nOldEndRow < MAXROW && nEndRow < nOldEndRow)
+nEndRow = nOldEndRow;
 if (nStartCol != nOldCol1 || nEndCol != nOldCol2)
 {
 SAL_WARN_IF( !maTableColumnNames.empty(), "sc.core", 
"ScDBData::ExtendDataArea - invalidating column names/offsets");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 starmath/source/mathmlimport.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit bbff2801ff00a41b95340b517d34c9d73fdb8959
Author: Caolán McNamara 
Date:   Fri Dec 15 09:26:20 2017 +

ofz#4649 don't care about exceptions for testing

Change-Id: I955460276c3bf98457eff6bc9503edd238a5650c
Reviewed-on: https://gerrit.libreoffice.org/46506
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 8daaa2c653e7..7d1d63756d62 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -3137,7 +3137,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool 
TestImportMML(SvStream &rStream)
 
 ErrCode nRet = ERRCODE_SFX_DOLOADFAILED;
 
-nRet = SmXMLImportWrapper::ReadThroughComponent(xStream, xModel, xContext, 
xInfoSet, "com.sun.star.comp.Math.XMLImporter", false);
+try
+{
+nRet = SmXMLImportWrapper::ReadThroughComponent(xStream, xModel, 
xContext, xInfoSet, "com.sun.star.comp.Math.XMLImporter", false);
+}
+catch (...)
+{
+}
 
 xDocSh->SetLoading(SfxLoadedFlags::ALL);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 starmath/source/parse.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit deba726824b751cdba7b13793e68ecc442168e7d
Author: Caolán McNamara 
Date:   Fri Dec 15 09:50:05 2017 +

ofz#4643 Direct-leak

Change-Id: Ie4fff1a113916c7a3344959cfb4ee14c3fda2073
Reviewed-on: https://gerrit.libreoffice.org/46512
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 57344e1c6ffe..9cc4feee9e7a 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1340,7 +1340,8 @@ SmNode *SmParser::DoTerm(bool bGroupNumberIdent)
 return pNode.release();
 }
 auto pSNode = o3tl::make_unique(m_aCurToken);
-pSNode->SetSubNodes(pNode.release(), 
DoError(SmParseError::RgroupExpected));
+std::unique_ptr 
xError(DoError(SmParseError::RgroupExpected));
+pSNode->SetSubNodes(pNode.release(), xError.release());
 return pSNode.release();
 }
 
@@ -1566,16 +1567,15 @@ SmOperNode *SmParser::DoOperator()
 auto pSNode = o3tl::make_unique(m_aCurToken);
 
 // get operator
-SmNode *pOperator = DoOper();
+std::unique_ptr xOperator(DoOper());
 
-if ( m_aCurToken.nGroup == TG::Limit ||
- m_aCurToken.nGroup == TG::Power )
-pOperator = DoSubSup(m_aCurToken.nGroup, pOperator);
+if (m_aCurToken.nGroup == TG::Limit || m_aCurToken.nGroup == TG::Power)
+xOperator.reset(DoSubSup(m_aCurToken.nGroup, xOperator.release()));
 
 // get argument
-SmNode *pArg = DoPower();
+std::unique_ptr xArg(DoPower());
 
-pSNode->SetSubNodes(pOperator, pArg);
+pSNode->SetSubNodes(xOperator.release(), xArg.release());
 return pSNode.release();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_filters_test.mk

[Stephan Bergmann]

 sw/CppunitTest_sw_filters_test.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2392077d47f2ccf0851391b0d0bba0a268d1014a
Author: Stephan Bergmann 
Date:   Fri Dec 15 18:11:10 2017 +0100

Apparently missing dependency

Some bots (the Jenkins lo_ubsan, some Jenkins Gerrit Build v2
macosx_clang_dbgutil builds) recently started to fail
CppunitTest_sw_filters_test at least sporadically with an abort() from
Scheduler::ProcessTaskScheduling (vcl/source/app/scheduler.cxx).
ba81ac19b7aec4fd7f07fcec9f6ea6f85d9aaa24 "Report more debug information 
about
caught exception" reveals that at least  fails because of

> warn:vcl.schedule:90989:529951052:vcl/source/app/scheduler.cxx:452: 
Uncaught com.sun.star.uno.DeploymentException component context fails to supply 
service com.sun.star.embed.FileSystemStorageFactory of type 
com.sun.star.lang.XSingleServiceFactory

Due to the unfortunate try-catch in Scheduler::ProcessTaskScheduling it is 
hard
to tell where the failure originates (and it only hits some bots and I at 
least
can't reproduce it locally), but lets assume that a dependency on
svl/source/fsstor/fsstorage.component is indeed missing, but manifests as a
failure only in some cases (for whatever reason).

Change-Id: I91214490ac6aab99a281c745ba4b2d138b12ddd1

diff --git a/sw/CppunitTest_sw_filters_test.mk 
b/sw/CppunitTest_sw_filters_test.mk
index 3ea529517dce..49758fd1f4d5 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 sax/source/expatwrap/expwrap \
 sfx2/util/sfx \
starmath/util/sm \
+svl/source/fsstor/fsstorage \
 svtools/util/svt \
 sw/util/msword \
 sw/util/sw \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 comphelper/source/misc/lok.cxx   |   12 
 desktop/source/lib/init.cxx  |2 ++
 include/LibreOfficeKit/LibreOfficeKitEnums.h |7 ++-
 include/comphelper/lok.hxx   |4 
 sc/source/ui/view/tabview.cxx|   18 +++---
 5 files changed, 35 insertions(+), 8 deletions(-)

New commits:
commit 2c79d998587cb2a0a561bbbd128ffb48fd56cf5a
Author: Marco Cecchetti 
Date:   Fri Dec 8 16:44:09 2017 +0100

lok: calc: LOK_FEATURE_RANGE_HEADERS

For allowing the client to enable/disable the new range based header
data

Change-Id: I95da8ec3e48137fb75b9b22af3bb1296001ba9ca
Reviewed-on: https://gerrit.libreoffice.org/46095
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 069cf9321be51e7203e336e0e87d8ba7dc9b729e)
Reviewed-on: https://gerrit.libreoffice.org/46570
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index a4f60ac6c565..b8324a4defcd 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -25,6 +25,8 @@ static bool g_bDialogPainting(false);
 
 static bool g_bTiledAnnotations(true);
 
+static bool g_bRangeHeaders(false);
+
 void setActive(bool bActive)
 {
 g_bActive = bActive;
@@ -75,6 +77,16 @@ bool isTiledAnnotations()
 return g_bTiledAnnotations;
 }
 
+void setRangeHeaders(bool bRangeHeaders)
+{
+g_bRangeHeaders = bRangeHeaders;
+}
+
+bool isRangeHeaders()
+{
+return g_bRangeHeaders;
+}
+
 static bool g_bLocalRendering(false);
 
 void setLocalRendering(bool bLocalRendering)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2e8d876cb985..5f18a457f241 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3366,6 +3366,8 @@ static void lo_setOptionalFeatures(LibreOfficeKit* pThis, 
unsigned long long con
 comphelper::LibreOfficeKit::setPartInInvalidation(true);
 if (features & LOK_FEATURE_NO_TILED_ANNOTATIONS)
 comphelper::LibreOfficeKit::setTiledAnnotations(false);
+if (features & LOK_FEATURE_RANGE_HEADERS)
+comphelper::LibreOfficeKit::setRangeHeaders(true);
 }
 
 static void lo_setDocumentPassword(LibreOfficeKit* pThis,
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index cf85d7c6b592..f14ce4d36a7a 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -79,7 +79,12 @@ typedef enum
 /**
  * Turn off tile rendering for annotations
  */
-LOK_FEATURE_NO_TILED_ANNOTATIONS = (1ULL << 3)
+LOK_FEATURE_NO_TILED_ANNOTATIONS = (1ULL << 3),
+
+/**
+ * Enable range based header data
+ */
+LOK_FEATURE_RANGE_HEADERS = (1ULL << 4)
 }
 LibreOfficeKitOptionalFeatures;
 
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 7a293ca70352..c42a740822e0 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -60,6 +60,10 @@ COMPHELPER_DLLPUBLIC void setDialogPainting(bool 
bDialogPainting);
 COMPHELPER_DLLPUBLIC void setTiledAnnotations(bool bTiledAnnotations);
 /// Check if annotations rendering is turned off
 COMPHELPER_DLLPUBLIC bool isTiledAnnotations();
+/// Set if we want range based header data
+COMPHELPER_DLLPUBLIC void setRangeHeaders(bool bTiledAnnotations);
+/// Check if range based header data is enabled
+COMPHELPER_DLLPUBLIC bool isRangeHeaders();
 
 // Status indicator handling. Even if in theory there could be several status 
indicators active at
 // the same time, in practice there is only one at a time, so we don't handle 
any identification of
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 1c6e61cc6ad4..9e88f11f36e5 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2719,6 +2719,8 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 if (rRectangle.IsEmpty())
 return OUString();
 
+bool bRangeHeaderSupport = comphelper::LibreOfficeKit::isRangeHeaders();
+
 rtl::OUStringBuffer aBuffer(256);
 aBuffer.append("{ \"commandName\": \".uno:ViewRowColumnHeaders\",\n");
 
@@ -2776,7 +2778,7 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 const ScOutlineArray* pRowArray = pTable ? &(pTable->GetRowArray()) : 
nullptr;
 size_t nRowGroupDepth = 0;
 std::vector aRowGroupIndexes;
-if (pTable)
+if (bRangeHeaderSupport && pTable)
 {
 nRowGroupDepth = pRowArray->GetDepth();
 lcl_getGroupIndexes(*pRowArray, nStartRow, nEndRow, aRowGroupIndexes);
@@ -2850,13 +2852,13 @@ OUString ScTabView::getRowColumnHeaders(const 
tools::Rectangle& rRectangle)
 nTotalPixels += nSizePx;
 const long nTotalTwips = nTotalPixels * TWIPS_PER_PIXEL;
 
-if (nRowGroupDepth > 0)

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

[Michael Stahl]

 sw/source/core/inc/txtfrm.hxx |   13 +
 sw/source/core/layout/trvlfrm.cxx |5 -
 sw/source/core/text/txtfrm.cxx|   14 +++---
 sw/source/core/text/txtinit.cxx   |4 ++--
 sw/source/uibase/index/toxmgr.cxx |   12 ++--
 5 files changed, 32 insertions(+), 16 deletions(-)

New commits:
commit b77881366b17230908f441dfa27afcafc4374708
Author: Michael Stahl 
Date:   Fri Dec 15 17:07:01 2017 +0100

tdf#100635 sw: fix layout crash caused by field expansion ...

... triggering recursive layout-in-layout where a SwTextFrame
that's being formatted is deleted inside some other frame's
SwTextNode::GetFormatted().

The offending field is a SwAuthorityField that's located in a
fly-frame with FLY_AT_PAGE anchor.

SwPageFrame::GetContentPosition() is only called by field expansion
code, so this shouldn't have an effect on layout.

It already has a fall-back for the case when the frame has invalid
flags, so handle the situation when the SwLineLayout has been
deleted from the SwCache due to overflow the same way,
which prevents the recursive formatting.

Change-Id: I90437edb5692dc2bdec7ad03964588942bde05be

diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index df410a56ceb2..dfaa27bf2a03 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1433,9 +1433,12 @@ void SwPageFrame::GetContentPosition( const Point &rPt, 
SwPosition &rPos ) const
 else if ( aAct.X() > aRect.Right() )
 aAct.X() = aRect.Right();
 
-if( !pAct->isFrameAreaDefinitionValid() )
+if (!pAct->isFrameAreaDefinitionValid() ||
+(pAct->IsTextFrame() && !static_cast(pAct)->HasPara()))
 {
 // ContentFrame not formatted -> always on node-beginning
+// tdf#100635 also if the SwTextFrame would require reformatting,
+// which is unwanted in case this is called from text formatting code
 SwContentNode* pCNd = const_cast(pAct->GetNode());
 OSL_ENSURE( pCNd, "Where is my ContentNode?" );
 rPos.nNode = *pCNd;
commit aa07f2892e581dd31f1b8861499e29c96dddbac0
Author: Michael Stahl 
Date:   Fri Dec 15 17:18:39 2017 +0100

sw: prefix SwTextFrame::pTextCache member

Change-Id: Ibfbc59c9df89a3cde6226bd49cf33c2ac865d4a8

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 36016aaca196..6a22cff6f059 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
 /// if there are too many of them, but the "valid" flags of the frame
 /// will still be set; GetFormatted() is the function that forces
 /// recreation of the SwLineLayout by Format() if necessary.
-static SwCache *pTextCache;
+static SwCache *s_pTextCache;
 static long nMinPrtLine;// This Line must not be underrun when printing
 // Hack for table cells stretching multiple 
pages
 
@@ -451,7 +451,7 @@ public:
 SwTextFrame *FindQuoVadisFrame();
 
 /**
- * In case the SwLineLayout was cleared out of the pTextCache, recreate it.
+ * In case the SwLineLayout was cleared out of the s_pTextCache, recreate 
it
  *
  * #i29062# GetFormatted() can trigger a full formatting
  * of the paragraph, causing other layout frames to become invalid. This
@@ -472,8 +472,8 @@ public:
 bool GetDropRect( SwRect &rRect ) const
 { return HasPara() && GetDropRect_( rRect ); }
 
-static SwCache *GetTextCache() { return pTextCache; }
-static void SetTextCache( SwCache *pNew ) { pTextCache = pNew; }
+static SwCache *GetTextCache() { return s_pTextCache; }
+static void SetTextCache( SwCache *pNew ) { s_pTextCache = pNew; }
 
 static long GetMinPrtLine() { return nMinPrtLine; }
 
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index a93fcb77fc50..65dbf5193ce5 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -398,7 +398,7 @@ SwTextFrame::SwTextFrame(SwTextNode * const pNode, SwFrame* 
pSib )
 
 void SwTextFrame::DestroyImpl()
 {
-// Remove associated SwParaPortion from pTextCache
+// Remove associated SwParaPortion from s_pTextCache
 ClearPara();
 
 const SwContentNode* pCNd;
@@ -2123,7 +2123,7 @@ SwTextFrame* SwTextFrame::GetFormatted( bool 
bForceQuickFormat )
 vcl::RenderContext* pRenderContext = 
getRootFrame()->GetCurrShell()->GetOut();
 SwSwapIfSwapped swap( this );
 
-// In case the SwLineLayout was cleared out of the pTextCache, recreate it.
+// In case the SwLineLayout was cleared out of the s_pTextCache, recreate 
it
 // Not for empty paragraphs
 if( !HasPara() && !(isFrameAreaDefinitionValid() && IsEmpty()) )
 {
@@ -2134,7 +2134,7 @@ SwTextFrame* SwTextFrame::GetFormatted( bool 
bForceQuickFormat )
 // If the flags 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Jim Raykowski]

 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5769b301dc307d2019faf1a480b930182d03ba54
Author: Jim Raykowski 
Date:   Thu Dec 7 22:52:00 2017 -0900

tdf#114216 Uncheck Thousands separator on Number category selection

Change-Id: Iaf616379fad1333d63bc397a9fba2220d7bbfc9b
Reviewed-on: https://gerrit.libreoffice.org/46072
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit eee645a4c281a99247fa7ae6e34711283156c614)
Reviewed-on: https://gerrit.libreoffice.org/46540

diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx 
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index e52a08e83be5..54c3975c9b08 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -211,6 +211,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
 bool bIsFraction ( nVal == 7 );  // For fraction, Decimal 
places is replaced by Denominator places
 mpBtnThousand->Show(!bIsScientific);
 mpBtnThousand->Enable(!bIsScientific);
+mpBtnThousand->Check(false);
 mpBtnEngineering->Show(bIsScientific);
 mpBtnEngineering->Enable(bIsScientific);
 mpBtnNegRed->Enable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - kit/ChildSession.cpp

[Jan Holesovsky]

 kit/ChildSession.cpp |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f189881aa1058d630bf3e4c6a0e407fe17a5e0fe
Author: Jan Holesovsky 
Date:   Fri Dec 15 17:08:00 2017 +0100

lokdialog: Fix RGBA vs. BGRA confusion.

Change-Id: I42ce8f46ab09e9b6684ace0627323a013831c571
Reviewed-on: https://gerrit.libreoffice.org/46563
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 326dabcd..530c5d98 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -447,7 +447,9 @@ bool ChildSession::sendFontRendering(const char* 
/*buffer*/, int /*length*/, con
 return sendTextFrame(output.data(), output.size());
 }
 
-if (Png::encodeBufferToPNG(ptrFont, width, height, output, 
LOK_TILEMODE_RGBA))
+const auto mode = 
static_cast(getLOKitDocument()->getTileMode());
+
+if (Png::encodeBufferToPNG(ptrFont, width, height, output, mode))
 {
 bSuccess = sendTextFrame(output.data(), output.size());
 }
@@ -999,8 +1001,10 @@ bool ChildSession::renderWindow(const char* /*buffer*/, 
int /*length*/, const st
 output.resize(response.size());
 std::memcpy(output.data(), response.data(), response.size());
 
+const auto mode = 
static_cast(getLOKitDocument()->getTileMode());
+
 // TODO: use png cache for dialogs too
-if (!Png::encodeSubBufferToPNG(pixmap.data(), 0, 0, width, height, 
bufferWidth, bufferHeight, output, LOK_TILEMODE_RGBA))
+if (!Png::encodeSubBufferToPNG(pixmap.data(), 0, 0, width, height, 
bufferWidth, bufferHeight, output, mode))
 {
 LOG_ERR("Failed to encode into PNG.");
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/ChildSession.cpp

[Jan Holesovsky]

 kit/ChildSession.cpp |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 2ef04a64460971d410080b3e8120b9675d6a781e
Author: Jan Holesovsky 
Date:   Fri Dec 15 17:08:00 2017 +0100

lokdialog: Fix RGBA vs. BGRA confusion.

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

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 326dabcd..530c5d98 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -447,7 +447,9 @@ bool ChildSession::sendFontRendering(const char* 
/*buffer*/, int /*length*/, con
 return sendTextFrame(output.data(), output.size());
 }
 
-if (Png::encodeBufferToPNG(ptrFont, width, height, output, 
LOK_TILEMODE_RGBA))
+const auto mode = 
static_cast(getLOKitDocument()->getTileMode());
+
+if (Png::encodeBufferToPNG(ptrFont, width, height, output, mode))
 {
 bSuccess = sendTextFrame(output.data(), output.size());
 }
@@ -999,8 +1001,10 @@ bool ChildSession::renderWindow(const char* /*buffer*/, 
int /*length*/, const st
 output.resize(response.size());
 std::memcpy(output.data(), response.data(), response.size());
 
+const auto mode = 
static_cast(getLOKitDocument()->getTileMode());
+
 // TODO: use png cache for dialogs too
-if (!Png::encodeSubBufferToPNG(pixmap.data(), 0, 0, width, height, 
bufferWidth, bufferHeight, output, LOK_TILEMODE_RGBA))
+if (!Png::encodeSubBufferToPNG(pixmap.data(), 0, 0, width, height, 
bufferWidth, bufferHeight, output, mode))
 {
 LOG_ERR("Failed to encode into PNG.");
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/dbdata.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit fa100e0abc83b876ca18b4178c44fb1dfc452a5d
Author: Eike Rathke 
Date:   Fri Dec 15 16:27:54 2017 +0100

Resolves: tdf#113537 don't keep nEndRow=MAXROW if data ends above

Change-Id: I186034cada9718c067fa4dc7f72e2ca55ac06f83

diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 020b2daed980..0b7ebd3b6bfe 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -624,7 +624,12 @@ void ScDBData::ExtendDataArea(const ScDocument* pDoc)
 SCCOL nOldCol1 = nStartCol, nOldCol2 = nEndCol;
 SCROW nOldEndRow = nEndRow;
 pDoc->GetDataArea(nTable, nStartCol, nStartRow, nEndCol, nEndRow, false, 
true);
-nEndRow = std::max(nEndRow, nOldEndRow);
+// nOldEndRow==MAXROW may easily happen when selecting whole columns and
+// setting an AutoFilter (i.e. creating an anonymous database-range). We
+// certainly don't want to iterate over nearly a million empty cells, but
+// keep only an intentionally user selected range.
+if (nOldEndRow < MAXROW && nEndRow < nOldEndRow)
+nEndRow = nOldEndRow;
 if (nStartCol != nOldCol1 || nEndCol != nOldCol2)
 {
 SAL_WARN_IF( !maTableColumnNames.empty(), "sc.core", 
"ScDBData::ExtendDataArea - invalidating column names/offsets");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - automation/Library_sts.mk canvas/Library_vclcanvas.mk dbaccess/Library_dbui.mk framework/Library_fwk.mk sc/Library_scfilt.mk sc/Library

[Don Lewis]

 automation/Library_sts.mk   |7 +--
 canvas/Library_vclcanvas.mk |   12 +
 dbaccess/Library_dbui.mk|   24 --
 framework/Library_fwk.mk|   12 +++--
 sc/Library_sc.mk|   99 +++-
 sc/Library_scfilt.mk|   10 +---
 sd/Library_sd.mk|   25 ---
 sd/Library_sdfilt.mk|   10 +---
 set_soenv.in|2 
 sfx2/Library_sfx.mk |   10 +---
 solenv/gbuild/LinkTarget.mk |8 +--
 svx/Library_svxcore.mk  |   13 ++---
 12 files changed, 96 insertions(+), 136 deletions(-)

New commits:
commit 53d9f415b2985f3784fabc9e72c3b486dad5efc8
Author: Don Lewis 
Date:   Fri Dec 15 14:54:32 2017 +

Enhance gb_LinkTarget_set_*_optimization functions to allow multiple

targets to be specified.

Convert optimization overrides in the gbuild library makefiles to
use gb_LinkTarget_set_*_optimization.

There should be no functional change.

diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk
index 16a4af320ca8..5c2bf76d454a 100644
--- a/automation/Library_sts.mk
+++ b/automation/Library_sts.mk
@@ -94,12 +94,11 @@ endif
 $(eval $(call gb_Library_add_exception_objects,sts,\
automation/source/server/XMLParser \
automation/source/server/server \
-))
-
-$(eval $(call gb_Library_add_cxxobjects,sts,\
automation/source/server/statemnt \
-   , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   automation/source/server/statement, $(gb_COMPILERNOOPTFLAGS) \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 0213ac0d1c82..3bcdffdefbb6 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
canvas/source/vcl/canvascustomsprite \
canvas/source/vcl/canvasfont \
canvas/source/vcl/canvashelper \
+   canvas/source/vcl/canvashelper_texturefill \
canvas/source/vcl/devicehelper \
canvas/source/vcl/impltools \
canvas/source/vcl/services \
@@ -80,14 +81,9 @@ $(eval $(call gb_Library_add_exception_objects,vclcanvas,\
 ))
 
 # Solaris Sparc with Sun Compiler: noopt
-ifneq ($(strip($OS)),SOLARIS)
-$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
-   canvas/source/vcl/canvashelper_texturefill \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\
-   canvas/source/vcl/canvashelper_texturefill \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ifeq ($(strip($OS)),SOLARIS)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   canvas/source/vcl/canvashelper_texturefill, $(gb_COMPILERNOOPTFLAGS) \
 ))
 endif
 
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index e3e68cce0947..7a0adb992bdc 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -269,6 +269,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/uno/UserSettingsDlg \
dbaccess/source/ui/uno/admindlg \
dbaccess/source/ui/uno/composerdialogs \
+   dbaccess/source/ui/uno/copytablewizard \
dbaccess/source/ui/uno/dbinteraction \
dbaccess/source/ui/uno/textconnectionsettings_uno \
dbaccess/source/ui/uno/unoDirectSql \
@@ -276,6 +277,15 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
dbaccess/source/ui/uno/unosqlmessage \
 ))
 
+# the following source file can't be compiled with optimization by some 
compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifneq ($(COM),$(filter-out GCC,$(COM)))
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+   dbaccess/source/ui/uno/copytablewizard, $(gb_COMPILERNOOPTFLAGS) \
+))
+endif
+
 $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/shared/dbu_reghelper \
dbaccess/source/shared/dbustrings \
@@ -299,18 +309,4 @@ $(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/ui/querydesign/TableFieldInfo \
 ))
 
-# the following source file can't be compiled with optimization by some 
compilers (crash or endless loop):
-# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
-# the latter is currently not supported by gbuild and needs a fix here later
-ifeq ($(COM),$(filter-out GCC,$(COM)))
-$(eval $(call gb_Library_add_exception_objects,dbui,\
-dbaccess/source/ui/uno/copytablewizard \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,dbui,\
-dbaccess/source/ui/uno/copytablewizard \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 449800331fce..bfcf494d50e6 100644
--- a/framework/Librar

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

[Stephan Bergmann]

 xmloff/source/text/XMLIndexTOCContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c2aaa98ed551f8465fbcc65cd8adc16f4aab657
Author: Stephan Bergmann 
Date:   Fri Dec 15 11:12:57 2017 +0100

-Werror,-Wsign-compare (clang-cl)

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

diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx 
b/xmloff/source/text/XMLIndexTOCContext.cxx
index cd1f17010fbd..ce73f0052e57 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -104,7 +104,7 @@ XMLIndexTOCContext::XMLIndexTOCContext(SvXMLImport& rImport,
 if (SvXMLUnitConverter::convertEnum(eIndexType, rLocalName, 
aIndexTypeMap))
 {
 // check for array index:
-OSL_ENSURE(eIndexType < (SAL_N_ELEMENTS(aIndexServiceMap)), "index 
out of range");
+OSL_ENSURE(unsigned(eIndexType) < 
(SAL_N_ELEMENTS(aIndexServiceMap)), "index out of range");
 OSL_ENSURE(SAL_N_ELEMENTS(aIndexServiceMap) ==
SAL_N_ELEMENTS(aIndexSourceElementMap),
"service and source element maps must be same size");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/core/data/dptabres.cxx |2 +-
 sc/source/core/data/dputil.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 263a6df93013200df3abecfa733fbc558cc48869
Author: Stephan Bergmann 
Date:   Fri Dec 15 11:11:51 2017 +0100

-Werror,-Wsign-compare (clang-cl)

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

diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index e7bae87f6fc1..f54e29113839 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -837,7 +837,7 @@ OUString ScDPResultData::GetMeasureString(long nMeasure, 
bool bForce, ScSubTotal
 {
 //  for user-specified subtotal function with all measures,
 //  display only function name
-assert(eForceFunc < SAL_N_ELEMENTS(aFuncStrIds));
+assert(unsigned(eForceFunc) < SAL_N_ELEMENTS(aFuncStrIds));
 if ( eForceFunc != SUBTOTAL_FUNC_NONE )
 return ScGlobal::GetRscString(aFuncStrIds[eForceFunc]);
 
diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index ed8d097b08f3..95e4a8beb3e1 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -390,7 +390,7 @@ const char* aFuncStrIds[] = {
 OUString ScDPUtil::getDisplayedMeasureName(const OUString& rName, 
ScSubTotalFunc eFunc)
 {
 OUStringBuffer aRet;
-assert(eFunc < SAL_N_ELEMENTS(aFuncStrIds));
+assert(unsigned(eFunc) < SAL_N_ELEMENTS(aFuncStrIds));
 const char* pId = aFuncStrIds[eFunc];
 if (pId)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 loleaflet/src/control/Control.LokDialog.js |   56 +
 1 file changed, 34 insertions(+), 22 deletions(-)

New commits:
commit 192a1f87024c97d4dda031a45cce4d4900416217
Author: Pranav Kant 
Date:   Fri Dec 15 20:05:27 2017 +0530

lokdialog: Handle 'title' field in the 'created' cb

While at it, move the title, width, height properties to this._dialogs
object as they are dialog specific.

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

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 20fb5bf0..2e1e80b1 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -24,6 +24,7 @@ L.Control.LokDialog = L.Control.extend({
},
 
_getParentDialog: function(id) {
+   id = parseInt(id);
for (var winId in this._dialogs) {
if (this._dialogs[winId].childid && 
this._dialogs[winId].childid === id) {
return winId;
@@ -39,7 +40,9 @@ L.Control.LokDialog = L.Control.extend({
},
 
_toRawDlgId: function(dialogId) {
-   return dialogId.replace(this.dialogIdPrefix, '');
+   if (typeof(dialogId) === 'string')
+   return parseInt(dialogId.replace(this.dialogIdPrefix, 
''));
+   return dialogId;
},
 
_toDlgPrefix: function(id) {
@@ -48,11 +51,11 @@ L.Control.LokDialog = L.Control.extend({
 
// Create a rectangle string of form "x,y,width,height"
// if params are missing, assumes 0,0,dialog width, dialog height
-   _createRectStr: function(x, y, width, height) {
+   _createRectStr: function(id, x, y, width, height) {
if (!width)
-   width = this._width;
+   width = this._dialogs[parseInt(id)].width;
if (!height)
-   height = this._height;
+   height = this._dialogs[parseInt(id)].height;
if (!x)
x = 0;
if (!y)
@@ -80,15 +83,18 @@ L.Control.LokDialog = L.Control.extend({
},
 
_onDialogMsg: function(e) {
+   e.id = parseInt(e.id);
var strDlgId = this._toDlgPrefix(e.id);
if (e.action === 'created') {
var width = parseInt(e.size.split(',')[0]);
var height = parseInt(e.size.split(',')[1]);
if (e.winType === 'dialog') {
-   this._width = width;
-   this._height = height;
-   this._launchDialog(this._toDlgPrefix(e.id));
-   this._sendPaintWindow(e.id, 
this._createRectStr());
+   this._launchDialog(this._toDlgPrefix(e.id), 
width, height, e.title);
+   this._sendPaintWindow(e.id, 
this._createRectStr(e.id));
+   if (e.title) {
+   this._dialogs[e.id].title = e.title;
+   $('#' + strDlgId).dialog('option', 
'title', e.title);
+   }
} else if (e.winType === 'child') {
if (!this._isOpen(e.parentId))
return;
@@ -104,7 +110,7 @@ L.Control.LokDialog = L.Control.extend({
this._dialogs[parentId].childx = left;
this._dialogs[parentId].childy = top;
this._createDialogChild(e.id, parentId, top, 
left);
-   this._sendPaintWindow(e.id, 
this._createRectStr(0, 0, width, height));
+   this._sendPaintWindow(e.id, 
this._createRectStr(null, 0, 0, width, height));
}
} else if (e.action === 'invalidate') {
var parent = this._getParentDialog(e.id);
@@ -116,20 +122,19 @@ L.Control.LokDialog = L.Control.extend({
return;
 
if (!rectangle)
-   rectangle = '0,0,' + this._width + ',' 
+ this._height;
+   rectangle = '0,0,' + 
this._dialogs[e.id].width + ',' + this._dialogs[e.id].height;
}
this._sendPaintWindow(e.id, rectangle);
} else if (e.action === 'size_changed') {
-   this._width = parseInt(e.size.split(',')[0]);
-   this._height = parseInt(e.size.split(',')[1]);
+   width = parseInt(e.size.split(',')[0]);
+   

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

[Christian Lohmaier]

Tag 'cp-5.3-35' created by Andras Timar  at 
2017-12-15 13:49 +

cp-5.3-53

Changes since cp-5.3-10:
Christian Lohmaier (1):
  update translations for 5.3.3 rc2

---
 source/am/cui/source/options.po|8 
 source/am/cui/source/tabpages.po   |8 
 source/am/cui/uiconfig/ui.po   |8 
 source/am/fpicker/source/office.po |   10 
 source/am/officecfg/registry/data/org/openoffice/Office.po |6 
 source/am/sc/source/ui/src.po  |8 
 source/am/sfx2/source/dialog.po|   12 
 source/am/svtools/source/dialogs.po|8 
 source/am/svtools/source/misc.po   |8 
 source/am/svx/source/stbctrls.po   |8 
 source/am/svx/uiconfig/ui.po   |   10 
 source/bg/sc/uiconfig/scalc/ui.po  |   20 
 source/bg/sfx2/source/dialog.po|   12 
 source/bg/svx/source/dialog.po |   30 
 source/bg/svx/source/form.po   |   10 
 source/bg/svx/source/stbctrls.po   |8 
 source/bg/svx/source/tbxctrls.po   |6 
 source/bg/svx/uiconfig/ui.po   |  289 
 source/bg/sw/source/ui/utlui.po|   21 
 source/bg/sw/source/uibase/utlui.po|6 
 source/bg/sw/uiconfig/swriter/ui.po|5 
 source/br/cui/uiconfig/ui.po   |   70 -
 source/br/extensions/source/bibliography.po|   12 
 source/br/extensions/source/propctrlr.po   |  152 ++--
 source/br/sc/source/ui/src.po  |   12 
 source/ca/helpcontent2/source/text/scalc/00.po |   20 
 source/ca/helpcontent2/source/text/scalc/01.po |8 
 source/ca/helpcontent2/source/text/scalc/guide.po  |   10 
 source/ca/helpcontent2/source/text/shared/01.po|6 
 source/ca/helpcontent2/source/text/shared/guide.po |5 
 source/ca/helpcontent2/source/text/shared/optionen.po  |8 
 source/ca/helpcontent2/source/text/simpress/guide.po   |   10 
 source/ca/helpcontent2/source/text/swriter/01.po   |   13 
 source/ca/helpcontent2/source/text/swriter/guide.po|   25 
 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po  |8 
 source/ca/sc/uiconfig/scalc/ui.po  |6 
 source/ca/svx/uiconfig/ui.po   |   12 
 source/cy/cui/uiconfig/ui.po   |8 
 source/cy/sfx2/source/dialog.po|   12 
 source/cy/sfx2/uiconfig/ui.po  |   15 
 source/cy/svtools/source/dialogs.po|8 
 source/cy/svtools/source/misc.po   |8 
 source/cy/svx/source/stbctrls.po   |   10 
 source/cy/svx/uiconfig/ui.po   |   10 
 source/da/cui/uiconfig/ui.po   |8 
 source/da/helpcontent2/source/text/scalc/01.po |   12 
 source/da/sfx2/source/dialog.po|   14 
 source/da/sfx2/uiconfig/ui.po  |   17 
 source/da/svtools/source/dialogs.po|   10 
 source/da/svtools/source/java.po   |   12 
 source/da/svtools/source/misc.po   |   10 
 source/da/svx/source/stbctrls.po   |8 
 source/da/svx/uiconfig/ui.po   |   12 
 source/de/editeng/source/items.po  |   10 
 source/de/formula/source/core/resource.po  |8 
 source/de/helpcontent2/source/auxiliary.po |6 
 source/de/helpcontent2/source/text/sbasic/shared/01.po |   10 
 source/de/helpcontent2/source/text/scalc.po|6 
 source/de/helpcontent2/source/text/scalc/00.po |6 
 source/de/helpcontent2/source/text/scalc/01.po |  100 +-
 source/de/helpcontent2/source/text/scalc/guide.po  |   34 
 source/de/helpcontent2/source/text/schart/01.po|6 
 source/de/helpcontent2/source/text/shared/00.po|   10 
 source/de/helpcontent2/source/text/shared/01.po|   12 
 source/de/helpcontent2/source/text/shared/explorer/database.po |8 
 source/de/helpcontent2/source/text/shared/guide.po |   16 
 source/de/helpcontent2/source/text/shared/optionen.po

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - debian/control loolwsd.spec.in

[Andras Timar]

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

New commits:
commit 47046bc1183f66d28336d65e12e0a8e3306705c1
Author: Andras Timar 
Date:   Fri Dec 15 14:51:48 2017 +0100

Requires: Collabora Office 5.3-35

Change-Id: I2467465803261ffbdc658e0ba855de851bcf2fc3

diff --git a/debian/control b/debian/control
index e24296f5..5078a941 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.31), 
collaboraofficebasis5.3-core (>= 5.3.10.31), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.31), 
collaboraofficebasis5.3-images (>= 5.3.10.31), collaboraofficebasis5.3-impress 
(>= 5.3.10.31), collaboraofficebasis5.3-ooofonts (>= 5.3.10.31), 
collaboraofficebasis5.3-writer (>= 5.3.10.31), collaboraoffice5.3 (>= 
5.3.10.31), collaboraoffice5.3-ure (>= 5.3.10.31), 
collaboraofficebasis5.3-en-us (>= 5.3.10.31), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.31), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.31), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.31), collaboraofficebasis5.3-draw 
(>= 5.3.10.31), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.31), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.31)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, libcap2-bin, collaboraofficebasis5.3-calc (>= 5.3.10.35), 
collaboraofficebasis5.3-core (>= 5.3.10.35), 
collaboraofficebasis5.3-graphicfilter (>= 5.3.10.35), 
collaboraofficebasis5.3-images (>= 5.3.10.35), collaboraofficebasis5.3-impress 
(>= 5.3.10.35), collaboraofficebasis5.3-ooofonts (>= 5.3.10.35), 
collaboraofficebasis5.3-writer (>= 5.3.10.35), collaboraoffice5.3 (>= 
5.3.10.35), collaboraoffice5.3-ure (>= 5.3.10.35), 
collaboraofficebasis5.3-en-us (>= 5.3.10.35), 
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.35), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.35), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.35), collaboraofficebasis5.3-draw 
(>= 5.3.10.35), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.35), 
collaboraofficebasis5.3-filter-data (>= 5.3.10.35)
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a1912a57..3dcb07f5 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -38,7 +38,7 @@ BuildRequires:  libcap-progs linux-glibc-devel 
systemd-rpm-macros
 BuildRequires:  libcap-progs
 %endif
 
-Requires:   collaboraoffice5.3 >= 5.3.10.31 collaboraoffice5.3-ure >= 
5.3.10.31 collaboraofficebasis5.3-core >= 5.3.10.31 
collaboraofficebasis5.3-writer >= 5.3.10.31 collaboraofficebasis5.3-impress >= 
5.3.10.31 collaboraofficebasis5.3-graphicfilter >= 5.3.10.31 
collaboraofficebasis5.3-en-US >= 5.3.10.31 collaboraofficebasis5.3-calc >= 
5.3.10.31 collaboraofficebasis5.3-en-US-res >= 5.3.10.31 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.31 
collaboraofficebasis5.3-ooofonts >= 5.3.10.31 collaboraofficebasis5.3-images >= 
5.3.10.31 collaboraofficebasis5.3-noto-fonts >= 5.3.10.31 
collaboraofficebasis5.3-draw >= 5.3.10.31 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.31 
collaboraofficebasis5.3-filter-data >= 5.3.10.31
+Requires:   collaboraoffice5.3 >= 5.3.10.35 collaboraoffice5.3-ure >= 
5.3.10.35 collaboraofficebasis5.3-core >= 5.3.10.35 
collaboraofficebasis5.3-writer >= 5.3.10.35 collaboraofficebasis5.3-impress >= 
5.3.10.35 collaboraofficebasis5.3-graphicfilter >= 5.3.10.35 
collaboraofficebasis5.3-en-US >= 5.3.10.35 collaboraofficebasis5.3-calc >= 
5.3.10.35 collaboraofficebasis5.3-en-US-res >= 5.3.10.35 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.35 
collaboraofficebasis5.3-ooofonts >= 5.3.10.35 collaboraofficebasis5.3-images >= 
5.3.10.35 collaboraofficebasis5.3-noto-fonts >= 5.3.10.35 
collaboraofficebasis5.3-draw >= 5.3.10.35 
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.35 
collaboraofficebasis5.3-filter-data >= 5.3.10.35
 Requires(post): coreutils grep sed
 %if 0%{?rhel} == 6
 # loolwsd dependencies
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier R]

Tag 'cp-5.3-35' created by Andras Timar  at 
2017-12-15 13:49 +

cp-5.3-53

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'cp-5.3-35' created by Andras Timar  at 
2017-12-15 13:49 +

cp-5.3-53

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

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

[Andras Timar]

Tag 'cp-5.3-35' created by Andras Timar  at 
2017-12-15 13:49 +

cp-5.3-53

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

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

[Andras Timar]

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

New commits:
commit cf54640727c9b58856e9abf15c0ac82d876262b6
Author: Andras Timar 
Date:   Fri Dec 15 14:49:24 2017 +0100

Bump version to 5.3-35

Change-Id: Iaa1d5dfa8b6a7706651775c47684b996f280b943

diff --git a/configure.ac b/configure.ac
index 30cd2b094b32..aaeeb995125e 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.3.10.34],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.35],[],[],[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: avmedia/source canvas/source connectivity/source dtrans/source embedserv/source extensions/source fpicker/source sal/osl shell/source winaccessibility/source xmlsecurit

[Stephan Bergmann]

 avmedia/source/win/winuno.cxx   |4 -
 canvas/source/directx/dx_canvas.cxx |2 
 canvas/source/directx/dx_spritecanvas.cxx   |2 
 connectivity/source/drivers/ado/ADriver.cxx |2 
 connectivity/source/drivers/ado/Aservices.cxx   |2 
 connectivity/source/inc/ado/ADriver.hxx |2 
 dtrans/source/generic/clipboardmanager.cxx  |4 -
 dtrans/source/generic/clipboardmanager.hxx  |4 -
 dtrans/source/generic/dtrans.cxx|2 
 dtrans/source/generic/generic_clipboard.cxx |4 -
 dtrans/source/generic/generic_clipboard.hxx |4 -
 dtrans/source/win32/clipb/WinClipboard.cxx  |2 
 dtrans/source/win32/clipb/wcbentry.cxx  |4 -
 dtrans/source/win32/dnd/dndentry.cxx|6 +-
 dtrans/source/win32/dtobj/DOTransferable.cxx|4 -
 dtrans/source/win32/dtobj/FmtFilter.cxx |   16 +++
 dtrans/source/win32/dtobj/FmtFilter.hxx |   16 +++
 dtrans/source/win32/dtobj/XTDataObject.cxx  |8 +--
 dtrans/source/win32/ftransl/ftransl.cxx |   14 +++---
 dtrans/source/win32/ftransl/ftranslentry.cxx|4 -
 dtrans/source/win32/misc/ImplHelper.cxx |   22 
+-
 dtrans/source/win32/misc/ImplHelper.hxx |   22 
+-
 embedserv/source/embed/register.cxx |8 +--
 extensions/source/ole/servprov.hxx  |8 +--
 extensions/source/ole/servreg.cxx   |   10 ++--
 extensions/source/update/check/onlinecheck.cxx  |2 
 extensions/source/update/check/onlinecheck.hxx  |2 
 fpicker/source/win32/filepicker/FPentry.cxx |6 +-
 fpicker/source/win32/filepicker/FilterContainer.cxx |2 
 fpicker/source/win32/filepicker/FilterContainer.hxx |2 
 fpicker/source/win32/filepicker/VistaFilePicker.cxx |2 
 fpicker/source/win32/folderpicker/FolderPicker.cxx  |2 
 sal/osl/w32/file.cxx|2 
 sal/osl/w32/file_dirvol.cxx |   14 +++---
 sal/osl/w32/module.cxx  |4 -
 sal/osl/w32/path_helper.cxx |2 
 sal/osl/w32/path_helper.hxx |2 
 sal/osl/w32/profile.cxx |4 -
 sal/osl/w32/security.cxx|4 -
 sal/osl/w32/thread.cxx  |2 
 sal/osl/w32/thread.hxx  |2 
 shell/source/backends/wininetbe/wininetbecdef.cxx   |4 -
 shell/source/win32/SysShExec.cxx|2 
 shell/source/win32/SysShentry.cxx   |4 -
 shell/source/win32/simplemail/smplmailentry.cxx |4 -
 shell/source/win32/simplemail/smplmailsuppl.cxx |2 
 winaccessibility/source/service/msaaservice_impl.cxx|4 -
 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx |4 -
 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx |4 -
 xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx  |2 
 50 files changed, 130 insertions(+), 130 deletions(-)

New commits:
commit c3250baa4a8029817f0d7fcaee8b9ffe169c6cb7
Author: Stephan Bergmann 
Date:   Fri Dec 15 10:21:55 2017 +0100

loplugin:salcall (clang-cl)

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

diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 92d7af1a0f9f..d431fbf67830 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -26,12 +26,12 @@ using namespace ::com::sun::star;
 // - factory methods -
 
 
-static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const 
uno::Reference< lang::XMultiServiceFactory >& rxFact )
+static uno::Reference< uno::XInterface > create_MediaPlayer( const 
uno::Reference< lang::XMultiServiceFactory >& rxFact )
 {
 return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( 
rxFact ) );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
avmediawin_component_getFactory( const sal_Char* pImplName, void* 
pServiceManager, void* )
+extern "C" SAL_DLLPUBLIC_EXPORT void* avmediawin_component_getFactory( const 
sal_Char* pImplName, void* pServ

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

[Marco Cecchetti]

 loleaflet/src/control/Control.ColumnHeader.js |   11 ++
 loleaflet/src/control/Control.Header.js   |   43 +-
 loleaflet/src/control/Control.RowHeader.js|   11 ++
 loleaflet/src/layer/tile/CalcTileLayer.js |   11 --
 loleaflet/src/layer/tile/TileLayer.js |1 
 5 files changed, 32 insertions(+), 45 deletions(-)

New commits:
commit c17cf464740619d9b73200137b87de3b3ce715e7
Author: Marco Cecchetti 
Date:   Wed Dec 13 23:20:30 2017 +0100

calc: use cursor position for change header highlight quickier

This patch fixes also a bug: when in edit mode the header for cell A1
are highlighted

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

diff --git a/loleaflet/src/control/Control.ColumnHeader.js 
b/loleaflet/src/control/Control.ColumnHeader.js
index 65a8da8b..73bfc308 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -184,13 +184,10 @@ L.Control.ColumnHeader = L.Control.Header.extend({
},
 
_onUpdateCurrentColumn: function (e) {
-   var x = e.min.x;
-   var w = e.getSize().x;
-   if (x !== -1) {
-   x = this._twipsToPixels(x);
-   w = this._twipsToPixels(w);
-   }
-   this.updateCurrent(this._data, x, w);
+   var x = e.curX - this._startHeaderIndex;
+   var w = this._twipsToPixels(e.width);
+   var slim = w <= 1;
+   this.updateCurrent(this._data, x, slim);
},
 
_updateColumnHeader: function () {
diff --git a/loleaflet/src/control/Control.Header.js 
b/loleaflet/src/control/Control.Header.js
index e77c7799..261b2958 100644
--- a/loleaflet/src/control/Control.Header.js
+++ b/loleaflet/src/control/Control.Header.js
@@ -213,42 +213,31 @@ L.Control.Header = L.Control.extend({
this._selection.end = itEnd;
},
 
-   updateCurrent: function (data, start, size) {
+   updateCurrent: function (data, cursorPos, slim) {
if (!data || data.isEmpty())
return;
 
-   if (start < 0) {
+   if (cursorPos < 0) {
this.unselect(data.get(this._current));
this._current = -1;
return;
}
 
-   var x0 = 0, x1 = 0;
-   var prevEntry = null;
-   var entry = data.getFirst();
-   var zeroSizeEntry = false;
-   while (entry) {
-   x0 = entry.pos - entry.size;
-   x1 = entry.pos;
-   if (x0 <= start && start < x1) {
-   // we have a slim cursor because of a zero size 
entry ?
-   zeroSizeEntry = size <= 1 && prevEntry && 
prevEntry.size === 0;
-   // when a whole row (column) is selected the 
cell cursor is moved to the first column (row)
-   // but this action should not cause to 
select/unselect anything, on the contrary we end up
-   // with all column (row) header entries 
selected but the one where the cell cursor was
-   // previously placed
-   if (this._selection.start === -1 && 
this._selection.end === -1) {
-   this.unselect(data.get(this._current));
-   // no selection when the cell cursor is 
slim
-   if (!zeroSizeEntry)
-   this.select(entry);
-   }
-   this._current = zeroSizeEntry ? -1 : 
entry.index;
-   break;
-   }
-   prevEntry = entry;
-   entry = data.getNext();
+   var prevEntry = cursorPos > 0 ? data.get(cursorPos - 1) : null;
+   var zeroSizeEntry = slim && prevEntry && prevEntry.size === 0;
+
+   var entry = data.get(cursorPos);
+   if (this._selection.start === -1 && this._selection.end === -1) 
{
+   // when a whole row (column) is selected the cell 
cursor is moved to the first column (row)
+   // but this action should not cause to select/unselect 
anything, on the contrary we end up
+   // with all column (row) header entries selected but 
the one where the cell cursor was
+   // previously placed
+   this.unselect(data.get(this._current));
+   // no selection when the cell cursor is slim
+   if (entry && !zeroSiz

Re: An error when compiling sd module

[Eike Rathke]

Hi 张文豪,

On Thursday, 2017-12-14 21:19:59 +0800, 张文豪 wrote:

> I have finished the entire build on macOS. And when I tried to compile the
> sd module with Qt Creator, error below occurred:
> 
> :15: expanded from here
> 
> #define SDUI_DLL_NAME libsduilo.dylib

Seems to be an enquoting problem of Qt Creator or the script that
generates things out of gbuild, the name should be quoted like
"libsduilo.dylib" which in gbuild is done here:

sd/Library_sd.mk:52:-DSDUI_DLL_NAME=\"$(call 
gb_Library_get_runtime_filename,$(call gb_Library__get_name,sdui))\" \

note the escaped \" quotes for literal quote characters around the
defined value.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/inc sc/source

[Markus Mohrhard]

 sc/inc/rangelst.hxx  |2 +-
 sc/source/core/tool/rangelst.cxx |   12 +++-
 sc/source/filter/excel/xecontent.cxx |2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 9e0ab4e19dc47953fe5ddff4b0af83b652d4f09b
Author: Markus Mohrhard 
Date:   Fri Dec 15 00:14:45 2017 +0100

tdf#113621: don't write whole column refs for conditional format ranges

Change-Id: I6b21345fb08cc7b7cf0cdc40532d480a8d5f72ae
Reviewed-on: https://gerrit.libreoffice.org/46493
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 2194105a38631e1c5c074634bc5b084cd2f8661f)
Reviewed-on: https://gerrit.libreoffice.org/46496
Reviewed-by: Eike Rathke 

diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 932a5ed52d6d..01e67ee49e55 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -45,7 +45,7 @@ public:
 
 voidFormat( OUString&, ScRefFlags nFlags, ScDocument* = 
nullptr,
 formula::FormulaGrammar::AddressConvention eConv = 
formula::FormulaGrammar::CONV_OOO,
-sal_Unicode cDelimiter = 0 ) const;
+sal_Unicode cDelimiter = 0, bool 
bFullAddressNotation = false ) const;
 
 voidJoin( const ScRange&, bool bIsInList = false );
 
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 8f976819bd5b..ae9ebd2b5d67 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -110,17 +110,18 @@ private:
 class FormatString
 {
 public:
-FormatString(OUString& rStr, ScRefFlags nFlags, ScDocument* pDoc, 
FormulaGrammar::AddressConvention eConv, sal_Unicode cDelim) :
+FormatString(OUString& rStr, ScRefFlags nFlags, ScDocument* pDoc, 
FormulaGrammar::AddressConvention eConv, sal_Unicode cDelim, bool 
bFullAddressNotation) :
 mrStr(rStr),
 mnFlags(nFlags),
 mpDoc(pDoc),
 meConv(eConv),
 mcDelim(cDelim),
-mbFirst(true) {}
+mbFirst(true),
+mbFullAddressNotation(bFullAddressNotation) {}
 
 void operator() (const ScRange* p)
 {
-OUString aStr(p->Format(mnFlags, mpDoc, meConv));
+OUString aStr(p->Format(mnFlags, mpDoc, meConv, 
mbFullAddressNotation));
 if (mbFirst)
 mbFirst = false;
 else
@@ -134,6 +135,7 @@ private:
 FormulaGrammar::AddressConvention meConv;
 sal_Unicode mcDelim;
 bool mbFirst;
+bool mbFullAddressNotation;
 };
 
 }
@@ -186,14 +188,14 @@ ScRefFlags ScRangeList::Parse( const OUString& rStr, 
const ScDocument* pDoc,
 
 void ScRangeList::Format( OUString& rStr, ScRefFlags nFlags, ScDocument* pDoc,
   formula::FormulaGrammar::AddressConvention eConv,
-  sal_Unicode cDelimiter ) const
+  sal_Unicode cDelimiter, bool bFullAddressNotation ) 
const
 {
 
 if (!cDelimiter)
 cDelimiter = ScCompiler::GetNativeSymbolChar(ocSep);
 
 OUString aStr;
-FormatString func(aStr, nFlags, pDoc, eConv, cDelimiter);
+FormatString func(aStr, nFlags, pDoc, eConv, cDelimiter, 
bFullAddressNotation);
 for_each(maRanges.begin(), maRanges.end(), func);
 rStr = aStr;
 }
diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 3164164c2cef..d8584e908bd1 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1269,7 +1269,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, 
const ScConditionalFormat
 else if(pFormatEntry->GetType() == condformat::DATE)
 maCFList.AppendNewRecord( new XclExpDateFormat( GetRoot(), 
static_cast(*pFormatEntry), ++rIndex ) );
 }
-aScRanges.Format( msSeqRef, ScRefFlags::VALID, nullptr, 
formula::FormulaGrammar::CONV_XL_OOX, ' ' );
+aScRanges.Format( msSeqRef, ScRefFlags::VALID, nullptr, 
formula::FormulaGrammar::CONV_XL_OOX, ' ', true );
 
 if(!aExtEntries.empty() && xExtLst.get())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 loleaflet/src/layer/tile/GridLayer.js |   16 ++--
 loleaflet/src/layer/tile/TileLayer.js |   11 ++-
 2 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit d3fe7a2eb9093bd2cf80184a06ef3cd4f206d9fe
Author: Marco Cecchetti 
Date:   Wed Dec 13 18:09:36 2017 +0100

calc: do not scroll to cell cursor when position is not changed

Old behaviour: when a cell cursor message is handled the document is
always scrolled in order to make the cell cursor visible.

New behaviour: as the old one except when the position of the cell
cursor is unchanged: in that case no scroll occurs.

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

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 421ad445..2cfd27cb 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -649,6 +649,13 @@ L.TileLayer = L.GridLayer.extend({
if (!this._prevCellCursor) {
this._prevCellCursor = L.LatLngBounds.createDefault();
}
+   if (!this._cellCursorXY) {
+   this._cellCursorXY = new L.Point(-1, -1);
+   }
+   if (!this._prevCellCursorXY) {
+   this._prevCellCursorXY = new L.Point(-1, -1);
+   }
+
if (textMsg.match('EMPTY')) {
this._cellCursorTwips = new L.Bounds(new L.Point(0, 0), 
new L.Point(0, 0));
this._cellCursor = L.LatLngBounds.createDefault();
@@ -662,6 +669,7 @@ L.TileLayer = L.GridLayer.extend({
this._cellCursor = new L.LatLngBounds(

this._twipsToLatLng(topLeftTwips, this._map.getZoom()),

this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
+   this._cellCursorXY = new L.Point(parseInt(strTwips[4]), 
parseInt(strTwips[5]));
}
 
var horizontalDirection = 0;
@@ -1671,7 +1679,7 @@ L.TileLayer = L.GridLayer.extend({
_onUpdateCellCursor: function (horizontalDirection, verticalDirection, 
onPgUpDn) {
if (this._cellCursor && 
!this._isEmptyRectangle(this._cellCursor)) {
var mapBounds = this._map.getBounds();
-   if (!mapBounds.contains(this._cellCursor)) {
+   if (!mapBounds.contains(this._cellCursor) && 
!this._cellCursorXY.equals(this._prevCellCursorXY)) {
var scrollX = 0, scrollY = 0;
if (onPgUpDn) {
var mapHalfHeight = 
(mapBounds.getNorth() - mapBounds.getSouth()) / 2;
@@ -1709,6 +1717,7 @@ L.TileLayer = L.GridLayer.extend({
center.y = Math.round(center.y < 0 ? 0 
: center.y);
this._map.fire('scrollto', {x: 
center.x, y: center.y});
}
+   this._prevCellCursorXY = this._cellCursorXY;
}
 
if (onPgUpDn) {
commit 8eff413c7ed953deb1206cbb415d56db6081a493
Author: Marco Cecchetti 
Date:   Mon Dec 11 11:35:49 2017 +0100

missing to update a tile content

When a tile has been invalidated, and the new tile content has not yet
been fetched and in the between a `canceltiles` message occurs, the
new tile content will never be fetched;
example: a tile is invalidated but a sudden scroll to the cell cursor
position causes to move the tile out of the visible area before the
new content is fetched, so when the tile is back inside the visible
area its content would be the old invalidated one;

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

diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 407f6612..d080cdfe 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -544,7 +544,13 @@ L.GridLayer = L.Layer.extend({
// so we're able to cancel the previous 
requests that are being processed
this._map._socket.sendMessage('canceltiles');
for (key in this._tiles) {
-   if (!this._tiles[key].loaded) {
+   // When _invalidCount > 0 the tile has 
been invalidated, however the new tile content
+   // has not yet been fetched and because 
of `canceltiles` message it will neve

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

[heiko tietze]

 cui/uiconfig/ui/optgeneralpage.ui |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 65ee299a0c0e9044d809e58c3c5e75d05ad76f0e
Author: heiko tietze 
Date:   Fri Dec 15 13:24:57 2017 +0100

tdf#114484 - Make internal file and print dialogs obsolete

Checkbox hidden in options dialog

Change-Id: I918b328dec1a4fbb4ebbcc538ffa902160ee0b9b
Reviewed-on: https://gerrit.libreoffice.org/46546
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 986edb599dfd..b0d0484f91c8 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -57,7 +57,6 @@
 
 
   
-True
 False
 0
 none
___
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.3' - sc/source

[Marco Cecchetti]

 sc/source/ui/docshell/dbdocfun.cxx |   16 ++
 sc/source/ui/docshell/olinefun.cxx |   40 ++---
 sc/source/ui/inc/dbfunc.hxx|2 -
 sc/source/ui/inc/tabview.hxx   |9 +++-
 sc/source/ui/inc/tabvwsh.hxx   |8 ---
 sc/source/ui/undo/undoblk2.cxx |4 ---
 sc/source/ui/undo/undodat.cxx  |   13 +---
 sc/source/ui/view/dbfunc.cxx   |2 -
 sc/source/ui/view/dbfunc3.cxx  |   13 
 sc/source/ui/view/gridwin.cxx  |3 ++
 sc/source/ui/view/tabview4.cxx |5 +++-
 sc/source/ui/view/tabvwshc.cxx |   25 +++
 sc/source/ui/view/viewfunc.cxx |4 ---
 13 files changed, 83 insertions(+), 61 deletions(-)

New commits:
commit 7c99515b6247ca1bfc2d4d25192cde9b46670b62
Author: Marco Cecchetti 
Date:   Fri Dec 15 11:43:55 2017 +0100

lok: sc: header, cursor and selection overlays issues wrt autofilter

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

diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index f33efe8cf789..4cbbd06b2050 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -614,6 +614,12 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& 
rQueryParam,
 ScDocShellModificator aModificator( rDocShell );
 
 ScDocument& rDoc = rDocShell.GetDocument();
+
+if (ScTabViewShell::isAnyEditViewInRange(/*bColumns*/ false, 
rQueryParam.nRow1, rQueryParam.nRow2))
+{
+return false;
+}
+
 if (bRecord && !rDoc.IsUndoEnabled())
 bRecord = false;
 ScDBData* pDBData = rDoc.GetDBAtArea( nTab, rQueryParam.nCol1, 
rQueryParam.nRow1,
@@ -924,6 +930,16 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& 
rQueryParam,
 pOld, bDoSize, pAdvSource ) );
 }
 
+ScTabViewShell* pViewSh = rDocShell.GetBestViewShell();
+if ( pViewSh )
+{
+// could there be horizontal autofilter ?
+// maybe it would be better to set bColumns to !rQueryParam.bByRow ?
+// anyway at the beginning the value of bByRow is 'false'
+// then after the first sort action it becomes 'true'
+pViewSh->OnLOKShowHideColRow(/*bColumns*/ false, rQueryParam.nRow1 - 
1);
+}
+
 if (bCopy)
 {
 SCCOL nEndX = aLocalParam.nCol2;
diff --git a/sc/source/ui/docshell/olinefun.cxx 
b/sc/source/ui/docshell/olinefun.cxx
index 2e07e6d2d2c0..22dec17cae06 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -78,32 +78,6 @@ static void lcl_PaintWidthHeight( ScDocShell& rDocShell, 
SCTAB nTab,
 rDocShell.PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts 
);
 }
 
-static bool lcl_IsAnyViewEditingInEntryRange(bool bColumns, SCCOLROW nStart, 
SCCOLROW nEnd)
-{
-if (comphelper::LibreOfficeKit::isActive())
-{
-SfxViewShell* pViewShell = SfxViewShell::GetFirst();
-while (pViewShell)
-{
-ScTabViewShell* pTabViewShell = 
dynamic_cast(pViewShell);
-if (pTabViewShell)
-{
-ScInputHandler* pInputHandler = 
pTabViewShell->GetInputHandler();
-if (pInputHandler && pInputHandler->GetActiveView())
-{
-const ScViewData& rViewData = pTabViewShell->GetViewData();
-SCCOLROW nPos = bColumns ? rViewData.GetCurX() : 
rViewData.GetCurY();
-if (nStart <= nPos && nPos <= nEnd)
-return true;
-}
-}
-pViewShell = SfxViewShell::GetNext(*pViewShell);
-}
-}
-return false;
-}
-
-
 void ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool 
bRecord, bool bApi )
 {
 SCCOL nStartCol = rRange.aStart.Col();
@@ -396,7 +370,7 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool 
bColumns, sal_uInt16 nLevel
 sal_uInt16 nThisLevel = aIter.LastLevel();
 bool bShow = (nThisLevel < nLevel);
 
-if (!bShow && lcl_IsAnyViewEditingInEntryRange(bColumns, nThisStart, 
nThisEnd))
+if (!bShow && ScTabViewShell::isAnyEditViewInRange(bColumns, 
nThisStart, nThisEnd))
 continue;
 
 if (bShow)  // enable
@@ -446,7 +420,7 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool 
bColumns, sal_uInt16 nLevel
 
 ScTabViewShell* pViewSh = rDocShell.GetBestViewShell();
 if ( pViewSh )
-pViewSh->OnLOKShowHideOutline(bColumns, nStart - 1);
+pViewSh->OnLOKShowHideColRow(bColumns, nStart - 1);
 
 if (bPaint)
 lcl_PaintWidthHeight( rDocShell, nTab, bColumns, nStart, nEnd );
@@ -557,8 +531,8 @@ bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& 
rRange, bool bRecord )

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

[Marco Cecchetti]

 sc/source/ui/docshell/olinefun.cxx |  111 -
 1 file changed, 84 insertions(+), 27 deletions(-)

New commits:
commit 1d7fc3d615f611c1a3729c92dbef363a1357f0cd
Author: Marco Cecchetti 
Date:   Wed Dec 13 18:19:16 2017 +0100

lok: sc: handling conflicts btw group collapsing and cell editing

Now when a cell is edited, a group including the cell in its range
can't be collapsed.

When whole levels are collapsed all together any group entry including
an edited cell is skipped from collapsing.

Undo/redo of collapsing/expanding has been (temporarily) disabled in
the LOK case, since it could mess things up when a cell is edited and
a group is collapsed because of an undo/redo.

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

diff --git a/sc/source/ui/docshell/olinefun.cxx 
b/sc/source/ui/docshell/olinefun.cxx
index c2e56231cc74..2e07e6d2d2c0 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -28,6 +28,7 @@
 #include "sc.hrc"
 
 #include 
+#include 
 #include 
 #include 
 
@@ -77,6 +78,32 @@ static void lcl_PaintWidthHeight( ScDocShell& rDocShell, 
SCTAB nTab,
 rDocShell.PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts 
);
 }
 
+static bool lcl_IsAnyViewEditingInEntryRange(bool bColumns, SCCOLROW nStart, 
SCCOLROW nEnd)
+{
+if (comphelper::LibreOfficeKit::isActive())
+{
+SfxViewShell* pViewShell = SfxViewShell::GetFirst();
+while (pViewShell)
+{
+ScTabViewShell* pTabViewShell = 
dynamic_cast(pViewShell);
+if (pTabViewShell)
+{
+ScInputHandler* pInputHandler = 
pTabViewShell->GetInputHandler();
+if (pInputHandler && pInputHandler->GetActiveView())
+{
+const ScViewData& rViewData = pTabViewShell->GetViewData();
+SCCOLROW nPos = bColumns ? rViewData.GetCurX() : 
rViewData.GetCurY();
+if (nStart <= nPos && nPos <= nEnd)
+return true;
+}
+}
+pViewShell = SfxViewShell::GetNext(*pViewShell);
+}
+}
+return false;
+}
+
+
 void ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool 
bRecord, bool bApi )
 {
 SCCOL nStartCol = rRange.aStart.Col();
@@ -333,7 +360,9 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool 
bColumns, sal_uInt16 nLevel
 SCCOLROW nStart, nEnd;
 rArray.GetRange( nStart, nEnd );
 
-if ( bRecord )
+// TODO undo can mess things up when another view is editing a cell in the 
range of group entry
+// this is a temporarily workaround
+if (!comphelper::LibreOfficeKit::isActive() && bRecord )
 {
 ScOutlineTable* pUndoTab = new ScOutlineTable( *pTable );
 ScDocument* pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
@@ -361,9 +390,16 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool 
bColumns, sal_uInt16 nLevel
 ScOutlineEntry* pEntry;
 while ((pEntry=aIter.GetNext()) != nullptr)
 {
+SCCOLROW nThisStart = pEntry->GetStart();
+SCCOLROW nThisEnd   = pEntry->GetEnd();
+
 sal_uInt16 nThisLevel = aIter.LastLevel();
 bool bShow = (nThisLevel < nLevel);
-if (bShow)  // einblenden
+
+if (!bShow && lcl_IsAnyViewEditingInEntryRange(bColumns, nThisStart, 
nThisEnd))
+continue;
+
+if (bShow)  // enable
 {
 pEntry->SetHidden( false );
 pEntry->SetVisible( true );
@@ -375,12 +411,20 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool 
bColumns, sal_uInt16 nLevel
 }
 else// verdeckt
 {
-pEntry->SetVisible( false );
+if (comphelper::LibreOfficeKit::isActive() && nThisLevel > 0)
+{
+pEntry->SetHidden( true );
+const ScOutlineEntry* pParentEntry = 
rArray.GetEntryByPos(nThisLevel - 1, nThisStart);
+if (pParentEntry && pParentEntry->IsHidden())
+pEntry->SetVisible( false );
+}
+else
+{
+pEntry->SetVisible( false );
+}
 }
 
-SCCOLROW nThisStart = pEntry->GetStart();
-SCCOLROW nThisEnd   = pEntry->GetEnd();
-for (SCCOLROW i=nThisStart; i<=nThisEnd; i++)
+   for (SCCOLROW i=nThisStart; i<=nThisEnd; i++)
 {
 if ( bColumns )
 rDoc.ShowCol( static_cast(i), nTab, bShow );
@@ -400,16 +444,16 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool 
bColumns, sal_uInt16 nLevel
 rDoc.SetDrawPageSize(nTab);
 rDoc.UpdatePageBreaks( nTab );
 
+ScT

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

[Marco Cecchetti]

 sc/source/ui/view/gridwin.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 5651eb34534db14851d4107435ca75e8f414124a
Author: Marco Cecchetti 
Date:   Wed Dec 13 18:02:01 2017 +0100

lok: sc: append the col, row position to the cell cursor message

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

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9cd3f117118e..d0710fd96777 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5761,11 +5761,14 @@ OString ScGridWindow::getCellCursor(const Fraction& 
rZoomX, const Fraction& rZoo
 if (nSizeYPix == 0)
 nSizeYPix = 1;
 
+long nPosXTw = rtl::math::round(aScrPos.getX() / fPPTX);
+long nPosYTw = rtl::math::round(aScrPos.getY() / fPPTY);
 long nSizeXTw = rtl::math::round(nSizeXPix / fPPTX);
 long nSizeYTw = rtl::math::round(nSizeYPix / fPPTY);
 
-Rectangle aRect(Point(rtl::math::round(aScrPos.getX() / fPPTX), 
rtl::math::round(aScrPos.getY() / fPPTY)),
-Size(nSizeXTw, nSizeYTw));
+std::stringstream ss;
+ss << nPosXTw << ", " << nPosYTw << ", " << nSizeXTw << ", " << nSizeYTw 
<< ", "
+   << nX << ", " << nY;
 
 pViewData->SetZoom(defaultZoomX, defaultZoomY, true);
 
@@ -5776,7 +5779,7 @@ OString ScGridWindow::getCellCursor(const Fraction& 
rZoomX, const Fraction& rZoo
 pViewData->GetLOKHeightHelper().insert(nY - 1, aScrPos.getY());
 pViewData->SetLOKOldCurY(nY);
 
-return aRect.toString();
+return ss.str().c_str();
 }
 
 void ScGridWindow::updateLibreOfficeKitCellCursor(SfxViewShell* pOtherShell) 
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Juergen Funk Mailinglist]

Hi Mike

>1. Creating a redirect at TDF side imposes additional load to our server 
>infrastructure; 
>2. Users will depend on reliability of TDF servers wrt this (in terms of their 
>state, correctness of the link, and also possible man-in-the-middle problems 
>with modified links pointing to malware) - note that LO downloads themselves 
>are served from multiple mirrors, but this kind of redirection can't work 
>using mirrors

I have mean directly from Microsoft not from TDF. 

>3. Users would need internet connection at time of setup (which might not be 
>there: many download the installer, to bring it somewhere where there's no 
>Internet connection

I think that is not a big problem, the most have an Internet connection (and 
many App can't install without connection), but when not the installer gives a 
hint (only when needed), and the user should install the redist.

But any way, this is only a  suggestion, and has also weakness  (e. g. MS 
changes the link), the other case we have always up to date the vc_redist.exe.

Best 
Juergen

 

-Ursprüngliche Nachricht-
Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag 
von Mike Kaganski
Gesendet: Freitag, 15. Dezember 2017 10:07
An: Juergen Funk Mailinglist ; 
libreoffice@lists.freedesktop.org
Betreff: Re: AW: tdf#108580: integrate vc_redist.exe into Windows installer

Hi Juergen,

thanks for feedback!

On 12/14/2017 11:04 AM, Juergen Funk Mailinglist wrote:
> this is a good idea, but I think the better way is, when the system need the 
> vc_redist then we "download" the new  vc_redist.exe from MS and starting.
> This has 2 advantage
>   - the LO msi would not be bigger
>   - we install always the up to date redist-dll's

Well, the main problem here is that there's no "latest vc_redist.exe" 
static link on MS site. So, this approach is simply impossible without us 
creating a redirect on our side. And this would create additional
problems:

1. Creating a redirect at TDF side imposes additional load to our server 
infrastructure; 2. Users will depend on reliability of TDF servers wrt this (in 
terms of their state, correctness of the link, and also possible 
man-in-the-middle problems with modified links pointing to malware) - note that 
LO downloads themselves are served from multiple mirrors, but this kind of 
redirection can't work using mirrors; 3. Users would need internet connection 
at time of setup (which might not be there: many download the installer, to 
bring it somewhere where there's no Internet connection).

So this is just not an option - at least, this is much worse than suggestion to 
simply telling people to manually download and install the redistributable 
themselves, put on the download page.

> In the current way it is possible you install older one of the dll's, and 
> after the LO installation it pop up the Windows-Update, that I think is a 
> little bit strange.

No; this is absolutely normal - most softwares out there behave this way, so 
not different from usual. Of course, *if* your suggestion was possible to be 
implemented in a reasonable way, it would be best - but the downsides outweigh 
the benefit.

--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/build loleaflet/dist loleaflet/Makefile.am loleaflet/src

[Pranav Kant]

 loleaflet/Makefile.am |1 
 loleaflet/build/deps.js   |7 
 loleaflet/dist/toolbar/toolbar.js |7 
 loleaflet/src/control/Control.CharacterMap.js |  535 --
 loleaflet/src/control/Control.Menubar.js  |   10 
 5 files changed, 4 insertions(+), 556 deletions(-)

New commits:
commit 30bae27622d3b6a2aa7af2e13f5da50a89f9e91e
Author: Pranav Kant 
Date:   Thu Dec 14 21:03:03 2017 +0530

lokdialog: Kill JS special character dialog; use the tunneled one

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

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 8171f00b..75c7243f 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -55,7 +55,6 @@ pot:
src/admin/AdminSocketHistory.js \
src/admin/AdminSocketSettings.js \
src/admin/Util.js \
-   src/control/Control.CharacterMap.js \
src/control/Control.ColumnHeader.js \
src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index a3009c56..9fd024f9 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -306,13 +306,6 @@ var deps = {
desc: 'Document Repair'
},
 
-   ControlCharacterMap: {
-   src: ['control/Control.js',
- 'control/Control.CharacterMap.js'],
-   heading: 'Controls',
-   desc: 'Character Map'
-   },
-
ControlContextmenu: {
src: ['control/Control.js',
  'control/Control.ContextMenu.js'],
diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 6c4f739b..136e7655 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -340,11 +340,6 @@ function onClick(id, item, subItem) {
w2ui['toolbar-up-more'].render();
resizeToolbar();
}
-   else if (id === 'specialcharacter') {
-   var fontList = $('.fonts-select option');
-   var selectedIndex = $('.fonts-select').prop('selectedIndex');
-   map._docLayer._onSpecialChar(fontList, selectedIndex);
-   }
 }
 
 function insertTable() {
@@ -501,7 +496,7 @@ $(function () {
{type: 'button',  id: 'inserttable',  img: 
'inserttable', hint: _('Insert table')},
{type: 'button',  id: 'insertannotation', img: 
'annotation', hint: _UNO('.uno:InsertAnnotation', '', true)},
{type: 'button',  id: 'insertgraphic',  img: 
'insertgraphic', hint: _UNO('.uno:InsertGraphic', '', true)},
-   {type: 'button',  id: 'specialcharacter', img: 
'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true)},
+   {type: 'button',  id: 'specialcharacter', img: 
'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true), uno: 
'.uno:InsertSymbol'},
{type: 'html', id: 'right'},
{type: 'button',  id: 'more', img: 'more', hint: 
_('More')},
{type: 'html', id: 'rightmenupadding'}
diff --git a/loleaflet/src/control/Control.CharacterMap.js 
b/loleaflet/src/control/Control.CharacterMap.js
deleted file mode 100644
index 8d7fe6a4..
--- a/loleaflet/src/control/Control.CharacterMap.js
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * L.Control.CharacterMap.
- */
-
-L.Control.CharacterMap = L.Control.extend({
-   options: {
-   position: 'topright'
-   },
-
-   unicodeBlocks : [
-   { name: _('None'),  start: 
0x, end: 0x }, /*UBLOCK_NO_BLOCK=0*/
-   { name: _('Basic Latin'),   start: 
0x0021, end: 0x007F }, /*UBLOCK_BASIC_LATIN=1*/
-   { name: _('Latin-1'),   start: 
0x0080, end: 0x00FF }, /*UBLOCK_LATIN_1_SUPPLEMENT=2*/
-   { name: _('Latin Extended-A'),  start: 
0x0100, end: 0x017F }, /*UBLOCK_LATIN_EXTENDED_A=3*/
-   { name: _('Latin Extended-B'),  start: 
0x0180, end: 0x024F }, /*UBLOCK_LATIN_EXTENDED_B=4*/
-   { name: _('IPA Extensions'),start: 
0x0250, end: 0x02AF }, /*UBLOCK_IPA_EXTENSIONS=5*/
-   { name: _('Spacing Modifier Letters'),  start: 
0x02B0, end: 0x02FF }, /*UBLOCK_SPACING_MODIFIER_LETTERS=6*/
-   { name: _('Combining Diacritical Marks'),   start: 
0x0300, end: 0x036F }, /*UBLOCK_COMBINING_DIACRITICAL_MARKS=7*/
-   { name: _('Basic Greek'),   start: 
0x0370, end: 0x03FF }, /*UBLO

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - kit/Kit.cpp

[Jan Holesovsky]

 kit/Kit.cpp |   42 +++---
 1 file changed, 15 insertions(+), 27 deletions(-)

New commits:
commit 78272b926468ce0c1c660bf6a132aef5518bc4ed
Author: Jan Holesovsky 
Date:   Fri Dec 15 11:51:46 2017 +0100

Avoid an unnecessary buffer in the watermark code.

Change-Id: I29b162fd9d8f43d0a2cb75853f0a3c0dc8ee92df
Reviewed-on: https://gerrit.libreoffice.org/46527
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
(cherry picked from commit 784e7a16453b7d7f4d86c79a4a8f470cc863dc7a)
Reviewed-on: https://gerrit.libreoffice.org/46548

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 38b9..35dc47bb 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -471,7 +471,7 @@ public:
 }
 
 private:
-/// Alpha blend 'pixel_count' pixels from 'from' over the 'to'.
+/// Alpha blend pixels from 'from' over the 'to'.
 void alphaBlend(const unsigned char* from, int from_width, int 
from_height, int from_offset_x, int from_offset_y,
 unsigned char* to, int to_width, int to_height)
 {
@@ -502,6 +502,7 @@ private:
 }
 }
 
+/// Create bitmap that we later use as the watermark for every tile.
 const unsigned char* getPixmap(int width, int height)
 {
 if (_pixmap && width == _width && height == _height)
@@ -531,38 +532,24 @@ private:
 }
 
 const unsigned int pixel_count = width * height * 4;
-
-// Create the blurred background; first a white text
 _pixmap = static_cast(malloc(pixel_count));
-unsigned char* from = text;
-unsigned char* to = _pixmap;
-for (; to < _pixmap + pixel_count; from += 4, to += 4)
-{
-// Pre-multiplied alpha!
-const double alpha = from[3] / 255.0;
-to[0] = 0xff * alpha;
-to[1] = 0xff * alpha;
-to[2] = 0xff * alpha;
-to[3] = from[3];
-}
 
-// Use box blur, which is fast, though crude.
-unsigned char* buffer = static_cast(malloc(pixel_count));
-memcpy(buffer, _pixmap, pixel_count);
-
-// Repeat an even number of times to smooth out.
+// Create the white blurred background
+// Use box blur, it's enough for our purposes
 const int r = 2;
 const double weight = (r+1) * (r+1);
-for (int y = r; y < height - r; ++y)
+for (int y = 0; y < height; ++y)
 {
-for (int x = r; x < width - r; ++x)
+for (int x = 0; x < width; ++x)
 {
 double t = 0;
-for (int ky = y - r; ky <= y + r; ++ky)
+for (int ky = std::max(y - r, 0); ky <= std::min(y + r, height 
- 1); ++ky)
 {
-for (int kx = x - r; kx <= x + r; ++kx)
+for (int kx = std::max(x - r, 0); kx <= std::min(x + r, 
width - 1); ++kx)
 {
-t += buffer[4 * (ky * width + kx) + 3];
+// Pre-multiplied alpha; the text is black, so all the
+// information is only in the alpha channel
+t += text[4 * (ky * width + kx) + 3];
 }
 }
 
@@ -570,19 +557,20 @@ private:
 double avg = t / weight;
 if (avg > 255.0)
 avg = 255.0;
+
+// Pre-multiplied alpha, but use white for the resulting color
 const double alpha = avg / 255.0;
 _pixmap[4 * (y * width + x) + 0] = 0xff * alpha;
 _pixmap[4 * (y * width + x) + 1] = 0xff * alpha;
 _pixmap[4 * (y * width + x) + 2] = 0xff * alpha;
-_pixmap[4 * (y * width + x) + 3] = static_cast(avg < 255.0 ? avg : 255);
+_pixmap[4 * (y * width + x) + 3] = avg;
 }
 }
 
-// Now copy text over the blur
+// Now copy the (black) text over the (white) blur
 alphaBlend(text, _width, _height, 0, 0, _pixmap, _width, _height);
 
 // No longer needed.
-std::free(buffer);
 std::free(text);
 
 // Make the resulting pixmap semi-transparent
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 sc/inc/strings.hrc |1 +
 sc/source/ui/view/gridwin.cxx  |3 +++
 vcl/source/window/floatwin.cxx |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit a895f6356159f4267c0ac24781814ae0cbcba0b9
Author: Pranav Kant 
Date:   Fri Dec 15 17:58:45 2017 +0530

lokdialog: Give non-programmatic name to autofilter

Change-Id: I8670a5aaa1703677cab173b2341c6e70e689f61a
(cherry-picked from 04abf03ecb18ccf1f805faa763d6f29013efc6bb)

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 27d534532c5c..5491a39eedbf 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -164,6 +164,7 @@
 #define SCSTR_QHLP_SCEN_LISTBOX 
NC_("SCSTR_QHLP_SCEN_LISTBOX", "Scenario Name")
 #define SCSTR_QHLP_SCEN_COMMENT 
NC_("SCSTR_QHLP_SCEN_COMMENT", "Comment")
 
+#define STR_MENU_AUTOFILTER NC_("STR_MENU_AUTOFILTER", 
"AutoFilter")
 #define STR_MENU_SORT_ASC   NC_("STR_MENU_SORT_ASC", 
"Sort Ascending")
 #define STR_MENU_SORT_DESC  NC_("STR_MENU_SORT_DESC", 
"Sort Descending")
 #define STR_MENU_SORT_CUSTOM
NC_("STR_MENU_SORT_CUSTOM", "Custom Sort")
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index df026bf60549..a1416600d9d2 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -628,7 +628,10 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 mpAutoFilterPopup.disposeAndClear();
 mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
 if (comphelper::LibreOfficeKit::isActive())
+{
 mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
+mpAutoFilterPopup->SetText(ScResId(STR_MENU_AUTOFILTER));
+}
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
 mpAutoFilterPopup->setPopupEndAction(
 new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab)));
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 63ae2172fc60..6377c6c6f853 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -624,6 +624,8 @@ void FloatingWindow::StateChanged( StateChangedType nType )
 }
 aItems.emplace_back("size", GetSizePixel().toString());
 aItems.emplace_back("position", mpImplData->maPos.toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", 
aItems);
 }
 else if (!IsVisible() && nType == StateChangedType::Visible)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - 2 commits - kit/Kit.cpp loleaflet/src loleaflet/unocommands.js

[Jan Holesovsky]

 kit/Kit.cpp  |   42 +--
 loleaflet/src/control/Control.ContextMenu.js |2 -
 loleaflet/src/control/Control.Menubar.js |6 +++
 loleaflet/unocommands.js |4 ++
 4 files changed, 25 insertions(+), 29 deletions(-)

New commits:
commit 784e7a16453b7d7f4d86c79a4a8f470cc863dc7a
Author: Jan Holesovsky 
Date:   Fri Dec 15 11:51:46 2017 +0100

Avoid an unnecessary buffer in the watermark code.

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

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 5cb82801..193b8ccb 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -525,7 +525,7 @@ public:
 }
 
 private:
-/// Alpha blend 'pixel_count' pixels from 'from' over the 'to'.
+/// Alpha blend pixels from 'from' over the 'to'.
 void alphaBlend(const unsigned char* from, int from_width, int 
from_height, int from_offset_x, int from_offset_y,
 unsigned char* to, int to_width, int to_height)
 {
@@ -556,6 +556,7 @@ private:
 }
 }
 
+/// Create bitmap that we later use as the watermark for every tile.
 const unsigned char* getPixmap(int width, int height)
 {
 if (_pixmap && width == _width && height == _height)
@@ -585,38 +586,24 @@ private:
 }
 
 const unsigned int pixel_count = width * height * 4;
-
-// Create the blurred background; first a white text
 _pixmap = static_cast(malloc(pixel_count));
-unsigned char* from = text;
-unsigned char* to = _pixmap;
-for (; to < _pixmap + pixel_count; from += 4, to += 4)
-{
-// Pre-multiplied alpha!
-const double alpha = from[3] / 255.0;
-to[0] = 0xff * alpha;
-to[1] = 0xff * alpha;
-to[2] = 0xff * alpha;
-to[3] = from[3];
-}
 
-// Use box blur, which is fast, though crude.
-unsigned char* buffer = static_cast(malloc(pixel_count));
-memcpy(buffer, _pixmap, pixel_count);
-
-// Repeat an even number of times to smooth out.
+// Create the white blurred background
+// Use box blur, it's enough for our purposes
 const int r = 2;
 const double weight = (r+1) * (r+1);
-for (int y = r; y < height - r; ++y)
+for (int y = 0; y < height; ++y)
 {
-for (int x = r; x < width - r; ++x)
+for (int x = 0; x < width; ++x)
 {
 double t = 0;
-for (int ky = y - r; ky <= y + r; ++ky)
+for (int ky = std::max(y - r, 0); ky <= std::min(y + r, height 
- 1); ++ky)
 {
-for (int kx = x - r; kx <= x + r; ++kx)
+for (int kx = std::max(x - r, 0); kx <= std::min(x + r, 
width - 1); ++kx)
 {
-t += buffer[4 * (ky * width + kx) + 3];
+// Pre-multiplied alpha; the text is black, so all the
+// information is only in the alpha channel
+t += text[4 * (ky * width + kx) + 3];
 }
 }
 
@@ -624,19 +611,20 @@ private:
 double avg = t / weight;
 if (avg > 255.0)
 avg = 255.0;
+
+// Pre-multiplied alpha, but use white for the resulting color
 const double alpha = avg / 255.0;
 _pixmap[4 * (y * width + x) + 0] = 0xff * alpha;
 _pixmap[4 * (y * width + x) + 1] = 0xff * alpha;
 _pixmap[4 * (y * width + x) + 2] = 0xff * alpha;
-_pixmap[4 * (y * width + x) + 3] = static_cast(avg < 255.0 ? avg : 255);
+_pixmap[4 * (y * width + x) + 3] = avg;
 }
 }
 
-// Now copy text over the blur
+// Now copy the (black) text over the (white) blur
 alphaBlend(text, _width, _height, 0, 0, _pixmap, _width, _height);
 
 // No longer needed.
-std::free(buffer);
 std::free(text);
 
 // Make the resulting pixmap semi-transparent
commit ff0c7fb6445003c562179ca5b13f207ad21e68e5
Author: Pranav Kant 
Date:   Thu Dec 14 20:48:03 2017 +0530

lokdialog: Dialogs related to object and shapes in presentation

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

diff --git a/loleaflet/src/control/Control.ContextMenu.js 
b/loleaflet/src/control/Control.ContextMenu.js
index e9006719..f49e924e 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -39,7 +39,7 @@ L.Control.ContextMenu = L.Control.extend({
 
spreadsheet: ['MergeCells', 'SplitCell'

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8par.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41f4fee00f1cddbf93f7d0ff732b1b41f8d13955
Author: Caolán McNamara 
Date:   Fri Dec 15 09:12:30 2017 +

ofz#4647 Integer-overflow

Change-Id: Ic5593df7ad39e591ce15895205a02f2007da4147
Reviewed-on: https://gerrit.libreoffice.org/46503
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index db82bf84f21c..c50dd00bc18b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4114,7 +4114,7 @@ bool SwWW8ImplReader::ReadText(WW8_CP nStartCp, WW8_CP 
nTextLen, ManTypes nType)
 if (bStartLine || m_bWasTabRowEnd)
 {
 // Call all 64 CRs; not for Header and the like
-if ((nCrCount++ & 0x40) == 0 && nType == MAN_MAINTEXT)
+if ((nCrCount++ & 0x40) == 0 && nType == MAN_MAINTEXT && l <= 
nTextLen)
 {
 if (nTextLen < WW8_CP_MAX/100)
 m_nProgress = (sal_uInt16)(l * 100 / nTextLen);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - kit/Kit.cpp

[Ashod Nakashian]

 kit/Kit.cpp |  143 +++-
 1 file changed, 104 insertions(+), 39 deletions(-)

New commits:
commit e0a0fe823d23efd457ef92ffd167c3c74c803a7b
Author: Ashod Nakashian 
Date:   Sun Dec 10 21:54:07 2017 -0500

wsd: improve watermark visibility on dark and grey backgrounds

The watermark text is now rendered on a blurred version
of itself, using inverted colors. This makes it
look sharp on light backgrounds, but inverted in
a blurry haze when on dark backgrounds, thereby
being readable on top of any background.

Change-Id: Ia6daf987674c484980f1fdec4f74e579ed87c213
Reviewed-on: https://gerrit.libreoffice.org/46491
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
Reviewed-on: https://gerrit.libreoffice.org/46526
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 5c6eb920..5cb82801 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -489,7 +489,6 @@ public:
 , _font("Liberation Sans")
 , _width(0)
 , _height(0)
-, _color{64, 64, 64}
 , _alphaLevel(0.2)
 , _pixmap(nullptr)
 {
@@ -505,7 +504,7 @@ public:
int offsetX, int offsetY,
int tilesPixmapWidth, int tilesPixmapHeight,
int tileWidth, int tileHeight,
-   LibreOfficeKitTileMode mode)
+   LibreOfficeKitTileMode /*mode*/)
 {
 // set requested watermark size a little bit smaller than tile size
 int width = tileWidth * 0.9;
@@ -515,42 +514,48 @@ public:
 
 if (pixmap && tilePixmap)
 {
-unsigned int pixmapSize = tilesPixmapWidth * tilesPixmapHeight * 4;
-int maxX = std::min(tileWidth, _width);
-int maxY = std::min(tileHeight, _height);
-
 // center watermark
+const int maxX = std::min(tileWidth, _width);
+const int maxY = std::min(tileHeight, _height);
 offsetX += (tileWidth - maxX) / 2;
 offsetY += (tileHeight - maxY) / 2;
 
-for (int y = 0; y < maxY; ++y)
-{
-for (int x = 0; x < maxX; ++x)
-{
-unsigned int i = (y * _width + x) * 4;
-unsigned int alpha = pixmap[i + 3];
-if (alpha)
-{
-for (int h = 0; h < 3; ++h)
-{
-unsigned int j = ((y + offsetY) * tilesPixmapWidth 
 + (x + offsetX)) * 4 + h;
-if (j < pixmapSize)
-{
-unsigned int color = (mode == 
LOK_TILEMODE_BGRA) ? _color[2 - h] : _color[h];
-
-// original alpha blending for smoothing text 
edges
-color = ((color * alpha) + tilePixmap[j] * 
(255 - alpha)) / 255;
-// blending between document tile and watermark
-tilePixmap[j] = color * _alphaLevel + 
tilePixmap[j] * (1 - _alphaLevel);
-   }
-}
-}
-}
-}
+alphaBlend(pixmap, _width, _height, offsetX, offsetY, tilePixmap, 
tilesPixmapWidth, tilesPixmapHeight);
 }
 }
 
 private:
+/// Alpha blend 'pixel_count' pixels from 'from' over the 'to'.
+void alphaBlend(const unsigned char* from, int from_width, int 
from_height, int from_offset_x, int from_offset_y,
+unsigned char* to, int to_width, int to_height)
+{
+for (int to_y = from_offset_y, from_y = 0; (to_y < to_height) && 
(from_y < from_height) ; ++to_y, ++from_y)
+for (int to_x = from_offset_x, from_x = 0; (to_x < to_width) && 
(from_x < from_width); ++to_x, ++from_x)
+{
+const unsigned char* f = from + 4 * (from_y * from_width + 
from_x);
+double src_r = f[0];
+double src_g = f[1];
+double src_b = f[2];
+double src_a = f[3] / 255.0;
+
+unsigned char* t = to + 4 * (to_y * to_width + to_x);
+double dst_r = t[0];
+double dst_g = t[1];
+double dst_b = t[2];
+double dst_a = t[3] / 255.0;
+
+double out_a = src_a + dst_a * (1.0 - src_a);
+unsigned char out_r = src_r + dst_r * (1.0 - src_a);
+unsigned char out_g = src_g + dst_g * (1.0 - src_a);
+unsigned char out_b = src_b + dst_b * (1.0 - src_a);
+
+t[0] = out_r;
+t[1] = out_g;
+t[2] = out_b;
+t[3] = static_cast(out_a * 255.0);
+}
+}
+
 const unsigned char* getPixmap(int width, int height)
 {
 if (_pixmap && width == _width && heig

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

[Michael Meeks]

 tools/source/rc/resmgr.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 846bb84d7f517dd9df0eb5b315b77205febbce55
Author: Michael Meeks 
Date:   Fri Dec 15 12:21:41 2017 +

Protect resmgr destructor to allow static unique_ptr use.

Otherwise DestroyAllResMgr's from VCL's deinit frees things under us.

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

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 31c4765f0304..daea1b5bde64 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -838,6 +838,10 @@ ResMgr::ResMgr( InternalResMgr * pImpMgr )
 
 ResMgr::~ResMgr()
 {
+// our container was freed by DestroyAllResMgr
+if (!pResMgrMutex)
+return;
+
 osl::Guard aGuard( getResMgrMutex() );
 
 ResMgrContainer::get().freeResMgr( pImpRes );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/implicitboolconversion.cxx |   39 +++
 1 file changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 9fcc7a907bc10e9af76ff27db891f5b20ccc0d38
Author: Stephan Bergmann 
Date:   Thu Dec 14 17:32:38 2017 +0100

Try even harder to get at template args in loplugin:implicitboolconversion

After f82dc45bdb9e930878447015291c5b90c9325b57 "Use the canonical 
TemplateDecl",
builds on macOS (at least those using C++17 and recent trunk libc++) 
started to
emit false warnings for that

std::pair< Reference,sal_Bool> aRet;
aRet.second = false;

code in dbaccess/source/ui/dlg/DbAdminImpl.cxx.  There's a declaration of
std::pair in type_traits and a definition in utility, and for some reason 
the
declaration in type_traits was deemed the canonical one, while the
SubstTemplateTypeParmType pointed at the definition in utility.  So just 
check
both, the original and the canonical TemplateDecl.

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

diff --git a/compilerplugins/clang/implicitboolconversion.cxx 
b/compilerplugins/clang/implicitboolconversion.cxx
index 5c658fd9c715..41f6fd56bcae 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -80,6 +80,25 @@ SubstTemplateTypeParmType const * 
getAsSubstTemplateTypeParmType(QualType type)
 }
 }
 
+QualType reconstructTemplateArgumentType(
+TemplateDecl const * decl, TemplateSpecializationType const * 
specializationType,
+SubstTemplateTypeParmType const * parmType)
+{
+TemplateParameterList const * ps = decl->getTemplateParameters();
+auto i = std::find(ps->begin(), ps->end(), 
parmType->getReplacedParameter()->getDecl());
+if (i == ps->end()) {
+return {};
+}
+if (ps->size() != specializationType->getNumArgs()) { //TODO
+return {};
+}
+TemplateArgument const & arg = specializationType->getArg(i - ps->begin());
+if (arg.getKind() != TemplateArgument::Type) {
+return {};
+}
+return arg.getAsType();
+}
+
 bool areSameTypedef(QualType type1, QualType type2) {
 // type1.getTypePtr() == typ2.getTypePtr() fails for e.g. ::sal_Bool vs.
 // sal_Bool:
@@ -159,28 +178,22 @@ bool isBoolExpr(Expr const * expr) {
 if (td == nullptr) {
 break;
 }
-td = cast(td->getCanonicalDecl());
-TemplateParameterList const * ps = td->getTemplateParameters();
 SubstTemplateTypeParmType const * t2
 = getAsSubstTemplateTypeParmType(
 me->getMemberDecl()->getType());
 if (t2 == nullptr) {
 break;
 }
-auto i = std::find(
-ps->begin(), ps->end(),
-t2->getReplacedParameter()->getDecl());
-if (i == ps->end()) {
-break;
-}
-if (ps->size() != t->getNumArgs()) { //TODO
-break;
+ty = reconstructTemplateArgumentType(td, t, t2);
+if (ty.isNull()) {
+auto const canon = 
cast(td->getCanonicalDecl());
+if (canon != td) {
+ty = reconstructTemplateArgumentType(canon, t, t2);
+}
 }
-TemplateArgument const & arg = t->getArg(i - ps->begin());
-if (arg.getKind() != TemplateArgument::Type) {
+if (ty.isNull()) {
 break;
 }
-ty = arg.getAsType();
 } else {
 CXXOperatorCallExpr const * op
 = dyn_cast(stack.top());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - libreofficekit/qa sfx2/source vcl/source

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx |9 
+
 sfx2/source/dialog/basedlgs.cxx |   18 
++
 sfx2/source/dialog/tabdlg.cxx   |6 ++-
 vcl/source/window/dialog.cxx|4 +-
 vcl/source/window/floatwin.cxx  |   10 
++---
 5 files changed, 32 insertions(+), 15 deletions(-)

New commits:
commit 49a58e6e735a90532720f74c8d255056cd018a1a
Author: Pranav Kant 
Date:   Thu Dec 14 20:28:39 2017 +0530

lokdialog: If we already have the title, emit it during creation

Some dialogs load the UI before we "Execute()" the dialog, or before the
dialog fires the InitShow event. In those cases, the title event has
already been fired and won't be fired after dialog is created.

Make sure that we send the title for such dialogs.

Change-Id: Ib66238298ad9b0dc85bd269aff37aeadf1fc82e4
(cherry picked from commit 10a88598a4233f2b24548571644a83dc9d20e15d)

diff --git 
a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index ffef18c8bdfa..5983b7f77e5b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -315,6 +315,7 @@ void LOKDocViewSigHandlers::window(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 {
 const std::string aType = aRoot.get("type");
 const std::string aSize = aRoot.get("size");
+const std::string aTitle = aRoot.get("title", "");
 std::vector aSizePoints = GtvHelpers::split(aSize, ", ", 2);
 
 if (aType == "dialog")
@@ -326,6 +327,9 @@ void LOKDocViewSigHandlers::window(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 g_signal_connect(pDialog, "destroy", G_CALLBACK(destroyLokDialog), 
window);
 g_signal_connect(pDialog, "delete-event", 
G_CALLBACK(deleteLokDialog), window);
 
+if (!aTitle.empty())
+gtk_window_set_title(GTK_WINDOW(pDialog), aTitle.c_str());
+
 gtk_window_set_resizable(GTK_WINDOW(pDialog), false);
 gtk_widget_show_all(GTK_WIDGET(pDialog));
 gtk_window_present(GTK_WINDOW(pDialog));
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index a11ddad63f02..fe740c879b34 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -178,8 +178,10 @@ short SfxModalDialog::Execute()
 SetLOKNotifier(pViewShell);
 const Size aSize = GetOptimalSize();
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "dialog"));
-aItems.emplace_back(std::make_pair("size", aSize.toString()));
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", aSize.toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems);
 }
 
@@ -217,8 +219,10 @@ void SfxModalDialog::StateChanged( StateChangedType nType )
 SetLOKNotifier(SfxViewShell::Current());
 const Size aSize = GetOptimalSize();
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "dialog"));
-aItems.emplace_back(std::make_pair("size", aSize.toString()));
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", aSize.toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 SfxViewShell::Current()->notifyWindow(GetLOKWindowId(), "created", 
aItems);
 }
 else if (nType == StateChangedType::Visible &&
@@ -278,8 +282,10 @@ void SfxModelessDialog::StateChanged( StateChangedType 
nStateChange )
 {
 SetLOKNotifier(pViewShell);
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "dialog"));
-aItems.emplace_back(std::make_pair("size", 
GetOptimalSize().toString()));
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", GetOptimalSize().toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems);
 }
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index eac3ea1968ae..c62a1c315e65 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -524,8 +524,10 @@ short SfxTabDialog::Execute()
 SetLOKNotifier(pViewShell);
 const Size aSize = GetOptimalSize();
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "dialog"));
-aItems.emplace_back(std::make_pair("

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

[Jim Raykowski]

 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit eee645a4c281a99247fa7ae6e34711283156c614
Author: Jim Raykowski 
Date:   Thu Dec 7 22:52:00 2017 -0900

tdf#114216 Uncheck Thousands separator on Number category selection

Change-Id: Iaf616379fad1333d63bc397a9fba2220d7bbfc9b
Reviewed-on: https://gerrit.libreoffice.org/46072
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx 
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index e52a08e83be5..54c3975c9b08 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -211,6 +211,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate(
 bool bIsFraction ( nVal == 7 );  // For fraction, Decimal 
places is replaced by Denominator places
 mpBtnThousand->Show(!bIsScientific);
 mpBtnThousand->Enable(!bIsScientific);
+mpBtnThousand->Check(false);
 mpBtnEngineering->Show(bIsScientific);
 mpBtnEngineering->Enable(bIsScientific);
 mpBtnNegRed->Enable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Dennis Francis]

 sc/source/core/tool/token.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 574b06d36e3f0df1dfa1029e8d33473237807dcb
Author: Dennis Francis 
Date:   Fri Dec 15 12:18:55 2017 +0530

tdf#114479 : Blacklist MATCH() for threading

due to reasons similar to VLOOKUP/HLOOKUP

Change-Id: I4eeefd37d87d19ed4c27c58cd661206ce916823a
Reviewed-on: https://gerrit.libreoffice.org/46499
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 
(cherry picked from commit 2ba36f21bad74cbbd68611afddaf9bbdc8ffda50)
Reviewed-on: https://gerrit.libreoffice.org/46510
Reviewed-by: Michael Meeks 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index e8d249a2ac50..709d00e3e2ad 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1344,7 +1344,8 @@ void ScTokenArray::CheckForThreading( OpCode eOp  )
 ocOffset,
 ocTableOp,
 ocVLookup,
-ocHLookup
+ocHLookup,
+ocMatch
 });
 
 // We only call this if it was already disabled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bin/find-unused-defines.py bin/find-unused-typedefs.py bin/find-unused-typedefs.sh compilerplugins/clang

[Noel Grandin]

 bin/find-unused-defines.py |1 +
 bin/find-unused-typedefs.py|   23 ---
 bin/find-unused-typedefs.sh|   25 -
 compilerplugins/clang/test/unusedindex.cxx |   16 
 compilerplugins/clang/unusedindex.cxx  |   23 ---
 5 files changed, 49 insertions(+), 39 deletions(-)

New commits:
commit 06c281c20654baaabfdb7080a77a350ca789f9b2
Author: Noel Grandin 
Date:   Fri Dec 15 12:27:10 2017 +0200

loplugin:unusedindex fix false+ in nested loops

Change-Id: I31acbf104e49a4d1f077817a68d0b116fd2e0a30

diff --git a/compilerplugins/clang/test/unusedindex.cxx 
b/compilerplugins/clang/test/unusedindex.cxx
index 69ad7000b38c..7b98f8645b91 100644
--- a/compilerplugins/clang/test/unusedindex.cxx
+++ b/compilerplugins/clang/test/unusedindex.cxx
@@ -18,6 +18,22 @@ void func1()
 n += 1;
 for (int i = 0; i < 10; ++i)
 n += i;
+
+for (int i = 0; i < 10; ++i) // expected-error {{loop variable not used 
[loplugin:unusedindex]}}
+{
+for (int j = 0; j < 10; ++j)
+{
+n += j;
+}
+}
+for (int i = 0; i < 10; ++i)
+{
+for (int j = 0; j < 10; ++j)
+{
+n += j;
+n += i;
+}
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/unusedindex.cxx 
b/compilerplugins/clang/unusedindex.cxx
index 96c343820a6b..1235e32b3a28 100644
--- a/compilerplugins/clang/unusedindex.cxx
+++ b/compilerplugins/clang/unusedindex.cxx
@@ -38,7 +38,7 @@ public:
 bool VisitDeclRefExpr(DeclRefExpr const* stmt);
 
 private:
-VarDecl const* mLoopVarDecl = nullptr;
+std::vector mLoopVarDecls;
 std::unordered_set mFoundSet;
 };
 
@@ -46,27 +46,28 @@ bool UnusedIndex::TraverseForStmt(ForStmt* stmt)
 {
 if (ignoreLocation(stmt))
 return true;
-auto savedCopy = mLoopVarDecl;
 
-mLoopVarDecl = nullptr;
+VarDecl const* loopVarDecl = nullptr;
 if (stmt->getInit())
 {
 auto declStmt = dyn_cast(stmt->getInit());
 if (declStmt && declStmt->isSingleDecl())
 {
-auto varDecl = dyn_cast(declStmt->getSingleDecl());
-if (varDecl)
-mLoopVarDecl = varDecl;
+loopVarDecl = dyn_cast(declStmt->getSingleDecl());
 }
 }
+if (loopVarDecl)
+mLoopVarDecls.push_back(loopVarDecl);
 
 // deliberately ignore the other parts of the for stmt, except for the body
 auto ret = RecursiveASTVisitor::TraverseStmt(stmt->getBody());
 
-if (mLoopVarDecl && mFoundSet.erase(mLoopVarDecl) == 0)
-report(DiagnosticsEngine::Warning, "loop variable not used", 
mLoopVarDecl->getLocStart())
-<< mLoopVarDecl->getSourceRange();
-mLoopVarDecl = savedCopy;
+if (loopVarDecl && mFoundSet.erase(loopVarDecl) == 0)
+report(DiagnosticsEngine::Warning, "loop variable not used", 
loopVarDecl->getLocStart())
+<< loopVarDecl->getSourceRange();
+
+if (loopVarDecl)
+mLoopVarDecls.pop_back();
 return ret;
 }
 
@@ -75,7 +76,7 @@ bool UnusedIndex::VisitDeclRefExpr(DeclRefExpr const* stmt)
 auto varDecl = dyn_cast(stmt->getDecl());
 if (!varDecl)
 return true;
-if (mLoopVarDecl && mLoopVarDecl == varDecl)
+if (std::find(mLoopVarDecls.begin(), mLoopVarDecls.end(), varDecl) != 
mLoopVarDecls.end())
 mFoundSet.insert(varDecl);
 return true;
 }
commit ca6d205e88f052d25325d360a6fd0d744cb43000
Author: Noel Grandin 
Date:   Fri Dec 15 12:26:07 2017 +0200

improve the find-unused-typedefs script

Change-Id: If4ab3bf8759c194e6005091d6df6a3a11cd633b7

diff --git a/bin/find-unused-defines.py b/bin/find-unused-defines.py
index 7f5f27cb6bc7..2c08cc6cd342 100755
--- a/bin/find-unused-defines.py
+++ b/bin/find-unused-defines.py
@@ -97,6 +97,7 @@ def in_exclusion_set( a ):
 return True;
 return False;
 
+# find defines, excluding the externals folder
 a = subprocess.Popen("git grep -hP '^#define\s+\w+\s+' -- \"[!e][!x][!t]*\" | 
sort -u", stdout=subprocess.PIPE, shell=True)
 
 with a.stdout as txt:
diff --git a/bin/find-unused-typedefs.py b/bin/find-unused-typedefs.py
index e292f097526a..1f3395835b89 100755
--- a/bin/find-unused-typedefs.py
+++ b/bin/find-unused-typedefs.py
@@ -2,8 +2,11 @@
 
 import subprocess
 
-a = subprocess.Popen("git grep -P '^typedef\s+.+\s+\w+;' -- 
\"[!e][!x][!t]*\"", stdout=subprocess.PIPE, shell=True)
+# find typedefs, excluding the externals folder
+a = subprocess.Popen("git grep -P 'typedef\s+.+\s+\w+;' -- \"[!e][!x][!t]*\"", 
stdout=subprocess.PIPE, shell=True)
 
+# parse out the typedef names
+typedefSet = set()
 with a.stdout as txt:
 for line in txt:
 idx2 = line.rfind(";")
@@ -12,6 +15,20 @@ with a.stdout as txt:
 if typedefName.startswith("*"):
typedefName = typedef

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - xmlhelp/source

[Michael Stahl]

 xmlhelp/source/cxxhelp/inc/tvread.hxx |3 +-
 xmlhelp/source/treeview/tvread.cxx|   36 --
 2 files changed, 24 insertions(+), 15 deletions(-)

New commits:
commit dabfbb120dfaca2958f503387a3acac97886e3af
Author: Michael Stahl 
Date:   Mon Dec 11 20:00:15 2017 +0100

tdf#114242 xmlhelp: fix crash in TVChildTarget::Check()

The ... idiomatic C++ code in TVChildTarget::Check() and
SearchAndInsert() handles ownership in non-obvious ways,
so it's not surprising that it took offense at the recent
conversion to std::unique_ptr.  Let's at least try to
prevent it from crashing so quickly.

(regression from 4b69497e36b941d4db62ae8d5bad863d032fdc50)

(cherry picked from commit 8a3bb9356219754af7e651a879b5fc8925a18468)

Attempt to blind fix build breaker
(cherry picked from commit 4094f9baf62a426b24f497c86d6a96ccfcb22ad1)

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

diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx 
b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index cd0b22b49e09..087d82b70733 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace treeview {
 
@@ -227,7 +228,7 @@ namespace treeview {
 
 static void subst( OUString& instpath );
 
-bool SearchAndInsert(TVDom* p, TVDom* tvDom);
+std::unique_ptr SearchAndInsert(std::unique_ptr p, 
TVDom* tvDom);
 
 void Check(TVDom* tvDom);
 
diff --git a/xmlhelp/source/treeview/tvread.cxx 
b/xmlhelp/source/treeview/tvread.cxx
index 5339a93117d7..3e6ae7afe8af 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -61,11 +61,10 @@ namespace treeview {
 return children.back().get();
 }
 
-TVDom* newChild(TVDom* p)
+void newChild(std::unique_ptr p)
 {
-children.emplace_back( p );
-p->parent = this;
-return children.back().get();
+children.emplace_back(std::move(p));
+children.back()->parent = this;
 }
 
 TVDom* getParent() const
@@ -448,8 +447,13 @@ void TVChildTarget::Check(TVDom* tvDom)
 TVDom* p = tvDom->children.back().get();
 
 for(auto & k : p->children)
-if (!SearchAndInsert(k.get(), tvDom->children[i].get()))
-tvDom->children[i]->newChild(k.get());
+{
+std::unique_ptr tmp(SearchAndInsert(std::move(k), 
tvDom->children[i].get()));
+if (tmp)
+{
+tvDom->children[i]->newChild(std::move(tmp));
+}
+}
 
 tvDom->children.pop_back();
 h = true;
@@ -458,9 +462,10 @@ void TVChildTarget::Check(TVDom* tvDom)
 }
 }
 
-bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
+std::unique_ptr
+TVChildTarget::SearchAndInsert(std::unique_ptr p, TVDom* tvDom)
 {
-if (p->isLeaf()) return false;
+if (p->isLeaf()) return p;
 
 bool h = false;
 sal_Int32 max = 0;
@@ -481,8 +486,8 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
 
 if (p_int==c_int)
 {
-(*(tvDom->children.insert(i+1, 
std::unique_ptr(p->parent = tvDom;
-return true;
+(*(tvDom->children.insert(i+1, std::move(p->parent = tvDom;
+return nullptr;
 }
 else if(c_int>max && c_int < p_int)
 {
@@ -491,17 +496,20 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* 
tvDom)
 }
 }
 if (h)
-(*(tvDom->children.insert(max_It, std::unique_ptr(p->parent 
= tvDom;
+{
+(*(tvDom->children.insert(max_It, std::move(p->parent = tvDom;
+return nullptr;
+}
 else
 {
 i = tvDom->children.begin();
-while ((i!=tvDom->children.end()) && (!h))
+while ((i!=tvDom->children.end()) && (p != nullptr))
 {
-h = SearchAndInsert(p, i->get());
+p = SearchAndInsert(std::move(p), i->get());
 ++i;
 }
+return p;
 }
-return h;
 }
 
 Any SAL_CALL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 dbaccess/source/ui/inc/WCopyTable.hxx  |2 +-
 dbaccess/source/ui/misc/DExport.cxx|4 ++--
 dbaccess/source/ui/misc/RowSetDrop.cxx |2 +-
 include/tools/contnr.hxx   |1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit f388d1dbb2edc1d678a658572bef6af4046728ff
Author: Noel Grandin 
Date:   Fri Dec 15 09:34:24 2017 +0200

CONTAINER_ENTRY_NOTFOUND not needed anymore

after we make dbaccess consistently use COLUMN_POSITION_NOT_FOUND

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

diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx 
b/dbaccess/source/ui/inc/WCopyTable.hxx
index db3dfbe38e98..b6d77f199be7 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -331,7 +331,7 @@ namespace dbaui
 voidCheckButtons(); // checks which button can be 
disabled, enabled
 
 // returns a vector where the position of a column and if the column 
is in the selection
-// when not the value is COLUMN_POSITION_NOT_FOUND == (sal_uInt32)-1
+// when not the value is COLUMN_POSITION_NOT_FOUND.
 const ODatabaseExport::TPositions& GetColumnPositions()const { 
return m_vColumnPositions; }
 const std::vector&GetColumnTypes()const { 
return m_vColumnTypes; }
 boolUseHeaderLine() const { return 
m_bUseHeaderLine; }
diff --git a/dbaccess/source/ui/misc/DExport.cxx 
b/dbaccess/source/ui/misc/DExport.cxx
index 81afc5b43bc7..b9c7998a8d4c 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -766,7 +766,7 @@ void ODatabaseExport::adjustFormat()
 if ( nNewPos < static_cast(m_vColumnPositions.size()) )
 {
 sal_Int32 nColPos = m_vColumnPositions[nNewPos].first;
-if( nColPos != sal::static_int_cast< long 
>(CONTAINER_ENTRY_NOTFOUND))
+if( nColPos != COLUMN_POSITION_NOT_FOUND)
 {
 --nColPos;
 OSL_ENSURE((nColPos) < 
static_cast(m_vNumberFormat.size()),"m_vFormatKey: Illegal index for 
vector");
@@ -832,7 +832,7 @@ Reference< XPreparedStatement > 
ODatabaseExport::createPreparedStatment( const R
 ODatabaseExport::TPositions::const_iterator aFind = 
std::find_if(_rvColumns.begin(),_rvColumns.end(),
 [j] (const ODatabaseExport::TPositions::value_type& tPos)
 { return tPos.second == (sal_Int32)(j+1); });
-if ( _rvColumns.end() != aFind && aFind->second != 
sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) && aFind->first != 
sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) )
+if ( _rvColumns.end() != aFind && aFind->second != 
COLUMN_POSITION_NOT_FOUND && aFind->first != COLUMN_POSITION_NOT_FOUND )
 {
 OSL_ENSURE((aFind->first) < 
static_cast(aInsertList.size()),"aInsertList: Illegal index for 
vector");
 aInsertList[aFind->first] = ::dbtools::quoteName( 
aQuote,*(pIter+j));
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx 
b/dbaccess/source/ui/misc/RowSetDrop.cxx
index aa1858a57d1b..c1cba83d2490 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -69,7 +69,7 @@ void ORowSetImportExport::initialize()
 m_aColumnTypes.reserve(nCount);
 for (sal_Int32 i = 1;i <= nCount; ++i)
 {
-sal_Int32 nPos = -1; // -1 means column is autoincrement or doesn't 
exist
+sal_Int32 nPos = COLUMN_POSITION_NOT_FOUND; // means column is 
autoincrement or doesn't exist
 if(!m_xTargetResultSetMetaData->isAutoIncrement(i))
 {
 try
diff --git a/include/tools/contnr.hxx b/include/tools/contnr.hxx
index 80d7abd6bca0..ba65820f8729 100644
--- a/include/tools/contnr.hxx
+++ b/include/tools/contnr.hxx
@@ -24,7 +24,6 @@
 #include 
 
 #define CONTAINER_APPEND(ULONG_MAX)
-#define CONTAINER_ENTRY_NOTFOUND(ULONG_MAX)
 
 #define TREELIST_APPEND (ULONG_MAX)
 #define TREELIST_ENTRY_NOTFOUND (ULONG_MAX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 dbaccess/source/ui/inc/DExport.hxx |4 ++--
 dbaccess/source/ui/inc/WCopyTable.hxx  |4 ++--
 dbaccess/source/ui/misc/DExport.cxx|   20 ++--
 dbaccess/source/ui/misc/WCPage.cxx |4 ++--
 dbaccess/source/ui/misc/WCopyTable.cxx |   20 ++--
 dbaccess/source/ui/misc/WNameMatch.cxx |   14 +++---
 dbaccess/source/ui/uno/copytablewizard.cxx |   17 -
 7 files changed, 41 insertions(+), 42 deletions(-)

New commits:
commit 865eb18f0faa94b260518526d44bbac2b6ca97b9
Author: Noel Grandin 
Date:   Fri Dec 15 09:28:52 2017 +0200

use ColumnPositions name more consistently

mostly so I can track down more accurately what values are being stored
in this vector>

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

diff --git a/dbaccess/source/ui/inc/DExport.hxx 
b/dbaccess/source/ui/inc/DExport.hxx
index 40a7a15431ef..5cc28b790f0d 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -64,7 +64,7 @@ namespace dbaui
 typedef std::vector< std::pair >   TPositions;
 
 protected:
-TPositions  m_vColumns; ///< columns to be used
+TPositions  m_vColumnPositions;  ///< columns to 
be used
 std::vectorm_vColumnTypes; ///< ColumnTypes for 
faster access
 std::vectorm_vColumnSize;
 std::vectorm_vNumberFormat;
@@ -161,7 +161,7 @@ namespace dbaui
 
 static css::uno::Reference< css::sdbc::XPreparedStatement > 
createPreparedStatment( const css::uno::Reference< 
css::sdbc::XDatabaseMetaData>& _xMetaData
,const 
css::uno::Reference< css::beans::XPropertySet>& _xDestTable
-   ,const TPositions& 
_rvColumns);
+   ,const TPositions& 
_rvColumnPositions);
 };
 }
 
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx 
b/dbaccess/source/ui/inc/WCopyTable.hxx
index 0d411c15cd04..db3dfbe38e98 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -250,7 +250,7 @@ namespace dbaui
 std::vector   m_aDestTypeInfoIndex;
 TNameMappingm_mNameMapping;
 
-ODatabaseExport::TPositions m_vColumnPos;
+ODatabaseExport::TPositions m_vColumnPositions;
 std::vectorm_vColumnTypes;
 
 css::uno::Reference< css::sdbc::XConnection > 
m_xDestConnection;
@@ -332,7 +332,7 @@ namespace dbaui
 
 // returns a vector where the position of a column and if the column 
is in the selection
 // when not the value is COLUMN_POSITION_NOT_FOUND == (sal_uInt32)-1
-const ODatabaseExport::TPositions& GetColumnPositions()const { 
return m_vColumnPos; }
+const ODatabaseExport::TPositions& GetColumnPositions()const { 
return m_vColumnPositions; }
 const std::vector&GetColumnTypes()const { 
return m_vColumnTypes; }
 boolUseHeaderLine() const { return 
m_bUseHeaderLine; }
 voidsetUseHeaderLine(bool _bUseHeaderLine) { 
m_bUseHeaderLine = _bUseHeaderLine; }
diff --git a/dbaccess/source/ui/misc/DExport.cxx 
b/dbaccess/source/ui/misc/DExport.cxx
index d83f0f74ff85..81afc5b43bc7 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -89,7 +89,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
  const OTypeInfoMap* _pInfoMap,
  bool _bAutoIncrementEnabled,
  SvStream& _rInputStream)
-:m_vColumns(_rColumnPositions)
+:m_vColumnPositions(_rColumnPositions)
 ,m_aDestColumns(true)
 ,m_xFormatter(_rxNumberF)
 ,m_xContext(_rxContext)
@@ -112,7 +112,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
 {
 m_nRows += nRows;
 sal_Int32 nCount = 0;
-for(const std::pair & rPair : m_vColumns)
+for(const std::pair & rPair : m_vColumnPositions)
 if ( rPair.first != COLUMN_POSITION_NOT_FOUND )
 ++nCount;
 
@@ -298,11 +298,11 @@ void ODatabaseExport::insertValueIntoColumn()
 if(pField)
 {
 sal_Int32 nNewPos = m_bIsAutoIncrement ? m_nColumnPos+1 : 
m_nColumnPos;
-OSL_ENSURE(nNewPos < 
static_cast(m_vColumns.size()),"m_vColumns: Illegal index for 
vector");
+OSL_ENSURE(nNewPos < 
static_cast(m_vColumnPositions.size()),"m_vColumnPositions: Illegal 
index for vector");
 
-if ( nNewPos < static_cast(m_vColumns.size() ) )
+if ( nNewPos < static_cast(m_vColumnPositions.size() ) )
 {
-  

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

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

New commits:
commit 0b100b78ccb24a4f8da51433f535030facb77705
Author: Caolán McNamara 
Date:   Tue Dec 12 14:17:11 2017 +

tdf#114408 set correct tooltip rectangle

The original code tried to get the position of the window relative
to its parent and then ask the parent to adjust that position to
a position relative to the toplevel. But the position to use in
that case should have be WindowImpl::nX/WindowImpl::nY not GetPosPixel()

Much easier to just directly ask the the current window for its position
relative to the toplevel.

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5083f418b2c2..84dabd027689 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1861,7 +1861,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
 {
 Point aPos = GetPosPixel();
 if ( ImplGetParent() && !ImplIsOverlapWindow() )
-aPos = ImplGetParent()->OutputToScreenPixel( aPos );
+aPos = OutputToScreenPixel(Point(0, 0));
 tools::Rectangle   aRect( aPos, GetSizePixel() );
 
 Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aRect, rStr );
@@ -1876,7 +1876,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
 {
 Point aPos = GetPosPixel();
 if ( ImplGetParent() && !ImplIsOverlapWindow() )
-aPos = ImplGetParent()->OutputToScreenPixel( aPos );
+aPos = OutputToScreenPixel(Point(0, 0));
 tools::Rectangle   aRect( aPos, GetSizePixel() );
 OUString  aHelpText;
 if ( !rStr.isEmpty() )
___
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.3' - sc/source vcl/source

[Pranav Kant]

 sc/source/ui/cctrl/checklistmenu.src |5 +
 sc/source/ui/inc/checklistmenu.hrc   |   15 ---
 sc/source/ui/view/gridwin.cxx|3 +++
 vcl/source/window/floatwin.cxx   |2 ++
 4 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 04abf03ecb18ccf1f805faa763d6f29013efc6bb
Author: Pranav Kant 
Date:   Fri Dec 15 14:52:31 2017 +0530

lokdialog: Give non-programmatic name to autofilter

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

diff --git a/sc/source/ui/cctrl/checklistmenu.src 
b/sc/source/ui/cctrl/checklistmenu.src
index 59c8eb09477b..2c65b2fbb851 100644
--- a/sc/source/ui/cctrl/checklistmenu.src
+++ b/sc/source/ui/cctrl/checklistmenu.src
@@ -21,6 +21,11 @@
 
 Resource RID_POPUP_FILTER
 {
+String STR_MENU_TITLE
+{
+Text [ en-US ] = "AutoFilter" ;
+};
+
 String STR_MENU_SORT_ASC
 {
 Text [ en-US ] = "Sort Ascending" ;
diff --git a/sc/source/ui/inc/checklistmenu.hrc 
b/sc/source/ui/inc/checklistmenu.hrc
index 7d009576f1dd..33b689887eb6 100644
--- a/sc/source/ui/inc/checklistmenu.hrc
+++ b/sc/source/ui/inc/checklistmenu.hrc
@@ -22,13 +22,14 @@
 
 #include 
 
-#define STR_MENU_SORT_ASC   1
-#define STR_MENU_SORT_DESC  2
-#define STR_MENU_SORT_CUSTOM3
-#define STR_BTN_TOGGLE_ALL  4
-#define STR_BTN_SELECT_CURRENT  5
-#define STR_BTN_UNSELECT_CURRENT6
-#define STR_EDIT_SEARCH_ITEMS   7
+#define STR_MENU_TITLE  1
+#define STR_MENU_SORT_ASC   2
+#define STR_MENU_SORT_DESC  3
+#define STR_MENU_SORT_CUSTOM4
+#define STR_BTN_TOGGLE_ALL  5
+#define STR_BTN_SELECT_CURRENT  6
+#define STR_BTN_UNSELECT_CURRENT7
+#define STR_EDIT_SEARCH_ITEMS   8
 
 #endif
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d285f6c05287..9cd3f117118e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -682,7 +682,10 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 mpAutoFilterPopup.disposeAndClear();
 mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
 if (comphelper::LibreOfficeKit::isActive())
+{
 mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
+mpAutoFilterPopup->SetText(SC_STRLOAD(RID_POPUP_FILTER, 
STR_MENU_TITLE));
+}
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, Normal));
 mpAutoFilterPopup->setPopupEndAction(
 new AutoFilterPopupEndAction(this, ScAddress(nCol, nRow, nTab)));
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 7a03108495b1..3ee264fad5ad 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -629,6 +629,8 @@ void FloatingWindow::StateChanged( StateChangedType nType )
 }
 aItems.emplace_back("size", GetSizePixel().toString());
 aItems.emplace_back("position", mpImplData->maPos.toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created", 
aItems);
 }
 else if (!IsVisible() && nType == StateChangedType::Visible)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - configure.ac download.lst

[Eike Rathke]

 configure.ac |2 +-
 download.lst |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 94ab4cedfaf44a2ff92b7ae53b549e771c970b43
Author: Eike Rathke 
Date:   Thu Dec 14 17:00:05 2017 +0100

Upgrade to ICU 60.2

Change-Id: I1a5653669f5d15b5cdca0967c82263f0b7d17b3c
Reviewed-on: https://gerrit.libreoffice.org/46470
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 
Reviewed-on: https://gerrit.libreoffice.org/46492
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 2ac35b7507df..6ae4b7183d6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8824,7 +8824,7 @@ SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
 ICU_MAJOR=60
-ICU_MINOR=1
+ICU_MINOR=2
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
 ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
diff --git a/download.lst b/download.lst
index 467f21ef5ee6..c0ef0d9abe7e 100644
--- a/download.lst
+++ b/download.lst
@@ -92,10 +92,10 @@ export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
 export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
-export ICU_TARBALL := icu4c-60_1-src.tgz
-export ICU_DATA_SHA256SUM := 
bbb920c6e67de8d9dcc0f0ec5554870170d0cb5eff6f0bc9881efc605f68210c
-export ICU_DATA_TARBALL := icu4c-60_1-data.zip
+export ICU_SHA256SUM := 
f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418
+export ICU_TARBALL := icu4c-60_2-src.tgz
+export ICU_DATA_SHA256SUM := 
68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9
+export ICU_DATA_TARBALL := icu4c-60_2-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - sw/qa sw/source

[Tamas Bunth]

 sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   13 +
 sw/source/filter/ww8/wrtw8nds.cxx |   26 +++---
 3 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit e516879cc5a17fab70aa421db30dfe7d7beadb88
Author: Tamas Bunth 
Date:   Fri Dec 15 01:00:00 2017 +0100

no section break after split paragraph

Change-Id: I08aa10527d6e5d8950a592334d01186cbd8cd355
Reviewed-on: https://gerrit.libreoffice.org/46495
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/46524
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 63dda5004c09..c727ca145e18 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2628,7 +2628,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 PrepareNewPageDesc( rNode.GetpSwAttrSet(), rNode, nullptr , 
pNextPageDesc);
 }
 }
-else
+else if (!bNeedParaSplit)
 {
 // else check if section break needed after the paragraph
 AttrOutput().SectionBreaks(rNode);
commit f08de7c9e14907c86128f689e9ebe4e3f6e97167
Author: Tamas Bunth 
Date:   Thu Dec 14 15:20:29 2017 +0100

tdf#41650 doc(x) export split paragraph

Fix for documents with one paragraph only.

Add unit test for splitting paragraph on section border.

Change-Id: I224f60ed362deae7b67dde79e04f26f949de034a
Reviewed-on: https://gerrit.libreoffice.org/46457
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/46523
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt 
b/sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt
new file mode 100644
index ..1d0b96f8bb96
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/parasplit-on-section-border.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 40081112629d..60701a264805 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -99,6 +99,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf67207_MERGEFIELD, 
"mailmerge.docx")
 
CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.text.fieldmaster.DataBase.Name"), 
sValue);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testParagraphSplitOnSectionBorder, 
"parasplit-on-section-border.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if(!pXmlDoc)
+return;
+
+// Test document has only one paragraph. After splitting, it should contain
+// two of them.
+assertXPath(pXmlDoc, "//w:sectPr", 2);
+assertXPath(pXmlDoc, "//w:p", 2);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf44832_testSectionWithDifferentHeader, 
"tdf44832_section_new_header.odt")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 3064f505d4ac..63dda5004c09 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2607,18 +2607,32 @@ void MSWordExportBase::OutputTextNode( const 
SwTextNode& rNode )
 while ( nAktPos < nEnd );
 
 // if paragraph is split, put the section break between the parts
-// else check if section break needed after the paragraph
-if( !bNeedParaSplit || *aBreakIt != rNode.GetText().getLength() )
+if( bNeedParaSplit && *aBreakIt != rNode.GetText().getLength() )
 {
-AttrOutput().SectionBreaks(rNode);
 SwNodeIndex aNextIndex( rNode, 1 );
 const SwNode& pNextNode = aNextIndex.GetNode();
-if( pNextNode.IsTextNode() && bNeedParaSplit )
+// if there is a next node, use its attributes to create the new
+// section
+if( pNextNode.IsTextNode() )
+{
+const SwTextNode& rNextNode = *static_cast(
+&aNextIndex.GetNode() );
+OutputSectionBreaks(rNextNode.GetpSwAttrSet(), rNextNode);
+}
+else if (pNextNode.IsEndNode() )
 {
-SectionBreaksAndFrames( *static_cast(
-&aNextIndex.GetNode() ));
+// In this case the same paragraph holds the next page style
+// too.
+const SwPageDesc* pNextPageDesc = m_pAktPageDesc->GetFollow();
+assert(pNextPageDesc);
+PrepareNewPageDesc( rNode.GetpSwAttrSet(), rNode, nullptr , 
pNextPageDesc);
 }
 }
+else
+{
+// else check if section break needed after the paragraph

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 3 commits - sw/qa sw/source

[Michael Stahl]

 sw/qa/extras/ooxmlexport/data/tdf44832_section_new_header.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|  114 ++
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |   10 
 sw/source/filter/ww8/docxexport.cxx   |   34 ++
 sw/source/filter/ww8/docxexport.hxx   |2 
 sw/source/filter/ww8/wrtw8nds.cxx |9 
 6 files changed, 156 insertions(+), 13 deletions(-)

New commits:
commit 66466f4bec9e3b3d2fcb6698b564279eca81c3bb
Author: Michael Stahl 
Date:   Wed Dec 13 15:36:14 2017 +0100

sw: fix crash exporting ooo72077-2.odt to DOCX

There is an assertion about empty lastOpenCell vector in
DocxAttributeOutput::SyncNodelessCells(); since i don't know
if this splitting should be done at all for paragraphs in a table,
let's disable it for now.

(regression from c1d58c46eec5081576979f584151c7e9a4f67fe0)

Change-Id: Ied67b6047b48689cba3c41b9d0f68b7c2a257ba0
Reviewed-on: https://gerrit.libreoffice.org/46522
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index c9ecf63e7d06..3064f505d4ac 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2240,7 +2240,8 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 
 SwSoftPageBreakList softBreakList;
 // Let's decide if we need to split the paragraph because of a section 
break
-bool bNeedParaSplit = NeedTextNodeSplit( rNode, softBreakList );
+bool bNeedParaSplit = NeedTextNodeSplit( rNode, softBreakList )
+&& !IsInTable();
 
 auto aBreakIt = softBreakList.begin();
 // iterate through portions on different pages
commit 6c36901e94b5dd21604d63b48b091cf9d32fa2ad
Author: Michael Stahl 
Date:   Wed Dec 13 13:06:49 2017 +0100

sw: fix crash exporting tdf93816-2.odt to WW8

The problem is that nLen = *aBreakIt - nAktPos - ofs; results in -12.

It doesn't make sense to me that nEnd should still be the end of the
paragraph in this case.

Change-Id: I0c9df6a938035b3bc2c8857ef09206d8967c20f4
Reviewed-on: https://gerrit.libreoffice.org/46521
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 5515560b55f9..c9ecf63e7d06 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2281,7 +2281,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 
 const OUString& aStr( rNode.GetText() );
 
-sal_Int32 const nEnd = aStr.getLength();
+sal_Int32 const nEnd = bNeedParaSplit ? *aBreakIt : aStr.getLength();
 bool bIncludeEndOfParaCRInRedlineProperties = false;
 sal_Int32 nOpenAttrWithRange = 0;
 OUString aStringForImage("\001");
@@ -2437,9 +2437,11 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& 
rNode )
 }
 nLen -= ofs;
 
-// if paragraph needs to be split, write only until split 
postition
+// if paragraph needs to be split, write only until split 
position
+assert(!bNeedParaSplit || nAktPos <= *aBreakIt);
 if( bNeedParaSplit && nAktPos + ofs + nLen > *aBreakIt)
 nLen = *aBreakIt - nAktPos - ofs;
+assert(0 <= nLen);
 
 OUString aSnippet( aAttrIter.GetSnippet( aStr, nAktPos + ofs, 
nLen ) );
 if ( ( m_nTextTyp == TXT_EDN || m_nTextTyp == TXT_FTN ) && 
nAktPos == 0 && nLen > 0 )
commit d7d464d624950b87fed702b2d2ac4581b98a9742
Author: Tamas Bunth 
Date:   Thu Nov 16 15:43:36 2017 +0100

tdf#41650 DOCX export: insert empty header/footer

Insert an empty header (or footer) to section which follows a section
with a header in it.

It is needed, because in case a section does not contain a header
definition, Word will use the preceding section's rule.

It causes problem if a document contains two page styles: one has
header (or footer), the other does not. In that case after saving to
docx it will end up in two sections. (only if it's not a plausable title
page)

Change-Id: I5add284d0cf1544923885e7205d9a2ac4e3cc9af
Reviewed-on: https://gerrit.libreoffice.org/44832
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/46520
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf44832_section_new_header.odt 
b/sw/qa/extras/ooxmlexport/data/tdf44832_section_new_header.odt
new file mode 100644
index ..9db311db1f2a
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf44832_section_new_header.odt differ
diff --git a/sw/qa/extras/ooxml

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/source

[Tamas Bunth]

 sw/source/filter/ww8/wrtw8nds.cxx | 1181 +++---
 sw/source/filter/ww8/wrtww8.cxx   |7 
 sw/source/filter/ww8/wrtww8.hxx   |4 
 3 files changed, 627 insertions(+), 565 deletions(-)

New commits:
commit 14af9cf82c492e623609df4bfebfb06692cb53e3
Author: Tamas Bunth 
Date:   Fri Dec 1 14:58:17 2017 +0100

tdf#41650 DOCX export: split para on section break

Given two pages with entirely different style (resp. not plausible for a
single section) and a paragraph which starts on the first page and has a
follow on the second.

Those page styles are represented in doc/docx structure with sections.
Doc/Docx does not support having a paragraph in more than one sections.

Workaround is to split the paragraph into more paragraphs and put the
section break in between.

Change-Id: I4014c45f97e18132470d0d0647bce84831b2460a
Reviewed-on: https://gerrit.libreoffice.org/45666
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/46519
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 467355777f29..5515560b55f9 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2135,6 +2135,32 @@ void MSWordExportBase::GetSortedBookmarks( const 
SwTextNode& rNode, sal_Int32 nA
 }
 }
 
+bool MSWordExportBase::NeedSectionBreak( const SwNode& rNd ) const
+{
+if ( m_bStyDef || m_bOutKF || m_bInWriteEscher || m_bOutPageDescs || 
m_pAktPageDesc == nullptr )
+return false;
+
+const SwPageDesc * pPageDesc = rNd.FindPageDesc()->GetFollow();
+
+if (m_pAktPageDesc != pPageDesc)
+{
+if 
(!sw::util::IsPlausableSingleWordSection(m_pAktPageDesc->GetFirstMaster(), 
pPageDesc->GetMaster()))
+{
+return true;
+}
+}
+
+return false;
+}
+
+bool MSWordExportBase::NeedTextNodeSplit( const SwTextNode& rNd, 
SwSoftPageBreakList& pList ) const
+{
+rNd.fillSoftPageBreakList( pList );
+pList.insert(0);
+pList.insert( rNd.GetText().getLength() );
+return pList.size() > 2 && NeedSectionBreak( rNd );
+}
+
 void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
 {
 SAL_INFO( "sw.ww8", "" );
@@ -2212,719 +2238,746 @@ void MSWordExportBase::OutputTextNode( const 
SwTextNode& rNode )
 }
 }
 
-AttrOutput().StartParagraph( pTextNodeInfo );
+SwSoftPageBreakList softBreakList;
+// Let's decide if we need to split the paragraph because of a section 
break
+bool bNeedParaSplit = NeedTextNodeSplit( rNode, softBreakList );
 
-const SwSection* pTOXSect = nullptr;
-if( m_bInWriteTOX )
+auto aBreakIt = softBreakList.begin();
+// iterate through portions on different pages
+do
 {
-// check for end of TOX
-SwNodeIndex aIdx( rNode, 1 );
-if( !aIdx.GetNode().IsTextNode() )
+sal_Int32 nAktPos = *aBreakIt;
+++aBreakIt;
+
+AttrOutput().StartParagraph( pTextNodeInfo );
+
+const SwSection* pTOXSect = nullptr;
+if( m_bInWriteTOX )
 {
-const SwSectionNode* pTOXSectNd = rNode.FindSectionNode();
-if ( pTOXSectNd )
+// check for end of TOX
+SwNodeIndex aIdx( rNode, 1 );
+if( !aIdx.GetNode().IsTextNode() )
 {
-pTOXSect = &pTOXSectNd->GetSection();
+const SwSectionNode* pTOXSectNd = rNode.FindSectionNode();
+if ( pTOXSectNd )
+{
+pTOXSect = &pTOXSectNd->GetSection();
 
-const SwNode* pNxt = rNode.GetNodes().GoNext( &aIdx );
-if( pNxt && pNxt->FindSectionNode() == pTOXSectNd )
-pTOXSect = nullptr;
+const SwNode* pNxt = rNode.GetNodes().GoNext( &aIdx );
+if( pNxt && pNxt->FindSectionNode() == pTOXSectNd )
+pTOXSect = nullptr;
+}
 }
 }
-}
 
-if ( aAttrIter.RequiresImplicitBookmark() )
-{
-OUString sBkmkName =  "_toc" + OUString::number( rNode.GetIndex() );
-AppendWordBookmark( sBkmkName );
-}
+if ( aAttrIter.RequiresImplicitBookmark() )
+{
+OUString sBkmkName =  "_toc" + OUString::number( rNode.GetIndex() 
);
+AppendWordBookmark( sBkmkName );
+}
 
-// Call this before write out fields and runs
-AttrOutput().GenerateBookmarksForSequenceField(rNode, aAttrIter);
+// Call this before write out fields and runs
+AttrOutput().GenerateBookmarksForSequenceField(rNode, aAttrIter);
 
-const OUString& aStr( rNode.GetText() );
+const OUString& aStr( rNode.GetText() );
 
-sal_Int32 nAktPos = 0;
-sal_Int32 const nEnd = aStr.getLength();
-bool bIncludeEndOfParaCRInRedlineProperties

Re: AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Christian Lohmaier]

Hi Mike, *,

On Fri, Dec 15, 2017 at 11:22 AM, Mike Kaganski
 wrote:
> On 12/15/2017 12:53 PM, Juergen Funk Mailinglist wrote:
> […]
>> I have mean directly from Microsoft not from TDF.
>
> As I mentioned, there's no "Latest VS 2015 redist" static link on their
> side. Only "VS 2015 redist version X.Y.Z", which is the same as embedding
> this specific version into installer.

Even if there was one, I'd object against relying on having internet
connectivity when installing.

> Also: at the time of creating the installer, we could possibly check that
> our embedded redist is ~current,

the redistributables then being handled by windows update → that's not
as critical as with the current method of shipping the dlls locally.

> so users would have reasonably low chance
> to get update request related to newly installed software (taking into
> account our rate of releases). OTOH, if a user chooses to download and
> install an out-of-date version, then it's not unexpected that, e.g.,
> LibreOffice itself would warn about "newer version available"; so I don't
> see anything unexpected here on redist side as well.

Agreed.

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

[Libreoffice-commits] core.git: desktop/source include/rtl sal/CppunitTest_sal_rtl.mk sal/qa sal/rtl sal/util

[Michael Meeks]

 desktop/source/lib/init.cxx|7 
 include/rtl/alloc.h|   37 +
 sal/CppunitTest_sal_rtl.mk |1 
 sal/qa/rtl/alloc/rtl_alloc.cxx |   70 +
 sal/rtl/alloc_arena.cxx|   28 
 sal/rtl/alloc_arena.hxx|5 ++
 sal/rtl/alloc_cache.cxx|   18 ++
 sal/rtl/strimp.cxx |   65 ++
 sal/rtl/strimp.hxx |   10 +
 sal/rtl/string.cxx |6 +--
 sal/rtl/strtmpl.cxx|4 +-
 sal/rtl/ustring.cxx|8 ++--
 sal/util/sal.map   |5 ++
 13 files changed, 255 insertions(+), 9 deletions(-)

New commits:
commit 556e121379494d4bed9738d9c7539ac5afc8f6f4
Author: Michael Meeks 
Date:   Thu Dec 7 21:19:09 2017 +

sal: add pre-initialization scheme for allocations.

This saves several megabytes of dirtied pages for each LOK
client of Online.

Change-Id: I425a2e7896879f0a64d71fcc0655e9e1fa1256aa

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f5361bdb834a..2e8d876cb985 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3538,6 +3538,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 if (bInitialized)
 return 1;
 
+if (eStage == PRE_INIT)
+rtl_alloc_preInit(true);
+
 if (eStage != SECOND_INIT)
 comphelper::LibreOfficeKit::setActive();
 
@@ -3689,6 +3692,10 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 fprintf(stderr, "Bootstrapping exception '%s'\n",
  OUStringToOString(exception.Message, 
RTL_TEXTENCODING_UTF8).getStr());
 }
+
+if (eStage == PRE_INIT)
+rtl_alloc_preInit(false);
+
 return bInitialized;
 }
 
diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index bd3149fece87..cb4f09cbb67c 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -286,6 +286,43 @@ SAL_DLLPUBLIC void SAL_CALL rtl_cache_free (
 ) SAL_THROW_EXTERN_C();
 
 
+#ifdef LIBO_INTERNAL_ONLY
+
+/** @cond INTERNAL */
+/** rtl_alloc_preInit
+ *
+ * This function, is called at the beginning and again
+ * at the end of LibreOfficeKit pre-initialization to enable
+ * various optimizations.
+ *
+ * Its function is to annotate a section @start = true to
+ * end (@start = false) via. two calls. Inside this section
+ * string allocators are replaced with ones which cause the
+ * strings to be staticized at the end of the section.
+ *
+ * This brings a number of constraints - in particular no
+ * string allocated outside the section should be freed
+ * inside it, practically this means starting the section
+ * as early as possible. No string allocated inside the
+ * section will be freed subsequently as they are
+ * staticized.
+ *
+ * This method is not thread-safe, nor intended for use in
+ * a threaded context, cf. previous constraints.
+ *
+ * It is almost certainly not the method that you want,
+ * use with extraordinary care referring to the
+ * implementation.
+ *
+ * @since LibreOffice 6.1
+ */
+SAL_DLLPUBLIC void SAL_CALL rtl_alloc_preInit (
+sal_Bool start
+) SAL_THROW_EXTERN_C();
+/** @endcond */
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk
index 43533fc5ab1c..c4629a2c33db 100644
--- a/sal/CppunitTest_sal_rtl.mk
+++ b/sal/CppunitTest_sal_rtl.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl,\
 
 $(eval $(call gb_CppunitTest_set_include,sal_rtl,\
-I$(SRCDIR)/sal/qa/inc \
+   -I$(SRCDIR) \
$$(INCLUDE) \
 ))
 
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 30aadcc94f69..6a4c1648ff53 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -18,11 +18,14 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
+#include 
+
 #include 
 
 namespace rtl_alloc
@@ -132,8 +135,75 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
+class TestPreinit : public CppUnit::TestFixture
+{
+public:
+TestPreinit()
+{
+}
+
+// initialise your test code values here.
+void setUp() override
+{
+}
+
+void tearDown() override
+{
+}
+
+// insert your test code here.
+
+void test()
+{
+const char *sample = "Hello World";
+std::vector aStrings;
+
+rtl_alloc_preInit(true);
+
+OUString aFoo("foo");
+
+// fill some cache bits
+for (int iter = 0; iter < 4; iter++)
+{
+for (int i = 1; i < 4096; i += 8)
+{
+OUStringBuffer aBuf(i);
+aBuf.appendAscii(sample, (i/8) % (sizeof(sample)-1));
+OUString aStr = aBuf.makeStringAndClear();
+aStrings.push_back(aStr);
+}
+// free some pieces to make holes
+

Re: AW: AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Mike Kaganski]

On 12/15/2017 12:53 PM, Juergen Funk Mailinglist wrote:

Hi Mike


1. Creating a redirect at TDF side imposes additional load to our server 
infrastructure;
2. Users will depend on reliability of TDF servers wrt this (in terms of their 
state, correctness of the link, and also possible man-in-the-middle problems 
with modified links pointing to malware) - note that LO downloads themselves 
are served from multiple mirrors, but this kind of redirection can't work using 
mirrors

I have mean directly from Microsoft not from TDF.


As I mentioned, there's no "Latest VS 2015 redist" static link on their 
side. Only "VS 2015 redist version X.Y.Z", which is the same as 
embedding this specific version into installer.


Also: at the time of creating the installer, we could possibly check 
that our embedded redist is ~current, so users would have reasonably low 
chance to get update request related to newly installed software (taking 
into account our rate of releases). OTOH, if a user chooses to download 
and install an out-of-date version, then it's not unexpected that, e.g., 
LibreOffice itself would warn about "newer version available"; so I 
don't see anything unexpected here on redist side as well.


--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 dbaccess/source/ui/dlg/DbAdminImpl.cxx |4 ++--
 dbaccess/source/ui/dlg/DbAdminImpl.hxx |2 +-
 dbaccess/source/ui/dlg/UserAdminDlg.cxx|4 ++--
 dbaccess/source/ui/dlg/adminpages.cxx  |2 +-
 dbaccess/source/ui/dlg/advancedsettings.cxx|2 +-
 dbaccess/source/ui/dlg/dbadmin.cxx |2 +-
 dbaccess/source/ui/dlg/dbwiz.cxx   |2 +-
 dbaccess/source/ui/dlg/dbwizsetup.cxx  |2 +-
 dbaccess/source/ui/inc/IItemSetHelper.hxx  |2 +-
 dbaccess/source/ui/inc/UserAdminDlg.hxx|2 +-
 dbaccess/source/ui/inc/advancedsettingsdlg.hxx |2 +-
 dbaccess/source/ui/inc/dbadmin.hxx |2 +-
 dbaccess/source/ui/inc/dbwiz.hxx   |2 +-
 dbaccess/source/ui/inc/dbwizsetup.hxx  |2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 6d03c1367f0955900194287805324a8b4144e124
Author: Stephan Bergmann 
Date:   Fri Dec 15 08:58:54 2017 +0100

sal_Bool -> bool

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

diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a09de194faa4..bb47bb39b41f 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -343,9 +343,9 @@ void ODbDataSourceAdministrationHelper::clearPassword()
 m_pItemSetHelper->getWriteOutputSet()->ClearItem(DSID_PASSWORD);
 }
 
-std::pair< Reference,sal_Bool> 
ODbDataSourceAdministrationHelper::createConnection()
+std::pair< Reference,bool> 
ODbDataSourceAdministrationHelper::createConnection()
 {
-std::pair< Reference,sal_Bool> aRet;
+std::pair< Reference,bool> aRet;
 aRet.second = false;
 Sequence< PropertyValue > aConnectionParams;
 if ( getCurrentSettings(aConnectionParams) )
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx 
b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 945a8dbec435..4089bdc3e455 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -94,7 +94,7 @@ namespace dbaui
 
 /** creates a new connection. The caller is responsible to dispose it 

 */
-std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> 
 createConnection();
+std::pair< css::uno::Reference< css::sdbc::XConnection >,bool>  
createConnection();
 
 /** return the corresponding driver for the selected URL
 */
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx 
b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 4cd2fc4da71a..2146c506a889 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -141,14 +141,14 @@ namespace dbaui
 {
 return m_pItemSet;
 }
-std::pair< Reference,sal_Bool> 
OUserAdminDlg::createConnection()
+std::pair< Reference,bool> OUserAdminDlg::createConnection()
 {
 if ( !m_xConnection.is() )
 {
 m_xConnection = m_pImpl->createConnection().first;
 m_bOwnConnection = m_xConnection.is();
 }
-return std::pair< Reference,sal_Bool> 
(m_xConnection,false);
+return std::pair< Reference,bool> (m_xConnection,false);
 }
 Reference< XComponentContext > OUserAdminDlg::getORB() const
 {
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx 
b/dbaccess/source/ui/dlg/adminpages.cxx
index bf1caccd2417..987bca7031a4 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -241,7 +241,7 @@ namespace dbaui
 bool bShowMessage = true;
 try
 {
-std::pair< Reference,sal_Bool> aConnectionPair = 
m_pAdminDialog->createConnection();
+std::pair< Reference,bool> aConnectionPair = 
m_pAdminDialog->createConnection();
 bShowMessage = aConnectionPair.second;
 bSuccess = aConnectionPair.first.is();
 ::comphelper::disposeComponent(aConnectionPair.first);
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx 
b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 1f1501dd0c16..6fc2d8263ee4 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -501,7 +501,7 @@ namespace dbaui
 return m_pExampleSet;
 }
 
-std::pair< Reference< XConnection >, sal_Bool > 
AdvancedSettingsDialog::createConnection()
+std::pair< Reference< XConnection >, bool > 
AdvancedSettingsDialog::createConnection()
 {
 return m_pImpl->createConnection();
 }
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx 
b/dbaccess/source/ui/dlg/dbadmin.cxx
index f920b70eae14..6c92062ef60e 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -265,7 +265,7 @@ SfxItemSet* ODbAdminDialog::getWriteOutputSet()
 retu

[Libreoffice-commits] core.git: vcl/inc vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win

[Jan-Marek Glogowski]

 vcl/inc/PhysicalFontFace.hxx   |   31 ++---
 vcl/inc/fontinstance.hxx   |   14 ---
 vcl/inc/quartz/salgdi.h|1 
 vcl/inc/unx/freetype_glyphcache.hxx|   17 +
 vcl/inc/unx/glyphcache.hxx |   15 
 vcl/inc/win/winlayout.hxx  |   17 ++---
 vcl/qt5/Qt5FontFace.cxx|5 
 vcl/qt5/Qt5FontFace.hxx|1 
 vcl/quartz/ctfonts.cxx |5 
 vcl/source/font/PhysicalFontFace.cxx   |5 
 vcl/source/gdi/pdfwriter_impl.cxx  |7 -
 vcl/source/gdi/pdfwriter_impl.hxx  |1 
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |5 +---
 vcl/unx/generic/print/genpspgraphics.cxx   |   15 +++-
 vcl/win/gdi/winlayout.cxx  |5 +---
 15 files changed, 58 insertions(+), 86 deletions(-)

New commits:
commit 8b700794b2746070814e9ff416ecd7bbb1c902e7
Author: Jan-Marek Glogowski 
Date:   Thu Dec 14 18:42:57 2017 +0100

Protect all LogicalFontInstance constructors

This way LogicalFontInstance can just be constructed by a
PhysicalFontFace based factory.

The patch also drops the wrong "Java logical font" comment
added by commit 125cdf3404e60cf78f2a5547e9a06ce994df5c8e.

Change-Id: Ibd5d7da0c3a65dbfa2c8ae6b05cf616d39b749f2
Reviewed-on: https://gerrit.libreoffice.org/46475
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index 94d7eb5ebc44..ff708b99cfb8 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -46,33 +46,18 @@ public:
 // TODO: get rid of height/width for scalable fonts
 // TODO: make cloning cheaper
 
-// abstract base class for physical font faces
-
-// Note about physical and logical fonts:
-//
-// A physical font is a concept we have taken from the Java world
-//
-// From https://docs.oracle.com/javase/tutorial/2d/text/fonts.html
-//
-//  There are two types of fonts: physical fonts and logical fonts.
-//  Physical fonts are the actual font libraries consisting of, for
-//  example, TrueType or PostScript Type 1 fonts. The physical fonts
-//  may be Time, Helvetica, Courier, or any number of other fonts,
-//  including international fonts. Logical fonts are the following
-//  five font families: Serif, SansSerif, Monospaced, Dialog, and
-//  DialogInput. These logical fonts are not actual font libraries.
-//  Instead, the logical font names are mapped to physical fonts by
-//  the Java runtime environment.
-
+/**
+ * abstract base class for physical font faces
+ *
+ * It acts as a factory for its corresponding LogicalFontInstances and
+ * can be extended to cache device and font instance specific data.
+ */
 class VCL_PLUGIN_PUBLIC PhysicalFontFace : public FontAttributes
 {
 public:
 virtual~PhysicalFontFace() {}
 
-// by using an PhysicalFontFace object as a factory for its corresponding
-// LogicalFontInstance can be extended to cache device and font instance
-// specific data
-virtual LogicalFontInstance*  CreateFontInstance( const FontSelectPattern& 
) const = 0;
+virtual LogicalFontInstance* CreateFontInstance(const FontSelectPattern&) 
const;
 virtual PhysicalFontFace* Clone() const = 0;
 
 int GetHeight() const   { return mnHeight; }
@@ -84,7 +69,7 @@ public:
 sal_Int32   CompareIgnoreSize( const PhysicalFontFace& ) const;
 
 protected:
-explicitPhysicalFontFace( const FontAttributes& );
+explicit PhysicalFontFace(const FontAttributes&);
 voidSetBitmapSize( int nW, int nH ) { mnWidth=nW; 
mnHeight=nH; }
 
 longmnWidth;// Width (in pixels)
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 0158e972a990..7595c79036cd 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -22,21 +22,24 @@
 
 #include "fontselect.hxx"
 #include "impfontmetricdata.hxx"
+#include "PhysicalFontFace.hxx"
 
 #include 
 
-class ImplFontCache;
 class ConvertChar;
+class ImplFontCache;
 
 // TODO: allow sharing of metrics for related fonts
 
 class VCL_PLUGIN_PUBLIC LogicalFontInstance
 {
-public:
-explicitLogicalFontInstance( const FontSelectPattern& );
-virtual ~LogicalFontInstance();
+// just declaring the factory function doesn't work AKA
+// friend LogicalFontInstance* PhysicalFontFace::CreateFontInstance(const 
FontSelectPattern&) const;
+friend class PhysicalFontFace;
 
 public: // TODO: make data members private
+virtual ~LogicalFontInstance();
+
 ImplFontCache * mpFontCache;
 FontSelectPattern  maFontSelData;   // FontSelectionData
 ImplFontMetricDataRef mxFontMetr

Re: Some points on clang-format usage

[Miklos Vajna]

Hi,

On Thu, Dec 14, 2017 at 11:28:57AM +0100, Stephan Bergmann 
 wrote:
> I'm somewhat undecided whether or not to do that change to .clang-format
> now.  My feeling is that reformatting of comments is a pain and a gotcha
> anyway.

Turning this on would also have the effect that e.g.

> void f() {
> statement1(); // lengthy comment comment comment comment comment comment 
> comment comment comment
>  // comment comment comment comment comment comment
> statement2();
> }

would be formatted (due to the extra -- probably unwanted -- space) as

> void f() {
> statement1(); // lengthy comment comment comment comment comment comment 
> comment comment comment
>   // comment comment comment comment comment comment
> statement2();
> }

which might be misleading as well. So leaving at as-is has some
benefits, I think.

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: Branch 'distro/collabora/cp-5.3' - libreofficekit/qa sfx2/source vcl/source

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx |4 ++
 sfx2/source/dialog/basedlgs.cxx |   18 
++
 sfx2/source/dialog/tabdlg.cxx   |6 ++-
 vcl/source/window/dialog.cxx|4 +-
 vcl/source/window/floatwin.cxx  |   10 
++---
 5 files changed, 27 insertions(+), 15 deletions(-)

New commits:
commit 4efd08f57e0d0a68f9c9786aa5f4729c42b77e26
Author: Pranav Kant 
Date:   Thu Dec 14 20:28:39 2017 +0530

lokdialog: If we already have the title, emit it during creation

Some dialogs load the UI before we "Execute()" the dialog, or before the
dialog fires the InitShow event. In those cases, the title event has
already been fired and won't be fired after dialog is created.

Make sure that we send the title for such dialogs.

While at it, remove the superfluous std::make_pair calls to emplace_back.
And consistently use emplace_back everywhere, not push_back

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

diff --git 
a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index 8fe9c5074951..73ee25d852ab 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -315,6 +315,7 @@ void LOKDocViewSigHandlers::window(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 {
 const std::string aType = aRoot.get("type");
 const std::string aSize = aRoot.get("size");
+const std::string aTitle = aRoot.get("title", "");
 std::vector aSizePoints = GtvHelpers::split(aSize, ", ", 2);
 
 if (aType == "dialog")
@@ -326,6 +327,9 @@ void LOKDocViewSigHandlers::window(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 g_signal_connect(pDialog, "destroy", G_CALLBACK(destroyLokDialog), 
window);
 g_signal_connect(pDialog, "delete-event", 
G_CALLBACK(deleteLokDialog), window);
 
+if (!aTitle.empty())
+gtk_window_set_title(GTK_WINDOW(pDialog), aTitle.c_str());
+
 gtk_window_set_resizable(GTK_WINDOW(pDialog), false);
 gtk_widget_show_all(GTK_WIDGET(pDialog));
 gtk_window_present(GTK_WINDOW(pDialog));
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 77486632c91d..710afd49b565 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -184,8 +184,10 @@ short SfxModalDialog::Execute()
 SetLOKNotifier(pViewShell);
 const Size aSize = GetOptimalSize();
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "dialog"));
-aItems.emplace_back(std::make_pair("size", aSize.toString()));
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", aSize.toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems);
 }
 
@@ -223,8 +225,10 @@ void SfxModalDialog::StateChanged( StateChangedType nType )
 SetLOKNotifier(SfxViewShell::Current());
 const Size aSize = GetOptimalSize();
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "dialog"));
-aItems.emplace_back(std::make_pair("size", aSize.toString()));
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", aSize.toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 SfxViewShell::Current()->notifyWindow(GetLOKWindowId(), "created", 
aItems);
 }
 else if (nType == StateChangedType::Visible &&
@@ -284,8 +288,10 @@ void SfxModelessDialog::StateChanged( StateChangedType 
nStateChange )
 {
 SetLOKNotifier(pViewShell);
 std::vector aItems;
-aItems.emplace_back(std::make_pair("type", "dialog"));
-aItems.emplace_back(std::make_pair("size", 
GetOptimalSize().toString()));
+aItems.emplace_back("type", "dialog");
+aItems.emplace_back("size", GetOptimalSize().toString());
+if (!GetText().isEmpty())
+aItems.emplace_back("title", GetText().toUtf8());
 pViewShell->notifyWindow(GetLOKWindowId(), "created", aItems);
 }
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index db07a8ff380d..13033266ba47 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -526,8 +526,10 @@ short SfxTabDialog::Execute()
 SetLOKNotifier(pViewShel

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - libreofficekit/qa

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx |5 
+
 1 file changed, 5 insertions(+)

New commits:
commit 915d27cd6654208d55373f52b06c411865b106b2
Author: Pranav Kant 
Date:   Thu Dec 14 18:35:04 2017 +0530

lokdialog: gtv: Set dialog title on callback

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

diff --git 
a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
index 75d511c53f94..8fe9c5074951 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lokdocview-signal-handlers.cxx
@@ -387,6 +387,11 @@ void LOKDocViewSigHandlers::window(LOKDocView* pDocView, 
gchar* pPayload, gpoint
 
 gtv_lok_dialog_invalidate(GTV_LOK_DIALOG(pDialog), 
aGdkRectangle);
 }
+else if (aAction == "title_changed")
+{
+const std::string aTitle = aRoot.get("title", "");
+gtk_window_set_title(pDialog, aTitle.c_str());
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sd/source

[Tamás Zolnai]

 sd/source/ui/view/drviews2.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 19fe039dcb8317ca93ce929dc71c61499ee54612
Author: Tamás Zolnai 
Date:   Fri Dec 15 00:56:26 2017 +0100

tdf#114477: Can't set character highlighting on a text box using sidebar

Change-Id: I9ef9d6dacc87fb26351eae5eaedd72fd0a081672
Reviewed-on: https://gerrit.libreoffice.org/46494
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit b1f0de010f041a9340b2d32d3fef010954be9a32)
Reviewed-on: https://gerrit.libreoffice.org/46498
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 5e02a2d5a3d1..0b942d08200a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3108,6 +3108,16 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
 }
 break;
 }
+case SID_ATTR_CHAR_BACK_COLOR:
+if( rReq.GetArgs() )
+{
+const SvxBackgroundColorItem* pItem = 
rReq.GetArg(SID_ATTR_CHAR_BACK_COLOR);
+if (pItem)
+{
+aNewAttr.Put(*pItem);
+}
+}
+break;
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis]

 sc/source/core/tool/token.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2ba36f21bad74cbbd68611afddaf9bbdc8ffda50
Author: Dennis Francis 
Date:   Fri Dec 15 12:18:55 2017 +0530

tdf#114479 : Blacklist MATCH() for threading

due to reasons similar to VLOOKUP/HLOOKUP

Change-Id: I4eeefd37d87d19ed4c27c58cd661206ce916823a
Reviewed-on: https://gerrit.libreoffice.org/46499
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1d698639d09a..40f302ef85ef 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1344,7 +1344,8 @@ void ScTokenArray::CheckForThreading( OpCode eOp  )
 ocOffset,
 ocTableOp,
 ocVLookup,
-ocHLookup
+ocHLookup,
+ocMatch
 });
 
 // We only call this if it was already disabled
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/macab/MacabDriver.cxx |2 +-
 connectivity/source/drivers/macab/MacabDriver.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0656952ad4c7ad28df51ccd11ee17cd1c028ec16
Author: Stephan Bergmann 
Date:   Thu Dec 14 17:32:09 2017 +0100

loplugin:salcall (macOS)

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

diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx 
b/connectivity/source/drivers/macab/MacabDriver.cxx
index 52345ec571d1..076d6072be97 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -317,7 +317,7 @@ OUString MacabDriver::impl_getConfigurationSettingsPath()
 return aPath.makeStringAndClear();
 }
 
-Reference< XInterface >  SAL_CALL MacabDriver::Create( const Reference< 
XMultiServiceFactory >& _rxFactory )
+Reference< XInterface > MacabDriver::Create( const Reference< 
XMultiServiceFactory >& _rxFactory )
 {
 return *(new MacabDriver(comphelper::getComponentContext(_rxFactory)));
 }
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx 
b/connectivity/source/drivers/macab/MacabDriver.hxx
index 71e8c88f6a2c..0d389712fbd5 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -119,7 +119,7 @@ namespace connectivity
 
 public:
 /// @throws css::uno::Exception
-static css::uno::Reference< css::uno::XInterface > SAL_CALL 
Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& 
_rxFactory);
+static css::uno::Reference< css::uno::XInterface > Create(const 
css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory);
 
 // XServiceInfo - static versions
 /// @throws css::uno::RuntimeException
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source svx/source

[Mark Hung]

 sd/source/ui/func/fuediglu.cxx |2 +-
 svx/source/svdraw/svddrgv.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 715d0f32eb36593a4c9e52763b2ceb17ec1283c5
Author: Mark Hung 
Date:   Fri Dec 15 00:13:49 2017 +0800

tdf113594: marking gluepoints immediately.

pPV was for the parameter of MarkGluePoint that was removed
in ec38966951f2, and was kept somehow and is converted
to bool here.  Just replace the default boolean value to false
( that means marking instead of unmarking. )

Change-Id: I4c4b9dd368537b7b90cc4effae482a7b8a41eec9
Reviewed-on: https://gerrit.libreoffice.org/46472
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit bf151f0716910b56e3538579f4af7ede8f51bbcf)
Reviewed-on: https://gerrit.libreoffice.org/46497

diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index bed07d6d72ed..da333d6b0621 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -141,7 +141,7 @@ bool FuEditGluePoints::MouseButtonDown(const MouseEvent& 
rMEvt)
 if (!rMEvt.IsShift())
 mpView->UnmarkAllGluePoints();
 
-mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, aVEvt.pPV);
+mpView->MarkGluePoint(aVEvt.pObj, aVEvt.nGlueId, false);
 SdrHdl* pHdl = mpView->GetGluePointHdl(aVEvt.pObj, aVEvt.nGlueId);
 
 if (pHdl)
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index d5734123d5f9..8f373f66a857 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -747,7 +747,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
 rGP.SetAbsolutePos(rPnt,*pObj);
 
 SdrHdl* pHdl=nullptr;
-if (MarkGluePoint(pObj,nGlueId,pPV))
+if (MarkGluePoint(pObj,nGlueId,false))
 {
 pHdl=GetGluePointHdl(pObj,nGlueId);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 tools/inc/poly.h  |8 ++--
 tools/source/generic/poly.cxx |   26 --
 2 files changed, 10 insertions(+), 24 deletions(-)

New commits:
commit 5763b7f48e7aaf089c78714a82212e94b28007d7
Author: Caolán McNamara 
Date:   Thu Dec 14 13:50:17 2017 +

merge ImplPolygon and ImplPolygonData

Change-Id: Ia59a4533965bb3b76c73cc23c31bff4718768339
Reviewed-on: https://gerrit.libreoffice.org/46454
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index 5609e4a5d681..e59123f06473 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -24,18 +24,15 @@
 
 class Point;
 
-class SAL_WARN_UNUSED ImplPolygonData
+class SAL_WARN_UNUSED ImplPolygon
 {
 public:
 std::unique_ptr mxPointAry;
 std::unique_ptr mxFlagAry;
 sal_uInt16  mnPoints;
-};
 
-class SAL_WARN_UNUSED ImplPolygon  : public ImplPolygonData
-{
 public:
-ImplPolygon() { mnPoints = 0; }
+ImplPolygon() : mnPoints(0) {}
 ImplPolygon( sal_uInt16 nInitSize, bool bFlags = false );
 ImplPolygon( sal_uInt16 nPoints, const Point* pPtAry, 
const PolyFlags* pInitFlags );
 ImplPolygon( const ImplPolygon& rImplPoly );
@@ -50,7 +47,6 @@ public:
 
 booloperator==( const ImplPolygon& rCandidate ) const;
 
-voidImplInitDefault();
 voidImplInitSize(sal_uInt16 nInitSize, bool bFlags = false);
 voidImplSetSize( sal_uInt16 nSize, bool bResize = true );
 voidImplCreateFlagArray();
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 46ea1db03e2f..19ac62c9bf0c 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -112,7 +112,7 @@ ImplPolygon::ImplPolygon( const tools::Rectangle& rRect )
  mxPointAry[4] = rRect.TopLeft();
  }
  else
-ImplInitDefault();
+mnPoints = 0;
 }
 
 ImplPolygon::ImplPolygon( const tools::Rectangle& rRect, sal_uInt32 
nHorzRound, sal_uInt32 nVertRound )
@@ -164,7 +164,7 @@ ImplPolygon::ImplPolygon( const tools::Rectangle& rRect, 
sal_uInt32 nHorzRound,
 }
 }
 else
-ImplInitDefault();
+mnPoints = 0;
 }
 
 ImplPolygon::ImplPolygon( const Point& rCenter, long nRadX, long nRadY )
@@ -220,7 +220,7 @@ ImplPolygon::ImplPolygon( const Point& rCenter, long nRadX, 
long nRadY )
 }
 }
 else
-ImplInitDefault();
+mnPoints = 0;
 }
 
 ImplPolygon::ImplPolygon( const tools::Rectangle& rBound, const Point& rStart, 
const Point& rEnd,
@@ -305,7 +305,7 @@ ImplPolygon::ImplPolygon( const tools::Rectangle& rBound, 
const Point& rStart, c
 mxPointAry[nPoints] = mxPointAry[0];
 }
 else
-ImplInitDefault();
+mnPoints = 0;
 }
 
 ImplPolygon::ImplPolygon( const Point& rBezPt1, const Point& rCtrlPt1,
@@ -352,13 +352,12 @@ ImplPolygon::ImplPolygon( const Point& rBezPt1, const 
Point& rCtrlPt1,
 // and a memcopy at ImplPolygon creation, but contains no zero-controlpoints
 // for straight edges.
 ImplPolygon::ImplPolygon(const basegfx::B2DPolygon& rPolygon)
+: mnPoints(0)
 {
 const bool bCurve(rPolygon.areControlPointsUsed());
 const bool bClosed(rPolygon.isClosed());
 sal_uInt32 nB2DLocalCount(rPolygon.count());
 
-ImplInitDefault();
-
 if(bCurve)
 {
 // #127979# Reduce source point count hard to the limit of the tools 
Polygon
@@ -487,18 +486,9 @@ ImplPolygon::ImplPolygon(const basegfx::B2DPolygon& 
rPolygon)
 
 bool ImplPolygon::operator==( const ImplPolygon& rCandidate) const
 {
-if(mnPoints == rCandidate.mnPoints)
-{
-if (mxFlagAry.get() == rCandidate.mxFlagAry.get() && mxPointAry.get() 
== rCandidate.mxPointAry.get())
-return true;
-}
-
-return false;
-}
-
-void ImplPolygon::ImplInitDefault()
-{
-mnPoints = 0;
+return mnPoints == rCandidate.mnPoints &&
+   mxFlagAry.get() == rCandidate.mxFlagAry.get() &&
+   mxPointAry.get() == rCandidate.mxPointAry.get();
 }
 
 void ImplPolygon::ImplInitSize(sal_uInt16 nInitSize, bool bFlags)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: AW: tdf#108580: integrate vc_redist.exe into Windows installer

[Mike Kaganski]

Hi Juergen,

thanks for feedback!

On 12/14/2017 11:04 AM, Juergen Funk Mailinglist wrote:

this is a good idea, but I think the better way is, when the system need the vc_redist 
then we "download" the new  vc_redist.exe from MS and starting.
This has 2 advantage
  - the LO msi would not be bigger
  - we install always the up to date redist-dll's


Well, the main problem here is that there's no "latest vc_redist.exe" 
static link on MS site. So, this approach is simply impossible without 
us creating a redirect on our side. And this would create additional 
problems:


1. Creating a redirect at TDF side imposes additional load to our server 
infrastructure;
2. Users will depend on reliability of TDF servers wrt this (in terms of 
their state, correctness of the link, and also possible 
man-in-the-middle problems with modified links pointing to malware) - 
note that LO downloads themselves are served from multiple mirrors, but 
this kind of redirection can't work using mirrors;
3. Users would need internet connection at time of setup (which might 
not be there: many download the installer, to bring it somewhere where 
there's no Internet connection).


So this is just not an option - at least, this is much worse than 
suggestion to simply telling people to manually download and install the 
redistributable themselves, put on the download page.



In the current way it is possible you install older one of the dll's, and after 
the LO installation it pop up the Windows-Update, that I think is a little bit 
strange.


No; this is absolutely normal - most softwares out there behave this 
way, so not different from usual. Of course, *if* your suggestion was 
possible to be implemented in a reasonable way, it would be best - but 
the downsides outweigh the benefit.


--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-26'

[Andras Timar]

Tag 'cd-5.3-26' created by Andras Timar  at 
2017-12-15 09:01 +

cd-5.3-26

Changes since cd-5.3-25-75:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo scp2/source

[Mike Kaganski]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt |3 -
 instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt  |   16 
--
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt  |2 -
 instsetoo_native/inc_sdkoo/windows/msi_templates/InstallE.idt   |3 -
 scp2/source/ooo/windowscustomaction_ooo.scp |4 +-
 8 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit cfbc934609aaa303d03fd73b58bde1370ea312dc
Author: Mike Kaganski 
Date:   Thu Dec 14 08:37:45 2017 +0200

MSI cleanup: remove redundant conditions

VersionNT is now always greated than 600 (only needs checking in version
checking action). ISSETUPDRIVEN and ISSCHEDULEREBOOT are specific to
InstallShield and aren't relevant to LibreOffice installer.

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

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index b30ebc27d9f6..d4f1c0f9a9e5 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -12,7 +12,7 @@ CreateShortcuts   2150
 DeleteServices VersionNT   1000
 DuplicateFiles 2050
 FileCost   400
-FindRelatedProductsNOT ISSETUPDRIVEN   100
+FindRelatedProducts100
 InstallFiles   1950
 InstallFinalize3150
 InstallInitialize  700
@@ -51,7 +51,6 @@ RemoveRegistryValues  1300
 RemoveShortcuts1600
 RMCCPSearchNot CCP_SUCCESS And CCP_TEST250
 SameProductFound   SAMEPRODUCTS120
-ScheduleReboot ISSCHEDULEREBOOT3125
 SetARPInstallLocation  990
 SetARPNoRemove VersionNT < 600 995
 SetODBCFolders 550
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 2377f5c5661f..7959472331a0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -10,5 +10,4 @@ InstallFiles  350
 InstallFinalize400
 InstallInitialize  250
 InstallValidate200
-ScheduleReboot ISSCHEDULEREBOOT375
 SetAdminInstallProperty248
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
index 32b74d61a9f5..132df0855f18 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdvtExec.idt
@@ -16,4 +16,3 @@ RegisterExtensionInfo 350
 RegisterMIMEInfo   450
 RegisterProgIdInfo 400
 RegisterTypeLibraries  500
-ScheduleReboot ISSCHEDULEREBOOT675
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 602c683b85d6..8aa06a155b46 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -5,7 +5,6 @@ ISInitAllUsers  307 ALLUSERS1
 setAllUsersProfile 51  ALLUSERSPROFILE [%ALLUSERSPROFILE]
 setUserProfile 51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
-SetARPNoRemove 51  ARPNOREMOVE 1
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
 WrongWindowsVersion19  OOO_CUSTOMACTION_5
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 680961b4f744..0a0d60f09832 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -1,7 +1,7 @@
 Action Condition   Sequence
 s72S255I2
 InstallExecuteSequence Action
-AllocateRegistrySpace  NOT Installed   750
+AllocateRegistrySpace  Not Installed   750
 AppSearch  25
 BindImage  2100
 CCPSearch  CCP_TEST200
@@ -9,17 +9,17 @@ CostFinalize  500
 CostInitialize 350
 CreateFolders  1850
 CreateShortcuts2150
-DeleteServices VersionNT   1000
+DeleteServices 1000

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

[Mark Hung]

 svx/source/svdraw/svdoedge.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 98de1ed2e2c49ea52f398f666aef7480b60e4e3c
Author: Mark Hung 
Date:   Tue Dec 12 23:40:57 2017 +0800

tdf#51188: notify that geometry has changed when dragging the connector.

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

diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index f81c1b3d5710..02ef84946b31 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1854,6 +1854,8 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
 const bool bDragA(0 == rDragStat.GetHdl()->GetPointNum());
 const Point aPointNow(rDragStat.GetNow());
 
+rDragStat.SetEndDragChangesGeoAndAttributes(true);
+
 if(rDragStat.GetPageView())
 {
 SdrObjConnection* pDraggedOne(bDragA ? &aCon1 : &aCon2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: .git-hooks/pre-commit solenv/clang-format sw/source

[Miklos Vajna]

 .git-hooks/pre-commit   |2 +-
 solenv/clang-format/ClangFormat.pm  |   25 ++---
 sw/source/filter/ww8/rtfattributeoutput.cxx |1 -
 3 files changed, 15 insertions(+), 13 deletions(-)

New commits:
commit 653b513181824f1aae76e6cad0a6a00b4456f6e1
Author: Miklos Vajna 
Date:   Thu Dec 14 22:23:55 2017 +0100

clang-format: restore lost warning on touching formatted file without check

Consistently only assign something to $clang_format if it's a good
version, and also consistently return undef if we found no good version.

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

diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit
index e25532bb0662..e859919fa566 100755
--- a/.git-hooks/pre-commit
+++ b/.git-hooks/pre-commit
@@ -133,7 +133,7 @@ sub check_style($)
 chomp $filename;
 if ($filename =~ /\.($src)$/ and 
!exists($blacklist_names->{$filename}))
 {
-if (! -x $clang_format)
+if (!defined($clang_format))
 {
 my $version = ClangFormat::get_wanted_version();
 my $opt_lo = ClangFormat::get_own_directory();
diff --git a/solenv/clang-format/ClangFormat.pm 
b/solenv/clang-format/ClangFormat.pm
index 024fe7c1f87f..5aba53fd285c 100644
--- a/solenv/clang-format/ClangFormat.pm
+++ b/solenv/clang-format/ClangFormat.pm
@@ -65,24 +65,27 @@ sub find()
 {
 my $version = get_wanted_version();
 my $opt_lo = get_own_directory();
-my $clang_format = $ENV{CLANG_FORMAT};
-if (!(defined($clang_format) && 
is_matching_clang_format_version($clang_format, $version)))
+my $clang_format;
+if (!(defined($ENV{CLANG_FORMAT}) && 
is_matching_clang_format_version($ENV{CLANG_FORMAT}, $version)))
 {
-$clang_format = "$opt_lo/clang-format";
-if (!is_matching_clang_format_version($clang_format, $version))
+my @dirs = split /:/, $ENV{PATH};
+unshift(@dirs, $opt_lo);
+
+foreach my $dir (@dirs)
 {
-foreach my $dir (split /:/, $ENV{PATH})
+if (is_matching_clang_format_version("$dir/clang-format", 
$version))
 {
-if (is_matching_clang_format_version("$dir/clang-format", 
$version))
-{
-$clang_format = "$dir/clang-format";
-last;
-}
+$clang_format = "$dir/clang-format";
+last;
 }
 }
 }
+else
+{
+$clang_format = $ENV{CLANG_FORMAT};
+}
 
-if ($^O eq "cygwin")
+if ($^O eq "cygwin" && defined($clang_format))
 {
 $clang_format = `cygpath -m '$clang_format'`;
 chomp $clang_format;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 791ec265b0bd..473bcddf8abf 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -54,7 +54,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits