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

[Noel Grandin (via logerrit)]

 tools/source/debug/debug.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5e38da867fb8b71011a52588ad87f0603f3d863f
Author: Noel Grandin 
AuthorDate: Mon May 6 14:28:03 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue May 7 08:31:35 2019 +0200

fix leak in exceptionToString

need to release the pointer we get back from demangle

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

diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index bfbb8e6b4554..290e1a88a384 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -115,6 +115,9 @@ OString exceptionToString(const css::uno::Any & caught)
 #endif
 sMessage += " context: ";
 sMessage += pContext;
+#if defined __GLIBCXX__
+delete pContext;
+#endif
 }
 {
 css::configuration::CorruptedConfigurationException specialized;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Writer Table Columns Access via Java API

[fxruby]

Hi Thomas,

thank you for the detailed explanation. It works :)

Thanks a lot,

Andy

On 5/6/19 5:59 PM, Thomas Krumbein wrote:
> Hey Andy,
> 
> is is not a bug... the use of writer tables is a little bit different.
> 
> the width of a column is not an absolute value, but will be calculated
> in realitionship to the width of the table itself. And the width of the
> table depends on width of your page, textarea and right/left margins.
> 
> so... to change the width of a table-column you need to know a lot of
> values and then you can calulate the width of your table istself (a
> texttable will be always expand over the hole width of the textarea
> minus left and right margin (if set).
> 
> Column-width will be specified in the struct
> com.sun.star.text.TableColumnSeperator - the array will define all
> tableseperators as value based on the total width of the table itself.
> 
> For example:
> 
> your textarea may have a width of 14 cm. Your table should have a width
> of 10 cm. So you define a magin left and right of 2 cm.
> 
> Now your table will have two colums --- first column should be 3 cm,
> second column is now 7 cm.
> 
> Your array TableColumnSeperator needs one element - starting from
> beginning of table the entry will have the value  3/10*1 = 3000.
> 
> so, always starting from beginning of the table, the width of the Table
> is always 1 (abstarct number, means maybe 100%).
> 
> The total width is 10 cm (calculate before), you need 3 cm --so you
> get:  3/10  * 1  - position of your column-seperator.
> 
> it is a little bit complicated and I do not have an code-example in java
> or ruby, only a german-based basic example. But I hope, you get some
> hints so you can search for more informations.
> 
> Best regards
> 
> Thomas
> 
> 
> 
> Am 06.05.2019 um 11:00 schrieb fxruby:
>> Hello,
>>
>> I'm currently writing a program using the libreoffice java api.
>> It's a programm controlling the Writer component. I can insert tables,
>> place images inside the table and also change the height of table rows.
>> Now I want to change the width of a table column. But when I try to get
>> a column, I always get an empty object.
>>
>> Here's what I do (it's JRuby code, but very similar to java):
>> [...]
>>
>> Is this a bug or what am I doing wrong?
>>
>> kind regards,
>>
>> Andy
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin (via logerrit)]

 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |4 ++--
 xmloff/source/core/PropertySetMerger.cxx   |   20 ++--
 2 files changed, 4 insertions(+), 20 deletions(-)

New commits:
commit 024f3e05e5a0ccf189903caede2ace7ba3e6f3de
Author: Noel Grandin 
AuthorDate: Mon May 6 14:27:42 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue May 7 08:31:22 2019 +0200

fix leak in FreetypeFontInfo::AnnounceFont

the Add can fail, and this is a reference-counted type

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

diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 691b3f004f12..4e3a834e95c7 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -304,8 +304,8 @@ const unsigned char* FreetypeFontInfo::GetTable( const 
char* pTag, sal_uLong* pL
 
 void FreetypeFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection )
 {
-FreetypeFontFace* pFD = new FreetypeFontFace( this, maDevFontAttributes );
-pFontCollection->Add( pFD );
+rtl::Reference pFD(new FreetypeFontFace( this, 
maDevFontAttributes ));
+pFontCollection->Add( pFD.get() );
 }
 
 void GlyphCache::InitFreetype()
commit 3484dff661d7418ecf4da48faac27ae64e01ec5f
Author: Arkadiy Illarionov 
AuthorDate: Mon May 6 10:08:52 2019 +0300
Commit: Noel Grandin 
CommitDate: Tue May 7 08:31:10 2019 +0200

Use comphelper::concatSequences to reduce copypaste

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

diff --git a/xmloff/source/core/PropertySetMerger.cxx 
b/xmloff/source/core/PropertySetMerger.cxx
index b29cf4579dd7..ad059a2b95d1 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -25,6 +25,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 
+#include 
 #include 
 
 class PropertySetMergerImpl : public ::cppu::WeakAggImplHelper3< XPropertySet, 
XPropertyState, XPropertySetInfo >
@@ -200,26 +201,9 @@ Any SAL_CALL PropertySetMergerImpl::getPropertyDefault( 
const OUString& aPropert
 Sequence< Property > SAL_CALL PropertySetMergerImpl::getProperties()
 {
 Sequence< Property > aProps1( mxPropSet1Info->getProperties() );
-const Property* pProps1 = aProps1.getArray();
-const sal_Int32 nCount1 = aProps1.getLength();
-
 Sequence< Property > aProps2( mxPropSet1Info->getProperties() );
-const Property* pProps2 = aProps2.getArray();
-const sal_Int32 nCount2 = aProps2.getLength();
-
-Sequence< Property > aProperties( nCount1 + nCount2 );
-
-sal_Int32 nIndex;
-
-Property* pProperties = aProperties.getArray();
-
-for( nIndex = 0; nIndex < nCount1; nIndex++ )
-*pProperties++ = *pProps1++;
-
-for( nIndex = 0; nIndex < nCount2; nIndex++ )
-*pProperties++ = *pProps2++;
 
-return aProperties;
+return comphelper::concatSequences(aProps1, aProps2);
 }
 
 Property SAL_CALL PropertySetMergerImpl::getPropertyByName( const OUString& 
aName )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adrien Ollier (via logerrit)]

 editeng/source/editeng/editobj.cxx  |3 +--
 editeng/source/editeng/editobj2.hxx |8 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 0e791f4e59f0288081375d26d281a5aef41b628d
Author: Adrien Ollier 
AuthorDate: Wed Apr 24 04:18:09 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 7 08:28:43 2019 +0200

tdf#74702 partial cleanup of OutDevType

XParaPortionList::RefDevIsVirtual() does not depend on eRefDevType

Change-Id: I22182bbe26502552125d24aa1a8c33ffb5a38971
Signed-off-by: Adrien Ollier 
Reviewed-on: https://gerrit.libreoffice.org/71649
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index c33d17d62ee8..dd4b710f3ef4 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -91,8 +91,7 @@ void XEditAttribute::SetItem(const SfxPoolItem& rNew)
 
 XParaPortionList::XParaPortionList(
 OutputDevice* pRefDev, sal_uLong nPW, sal_uInt16 _nStretchX, sal_uInt16 
_nStretchY)
-: nRefDevPtr(pRefDev)
-, eRefDevType(pRefDev->GetOutDevType())
+: pRefDevPtr(pRefDev)
 , aRefMapMode(pRefDev->GetMapMode())
 , nStretchX(_nStretchX)
 , nStretchY(_nStretchY)
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index 24c399db53a1..c833e4b57d99 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -96,8 +96,7 @@ class XParaPortionList
 typedef std::vector > ListType;
 ListType maList;
 
-VclPtr nRefDevPtr;
-OutDevType  eRefDevType;
+VclPtr pRefDevPtr;
 MapMode aRefMapMode;
 sal_uInt16  nStretchX;
 sal_uInt16  nStretchY;
@@ -109,10 +108,9 @@ public:
 void push_back(XParaPortion* p);
 const XParaPortion& operator[](size_t i) const;
 
-OutputDevice*   GetRefDevPtr() const{ return nRefDevPtr; }
+OutputDevice*   GetRefDevPtr() const{ return pRefDevPtr; }
 sal_uLong   GetPaperWidth() const   { return nPaperWidth; }
-bool RefDevIsVirtual() const
-{ return (eRefDevType == OUTDEV_VIRDEV) || (eRefDevType == 
OUTDEV_PDF); }
+boolRefDevIsVirtual() const {return 
pRefDevPtr->IsVirtual();}
 const MapMode&  GetRefMapMode() const   { return aRefMapMode; }
 sal_uInt16  GetStretchX() const { return nStretchX; }
 sal_uInt16  GetStretchY() const { return nStretchY; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/WidgetDefinition.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7764439f85f23efb4510b41e795abd1e4c9089e9
Author: Tomaž Vajngerl 
AuthorDate: Mon May 6 22:10:57 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue May 7 02:40:04 2019 +0200

WidgetDefinition: add "action" state for the PushButton

Change-Id: I0db9ec275cc95184ceb2cdbce8ae5343a10582c1
Reviewed-on: https://gerrit.libreoffice.org/71861
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/WidgetDefinition.cxx 
b/vcl/source/gdi/WidgetDefinition.cxx
index 6eb6ae7fa3ac..2a8ae5025020 100644
--- a/vcl/source/gdi/WidgetDefinition.cxx
+++ b/vcl/source/gdi/WidgetDefinition.cxx
@@ -99,6 +99,13 @@ WidgetDefinitionPart::getStates(ControlType eType, 
ControlPart ePart, ControlSta
 }
 }
 break;
+case ControlType::Pushbutton:
+{
+auto const& rPushButtonValue = static_cast(rValue);
+if (rPushButtonValue.mbIsAction)
+sExtra = "action";
+}
+break;
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/helpers.hpp

[Libreoffice Gerrit user]

 test/helpers.hpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 21012c1c74f143a5826802a8db5c964dfb0ad27f
Author: Andras Timar 
AuthorDate: Mon May 6 22:43:56 2019 +0200
Commit: Andras Timar 
CommitDate: Mon May 6 23:11:08 2019 +0200

do not ignore the result of fwrite...

... at least from compiler point of view.
On some systems with old glibc (<= 2.15) the fwrite function has
the warn_unused_result attribute. That makes the build fail.
Starting with glibc 2.16 the attribute was removed [1].

[1]
The bug: https://sourceware.org/bugzilla/show_bug.cgi?id=11959
Release notes to 2.16:
https://sourceware.org/ml/libc-alpha/2012-06/msg00807.html

Change-Id: Ia62ccff2120dce51e311303124aadc60c134a1aa
Reviewed-on: https://gerrit.libreoffice.org/71880
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/test/helpers.hpp b/test/helpers.hpp
index 2445ef3d2..0bbd3c686 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -660,7 +660,8 @@ inline bool svgMatch(const char *testname, const 
std::vector &response, co
 TST_LOG_APPEND("Updated template writing to: " << newName << "\n");
 TST_LOG_END;
 FILE *of = fopen(Poco::Path(TDOC, newName).toString().c_str(), "w");
-fwrite(response.data(), response.size(), 1, of);
+size_t unused = fwrite(response.data(), response.size(), 1, of);
+(void)unused;
 fclose(of);
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/4.1-beta1'

[Libreoffice Gerrit user]

Tag '4.1-beta1' created by Andras Timar  at 
2019-05-06 20:49 +

4.1-beta1

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

[Libreoffice-commits] online.git: Branch 'refs/tags/4.1-beta1' - 0 commits -

[Libreoffice Gerrit user]

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - test/helpers.hpp

[Libreoffice Gerrit user]

 test/helpers.hpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4185361e5f2b6959bec43cbf4eeadccd4a7b139d
Author: Andras Timar 
AuthorDate: Mon May 6 22:43:56 2019 +0200
Commit: Andras Timar 
CommitDate: Mon May 6 22:43:56 2019 +0200

do not ignore the result of fwrite...

... at least from compiler point of view.
On some systems with old glibc (<= 2.15) the fwrite function has
the warn_unused_result attribute. That makes the build fail.
Starting with glibc 2.16 the attribute was removed [1].

[1]
The bug: https://sourceware.org/bugzilla/show_bug.cgi?id=11959
Release notes to 2.16:
https://sourceware.org/ml/libc-alpha/2012-06/msg00807.html

Change-Id: Ia62ccff2120dce51e311303124aadc60c134a1aa

diff --git a/test/helpers.hpp b/test/helpers.hpp
index 2c2ebdec4..ccd29824d 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -660,7 +660,8 @@ inline bool svgMatch(const char *testname, const 
std::vector &response, co
 TST_LOG_APPEND("Updated template writing to: " << newName << "\n");
 TST_LOG_END;
 FILE *of = fopen(Poco::Path(TDOC, newName).toString().c_str(), "w");
-fwrite(response.data(), response.size(), 1, of);
+size_t unused = fwrite(response.data(), response.size(), 1, of);
+(void)unused;
 fclose(of);
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/StaticLibrary_fuzzerstubs.mk vcl/workben

[Caolán McNamara (via logerrit)]

 vcl/StaticLibrary_fuzzerstubs.mk|1 
 vcl/workben/localestub/localedata_en_ZM.cxx |  142 
 2 files changed, 143 insertions(+)

New commits:
commit a43909d538a63ec10e267d58acecbeb9a65fd3d8
Author: Caolán McNamara 
AuthorDate: Mon May 6 19:59:14 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 6 22:17:00 2019 +0200

ofz#14612 add en_ZM locale data stub

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

diff --git a/vcl/StaticLibrary_fuzzerstubs.mk b/vcl/StaticLibrary_fuzzerstubs.mk
index 3c9109dfe1bd..d96d67ec3c85 100644
--- a/vcl/StaticLibrary_fuzzerstubs.mk
+++ b/vcl/StaticLibrary_fuzzerstubs.mk
@@ -38,6 +38,7 @@ $(eval $(call 
gb_StaticLibrary_add_exception_objects,fuzzerstubs,\
 vcl/workben/localestub/localedata_en_TT \
 vcl/workben/localestub/localedata_en_US \
 vcl/workben/localestub/localedata_en_ZA \
+vcl/workben/localestub/localedata_en_ZM \
 vcl/workben/localestub/localedata_en_ZW \
 ))
 
diff --git a/vcl/workben/localestub/localedata_en_ZM.cxx 
b/vcl/workben/localestub/localedata_en_ZM.cxx
new file mode 100644
index ..0e61cd7bfa2f
--- /dev/null
+++ b/vcl/workben/localestub/localedata_en_ZM.cxx
@@ -0,0 +1,142 @@
+#include 
+
+#include 
+
+extern "C" {
+
+static const sal_Unicode langID[] = { 0x65, 0x6e, 0x0 };
+static const sal_Unicode langDefaultName[] = { 0x45, 0x6e, 0x67, 0x6c, 0x69, 
0x73, 0x68, 0x0 };
+static const sal_Unicode countryID[] = { 0x5a, 0x4d, 0x0 };
+static const sal_Unicode countryDefaultName[] = { 0x5a, 0x61, 0x6d, 0x62, 
0x69, 0x61, 0x0 };
+static const sal_Unicode Variant[] = { 0x0 };
+
+static const sal_Unicode* LCInfoArray[]
+= { langID, langDefaultName, countryID, countryDefaultName, Variant };
+
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getLCInfo_en_ZM(sal_Int16& count)
+{
+count = SAL_N_ELEMENTS(LCInfoArray);
+return (sal_Unicode**)LCInfoArray;
+}
+extern sal_Unicode** SAL_CALL getLocaleItem_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getLocaleItem_en_ZM(sal_Int16& 
count)
+{
+return getLocaleItem_en_GB(count);
+}
+static const sal_Unicode replaceTo0[]
+= { 0x5b, 0x24, 0x4b, 0x2d, 0x41, 0x30, 0x30, 0x39, 0x5d, 0x0 };
+extern sal_Unicode const* const* SAL_CALL getAllFormats0_en_GB(sal_Int16& 
count,
+   const 
sal_Unicode*& from,
+   const 
sal_Unicode*& to);
+SAL_DLLPUBLIC_EXPORT sal_Unicode const* const* SAL_CALL
+getAllFormats0_en_ZM(sal_Int16& count, const sal_Unicode*& from, const 
sal_Unicode*& to)
+{
+to = replaceTo0;
+const sal_Unicode* tmp;
+return getAllFormats0_en_GB(count, from, tmp);
+}
+extern sal_Unicode** SAL_CALL getDateAcceptancePatterns_en_GB(sal_Int16& 
count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL 
getDateAcceptancePatterns_en_ZM(sal_Int16& count)
+{
+return getDateAcceptancePatterns_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getCollatorImplementation_en_GB(sal_Int16& 
count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL 
getCollatorImplementation_en_ZM(sal_Int16& count)
+{
+return getCollatorImplementation_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getCollationOptions_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL 
getCollationOptions_en_ZM(sal_Int16& count)
+{
+return getCollationOptions_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getSearchOptions_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getSearchOptions_en_ZM(sal_Int16& 
count)
+{
+return getSearchOptions_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getIndexAlgorithm_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getIndexAlgorithm_en_ZM(sal_Int16& 
count)
+{
+return getIndexAlgorithm_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getUnicodeScripts_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getUnicodeScripts_en_ZM(sal_Int16& 
count)
+{
+return getUnicodeScripts_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getFollowPageWords_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL 
getFollowPageWords_en_ZM(sal_Int16& count)
+{
+return getFollowPageWords_en_GB(count);
+}
+extern sal_Unicode** SAL_CALL getAllCalendars_en_GB(sal_Int16& count);
+SAL_DLLPUBLIC_EXPORT sal_Unicode** SAL_CALL getAllCalendars_en_ZM(sal_Int16& 
count)
+{
+return getAllCalendars_en_GB(count);
+}
+static const sal_Unicode defaultCurrency0[] = { 1 };
+static const sal_Unicode defaultCurrencyUsedInCompatibleFormatCodes0[] = { 1 };
+static const sal_Unicode defaultCurrencyLegacyOnly0[] = { 0 };
+static const sal_Unicode currencyID0[] = { 0x5a, 0x4d, 0x57, 0x0 };
+static const sal_Unicode currencySymbol0[] = { 0x4b, 0x0 };
+static const sal

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

[Jim Raykowski (via logerrit)]

 cui/source/inc/cuitabarea.hxx|1 +
 cui/source/tabpages/tpbitmap.cxx |   20 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 6c3ceaf3e4d59c658d0f9e4e1b22204be25f74e2
Author: Jim Raykowski 
AuthorDate: Wed Jan 23 22:13:21 2019 -0900
Commit: Katarina Behrens 
CommitDate: Mon May 6 22:08:25 2019 +0200

Fix bitmap not being selected and displayed in bitmap tab page

The background tab page uses SvxBrushItem. Area tab page uses
XFillBitmapItem. setSvxBrushItemAsFillAttributesToTargetSet creates
empty string for XFillBitmapItem name. Bitmap can be identified by
GraphicObject::GetUniqueId. Use this to select bitmap in bitmap tab page
bitmap list.

Change-Id: Ic739c0b462502a986358bf00acfbac01fafd19f7
Reviewed-on: https://gerrit.libreoffice.org/66838
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 
(cherry picked from commit 6850fcef74f7d3d82dc17143dd1befdf250977d7)
Reviewed-on: https://gerrit.libreoffice.org/71855
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index f98a6acc9c6f..8faa44e825f2 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -564,6 +564,7 @@ private:
 void ClickBitmapHdl_Impl();
 void CalculateBitmapPresetSize();
 sal_Int32 SearchBitmapList(const OUString& rBitmapName);
+sal_Int32 SearchBitmapList(const GraphicObject& rGraphicObject);
 
 public:
 SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index f73301e373a2..78f795ee0cf8 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -157,9 +157,9 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& rSet 
)
 sal_Int32 nPos( 0 );
 if ( !aItem.isPattern() )
 {
-nPos = SearchBitmapList( aItem.GetName() );
+nPos = SearchBitmapList( aItem.GetGraphicObject() );
 if ( nPos == LISTBOX_ENTRY_NOTFOUND )
-nPos = 0;
+return;
 }
 else
 {
@@ -784,6 +784,22 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, 
weld::Button&, void)
 }
 }
 
+sal_Int32 SvxBitmapTabPage::SearchBitmapList(const GraphicObject& 
rGraphicObject)
+{
+long nCount = m_pBitmapList->Count();
+sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
+
+for(long i = 0;i < nCount;i++)
+{
+if(rGraphicObject.GetUniqueID() == m_pBitmapList->GetBitmap( i 
)->GetGraphicObject().GetUniqueID())
+{
+nPos = i;
+break;
+}
+}
+return nPos;
+}
+
 sal_Int32 SvxBitmapTabPage::SearchBitmapList(const OUString& rBitmapName)
 {
 long nCount = m_pBitmapList->Count();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 udkapi/com/sun/star/lang/Locale.idl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d60d583c49ac2115eb376156032327b940bc11ce
Author: Eike Rathke 
AuthorDate: Mon May 6 16:39:11 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon May 6 21:22:46 2019 +0200

Move quotes confusing doxygen

The output of "qlt" was literally
qlt instead of "qlt" strong formatted.

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

diff --git a/udkapi/com/sun/star/lang/Locale.idl 
b/udkapi/com/sun/star/lang/Locale.idl
index da1d3b3004a9..a5c7c7718955 100644
--- a/udkapi/com/sun/star/lang/Locale.idl
+++ b/udkapi/com/sun/star/lang/Locale.idl
@@ -61,7 +61,7 @@ published struct Locale
 
 Since LibreOffice 4.2, if the locale can not be represented
 using only ISO 639 and ISO 3166 codes this field contains the
-ISO 639-3 reserved for local use code "qlt" and
+ISO 639-3 reserved for local use code "qlt" and
 a BCP 47 language tag is present in the Variant
 field. 
  */
@@ -84,7 +84,7 @@ published struct Locale
 /** specifies a BCP 47 Language Tag.
 
 Since LibreOffice 4.2, if the Language field
-is the code "qlt" this field contains the full
+is the code "qlt" this field contains the full
 BCP 47 language tag. If the Language field is not "qlt" this
 field is empty. 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/4.1-beta1'

[Libreoffice Gerrit user]

Tag '4.1-beta1' created by Andras Timar  at 
2019-05-06 19:11 +

4.1-beta1

Changes since cp-4.0.3-1-189:
---
 0 files changed
---
___
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-4' - debian/changelog

[Libreoffice Gerrit user]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit dedfa2362ee39938f19eb2f345eef26a6377526d
Author: Andras Timar 
AuthorDate: Mon May 6 21:10:50 2019 +0200
Commit: Andras Timar 
CommitDate: Mon May 6 21:10:50 2019 +0200

Debian changelog for 4.1-beta1

Change-Id: I3c09c1d9147d17c1b2b5109d1f95dde29acabe4d

diff --git a/debian/changelog b/debian/changelog
index fcdb70028..c18826127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.1.0-1) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool4
+
+ -- Andras Timar   Mon, 06 May 2019 13:30:00 +0100
+
 loolwsd (4.0.3-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool4
___
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-4' - configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit 0812f72134b58a235715a0aa6f5211dd7bcd782e
Author: Andras Timar 
AuthorDate: Mon May 6 21:08:37 2019 +0200
Commit: Andras Timar 
CommitDate: Mon May 6 21:08:37 2019 +0200

Bump version to 4.1.0

Change-Id: Ifeed2bd03303e01a1363d4fdcfc604b0c4f91459

diff --git a/configure.ac b/configure.ac
index f8ad130c7..14ca275dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.0.3], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.1.0], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5Menu.hxx |3 ---
 vcl/qt5/Qt5Menu.cxx |1 -
 2 files changed, 4 deletions(-)

New commits:
commit ac52193805c537619402b993d7308935857ce668
Author: Jan-Marek Glogowski 
AuthorDate: Mon May 6 15:09:51 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon May 6 20:58:58 2019 +0200

Qt5 remove unused Qt5Menu::setFrameSignal

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

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index b8a451657372..f3807abb0bf6 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -73,9 +73,6 @@ public:
 unsigned GetItemCount() { return maItems.size(); }
 Qt5MenuItem* GetItemAtPos(unsigned nPos) { return maItems[nPos]; }
 
-Q_SIGNALS:
-void setFrameSignal(const SalFrame* pFrame);
-
 private slots:
 static void slotMenuTriggered(Qt5MenuItem* pQItem);
 static void slotMenuAboutToShow(Qt5MenuItem* pQItem);
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 6112a7aa4e6c..d119c71010b9 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -29,7 +29,6 @@ Qt5Menu::Qt5Menu(bool bMenuBar)
 , mpQMenuBar(nullptr)
 , mpQMenu(nullptr)
 {
-connect(this, &Qt5Menu::setFrameSignal, this, &Qt5Menu::SetFrame, 
Qt::BlockingQueuedConnection);
 }
 
 bool Qt5Menu::VisibleMenuBar() { return true; }
___
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-4' - loleaflet/js loleaflet/src test/Makefile.am test/UnitWOPIRenameFile.cpp test/WopiTestServer.hpp wsd/ClientSession.cpp w

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js   |   10 +++
 loleaflet/src/control/Toolbar.js  |8 +++
 loleaflet/src/core/Socket.js  |5 +
 loleaflet/src/errormessages.js|3 -
 loleaflet/src/map/handler/Map.WOPI.js |4 +
 test/Makefile.am  |6 +-
 test/UnitWOPIRenameFile.cpp   |   90 ++
 test/WopiTestServer.hpp   |   25 +++--
 wsd/ClientSession.cpp |   17 +-
 wsd/DocumentBroker.cpp|   33 +---
 wsd/DocumentBroker.hpp|4 -
 wsd/Storage.cpp   |   40 +--
 wsd/Storage.hpp   |   20 ++-
 13 files changed, 223 insertions(+), 42 deletions(-)

New commits:
commit c93c8c86892ab5743929a17fef6a8a0ab0cc0518
Author: merttumer 
AuthorDate: Tue Apr 30 17:21:44 2019 +0300
Commit: Jan Holesovsky 
CommitDate: Mon May 6 20:35:46 2019 +0200

Added RenameFile Support for WOPI

This patch concerns rename file operation when the integration
supports it
Signed-off-by: merttumer 

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

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 9c9863595..e0916cdd3 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1334,7 +1334,15 @@ function onSearchKeyDown(e) {
 function documentNameConfirm() {
var value = $('#document-name-input').val();
if (value !== null && value != '' && value != map['wopi'].BaseFileName) 
{
-   map.saveAs(value);
+   if (map['wopi'].UserCanRename && map['wopi'].SupportsRename) {
+   // file name must be without the extension
+   if (value.lastIndexOf('.') > 0)
+   value = value.substr(0, value.lastIndexOf('.'));
+   map.renameFile(value);
+   } else {
+   // saveAs for rename
+   map.saveAs(value);
+   }
}
map._onGotFocus();
 }
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 8f3820431..a08642b2e 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -107,6 +107,14 @@ L.Map.include({
'options=' + options);
},
 
+   renameFile: function (filename) {
+   if (!filename) {
+   return;
+   }
+   this.showBusy(_('Renaming...'), false);
+   this._socket.sendMessage('renamefile filename=' + 
encodeURIComponent(filename));
+   },
+
applyStyle: function (style, familyName) {
if (!style || !familyName) {
this.fire('error', {cmd: 'setStyle', kind: 
'incorrectparam'});
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 0e27a7096..884a0c8d2 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -493,6 +493,9 @@ L.Socket = L.Class.extend({
else if (command.errorKind === 'savefailed') {
storageError = errorMessages.storage.savefailed;
}
+   else if (command.errorKind === 'renamefailed') {
+   storageError = 
errorMessages.storage.renamefailed;
+   }
else if (command.errorKind === 'saveunauthorized') {
storageError = 
errorMessages.storage.saveunauthorized;
}
@@ -696,7 +699,7 @@ L.Socket = L.Class.extend({
', last: ' + (command.rendercount - 
this._map._docLayer._debugRenderCount));
this._map._docLayer._debugRenderCount = 
command.rendercount;
}
-   else if (textMsg.startsWith('saveas:')) {
+   else if (textMsg.startsWith('saveas:') || 
textMsg.startsWith('renamefile:')) {
this._map.hideBusy();
if (command !== undefined && command.url !== undefined 
&& command.url !== '') {
this.close();
diff --git a/loleaflet/src/errormessages.js b/loleaflet/src/errormessages.js
index b4b04838f..7e790c833 100644
--- a/loleaflet/src/errormessages.js
+++ b/loleaflet/src/errormessages.js
@@ -28,7 +28,8 @@ errorMessages.storage = {
loadfailed: _('Failed to read document from storage. Please contact 
your storage server (%storageserver) administrator.'),
savediskfull: _('Save failed due to no disk space left on storage 
server. Document will now be read-only. Please contact the server 
(%storageserver) administrator to continue editing.'),
saveunauthorized: _('Document cannot be saved due to expi

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/text/frmform.cxx |9 -
 sw/source/core/text/txtfrm.cxx  |2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 1c4b53909b2a1c99dfcb51685e5100c503c6
Author: Michael Stahl 
AuthorDate: Mon May 6 15:40:41 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon May 6 20:33:56 2019 +0200

tdf#122892 tdf#124366 sw: fix loop in SwTextFrame::CalcFollow()

... differently; commit b7d4418c309c8bc4fd25485dd3a0ea6ad9edf34e
was partially wrong because if SetPrepWidows() isn't called and the
master and follow have fewer lines than the sum of orphans and
widows, then the frames must be merged, i.e., master must move
forward to the next page and follow must be deleted, but that only
happens with SetPrepWidows().

However if the SwTextFrame::PrepWidows() determines that no lines can be
moved from the master, SwTextFrame::CalcPreps() will grow the master
to force it to move to the next page, and then it sets SetWidow() too,
so check this flag to break the loop in SwTextFrame::CalcFollow().

Another question is what is the point of the "very cheesy" follow
formatting fall-back, which might be removable.

Change-Id: I0769a5a4f13ca4c95c2229a496207809d05576f9
Reviewed-on: https://gerrit.libreoffice.org/71866
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 1caea03fcc6c24e38b2d1d9f6097ad84183ffefd)
Reviewed-on: https://gerrit.libreoffice.org/71872
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 157a338bda34..dad1b9a47109 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -238,7 +238,14 @@ bool SwTextFrame::CalcFollow(TextFrameIndex const 
nTextOfst)
 if ( !pMyFollow->GetNext() && !pMyFollow->HasFootnote() )
 nOldBottom =  aRectFnSet.IsVert() ? 0 : LONG_MAX;
 
-while( true )
+// tdf#122892 check flag:
+// 1. WidowsAndOrphans::FindWidows() determines follow is a widow
+// 2. SwTextFrame::PrepWidows() calls SetPrepWidows() on master;
+//if it can spare lines, master truncates one line
+// 3. SwTextFrame::CalcPreps() on master (below);
+//unless IsPrepMustFit(), if master hasn't shrunk via 2., it will 
SetWidow()
+// 4. loop must exit then, because the follow didn't grow so nothing 
will ever change
+while (!IsWidow())
 {
 if( !FormatLevel::LastLevel() )
 {
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 99981405d297..d5a71ed936a7 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2567,6 +2567,7 @@ void SwTextFrame::PrepWidows( const sal_uInt16 nNeed, 
bool bNotify )
 SwParaPortion *pPara = GetPara();
 if ( !pPara )
 return;
+pPara->SetPrepWidows();
 
 sal_uInt16 nHave = nNeed;
 
@@ -2598,7 +2599,6 @@ void SwTextFrame::PrepWidows( const sal_uInt16 nNeed, 
bool bNotify )
 
 if( bSplit )
 {
-pPara->SetPrepWidows();
 GetFollow()->SetOfst( aLine.GetEnd() );
 aLine.TruncLines( true );
 if( pPara->IsFollowField() )
___
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-6.0-30'

[Szymon Kłos (via logerrit)]

Tag 'cp-6.0-30' created by Andras Timar  at 
2019-05-06 18:17 +

cp-6.0-30

Changes since co-6.0-28-84:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-30' created by Andras Timar  at 
2019-05-06 18:17 +

cp-6.0-30

Changes since cp-6.0-19:
Andras Timar (1):
  remove executable bit from *.aff and *.dic files

---
 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-6.0-30'

[Libreoffice Gerrit user]

Tag 'cp-6.0-30' created by Andras Timar  at 
2019-05-06 18:17 +

cp-6.0-30

Changes since cp-6.0-7:
Adolfo Jayme Barrientos (1):
  .howtoget, now more Collabora-y

---
 help3xsl/default.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
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-4' - loleaflet/css loleaflet/images loleaflet/js loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/css/toolbar.css|1 +
 loleaflet/images/lc_formproperties.svg   |1 +
 loleaflet/js/toolbar.js  |6 --
 loleaflet/src/control/Control.Menubar.js |8 ++--
 loleaflet/src/map/Map.js |2 +-
 loleaflet/src/unocommands.js |1 +
 6 files changed, 14 insertions(+), 5 deletions(-)

New commits:
commit 212290a35dc4e87439e5d4d41b16224281c8d27d
Author: Ashod Nakashian 
AuthorDate: Sat May 4 15:30:11 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Mon May 6 20:15:33 2019 +0200

leaflet: Add sidebar commands in toolbar and menu

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

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index b60a95806..881707038 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -612,6 +612,7 @@ button.leaflet-control-search-next
 .w2ui-icon.fullscreen{ background: url('images/lc_fullscreen.svg') no-repeat 
center !important; }
 .w2ui-icon.closemobile{ background: url('images/lc_closedocmobile.svg') 
no-repeat center !important; }
 .w2ui-icon.closetoolbar{ background: url('images/close_toolbar.svg') no-repeat 
center !important; }
+.w2ui-icon.sidebar_modify_page{ background: 
url('images/lc_formproperties.svg') no-repeat center !important; }
 
 .w2ui-icon.vereign{ background: url('images/vereign.png') no-repeat center 
!important; }
 
diff --git a/loleaflet/images/lc_formproperties.svg 
b/loleaflet/images/lc_formproperties.svg
new file mode 100644
index 0..75c2b7b52
--- /dev/null
+++ b/loleaflet/images/lc_formproperties.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
 
\ No newline at end of file
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 68cddbd22..9c9863595 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -814,6 +814,8 @@ function createToolbar() {
{type: 'button',  id: 'insertsymbol', img: 'insertsymbol', 
hint: _UNO('.uno:InsertSymbol', '', true), uno: 'InsertSymbol'},
{type: 'spacer'},
{type: 'button',  id: 'edit',  img: 'edit'},
+   {type: 'button',  id: 'sidebar', img: 'sidebar_modify_page', 
hint: _UNO('.uno:Sidebar', '', true), uno: '.uno:Sidebar', hidden: true},
+   {type: 'break', id: 'breaksidebar', hidden: true},
{type: 'button',  id: 'fold',  img: 'fold', desktop: true, 
mobile: false, hidden: true},
{type: 'button',  id: 'hamburger-tablet',  img: 'hamburger', 
desktop: false, mobile: false, tablet: true, hidden: true}
];
@@ -1569,7 +1571,7 @@ function onDocLayerInit() {
toolbarUp.show('textalign', 'wraptext', 'breakspacing', 
'insertannotation', 'conditionalformaticonset',
'numberformatcurrency', 'numberformatpercent',
'numberformatincdecimals', 'numberformatdecdecimals', 
'break-number', 'togglemergecells', 'breakmergecells',
-   'setborderstyle', 'sortascending', 'sortdescending', 
'breaksorting');
+   'setborderstyle', 'sortascending', 'sortdescending', 
'breaksorting', 'breaksidebar', 'sidebar');
toolbarUp.remove('styles');
 
statusbar.remove('prev', 'next', 'prevnextbreak');
@@ -1636,7 +1638,7 @@ function onDocLayerInit() {
case 'text':
toolbarUp.show('leftpara', 'centerpara', 'rightpara', 
'justifypara', 'breakpara', 'linespacing',
'breakspacing', 'defaultbullet', 'defaultnumbering', 
'breakbullet', 'incrementindent', 'decrementindent',
-   'breakindent', 'inserttable', 'insertannotation');
+   'breakindent', 'inserttable', 'insertannotation', 
'breaksidebar', 'sidebar');
 
if (!_inMobileMode()) {
statusbar.insert('left', [
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index f58b457ed..676cf8047 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -62,7 +62,9 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ZoomMinus', 'text'), id: 
'zoomout', type: 'action'},
{name: _('Reset zoom'), id: 'zoomreset', type: 
'action'},
{type: 'separator'},
-   {uno: '.uno:ControlCodes'}
+   {uno: '.uno:ControlCodes'},
+   {type: 'separator'},
+   {uno: '.uno:Sidebar'}
]
},
{name: _UNO('.uno:InsertMenu', 'text'), type: 'menu', 
menu: [
@@ -347,7 +349,9 @@ L.Control.Menubar = L.Control.extend({
 

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-30' created by Andras Timar  at 
2019-05-06 18:17 +

cp-6.0-30

Changes since co-6.0-24:
Andras Timar (1):
  tdf#123500 double '~' character in translation

---
 source/fr/officecfg/registry/data/org/openoffice/Office/UI.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
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-4' - test/test.cpp

[Libreoffice Gerrit user]

 test/test.cpp |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit f39cebd66013850b824aa641bfcb1b20a7110733
Author: Michael Meeks 
AuthorDate: Sat May 4 20:16:36 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon May 6 20:08:06 2019 +0200

test: recommend --verbose mode, and interleave output chronologically.

Avoids a number of unpleasant attempts to interleave output.

Change-Id: I84b25e338b576d88f7f5fc47fbfcae34c3d377fd
Reviewed-on: https://gerrit.libreoffice.org/71801
Reviewed-by: Ashod Nakashian 
Tested-by: Jan Holesovsky 

diff --git a/test/test.cpp b/test/test.cpp
index 1dde93600..5ee19cf12 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -82,17 +82,24 @@ bool isStandalone()
 }
 
 static std::mutex errorMutex;
+static bool IsVerbose = false;
 static std::stringstream errors;
 
 void tstLog(const std::ostringstream &stream)
 {
-std::lock_guard lock(errorMutex);
-errors << stream.str();
+if (IsVerbose)
+std::cerr << stream.str() << std::endl;
+else
+{
+std::lock_guard lock(errorMutex);
+errors << stream.str();
+}
 }
 
 // returns true on success
 bool runClientTests(bool standalone, bool verbose)
 {
+IsVerbose = verbose;
 IsStandalone = standalone;
 
 CPPUNIT_NS::TestResult controller;
@@ -129,7 +136,6 @@ bool runClientTests(bool standalone, bool verbose)
 
 if (!verbose)
 {
-// redirect std::cerr temporarily
 runner.run(controller);
 
 // output the errors we got during the testing
@@ -149,7 +155,7 @@ bool runClientTests(bool standalone, bool verbose)
 if (!envar && failures.size() > 0)
 {
 std::cerr << "\nTo reproduce the first test failure use:\n\n";
-std::cerr << "(cd test; CPPUNIT_TEST_NAME=\"" << 
(*failures.begin())->failedTestName() << "\" ./run_unit.sh)\n\n";
+std::cerr << "(cd test; CPPUNIT_TEST_NAME=\"" << 
(*failures.begin())->failedTestName() << "\" ./run_unit.sh --verbose)\n\n";
 }
 
 return result.wasSuccessful();
___
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-4' - test/run_unit.sh.in

[Libreoffice Gerrit user]

 test/run_unit.sh.in |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8c9ebfd76a71d98f6e52b5c9ae185d93bfe82059
Author: Michael Meeks 
AuthorDate: Sat May 4 21:26:40 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon May 6 20:08:56 2019 +0200

test: encourage the test script to sleep for the debugger too.

Change-Id: I538b2d80f57ecc8a342a38a64864d16b9128a04f
Reviewed-on: https://gerrit.libreoffice.org/71803
Reviewed-by: Ashod Nakashian 
Tested-by: Jan Holesovsky 

diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 1c63c3ae2..99f5e51c3 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -98,6 +98,12 @@ if test "z$tst" == "z"; then
  
--o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
  --o:admin_console.username=admin 
--o:admin_console.password=admin \
  > "$tst_log" 2>&1 &
+ if test "z${SLEEPFORDEBUGGER}${SLEEPKITFORDEBUGGER}" != "z"; then
+ echo "sleeping for debugger"
+  sleep ${SLEEPFORDEBUGGER:-0}
+  sleep ${SLEEPKITFORDEBUGGER:-0}
+ fi
+
  echo "  executing test"
 
  oldpath=`pwd`
@@ -111,8 +117,10 @@ if test "z$tst" == "z"; then
 retval=1
  fi
 
- echo "killing $!"
- kill $!
+ if test "z${SLEEPFORDEBUGGER}${SLEEPKITFORDEBUGGER}" == "z"; then
+ echo "killing $!"
+ kill $!
+ fi
 
  exit $retval
 
___
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-4' - test/httpcrashtest.cpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 test/httpcrashtest.cpp |3 +++
 wsd/LOOLWSD.cpp|4 
 2 files changed, 7 insertions(+)

New commits:
commit bffaf016190ec47b61456c180d3ef36df2013b42
Author: Michael Meeks 
AuthorDate: Sat May 4 22:50:00 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon May 6 20:10:04 2019 +0200

test: close testCrashKit race.

LOOLWSD is conservative and leaves forkit to start processes for a
while. If we kill a kit before it has started and registered we can
end up with LOOLWSD holding off to wait for the (now dead) kit, and
the tearDown assertions that we have 1 kit failing.

Change-Id: Id25e48bf55d1757d2223816293500fde6ff9df1b
Reviewed-on: https://gerrit.libreoffice.org/71808
Reviewed-by: Ashod Nakashian 
Tested-by: Jan Holesovsky 

diff --git a/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
index a2b1a9d2a..6fd8ee938 100644
--- a/test/httpcrashtest.cpp
+++ b/test/httpcrashtest.cpp
@@ -136,6 +136,9 @@ void HTTPCrashTest::testCrashKit()
 {
 std::shared_ptr socket = 
loadDocAndGetSocket("empty.odt", _uri, testname);
 
+TST_LOG("Allowing time for kits to spawn and connect to wsd to get 
cleanly killed");
+std::this_thread::sleep_for(std::chrono::milliseconds(1000));
+
 TST_LOG("Killing loolkit instances.");
 
 killLoKitProcesses();
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b520dcba7..f355e6b7b 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -363,6 +363,7 @@ void cleanupDocBrokers()
 /// -1 for error.
 static int forkChildren(const int number)
 {
+LOG_TRC("Request forkit to spawn " << number << " new child(ren)");
 Util::assertIsLocked(NewChildrenMutex);
 
 if (number > 0)
@@ -1514,6 +1515,9 @@ void LOOLWSD::autoSave(const std::string& docKey)
 void PrisonerPoll::wakeupHook()
 {
 #if !MOBILEAPP
+LOG_TRC("PrisonerPoll - wakes up with " << NewChildren.size() <<
+" new children and " << DocBrokers.size() << " brokers and " <<
+OutstandingForks << " kits forking");
 if (!LOOLWSD::checkAndRestoreForKit())
 {
 // No children have died.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unit Tests fail. But why?

[Regina Henschel]

Hi Miklos,

Miklos Vajna schrieb am 06-May-19 um 17:14:

Hi Regina,

On Mon, May 06, 2019 at 04:36:57PM +0200, Regina Henschel 
 wrote:

The expected text '\nText 1: Caption' means, that it will always fail on
Windows. Where is the place, that disables this test for Windows?


It's not "not on Windows", it's "Linux only". Makefile.in:17 has the
condition, so 'make check' includes gbuild's "uicheck" target on Linux,
but not elsewhere.


I see, thank you.

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

What is shape property 'AnchorPosition' ?

[Regina Henschel]

Hi all,

If you inspect the shape properties using a Basic macro, you will see 
the read only property 'AnchorPosition'. What is the meaning of this 
property? I do not find such property in the API. It seems to be related 
to the left/top of the center window.


A document with macro is attached to
https://bugs.documentfoundation.org/show_bug.cgi?id=124534

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - test/countloolkits.hpp test/test.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 test/countloolkits.hpp |7 +++
 test/test.cpp  |2 +-
 wsd/DocumentBroker.hpp |2 +-
 wsd/LOOLWSD.cpp|6 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit d749765588b8c3fb6577dd2cb2a407cd782dfcc7
Author: Michael Meeks 
AuthorDate: Fri May 3 13:51:49 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon May 6 20:06:27 2019 +0200

Improve pid collection and printout for tests.

Change-Id: I820c1acbdbae41dd2c2c6bb7285b84bbb61e79d5
Reviewed-on: https://gerrit.libreoffice.org/71772
Reviewed-by: Ashod Nakashian 
Tested-by: Jan Holesovsky 

diff --git a/test/countloolkits.hpp b/test/countloolkits.hpp
index 0f7010ff0..782b19b50 100644
--- a/test/countloolkits.hpp
+++ b/test/countloolkits.hpp
@@ -62,6 +62,13 @@ static int countLoolKitProcesses(const int expected)
 TST_LOG("Found " << count << " LoKit processes but was expecting " << 
expected << ".");
 }
 
+std::vector pids = getKitPids();
+std::ostringstream oss;
+oss << "Test kit pids are ";
+for (auto i : pids)
+oss << i << " ";
+TST_LOG(oss.str());
+
 return count;
 }
 
diff --git a/test/test.cpp b/test/test.cpp
index 91e3251c7..1dde93600 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -158,7 +158,7 @@ bool runClientTests(bool standalone, bool verbose)
 // Versions assuming a single user, on a single machine
 #ifndef UNIT_CLIENT_TESTS
 
-std::vector getProcPids(const char* exec_filename, bool ignoreZombies = 
false)
+std::vector getProcPids(const char* exec_filename, bool ignoreZombies = 
true)
 {
 std::vector pids;
 
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 5f20cdc7a..eeeb97da3 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -333,7 +333,7 @@ public:
 void childSocketTerminated();
 
 /// Get the PID of the associated child process
-Poco::Process::PID getPid() const { return _childProcess->getPid(); }
+Poco::Process::PID getPid() const { return _childProcess ? 
_childProcess->getPid() : 0; }
 
 std::unique_lock getLock() { return 
std::unique_lock(_mutex); }
 std::unique_lock getDeferredLock() { return 
std::unique_lock(_mutex, std::defer_lock); }
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 1cd9841a5..b520dcba7 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3398,7 +3398,11 @@ std::vector LOOLWSD::getKitPids()
 {
 std::unique_lock lock(DocBrokersMutex);
 for (const auto &it : DocBrokers)
-pids.push_back(it.second->getPid());
+{
+int pid = it.second->getPid();
+if (pid > 0)
+pids.push_back(pid);
+}
 }
 return pids;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Marco A.G.Pinto (via logerrit)]

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

New commits:
commit f0aa8f4ce0b1d311e0731100e3d4113f702b8a18
Author: Marco A.G.Pinto 
AuthorDate: Wed May 1 13:20:59 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Mon May 6 19:39:22 2019 +0200

Update git submodules

* Update dictionaries from branch 'master'
  - Updated the English dictionaries: GB

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

diff --git a/dictionaries b/dictionaries
index 23120b6ade92..547d7a6839fa 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 23120b6ade924b892055e26148c18f44896821c6
+Subproject commit 547d7a6839fa289ca52c2a241f9923e0359aee2f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: en/changelog.txt en/description.xml en/en_GB.aff en/en_GB.dic en/package-description.txt en/README_en_GB.txt

[Libreoffice Gerrit user]

 en/README_en_GB.txt|   28 
 en/changelog.txt   |   26 
 en/description.xml |2 
 en/en_GB.aff   |  130 +
 en/en_GB.dic   | 3413 +++--
 en/package-description.txt |2 
 6 files changed, 3144 insertions(+), 457 deletions(-)

New commits:
commit 547d7a6839fa289ca52c2a241f9923e0359aee2f
Author: Marco A.G.Pinto 
AuthorDate: Wed May 1 13:20:59 2019 +0100
Commit: Aron Budea 
CommitDate: Mon May 6 19:39:22 2019 +0200

Updated the English dictionaries: GB

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

diff --git a/en/README_en_GB.txt b/en/README_en_GB.txt
index 9bba23e..88656e1 100644
--- a/en/README_en_GB.txt
+++ b/en/README_en_GB.txt
@@ -1,7 +1,7 @@
 This dictionary was initially based on a subset of the
 original English wordlist created by Kevin Atkinson for
 Pspell and Aspell and thus is covered by his original
-LGPL licence. 
+LGPL licence.
 
 It has been extensively updated by David Bartlett, Brian Kelk,
 Andrew Brown and Marco A.G.Pinto:
@@ -10,7 +10,8 @@ Andrew Brown and Marco A.G.Pinto:
  — Missing words have been added;
  — Many errors have been corrected;
  — Compound hyphenated words have been added where appropriate;
- — Thousands of proper/places names have been added.
+ — Thousands of proper/places names have been added;
+ — Thousands of possessives have been added to nouns and proper names.
 
 Valuable inputs to this process were received from many other
 people — far too numerous to name. Serious thanks to you all
@@ -73,7 +74,7 @@ OOo Issue 63541 — remove *dessicated
 2018-05-01 — Andrew Ziem suggested a list of 328 names of famous people on 
Kevin's GitHub:
  "These 328 name tokens were derived from the top 100 lists in 
Google Trends via
 this repository 
(https://github.com/az0/google-trend-names). The geography was
-set to US, and it spanned dates from 2004 to 2018."
 
+set to US, and it spanned dates from 2004 to 2018."
 2018-08-01 — Slightly higher quality icon
   — Added tons of drugs names supplied by the user Andrew Ziem 
on Kevin's GitHub
   — Fixed/improved flag "5": "women's" was missing
@@ -103,7 +104,18 @@ to
— Added tons of cities from the US with a 10 000+ population.
  This list was supplied by Michael Holroyd on Kevin Atkinson's 
GitHub.
— Added tons of possessives to nouns, thanks to Jörg Knobloch.
-
+2018-12-01 — Added the cities from Canada:
+ — 
https://en.wikipedia.org/wiki/List_of_cities_in_Canada
+2019-02-01 — Improved flag "5" thanks to the GitHub user Ding-adong:
+ Some "swomen's" and "women's" entries were missing.
+  — Fixed flag "3": -ists, -ists, -ist's → -ist, -ists, -ist's.
+  — Improved flag "N".
+2019-03-01 — Added the LGPL_V3 License .txt into the Extension.
+  — Ding-adong added a flag "=" for suffixes:  -lessness, 
-lessnesses, -lessness's.
+  — Ding-adong changed the prefix flag "O" to "^" since "O" 
was both prefix and suffix.
+  — Small fixes and enhancements on flags "z" and "O" by 
Ding-adong.
+2019-04-01 — Improved flag "P" thanks to the GitHub user Ding-adong, giving 
also -nesses which
+increased the wordlist in about 1800 valid words.
 ---
 
 MARCO A.G.PINTO:
@@ -118,9 +130,11 @@ The sources used to verify the spelling of the words I 
included in the dictionar
  1) Oxford Dictionaries;
  2) Collins Dictionary;
  3) Macmillan Dictionary;
- 4) Wiktionary (used with caution);
- 5) Wikipedia (used with caution);
- 6) Physical dictionaries.
+ 4) Cambridge Dictionary;
+ 5) Merriam-Webster Dictionary (used with caution ⚠); 
+ 6) Wiktionary (used with caution ⚠);
+ 7) Wikipedia (used with caution ⚠);
+ 8) Physical dictionaries.
 
 Main difficulties developing this dictionary:
  1) Proper names;
diff --git a/en/changelog.txt b/en/changelog.txt
index 00d41c7..a711ad2 100644
--- a/en/changelog.txt
+++ b/en/changelog.txt
@@ -1,3 +1,29 @@
+MAGP 2019-05-01
+
+Updated the Dictionaries:
+- British (Marco A.G.Pinto)*
+  * British has 2358 new words (2019-04-01) + 458 new words (2019-05-01).
+
+
+
+MAGP 2019-03-01
+
+Added the LGPL_V3 License .txt into the Extension.
+
+Updated the Dictionaries:
+- British (Marco A.G.Pinto)*
+  * British has 764 new words (2019-02-01) + 1046 new words (2019-03-01).
+
+
+
+MAGP 2019-01-01
+
+Updated the Dictionaries:
+- British (Marco A.G.Pinto)*
+  * British has 1529 new words (2018-12-01) + 1175 new words (2019-01-01).
+
+
+
 MAGP 2018-11-01
 
 Updated the Dictionaries:
diff --git a/en/description.xml b/en/description.xml
index 2bdb57e..734b2f0 100644
--- a/en/description

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

[Eike Rathke (via logerrit)]

 sc/source/ui/view/viewfun6.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 67d95af78b26d799e68859761dfe72771f71aeab
Author: Eike Rathke 
AuthorDate: Mon May 6 15:42:20 2019 +0200
Commit: Eike Rathke 
CommitDate: Mon May 6 18:57:35 2019 +0200

Resolves: tdf#124315 clear "Enter pastes" mode and marching ants overlay

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

diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 2332f88cdf05..b632d401d122 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -329,6 +329,11 @@ void ScViewFunc::InsertCurrentTime(SvNumFormatType 
nReqFmt, const OUString& rUnd
 }
 else
 {
+// Clear "Enter pastes" mode.
+rViewData.SetPasteMode( ScPasteFlags::NONE );
+// Clear CopySourceOverlay in each window of a split/frozen tabview.
+rViewData.GetViewShell()->UpdateCopySourceOverlay();
+
 bool bForceReqFmt = false;
 const double fCell = rDoc.GetValue( aCurPos);
 // Combine requested date/time stamp with existing cell time/date, if 
any.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 vcl/win/gdi/DWriteTextRenderer.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e9813126b7648b735d2231a703190ee48b8bbe42
Author: Miklos Vajna 
AuthorDate: Mon May 6 16:44:56 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 6 18:57:51 2019 +0200

Related: tdf#114209 vcl DirectWrite rotation: don't truncate to int degrees

Pointed out in the post-commit review of
, thanks Mike.

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

diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx 
b/vcl/win/gdi/DWriteTextRenderer.cxx
index 98daff12c4a4..93f877d2aea9 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -401,8 +401,9 @@ 
WinFontTransformGuard::WinFontTransformGuard(ID2D1RenderTarget* pRenderTarget, f
 {
 // DWrite angle is in clockwise degrees, our orientation is in 
counter-clockwise 10th
 // degrees.
-aTransform
-= aTransform * 
D2D1::Matrix3x2F::Rotation(-rLayout.GetOrientation() / 10, rBaseline);
+aTransform = aTransform
+ * D2D1::Matrix3x2F::Rotation(
+   -static_cast(rLayout.GetOrientation()) / 10, 
rBaseline);
 }
 mpRenderTarget->SetTransform(aTransform);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Writer Table Columns Access via Java API

[Thomas Krumbein]

Hey Andy,

is is not a bug... the use of writer tables is a little bit different.

the width of a column is not an absolute value, but will be calculated 
in realitionship to the width of the table itself. And the width of the 
table depends on width of your page, textarea and right/left margins.


so... to change the width of a table-column you need to know a lot of 
values and then you can calulate the width of your table istself (a 
texttable will be always expand over the hole width of the textarea 
minus left and right margin (if set).


Column-width will be specified in the struct 
com.sun.star.text.TableColumnSeperator - the array will define all 
tableseperators as value based on the total width of the table itself.


For example:

your textarea may have a width of 14 cm. Your table should have a width 
of 10 cm. So you define a magin left and right of 2 cm.


Now your table will have two colums --- first column should be 3 cm, 
second column is now 7 cm.


Your array TableColumnSeperator needs one element - starting from 
beginning of table the entry will have the value  3/10*1 = 3000.


so, always starting from beginning of the table, the width of the Table 
is always 1 (abstarct number, means maybe 100%).


The total width is 10 cm (calculate before), you need 3 cm --so you 
get:  3/10  * 1  - position of your column-seperator.


it is a little bit complicated and I do not have an code-example in java 
or ruby, only a german-based basic example. But I hope, you get some 
hints so you can search for more informations.


Best regards

Thomas



Am 06.05.2019 um 11:00 schrieb fxruby:

Hello,

I'm currently writing a program using the libreoffice java api.
It's a programm controlling the Writer component. I can insert tables,
place images inside the table and also change the height of table rows.
Now I want to change the width of a table column. But when I try to get
a column, I always get an empty object.

Here's what I do (it's JRuby code, but very similar to java):
[...]

Is this a bug or what am I doing wrong?

kind regards,

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

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

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

[Michael Stahl (via logerrit)]

 sw/source/core/text/frmform.cxx |9 -
 sw/source/core/text/txtfrm.cxx  |2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 1caea03fcc6c24e38b2d1d9f6097ad84183ffefd
Author: Michael Stahl 
AuthorDate: Mon May 6 15:40:41 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon May 6 17:48:54 2019 +0200

tdf#122892 tdf#124366 sw: fix loop in SwTextFrame::CalcFollow()

... differently; commit b7d4418c309c8bc4fd25485dd3a0ea6ad9edf34e
was partially wrong because if SetPrepWidows() isn't called and the
master and follow have fewer lines than the sum of orphans and
widows, then the frames must be merged, i.e., master must move
forward to the next page and follow must be deleted, but that only
happens with SetPrepWidows().

However if the SwTextFrame::PrepWidows() determines that no lines can be
moved from the master, SwTextFrame::CalcPreps() will grow the master
to force it to move to the next page, and then it sets SetWidow() too,
so check this flag to break the loop in SwTextFrame::CalcFollow().

Another question is what is the point of the "very cheesy" follow
formatting fall-back, which might be removable.

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

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index db81c7aca3e7..3b484176ab8e 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -226,7 +226,14 @@ bool SwTextFrame::CalcFollow(TextFrameIndex const 
nTextOfst)
 if ( !pMyFollow->GetNext() && !pMyFollow->HasFootnote() )
 nOldBottom =  aRectFnSet.IsVert() ? 0 : LONG_MAX;
 
-while( true )
+// tdf#122892 check flag:
+// 1. WidowsAndOrphans::FindWidows() determines follow is a widow
+// 2. SwTextFrame::PrepWidows() calls SetPrepWidows() on master;
+//if it can spare lines, master truncates one line
+// 3. SwTextFrame::CalcPreps() on master (below);
+//unless IsPrepMustFit(), if master hasn't shrunk via 2., it will 
SetWidow()
+// 4. loop must exit then, because the follow didn't grow so nothing 
will ever change
+while (!IsWidow())
 {
 if( !FormatLevel::LastLevel() )
 {
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 37c1c406d365..b531bd749742 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2631,6 +2631,7 @@ void SwTextFrame::PrepWidows( const sal_uInt16 nNeed, 
bool bNotify )
 SwParaPortion *pPara = GetPara();
 if ( !pPara )
 return;
+pPara->SetPrepWidows();
 
 sal_uInt16 nHave = nNeed;
 
@@ -2662,7 +2663,6 @@ void SwTextFrame::PrepWidows( const sal_uInt16 nNeed, 
bool bNotify )
 
 if( bSplit )
 {
-pPara->SetPrepWidows();
 GetFollow()->SetOfst( aLine.GetEnd() );
 aLine.TruncLines( true );
 if( pPara->IsFollowField() )
___
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-4' - ios/Mobile.xcodeproj

[Libreoffice Gerrit user]

 ios/Mobile.xcodeproj/project.pbxproj |  154 ++-
 1 file changed, 153 insertions(+), 1 deletion(-)

New commits:
commit 9e842f92176c8e55bc168c3d4ac9d9ef665051f1
Author: Tor Lillqvist 
AuthorDate: Mon May 6 12:56:55 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 6 18:46:30 2019 +0300

Add more core source files for breakpointing convenience

diff --git a/ios/Mobile.xcodeproj/project.pbxproj 
b/ios/Mobile.xcodeproj/project.pbxproj
index 75428f7f2..4f66251ed 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -415,6 +415,66 @@
BE51F51622491766005129DC /* view1.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = view1.cxx; 
path = "../../ios-device/sw/source/uibase/uiview/view1.cxx"; sourceTree = 
""; };
BE51F51722491766005129DC /* swcli.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = swcli.cxx; 
path = "../../ios-device/sw/source/uibase/uiview/swcli.cxx"; sourceTree = 
""; };
BE51F51822491766005129DC /* viewdlg.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewdlg.cxx; 
path = "../../ios-device/sw/source/uibase/uiview/viewdlg.cxx"; sourceTree = 
""; };
+   BE533496227C545B00D63ADE /* viewsh.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewsh.cxx; 
path = "../../ios-device/sw/source/core/view/viewsh.cxx"; sourceTree = 
""; };
+   BE533497227C545B00D63ADE /* viewimp.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewimp.cxx; 
path = "../../ios-device/sw/source/core/view/viewimp.cxx"; sourceTree = 
""; };
+   BE533498227C545B00D63ADE /* viewpg.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = viewpg.cxx; 
path = "../../ios-device/sw/source/core/view/viewpg.cxx"; sourceTree = 
""; };
+   BE533499227C545B00D63ADE /* pagepreviewlayout.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
pagepreviewlayout.cxx; path = 
"../../ios-device/sw/source/core/view/pagepreviewlayout.cxx"; sourceTree = 
""; };
+   BE53349A227C545B00D63ADE /* vdraw.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vdraw.cxx; 
path = "../../ios-device/sw/source/core/view/vdraw.cxx"; sourceTree = 
""; };
+   BE53349B227C545B00D63ADE /* vnew.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vnew.cxx; path 
= "../../ios-device/sw/source/core/view/vnew.cxx"; sourceTree = ""; };
+   BE53349C227C545B00D63ADE /* vprint.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = vprint.hxx; path 
= "../../ios-device/sw/source/core/view/vprint.hxx"; sourceTree = ""; };
+   BE53349D227C545B00D63ADE /* vprint.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vprint.cxx; 
path = "../../ios-device/sw/source/core/view/vprint.cxx"; sourceTree = 
""; };
+   BE53349E227C545B00D63ADE /* printdata.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = printdata.cxx; 
path = "../../ios-device/sw/source/core/view/printdata.cxx"; sourceTree = 
""; };
+   BE53352F227C54CD00D63ADE /* objectformatterlayfrm.hxx */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
objectformatterlayfrm.hxx; path = 
"../../ios-device/sw/source/core/layout/objectformatterlayfrm.hxx"; sourceTree 
= ""; };
+   BE533530227C54CD00D63ADE /* flycnt.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = flycnt.cxx; 
path = "../../ios-device/sw/source/core/layout/flycnt.cxx"; sourceTree = 
""; };
+   BE533531227C54CD00D63ADE /* layouter.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = layouter.cxx; 
path = "../../ios-device/sw/source/core/layout/layouter.cxx"; sourceTree = 
""; };
+   BE533532227C54CD00D63ADE /* fly.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fly.cxx; path 
= "../../ios-device/sw/source/core/layout/fly.cxx"; sourceTree = ""; };
+   BE533533227C54CD00D63ADE /* dbg_lay.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbg_lay.cxx; 
path = "../../ios-device/sw/source/core/layout/dbg_lay.cxx"; sourceTree = 
""; };
+   BE533534227C54CD00D63ADE /* calcmove.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = calcmove.cxx; 
path = "../../ios-device/sw/source/core/layout/calcmove.cxx"; sourceTree = 
""; };
+   BE533535227C54CD00D63ADE /* anchoredobject.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
anchoredobject.cxx; path = 
"../../ios-device/sw/source/core/layout/anchoredobj

Re: Unit Tests fail. But why?

[Miklos Vajna]

Hi Regina,

On Mon, May 06, 2019 at 04:36:57PM +0200, Regina Henschel 
 wrote:
> The expected text '\nText 1: Caption' means, that it will always fail on
> Windows. Where is the place, that disables this test for Windows?

It's not "not on Windows", it's "Linux only". Makefile.in:17 has the
condition, so 'make check' includes gbuild's "uicheck" target on Linux,
but not elsewhere.

Regards,

Miklos


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

Writer Table Columns Access via Java API

[fxruby]

Hello,

I'm currently writing a program using the libreoffice java api.
It's a programm controlling the Writer component. I can insert tables,
place images inside the table and also change the height of table rows.
Now I want to change the width of a table column. But when I try to get
a column, I always get an empty object.

Here's what I do (it's JRuby code, but very similar to java):

[27] pry(main)> table.java_object
=>
[Proxy:1640296160,7f207000c9b0;gcc3[0];d5b23e2451b4b4a295c975776715,Type[com.sun.star.text.XTextTable]]>
[28] pry(main)> columns = table.columns
=> #
[29] pry(main)> columns.java_object
=>
[Proxy:1534694976,7f207c000de0;gcc3[0];d5b23e2451b4b4a295c975776715,Type[com.sun.star.table.XTableColumns]]>
[30] pry(main)> columns.getCount
=> 12
[31] pry(main)> col = columns.getByIndex 0
=> nil

I always get nil :(

There's some kind of functionality behind the method, because if I enter
a wrong index, an exception is raised

[32] pry(main)> col = columns.getByIndex 13
Java::ComSunStarLang::IndexOutOfBoundsException:
from
com.sun.star.lib.uno.environments.remote.Job.remoteUnoRequestRaisedException(com/sun/star/lib/uno/environments/remote/Job.java:158)
[33] pry(main)>

Is this a bug or what am I doing wrong?

kind regards,

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

Review for tdf#125126 Use individual methods for polar handles in OOXML shapes

[Regina Henschel]

Hi all,

It would be nice to get a review for https://gerrit.libreoffice.org/71831.

Kind regards
Regina


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

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

[Muhammet Kara (via logerrit)]

 sfx2/inc/SfxRedactionHelper.hxx|5 +--
 sfx2/source/doc/SfxRedactionHelper.cxx |   50 +++--
 sfx2/source/doc/objserv.cxx|7 +---
 3 files changed, 27 insertions(+), 35 deletions(-)

New commits:
commit 2ff22c0bf4c23c4bed9ccfcfa79dff848086650d
Author: Muhammet Kara 
AuthorDate: Fri May 3 22:07:59 2019 +0300
Commit: Muhammet Kara 
CommitDate: Mon May 6 16:49:16 2019 +0200

tdf#125135: Standardize content placement for redaction

Correct the position & size by roundtrip conversion
from/to wmf as a temporary solution.

Simplify a bit.

Change-Id: I59f32bd29750f9ac759800893583308f29b8aad5
Reviewed-on: https://gerrit.libreoffice.org/71860
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index 1cd653650557..8b1bdd57e247 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -49,15 +49,14 @@ public:
  * */
 static void getPageMetaFilesFromDoc(std::vector& aMetaFiles,
 std::vector<::Size>& aPageSizes, const 
sal_Int32& nPages,
-DocumentToGraphicRenderer& aRenderer, 
bool bIsWriter,
-bool bIsCalc);
+DocumentToGraphicRenderer& aRenderer);
 /*
  * Creates one shape and one draw page for each gdimetafile,
  * and inserts the shapes into the newly created draw pages.
  * */
 static void addPagesToDraw(uno::Reference& xComponent, const 
sal_Int32& nPages,
const std::vector& aMetaFiles,
-   const std::vector<::Size>& aPageSizes, bool 
bIsCalc);
+   const std::vector<::Size>& aPageSizes);
 /*
  * Makes the Redaction toolbar visible to the user.
  * Meant to be called after converting a document to a Draw doc
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx 
b/sfx2/source/doc/SfxRedactionHelper.cxx
index 67cdfa77c22f..b63340c4913f 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -28,6 +28,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -61,11 +64,24 @@ OUString SfxRedactionHelper::getStringParam(const 
SfxRequest& rReq, const sal_uI
 return sStringParam;
 }
 
+namespace
+{
+void fixMetaFile(GDIMetaFile& tmpMtf)
+{
+SvMemoryStream aDestStrm(65535, 65535);
+ConvertGDIMetaFileToWMF(tmpMtf, aDestStrm, nullptr, false);
+aDestStrm.Seek(0);
+
+tmpMtf.Clear();
+
+ReadWindowMetafile(aDestStrm, tmpMtf);
+}
+}
+
 void SfxRedactionHelper::getPageMetaFilesFromDoc(std::vector& 
aMetaFiles,
  std::vector<::Size>& 
aPageSizes,
  const sal_Int32& nPages,
- DocumentToGraphicRenderer& 
aRenderer,
- bool bIsWriter, bool bIsCalc)
+ DocumentToGraphicRenderer& 
aRenderer)
 {
 for (sal_Int32 nPage = 1; nPage <= nPages; ++nPage)
 {
@@ -75,12 +91,10 @@ void 
SfxRedactionHelper::getPageMetaFilesFromDoc(std::vector& aMeta
 ::Size aCalcPageContentSize;
 ::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage, &aLogicPos, 
&aCalcPageLogicPos,
  
&aCalcPageContentSize);
-// FIXME: This is a temporary hack. Need to figure out a proper way to 
derive this scale factor.
-::Size aTargetSize(aDocumentSizePixel.Width() * 1.23, 
aDocumentSizePixel.Height() * 1.23);
 
 aPageSizes.push_back(aLogic);
 
-Graphic aGraphic = aRenderer.renderToGraphic(nPage, 
aDocumentSizePixel, aTargetSize,
+Graphic aGraphic = aRenderer.renderToGraphic(nPage, 
aDocumentSizePixel, aDocumentSizePixel,
  COL_TRANSPARENT, true);
 auto& rGDIMetaFile = 
const_cast(aGraphic.GetGDIMetaFile());
 
@@ -88,24 +102,11 @@ void 
SfxRedactionHelper::getPageMetaFilesFromDoc(std::vector& aMeta
 // will be correct in MM.
 MapMode aMapMode;
 aMapMode.SetMapUnit(MapUnit::Map100thMM);
-// FIXME: This is a temporary hack. Need to figure out a proper way to 
derive these magic numbers.
-if (bIsWriter)
-aMapMode.SetOrigin(::Point(-(aLogicPos.getX() - 512) * 1.53,
-   -((aLogicPos.getY() - 501) * 1.53 + 
(nPage - 1) * 740)));
-else if (bIsCalc)
-rGDIMetaFile.Scale(0.566, 0.566);
 
 rGDIMetaFile.SetPrefMapMode(aMapMode);
+rGDIMetaFile.SetPrefSize(aLogic);
 
-if (bIsCalc)
- 

[Libreoffice-commits] core.git: bin/find-unneeded-includes

[Gabor Kelemen (via logerrit)]

 bin/find-unneeded-includes |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e2c2136dccbf2f4800ca4adc04911b6258a179fe
Author: Gabor Kelemen 
AuthorDate: Mon Apr 29 23:42:09 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 6 16:47:42 2019 +0200

find-unneeded-includes: don't try to replace forward_list with debug header

As seen in tools/source/inet/inetmime.cxx

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

diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index da143cde3249..bc8e728078a8 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -43,6 +43,7 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules):
 "array": ("debug/array", ),
 "bitset": ("debug/bitset", ),
 "deque": ("debug/deque", ),
+"forward_list": ("debug/forward_list", ),
 "list": ("debug/list", ),
 "map": ("debug/map.h", ),
 "set": ("debug/set.h", "debug/multiset.h"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unit Tests fail. But why?

[Regina Henschel]

Hi Stephan,

Stephan Bergmann schrieb am 06-May-19 um 15:48:

On 06/05/2019 15:26, Regina Henschel wrote:

it is about https://gerrit.libreoffice.org/71831

Unit tests fail in Jenkins. But I have no idea, what is wrong.
The tests are from sw and my changes have nothing to do with sw. My 
patch is about calculating of adjustment values from handle position.


Crappy tests.


I have run the failing test locally now, Windows 10. I get
==
FAIL: test_insert_caption (insertCaption.insertCaption)
--
Traceback (most recent call last):
  File 
"D:/Build_diverses/core/sw/qa/uitest/writer_tests/insertCaption.py", 
line 46, in test_insert_caption
self.assertEqual(document.TextFrames.getByIndex(0).Text.String, 
"\nText 1: Caption")

AssertionError: '\r\nText 1: Caption' != '\nText 1: Caption'

The expected text '\nText 1: Caption' means, that it will always fail on 
Windows. Where is the place, that disables this test for Windows?


  I triggered a rebuild from the Jenkins UI now (people
with sufficient rights can push "Resume build" button there, so ask for 
someone to do that on IRC,


Thank you.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - bin/check-elf-dynamic-objects

[Christian Lohmaier (via logerrit)]

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

New commits:
commit f952a93e791719e754edcc2b11793c4c41b73651
Author: Christian Lohmaier 
AuthorDate: Sat May 4 23:51:57 2019 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 6 16:19:42 2019 +0200

check_dynamic_objects: --enable-gtk3-kde5 also wants qt5/kf5 whitelist..

Change-Id: I098e894d80c2b319307bf9e9eece7a59d2ff0bd0
Reviewed-on: https://gerrit.libreoffice.org/71810
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 4f95f74d9f9944fc225c92d17bed9921d059690e)
Reviewed-on: https://gerrit.libreoffice.org/71854

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index c1b69e6ec61d..a2bb41b3548b 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -147,7 +147,7 @@ local file="$1"
 ;;
 */libvclplug_gtk3_kde5lo.so)
 if [ "$ENABLE_GTK3_KDE5" = TRUE ]; then
-whitelist="${whitelist} ${x11whitelist} ${gtk3whitelist}"
+whitelist="${whitelist} ${x11whitelist} ${gtk3whitelist} 
${qt5whitelist} ${kf5whitelist} libxcb.so.1"
 fi
 ;;
 */lo_kde5filepicker)
___
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-4' - loleaflet/css

[Libreoffice Gerrit user]

 loleaflet/css/leaflet.css |2 +-
 loleaflet/css/loleaflet.css   |2 +-
 loleaflet/css/menubar.css |2 +-
 loleaflet/css/spreadsheet.css |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a74049ac024c00fe09de2978a3a3d60d8e299821
Author: Tor Lillqvist 
AuthorDate: Mon May 6 14:35:17 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 6 15:56:53 2019 +0200

Revert "loleaflet: mobile: fix max-width screen size tablet"

This makes the iOS app return to how it looked last week.

If the reverted change really was intentional and carefully designed
for normal Online I don't know what to do. I assume there is no way to
have CSS that would be conditional on whether it is running in the iOS
app or in a normal browser?

This reverts commit 01f37fbbd33292de4d8f64fb753428669cbc34a7.

Change-Id: I04eead4b0200c4ca40af56718f92234fe896828e
Reviewed-on: https://gerrit.libreoffice.org/71856
Reviewed-by: Szymon Kłos 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 4b76672d2..8c11b9af8 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -792,7 +792,7 @@ input.clipboard {
}
 }
 
-@media (max-width: 768px),(max-device-height: 768px) {
+@media (max-width: 767px),(max-device-height: 767px) {
.loleaflet-ruler {
height: 0px;
display: none;
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 6078f7155..c029fd0d4 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -139,7 +139,7 @@ body {
}
 }
 
-@media (max-width: 768px),(max-device-height: 768px) {
+@media (max-width: 767px),(max-device-height: 767px) {
/* Show slidesorter beyond 768px only */
#presentation-controls-wrapper {
display: none;
diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index ffbf288c5..099210f9c 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -256,7 +256,7 @@
background-position: bottom;
 }
 
-@media (max-width: 768px),(max-device-height: 768px) {
+@media (max-width: 767px),(max-device-height: 767px) {
 .document-logo {
 width: 35px;
 height: 38px;
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 2627c222f..4411b69ab 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -212,7 +212,7 @@
background-repeat: no-repeat;
}
 
-@media (max-width: 768px) {
+@media (max-width: 767px) {
#spreadsheet-toolbar {
bottom: 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unit Tests fail. But why?

[Stephan Bergmann]

On 06/05/2019 15:26, Regina Henschel wrote:

it is about https://gerrit.libreoffice.org/71831

Unit tests fail in Jenkins. But I have no idea, what is wrong.
The tests are from sw and my changes have nothing to do with sw. My 
patch is about calculating of adjustment values from handle position.


Crappy tests.  I triggered a rebuild from the Jenkins UI now (people 
with sufficient rights can push "Resume build" button there, so ask for 
someone to do that on IRC, or even better ask to get those rights 
granted yourself).

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

[Libreoffice-commits] core.git: Branch 'feature/item_refactor2' - include/item item/source

[Armin Le Grand (via logerrit)]

 include/item/base/ItemAdministrator.hxx |2 +-
 include/item/base/ItemBase.hxx  |6 --
 include/item/base/ItemBuffered.hxx  |8 +---
 include/item/base/ItemControlBlock.hxx  |5 +++--
 item/source/base/ItemBase.cxx   |   11 +++
 item/source/base/ItemBuffered.cxx   |   19 ++-
 item/source/base/ItemControlBlock.cxx   |2 +-
 7 files changed, 31 insertions(+), 22 deletions(-)

New commits:
commit 4b0409c319abd3248360345cf7d86d66b932d513
Author: Armin Le Grand 
AuthorDate: Mon May 6 15:45:26 2019 +0200
Commit: Armin Le Grand 
CommitDate: Mon May 6 15:45:26 2019 +0200

WIP: Linux build changes

Change-Id: I3ea79f9a48f626681604e871143c0adec7c0cb7a

diff --git a/include/item/base/ItemAdministrator.hxx 
b/include/item/base/ItemAdministrator.hxx
index 4b77f5ffafca..18a3a6eb953a 100644
--- a/include/item/base/ItemAdministrator.hxx
+++ b/include/item/base/ItemAdministrator.hxx
@@ -31,7 +31,7 @@
 
 namespace Item
 {
-class ItemAdministrator
+class ITEM_DLLPUBLIC ItemAdministrator
 {
 private:
 std::functionm_aConstructItem;
diff --git a/include/item/base/ItemBase.hxx b/include/item/base/ItemBase.hxx
index 44c597cddbed..b93d5b196ce9 100644
--- a/include/item/base/ItemBase.hxx
+++ b/include/item/base/ItemBase.hxx
@@ -42,7 +42,7 @@ namespace Item
 
 // PutValue/Any interface for automated instance creation from SfxType
 // mechanism (UNO API and sfx2 stuff)
-virtual void putValues(const AnyIDArgs& rArgs);
+virtual void putAnyValues(const AnyIDArgs& rArgs);
 
 private:
 // local reference to instance of ItemControlBlock for this
@@ -55,10 +55,12 @@ namespace Item
 protected:
 // PutValue/Any interface for automated instance creation from SfxType
 // mechanism (UNO API and sfx2 stuff)
-virtual void putValue(const css::uno::Any& rVal, sal_uInt8 nMemberId);
+virtual void putAnyValue(const css::uno::Any& rVal, sal_uInt8 
nMemberId);
 
 public:
 ItemBase(ItemControlBlock& rItemControlBlock);
+virtual ~ItemBase();
+
 ItemBase(const ItemBase&);
 ItemBase& operator=(const ItemBase&);
 
diff --git a/include/item/base/ItemBuffered.hxx 
b/include/item/base/ItemBuffered.hxx
index 82647198efaf..43727586ffbf 100755
--- a/include/item/base/ItemBuffered.hxx
+++ b/include/item/base/ItemBuffered.hxx
@@ -29,6 +29,8 @@
 
 namespace Item
 {
+class ItemAdministrator;
+
 class ITEM_DLLPUBLIC ItemBuffered : public ItemBase
 {
 public:
@@ -44,7 +46,7 @@ namespace Item
 
 // PutValue/Any interface for automated instance creation from 
SfxType
 // mechanism (UNO API and sfx2 stuff)
-virtual void putValue(const css::uno::Any& rVal, sal_uInt8 
nMemberId);
+virtual void putAnyValue(const css::uno::Any& rVal, sal_uInt8 
nMemberId);
 
 public:
 ItemData();
@@ -67,7 +69,7 @@ namespace Item
 public:
 // PutValue/Any interface for automated instance creation from SfxType
 // mechanism (UNO API and sfx2 stuff)
-virtual void putValues(const AnyIDArgs& rArgs);
+virtual void putAnyValues(const AnyIDArgs& rArgs);
 
 protected:
 // Method to internally (thus protected) set a new ItemData
@@ -90,7 +92,7 @@ namespace Item
 virtual ~ItemBuffered();
 ItemBuffered& operator=(const ItemBuffered&);
 
-virtual bool operator==(const ItemBuffered&) const;
+virtual bool operator==(const ItemBase&) const;
 virtual std::unique_ptr clone() const;
 };
 } // end of namespace Item
diff --git a/include/item/base/ItemControlBlock.hxx 
b/include/item/base/ItemControlBlock.hxx
index b83f37333d29..80effd85a24a 100755
--- a/include/item/base/ItemControlBlock.hxx
+++ b/include/item/base/ItemControlBlock.hxx
@@ -22,15 +22,16 @@
 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
 
 ///
 
 namespace Item
 {
 // predefine - no need to include
-class ItemBase;
-
 class ITEM_DLLPUBLIC ItemControlBlock
 {
 private:
diff --git a/item/source/base/ItemBase.cxx b/item/source/base/ItemBase.cxx
index 158972837d15..40be2aeb73f8 100644
--- a/item/source/base/ItemBase.cxx
+++ b/item/source/base/ItemBase.cxx
@@ -8,7 +8,6 @@
  */
 
 #include 
-// #include 
 #include 
 #include 
 
@@ -86,18 +85,18 @@ Nonetheless these SlotItems STILL depend on the 
SfxItem-RANGES defined in the Sf
 
 namespace Item
 {
-void ItemBase::putValues(const AnyIDArgs& rArgs)
+void ItemBase::putAnyValues(const AnyIDArgs& rArgs)
 {
 if(!rArgs.empty())
 {
 for(const auto& arg : rArgs)
 {
-putValue(arg.first, arg.second);
+putAnyValue(arg.first, arg.second);
 }
 }
 }
 
-void ItemBase::putValue(const css::uno

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/LibreOfficeKit vcl/source

[Szymon Kłos (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |2 ++
 vcl/source/window/dialog.cxx |7 +++
 2 files changed, 9 insertions(+)

New commits:
commit 3ef1164bc3a13af481102e0abef06929c53bad8b
Author: Szymon Kłos 
AuthorDate: Mon Apr 29 16:58:03 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Mon May 6 15:42:12 2019 +0200

libreofficekit: send show/hide messages for dialogs

Change-Id: I2b3ff5e5122b2be099be500ac544bf81f8d1b2ae
Reviewed-on: https://gerrit.libreoffice.org/71544
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/71545
Tested-by: Jan Holesovsky 

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 7ff69d1b350b..2c29ef201519 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -605,6 +605,8 @@ typedef enum
  * - "cursor_visible" - cursor visible status is changed. Status is 
available
  *in "visible" field
  * - "close" - window is closed
+ * - "show" - show the window
+ * - "hide" - hide the window
  */
 LOK_CALLBACK_WINDOW = 36,
 
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 84d98914fd74..f050e33ffb16 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -763,6 +763,13 @@ void Dialog::StateChanged( StateChangedType nType )
 aObject.EventName = "ModelessDialogVisible";
 xEventBroadcaster->documentEventOccured(aObject);
 UITestLogger::getInstance().log("Modeless Dialog Visible");
+
+if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+{
+std::vector aPayload;
+aPayload.emplace_back("title", GetText().toUtf8());
+pNotifier->notifyWindow(GetLOKWindowId(), IsVisible()? 
OUString("show"): OUString("hide"), aPayload);
+}
 }
 }
 
___
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-6.0' - sc/source

[Jan Holesovsky (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 4a226f94f506dc87fcb34486b6a00cfa2f4f0e35
Author: Jan Holesovsky 
AuthorDate: Thu Nov 15 11:51:42 2018 +0100
Commit: Aron Budea 
CommitDate: Mon May 6 15:36:36 2019 +0200

lok sc: Fix the formula input bar and address bar notifications.

Apparently we did not have the pInputWin living in the background; but
now we have.  There is no reason to treat it in an 'else' branch, these
checks should be separate either way.

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

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2077b42d2433..3c65a12295fc 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3692,11 +3692,9 @@ void ScInputHandler::NotifyChange( const 
ScInputHdlState* pState,
 
 if ( pInputWin )
 pInputWin->SetTextString(aString);
-else if (comphelper::LibreOfficeKit::isActive())
-{
-if (pActiveViewSh)
-
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, 
aString.toUtf8().getStr());
-}
+
+if (comphelper::LibreOfficeKit::isActive() && 
pActiveViewSh)
+
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, 
aString.toUtf8().getStr());
 }
 
 if ( pInputWin || comphelper::LibreOfficeKit::isActive())  
  // Named range input
@@ -3734,10 +3732,9 @@ void ScInputHandler::NotifyChange( const 
ScInputHdlState* pState,
 
pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
 pInputWin->SetSumAssignMode();
 }
-else if (pActiveViewSh)
-{
+
+if (comphelper::LibreOfficeKit::isActive() && 
pActiveViewSh)
 
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, 
aPosStr.toUtf8().getStr());
-}
 }
 
 if (bStopEditing)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Unit Tests fail. But why?

[Regina Henschel]

Hi all,

it is about https://gerrit.libreoffice.org/71831

Unit tests fail in Jenkins. But I have no idea, what is wrong.
The tests are from sw and my changes have nothing to do with sw. My 
patch is about calculating of adjustment values from handle position.


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

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

[Ashod Nakashian (via logerrit)]

 desktop/source/lib/init.cxx |   17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 8e9c36dfc346387abfbbaefbc15a518cbe3e257c
Author: Ashod Nakashian 
AuthorDate: Sun May 5 12:36:09 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Mon May 6 15:25:36 2019 +0200

LOK: remove duplicate cursor invalidations for same view only

This limits duplicate cursor invalidation removal to same
view only, which seems to have been left in error.

We should now remove any old cursor invalidations (for
the same view) and only keep the latest (current) one.

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c5bf038e14a3..626e37b87a1f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -929,8 +929,8 @@ 
CallbackFlushHandler::CallbackFlushHandler(LibreOfficeKitDocument* pDocument, Li
 {
 SetPriority(TaskPriority::POST_PAINT);
 
-// Add the states that are safe to skip duplicates on,
-// even when not consequent.
+// Add the states that are safe to skip duplicates on, even when
+// not consequent (i.e. do no emmit them if unchanged from last).
 m_states.emplace(LOK_CALLBACK_TEXT_SELECTION, "NIL");
 m_states.emplace(LOK_CALLBACK_GRAPHIC_SELECTION, "NIL");
 m_states.emplace(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, "NIL");
@@ -1022,7 +1022,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_GRAPHIC_SELECTION:
 case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
 case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
-case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR :
+case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
 case LOK_CALLBACK_STATE_CHANGED:
 case LOK_CALLBACK_MOUSE_POINTER:
 case LOK_CALLBACK_CELL_CURSOR:
@@ -1106,6 +1106,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 case LOK_CALLBACK_CELL_VIEW_CURSOR:
 case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
 case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
+case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
 case LOK_CALLBACK_TEXT_VIEW_SELECTION:
 case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
 {
@@ -1118,16 +1119,6 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 }
 break;
 
-case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
-{
-removeAll(
-[type, &payload] (const queue_type::value_type& elem) {
-return (elem.Type == type && elem.PayloadString == 
payload);
-}
-);
-}
-break;
-
 case LOK_CALLBACK_INVALIDATE_TILES:
 {
 RectangleAndPart& rcNew = 
aCallbackData.setRectangleAndPart(payload);
___
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-6.0' - vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/WidgetDefinition.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit c76f89edf12a62b49e4beb0f1a294ab68c532c72
Author: Tomaž Vajngerl 
AuthorDate: Mon May 6 22:10:57 2019 +0900
Commit: Jan Holesovsky 
CommitDate: Mon May 6 15:24:09 2019 +0200

WidgetDefinition: add "action" state for the PushButton

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

diff --git a/vcl/source/gdi/WidgetDefinition.cxx 
b/vcl/source/gdi/WidgetDefinition.cxx
index c41afb63fe91..f9bad9aa7163 100644
--- a/vcl/source/gdi/WidgetDefinition.cxx
+++ b/vcl/source/gdi/WidgetDefinition.cxx
@@ -99,6 +99,12 @@ WidgetDefinitionPart::getStates(ControlType eType, 
ControlPart ePart, ControlSta
 }
 }
 break;
+case ControlType::Pushbutton:
+{
+auto const& rPushButtonValue = static_cast(rValue);
+if (rPushButtonValue.mbIsAction)
+sExtra = "action";
+}
 default:
 break;
 }
___
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-6.0' - desktop/source

[Ashod Nakashian (via logerrit)]

 desktop/source/lib/init.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 79dbfbec29714ec50a8741b6e8065073fd30d075
Author: Ashod Nakashian 
AuthorDate: Sun May 5 12:35:42 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Mon May 6 15:22:32 2019 +0200

LOK: trace queue only when it is changed

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 52b7f399c38b..c5bf038e14a3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -965,22 +965,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 
 CallbackData aCallbackData(type, (data ? data : "(nil)"));
 const std::string& payload = aCallbackData.PayloadString;
-SAL_INFO("lok", "Queue: " << type << " : " << payload);
-
-#ifdef DBG_UTIL
-{
-// Dump the queue state and validate cached data.
-int i = 1;
-std::ostringstream oss;
-oss << '\n';
-for (const CallbackData& c : m_queue)
-oss << i++ << ": [" << c.Type << "] [" << c.PayloadString << 
"].\n";
-const std::string aQueued = oss.str();
-SAL_INFO("lok", "Current Queue: " << (aQueued.empty() ? "Empty" : 
aQueued));
-for (const CallbackData& c : m_queue)
-assert(c.validate());
-}
-#endif
+SAL_INFO("lok", "Queue: [" << type << "]: [" << payload << "] on " << 
m_queue.size() << " entries.");
 
 bool bIsChartActive = false;
 if (type == LOK_CALLBACK_GRAPHIC_SELECTION)
@@ -1414,6 +1399,21 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 SAL_INFO("lok", "Queued #" << (m_queue.size() - 1) <<
  " [" << type << "]: [" << payload << "] to have " << 
m_queue.size() << " entries.");
 
+#ifdef DBG_UTIL
+{
+// Dump the queue state and validate cached data.
+int i = 1;
+std::ostringstream oss;
+oss << '\n';
+for (const CallbackData& c : m_queue)
+oss << i++ << ": [" << c.Type << "] [" << c.PayloadString << 
"].\n";
+const std::string aQueued = oss.str();
+SAL_INFO("lok", "Current Queue: " << (aQueued.empty() ? "Empty" : 
aQueued));
+for (const CallbackData& c : m_queue)
+assert(c.validate());
+}
+#endif
+
 lock.unlock();
 if (!IsActive())
 {
___
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-6.0' - sfx2/source

[Ashod Nakashian (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 60c048e665c7e8dc32c378f0364931b6e26a9ca2
Author: Ashod Nakashian 
AuthorDate: Sun May 5 11:51:30 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Mon May 6 15:17:34 2019 +0200

Notify the client when we close the sidebar

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

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 876cae106319..1bf43c7bac40 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -65,13 +65,13 @@ namespace
 const static sal_Int32 gnWidthCloseThreshold (70);
 const static sal_Int32 gnWidthOpenThreshold (40);
 
-static std::string UnoNameFromDeckId(const OUString& rsDeckId)
+static std::string UnoNameFromDeckId(const OUString& rsDeckId, bool 
isDraw=false)
 {
 if (rsDeckId == "SdCustomAnimationDeck")
 return ".uno:CustomAnimation";
 
 if (rsDeckId == "PropertyDeck")
-return ".uno:ModifyPage";
+return isDraw ? ".uno:ModifyPage" : ".uno:Sidebar";
 
 if (rsDeckId == "SdLayoutsDeck")
 return ".uno:ModifyPage";
@@ -224,7 +224,17 @@ void SidebarController::disposeDecks()
 SolarMutexGuard aSolarMutexGuard;
 
 if (comphelper::LibreOfficeKit::isActive())
+{
+if (const SfxViewShell* pViewShell = mpViewFrame->GetViewShell())
+{
+const std::string hide = UnoNameFromDeckId(msCurrentDeckId);
+if (!hide.empty())
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+   (hide + 
"=false").c_str());
+}
+
 mpParentWindow->ReleaseLOKNotifier();
+}
 
 mpCurrentDeck.clear();
 maFocusManager.Clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 desktop/source/lib/lokclipboard.cxx |   31 +++
 desktop/source/lib/lokclipboard.hxx |6 --
 solenv/clang-format/blacklist   |2 --
 3 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit b86ca947115f2ef61dd71c7a43e7a3ec1f1cf3b0
Author: Miklos Vajna 
AuthorDate: Mon May 6 14:27:04 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 6 15:16:58 2019 +0200

desktop: turn on clang-format for lokclipboard

This had manual consistent formatting. Recently it was broken, so bring
back consisency by using clang-format.

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

diff --git a/desktop/source/lib/lokclipboard.cxx 
b/desktop/source/lib/lokclipboard.cxx
index b02dc3ca172b..e8c8644eff84 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -17,26 +17,25 @@ uno::Reference SAL_CALL 
LOKClipboard::getContents()
 return m_xTransferable;
 }
 
-void SAL_CALL LOKClipboard::setContents(const 
uno::Reference& xTransferable,
-const 
uno::Reference& /*xClipboardOwner*/)
+void SAL_CALL LOKClipboard::setContents(
+const uno::Reference& xTransferable,
+const uno::Reference& 
/*xClipboardOwner*/)
 {
 m_xTransferable = xTransferable;
 }
 
-OUString SAL_CALL LOKClipboard::getName()
-{
-return OUString();
-}
+OUString SAL_CALL LOKClipboard::getName() { return OUString(); }
 
 LOKTransferable::LOKTransferable(const char* pMimeType, const char* pData, 
std::size_t nSize)
-: m_aMimeType(OUString::fromUtf8(pMimeType)),
-  m_aSequence(reinterpret_cast(pData), nSize)
+: m_aMimeType(OUString::fromUtf8(pMimeType))
+, m_aSequence(reinterpret_cast(pData), nSize)
 {
 }
 
-LOKTransferable::LOKTransferable(const OUString& sMimeType, const 
css::uno::Sequence& aSequence)
-: m_aMimeType(sMimeType),
-  m_aSequence(aSequence)
+LOKTransferable::LOKTransferable(const OUString& sMimeType,
+ const css::uno::Sequence& aSequence)
+: m_aMimeType(sMimeType)
+, m_aSequence(aSequence)
 {
 }
 
@@ -58,7 +57,7 @@ std::vector 
LOKTransferable::getTransferDataFlavorsAsV
 std::vector aRet;
 datatransfer::DataFlavor aFlavor;
 aFlavor.MimeType = m_aMimeType;
-aFlavor.DataType = cppu::UnoType< uno::Sequence >::get();
+aFlavor.DataType = cppu::UnoType>::get();
 
 sal_Int32 nIndex(0);
 if (m_aMimeType.getToken(0, ';', nIndex) == "text/plain")
@@ -80,10 +79,10 @@ uno::Sequence SAL_CALL 
LOKTransferable::getTransferDat
 sal_Bool SAL_CALL LOKTransferable::isDataFlavorSupported(const 
datatransfer::DataFlavor& rFlavor)
 {
 const std::vector aFlavors = 
getTransferDataFlavorsAsVector();
-return std::any_of(aFlavors.begin(), aFlavors.end(), [&rFlavor](const 
datatransfer::DataFlavor& i)
-{
-return i.MimeType == rFlavor.MimeType && i.DataType == 
rFlavor.DataType;
-});
+return std::any_of(aFlavors.begin(), aFlavors.end(),
+   [&rFlavor](const datatransfer::DataFlavor& i) {
+   return i.MimeType == rFlavor.MimeType && i.DataType 
== rFlavor.DataType;
+   });
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/lib/lokclipboard.hxx 
b/desktop/source/lib/lokclipboard.hxx
index ae83eb6dd2e6..c8896d01e739 100644
--- a/desktop/source/lib/lokclipboard.hxx
+++ b/desktop/source/lib/lokclipboard.hxx
@@ -23,8 +23,10 @@ class LOKClipboard : public 
cppu::WeakImplHelper SAL_CALL 
getContents() override;
 
-void SAL_CALL setContents(const 
css::uno::Reference& xTransferable,
-  const 
css::uno::Reference& 
xClipboardOwner) override;
+void SAL_CALL setContents(
+const css::uno::Reference& 
xTransferable,
+const 
css::uno::Reference& 
xClipboardOwner)
+override;
 
 OUString SAL_CALL getName() override;
 };
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index e270e474ea51..0d6806032587 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -3710,8 +3710,6 @@ desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
 desktop/source/inc/helpids.h
 desktop/source/lib/init.cxx
 desktop/source/lib/lokandroid.cxx
-desktop/source/lib/lokclipboard.cxx
-desktop/source/lib/lokclipboard.hxx
 desktop/source/lib/lokinteractionhandler.cxx
 desktop/source/lib/lokinteractionhandler.hxx
 desktop/source/migration/migration.cxx
___
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-6.0' - sfx2/source

[Ashod Nakashian (via logerrit)]

 sfx2/source/sidebar/SidebarChildWindow.cxx   |4 +--
 sfx2/source/sidebar/SidebarController.cxx|   36 ++-
 sfx2/source/sidebar/SidebarDockingWindow.cxx |2 -
 3 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 5ddf63041bec4deda56d10992c35ae4efe06
Author: Ashod Nakashian 
AuthorDate: Sun May 5 23:33:34 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Mon May 6 15:16:30 2019 +0200

LOK: support sidebars in writer and calc

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

diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx 
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 6296c9fe05e0..890b7b8cb0a9 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -68,7 +68,7 @@ SidebarChildWindow::SidebarChildWindow(vcl::Window* 
pParentWindow, sal_uInt16 nI
 // Undock sidebar in LOK to allow for resizing freely
 // (i.e. when the client window is resized) and collapse
 // it so the client can open it on demand.
-pDockWin->SetFloatingSize(Size(TabBar::GetDefaultWidth() * 
GetWindow()->GetDPIScaleFactor(),
+pDockWin->SetFloatingSize(Size(pDockWin->GetSizePixel().Width() * 
GetWindow()->GetDPIScaleFactor(),
pDockWin->GetSizePixel().Height()));
 pDockWin->SetFloatingMode(true);
 }
@@ -78,7 +78,7 @@ SidebarChildWindow::SidebarChildWindow(vcl::Window* 
pParentWindow, sal_uInt16 nI
 pDockWin->Show();
 }
 
-sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)
+sal_Int32 SidebarChildWindow::GetDefaultWidth(vcl::Window const* pWindow)
 {
 if (pWindow != nullptr)
 {
diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 420847351e53..876cae106319 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -464,7 +464,7 @@ void SidebarController::ProcessNewWidth (const sal_Int32 
nNewWidth)
 return;
 
 if (mbIsDeckRequestedOpen.get())
- {
+{
 // Deck became large enough to be shown.  Show it.
 mnSavedSidebarWidth = nNewWidth;
 RequestOpenDeck();
@@ -719,6 +719,24 @@ void SidebarController::SwitchToDeck (
 const DeckDescriptor& rDeckDescriptor,
 const Context& rContext)
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+if (const SfxViewShell* pViewShell = mpViewFrame->GetViewShell())
+{
+if (msCurrentDeckId != rDeckDescriptor.msId)
+{
+const std::string hide = UnoNameFromDeckId(msCurrentDeckId);
+if (!hide.empty())
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+   (hide + 
"=false").c_str());
+}
+
+const std::string show = UnoNameFromDeckId(rDeckDescriptor.msId);
+if (!show.empty())
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+   (show + 
"=true").c_str());
+}
+}
 
 maFocusManager.Clear();
 
@@ -732,22 +750,6 @@ void SidebarController::SwitchToDeck (
 if (mpCurrentDeck)
 mpCurrentDeck->Hide();
 
-if (comphelper::LibreOfficeKit::isActive())
-{
-if (const SfxViewShell* pViewShell = mpViewFrame->GetViewShell())
-{
-const std::string hide = UnoNameFromDeckId(msCurrentDeckId);
-if (!hide.empty())
-
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
-   (hide + 
"=false").c_str());
-
-const std::string show = 
UnoNameFromDeckId(rDeckDescriptor.msId);
-if (!show.empty())
-
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
-   (show + 
"=true").c_str());
-}
-}
-
 msCurrentDeckId = rDeckDescriptor.msId;
 }
 mpTabBar->HighlightDeck(msCurrentDeckId);
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 4264dbb234aa..8bd5fa307892 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -109,7 +109,7 @@ void SidebarDockingWindow::NotifyResize()
 // Note: this means we *cannot* create a sidebar post attaching a new 
view because the
 // ViewShell will not change, and therefore we will never 
SetLOKNotifier. To avoid that
 // we hide sidebars instead of closing (see OnMenuItemSelected in 
SidebarController).
-if (mpSide

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5Widget.hxx   |5 ++
 vcl/qt5/Qt5AccessibleWidget.cxx |2 -
 vcl/qt5/Qt5Widget.cxx   |   79 +++-
 3 files changed, 43 insertions(+), 43 deletions(-)

New commits:
commit 8c71d28069acffa2d4590a4acf95a98d1415b563
Author: Jan-Marek Glogowski 
AuthorDate: Sun May 5 23:22:09 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon May 6 14:57:45 2019 +0200

Qt5 make Qt5Widdget's frame a private reference

Kind of a regression from commit 4d382636b0b1 ("qt5: Add basic
a11y support"), which made it public for a single call.

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

diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index d96afa64aeb0..30998a8a1c6d 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -42,6 +42,8 @@ class Qt5Widget : public QWidget
 {
 Q_OBJECT
 
+Qt5Frame& m_rFrame;
+
 bool handleKeyEvent(QKeyEvent*, bool);
 void handleMouseButtonEvent(QMouseEvent*, bool);
 
@@ -71,7 +73,8 @@ public slots:
 
 public:
 Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags());
-Qt5Frame* m_pFrame;
+
+Qt5Frame& getFrame() const { return m_rFrame; }
 void startDrag(sal_Int8 nSourceActions);
 };
 
diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/Qt5AccessibleWidget.cxx
index b76acb4a1c57..2c31a2bdb92a 100644
--- a/vcl/qt5/Qt5AccessibleWidget.cxx
+++ b/vcl/qt5/Qt5AccessibleWidget.cxx
@@ -718,7 +718,7 @@ QAccessibleInterface* 
Qt5AccessibleWidget::customFactory(const QString& classnam
 if (classname == QLatin1String("Qt5Widget") && object && 
object->isWidgetType())
 {
 Qt5Widget* pWidget = static_cast(object);
-vcl::Window* pWindow = pWidget->m_pFrame->GetWindow();
+vcl::Window* pWindow = pWidget->getFrame().GetWindow();
 
 if (pWindow)
 return new Qt5AccessibleWidget(pWindow->GetAccessible());
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 0b22cbb884f8..865f36b0a567 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -49,12 +49,12 @@
 void Qt5Widget::paintEvent(QPaintEvent* pEvent)
 {
 QPainter p(this);
-if (!m_pFrame->m_bNullRegion)
-p.setClipRegion(m_pFrame->m_aRegion);
+if (!m_rFrame.m_bNullRegion)
+p.setClipRegion(m_rFrame.m_aRegion);
 
-if (m_pFrame->m_bUseCairo)
+if (m_rFrame.m_bUseCairo)
 {
-cairo_surface_t* pSurface = m_pFrame->m_pSurface.get();
+cairo_surface_t* pSurface = m_rFrame.m_pSurface.get();
 cairo_surface_flush(pSurface);
 
 QImage aImage(cairo_image_surface_get_data(pSurface), size().width(), 
size().height(),
@@ -62,55 +62,55 @@ void Qt5Widget::paintEvent(QPaintEvent* pEvent)
 p.drawImage(pEvent->rect().topLeft(), aImage, pEvent->rect());
 }
 else
-p.drawImage(pEvent->rect().topLeft(), *m_pFrame->m_pQImage, 
pEvent->rect());
+p.drawImage(pEvent->rect().topLeft(), *m_rFrame.m_pQImage, 
pEvent->rect());
 }
 
 void Qt5Widget::resizeEvent(QResizeEvent* pEvent)
 {
-if (m_pFrame->m_bUseCairo)
+if (m_rFrame.m_bUseCairo)
 {
 int width = size().width();
 int height = size().height();
 
-if (m_pFrame->m_pSvpGraphics)
+if (m_rFrame.m_pSvpGraphics)
 {
 cairo_surface_t* pSurface
 = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, 
height);
 cairo_surface_set_user_data(pSurface, 
SvpSalGraphics::getDamageKey(),
-&m_pFrame->m_aDamageHandler, nullptr);
-m_pFrame->m_pSvpGraphics->setSurface(pSurface, 
basegfx::B2IVector(width, height));
-UniqueCairoSurface old_surface(m_pFrame->m_pSurface.release());
-m_pFrame->m_pSurface.reset(pSurface);
+&m_rFrame.m_aDamageHandler, nullptr);
+m_rFrame.m_pSvpGraphics->setSurface(pSurface, 
basegfx::B2IVector(width, height));
+UniqueCairoSurface old_surface(m_rFrame.m_pSurface.release());
+m_rFrame.m_pSurface.reset(pSurface);
 
 int min_width = qMin(pEvent->oldSize().width(), 
pEvent->size().width());
 int min_height = qMin(pEvent->oldSize().height(), 
pEvent->size().height());
 
 SalTwoRect rect(0, 0, min_width, min_height, 0, 0, min_width, 
min_height);
 
-m_pFrame->m_pSvpGraphics->copySource(rect, old_surface.get());
+m_rFrame.m_pSvpGraphics->copySource(rect, old_surface.get());
 }
 }
 else
 {
 QImage* pImage = nullptr;
 
-if (m_pFrame->m_pQImage)
+if (m_rFrame.m_pQImage)
 pImage = new QImage(
-m_pFrame->m_pQImage->copy(0, 0, pEvent->size().width(), 
pEvent->size().height()));
+m_rFrame.m_pQImage->

[Libreoffice-commits] online.git: loleaflet/reference.html loleaflet/src wsd/DocumentBroker.cpp

[Libreoffice Gerrit user]

 loleaflet/reference.html |5 +++--
 loleaflet/src/core/Socket.js |   11 +++
 wsd/DocumentBroker.cpp   |   11 ++-
 3 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit e62cdfae828bce64ab17ccce6620500a99236110
Author: Szymon Kłos 
AuthorDate: Fri Apr 26 12:06:17 2019 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 6 14:01:26 2019 +0200

Handle storage load errors

Pass information about storage loading failures
to the wopi host.

Change-Id: I8da3a80e47b15f246343dc8e4199d8f860e1fb8a
Reviewed-on: https://gerrit.libreoffice.org/71354
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 58bdb351b..2fb7c801f 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -2765,10 +2765,11 @@ Editor to WOPI host
can be shown. 
Accompanying keys: Features: This client's 
capabilities.
Supported values are: VersionStates. Tells the host 
that client supports different version states. See Version Restore for more 
details.
-   When Status is Document_Loaded, document has been completely
+   When Status is Document_Loaded, document has been 
completely
loaded and host can also start using PostMessage API.
Accompanying keys:
-   DocumentLoadedTime
+   DocumentLoadedTime
+   When Status is Failed, document hasn't been 
loaded but host can show the loleaflet frame to present an error for a user.


 
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index d1a09583d..7f45eb73a 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -281,6 +281,17 @@ L.Socket = L.Class.extend({
this._map.fire('wopiprops', wopiInfo);
return;
}
+   else if (textMsg.startsWith('loadstorage: ')) {
+   if (textMsg.substring(textMsg.indexOf(':') + 2) === 
'failed') {
+   console.debug('Loading document from a storage 
failed');
+   this._map.fire('postMessage', {
+   msgId: 'App_LoadingStatus',
+   args: {
+   Status: 'Failed'
+   }
+   });
+   }
+   }
else if (textMsg.startsWith('lastmodtime: ')) {
var time = textMsg.substring(textMsg.indexOf(' ') + 1);
this._map.updateModificationIndicator(time);
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 40465c0ce..4b0390ce9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -480,7 +480,16 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 const Poco::URI& uriPublic = session->getPublicUri();
 LOG_DBG("Loading, and creating new storage instance for URI [" << 
LOOLWSD::anonymizeUrl(uriPublic.toString()) << "].");
 
-_storage = StorageBase::create(uriPublic, jailRoot, 
jailPath.toString());
+try
+{
+_storage = StorageBase::create(uriPublic, jailRoot, 
jailPath.toString());
+}
+catch (...)
+{
+session->sendMessage("loadstorage: failed");
+throw;
+}
+
 if (_storage == nullptr)
 {
 // We should get an exception, not null.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 toolkit/source/awt/vclxwindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6567a7542b6a6f47221501fac4e515c16b280f75
Author: Samuel Mehrbrodt 
AuthorDate: Mon May 6 10:12:00 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon May 6 13:35:07 2019 +0200

Fix indentation

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

diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index 0f37e710e0b2..bacb184fded0 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -864,7 +864,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& 
rVclWindowEvent )
 aEvent.Source = static_cast(this);
 mpImpl->getDockableWindowListeners().notifyEach( 
&XDockableWindowListener::toggleFloatingMode, aEvent );
 }
-   }
+}
 break;
 case VclEventId::WindowEndPopupMode:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Luboš Luňák (via logerrit)]

 configure.ac |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 791fd6c935dd9420aec97319c61475c1bc97591e
Author: Luboš Luňák 
AuthorDate: Sat Mar 9 22:44:42 2019 +0100
Commit: Luboš Luňák 
CommitDate: Mon May 6 12:36:16 2019 +0200

PCH works fine with compiler plugins

No idea why this has been disabled, Clang can handle both plugins
and PCH at the same time.

Change-Id: I957b57f5f86b041c0437a121990b40bfa0095a0d
Reviewed-on: https://gerrit.libreoffice.org/71564
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index a0cf4cda626f..020e3b75ed42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5036,15 +5036,6 @@ dnl 
===
 dnl enable pch by default on windows
 dnl enable it explicitly otherwise
 ENABLE_PCH=""
-if test "$enable_pch" = yes -a "$enable_compiler_plugins" = yes; then
-if test -z "$libo_fuzzed_enable_pch"; then
-AC_MSG_ERROR([--enable-pch cannot be used with 
--enable-compiler-plugins])
-else
-AC_MSG_NOTICE([Resetting --enable-pch=no])
-enable_pch=no
-fi
-fi
-
 AC_MSG_CHECKING([whether to enable pch feature])
 if test "$enable_pch" != "no"; then
 if test "$_os" = "WINNT"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: formula/source include/formula include/IwyuFilter_include.yaml sd/qa

[Gabor Kelemen (via logerrit)]

 formula/source/core/api/FormulaOpCodeMapperObj.cxx |1 +
 include/IwyuFilter_include.yaml|   13 +
 include/formula/FormulaCompiler.hxx|2 --
 include/formula/FormulaOpCodeMapperObj.hxx |3 ---
 include/formula/IFunctionDescription.hxx   |3 ++-
 include/formula/formula.hxx|1 -
 include/formula/funcutl.hxx|4 
 include/formula/token.hxx  |1 -
 include/formula/tokenarray.hxx |4 +++-
 include/formula/vectortoken.hxx|2 +-
 sd/qa/unit/dialogs-test.cxx|1 -
 11 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit 779a48f70ea8f7843ed3145c7efd522027e9183f
Author: Gabor Kelemen 
AuthorDate: Wed Apr 10 22:04:15 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 6 12:18:13 2019 +0200

tdf#42949 Fix IWYU warnings in include/formula/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx 
b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 73f085813d22..57ba594e13e8 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace formula
 {
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 5ec1ba2b23de..04631f47ea27 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -920,6 +920,19 @@ blacklist:
 - com/sun/star/awt/FontDescriptor.hpp
 - com/sun/star/style/LineSpacing.hpp
 - com/sun/star/style/TabStop.hpp
+include/formula/FormulaOpCodeMapperObj.hxx:
+# base class has to be a complete type
+- com/sun/star/lang/XServiceInfo.hpp
+- com/sun/star/sheet/XFormulaOpCodeMapper.hpp
+include/formula/paramclass.hxx:
+# Needed for enum type
+- sal/types.h
+include/formula/opcode.hxx:
+# Needed for enum type
+- sal/types.h
+include/formula/tokenarray.hxx:
+# Needed to avoid linking errors on WIN
+- formula/ExternalReferenceHelper.hxx
 include/svx/AccessibleControlShape.hxx:
 # base class has to be a complete type
 - com/sun/star/beans/XPropertyChangeListener.hpp
diff --git a/include/formula/FormulaCompiler.hxx 
b/include/formula/FormulaCompiler.hxx
index fef6e82e39e1..a2c6f6f3d9c0 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -28,13 +28,11 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx 
b/include/formula/FormulaOpCodeMapperObj.hxx
index af74100d2165..8804e2488d94 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
 #define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
 
-#include 
 #include 
 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/formula/IFunctionDescription.hxx 
b/include/formula/IFunctionDescription.hxx
index 3d03d4e6c069..5d4616b9b9e5 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -25,7 +25,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -36,6 +35,8 @@ namespace com { namespace sun { namespace star {
 namespace sheet { class XFormulaParser; }
 } } }
 
+namespace com::sun::star::uno { template  class Sequence; }
+
 namespace formula
 {
 class IFunctionCategory;
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index defd1ecfd1a8..873ab04866d7 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 
-class Idle;
 class NotifyEvent;
 class SfxBindings;
 class SfxChildWindow;
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 51e1b9dbae09..7ab1252e7c97 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -33,10 +33,6 @@
 
 class KeyEvent;
 
-namespace vcl {
-class Window;
-}
-
 namespace formula {
 
 class IControlReferenceHandler;
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 26643fc08fcd..034b3aa78b6f 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -27,7 +27,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 9f93aa63a9b1..df82ceb1cb22 100644
--- a/include/formula/tokena

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - bundled/include

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h  |   18 ++-
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx|   48 +++
 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |2 
 bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |   15 +
 bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h |6 ++
 5 files changed, 35 insertions(+), 54 deletions(-)

New commits:
commit 4aba297557e4d138e7def6dc5845bdc15f497c84
Author: Jan Holesovsky 
AuthorDate: Mon May 6 11:08:14 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon May 6 11:53:44 2019 +0200

Update the bundled headers from cp-6.0.

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

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 4b3800357..9fa134b56 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -104,6 +104,12 @@ struct _LibreOfficeKitClass
const int nCertificateBinarySize,
const unsigned char* pPrivateKeyBinary,
const int nPrivateKeyBinarySize);
+
+/// @see lok::Office::runLoop()
+void (*runLoop) (LibreOfficeKit* pThis,
+ LibreOfficeKitPollCallback pPollCallback,
+ LibreOfficeKitWakeCallback pWakeCallback,
+ void* pData);
 };
 
 #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) 
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
@@ -328,18 +334,6 @@ struct _LibreOfficeKitDocumentClass
 const int width, const int height,
 const double dpiscale);
 
-#ifdef IOS
-/// @see lok::Document::paintTileToCGContext().
-void (*paintTileToCGContext) (LibreOfficeKitDocument* pThis,
-  void* rCGContext,
-  const int nCanvasWidth,
-  const int nCanvasHeight,
-  const int nTilePosX,
-  const int nTilePosY,
-  const int nTileWidth,
-  const int nTileHeight);
-#endif // IOS
-
 // CERTIFICATE AND SIGNING
 
 /// @see lok::Document::insertCertificate().
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 895ca5bf5..235053fa0 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -188,7 +188,7 @@ public:
  *
  * @param nWindowid
  */
-void postWindow(unsigned nWindowId, int nAction, const char* pData)
+void postWindow(unsigned nWindowId, int nAction, const char* pData = 
nullptr)
 {
 return mpDoc->pClass->postWindow(mpDoc, nWindowId, nAction, pData);
 }
@@ -561,34 +561,6 @@ public:
 mpDoc->pClass->postWindowExtTextInputEvent(mpDoc, nWindowId, nType, 
pText);
 }
 
-#ifdef IOS
-/**
- * Renders a subset of the document to a Core Graphics context.
- *
- * Note that the buffer size and the tile size implicitly supports
- * rendering at different zoom levels, as the number of rendered pixels and
- * the rendered rectangle of the document are independent.
- *
- * @param rCGContext the CGContextRef, cast to a void*.
- * @param nCanvasHeight number of pixels in a column of pBuffer.
- * @param nTilePosX logical X position of the top left corner of the 
rendered rectangle, in TWIPs.
- * @param nTilePosY logical Y position of the top left corner of the 
rendered rectangle, in TWIPs.
- * @param nTileWidth logical width of the rendered rectangle, in TWIPs.
- * @param nTileHeight logical height of the rendered rectangle, in TWIPs.
- */
-void paintTileToCGContext(void* rCGContext,
-  const int nCanvasWidth,
-  const int nCanvasHeight,
-  const int nTilePosX,
-  const int nTilePosY,
-  const int nTileWidth,
-  const int nTileHeight)
-{
-return mpDoc->pClass->paintTileToCGContext(mpDoc, rCGContext, 
nCanvasWidth, nCanvasHeight,
-   nTilePosX, nTilePosY, 
nTileWidth, nTileHeight);
-}
-#endif // IOS
-
 /**
  *  Insert certificate (in binary form) to the certificate store.
  */
@@ -852,6 +824,24 @@ public:
 pCertificateBinary, 
nCertificateBinarySize,
 pPrivateKeyBinary, 
nPrivateKeyBinarySize);
 }
+
+/**
+ * Runs the main-loop in the curre

Re: help!

[Michael Stahl]

On 03.05.19 08:37, Adrien Ollier wrote:

Hi,

"and" is a C++ keyword (https://en.cppreference.com/w/cpp/keyword, 
https://en.cppreference.com/w/cpp/keyword/and) which is the logical AND 
(&&). I am surprised it is not recognized.


using "and" in C++ is unidiomatic.

the idiomatic way is to either use "&&" or "#define AND &&" and use 
"AND" [1].


[1] 
https://cgit.freedesktop.org/libreoffice/core/tree/include/cosv/csv_env.hxx?id=be49d3a25bc867c4f523cc6ff51ed2e8df9211d7#n60


PS: this email may contain traces of sarcasm ;)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist (via logerrit)]

 external/libpng/StaticLibrary_libpng.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3bd5a3979dc427bc27890f7e9c111a33d5ee9bf4
Author: Tor Lillqvist 
AuthorDate: Mon May 6 12:37:11 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 6 12:37:34 2019 +0300

Compile also the palette_neon_intrinsics file for ARM

Change-Id: I26deeefc8cf335f53aa55c8523cd08687f27b63b

diff --git a/external/libpng/StaticLibrary_libpng.mk 
b/external/libpng/StaticLibrary_libpng.mk
index dbbc3848c541..f43a462c7935 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
$(if $(filter ARM ARM64,$(CPUNAME)),\
UnpackedTarball/libpng/arm/arm_init \
UnpackedTarball/libpng/arm/filter_neon_intrinsics \
+   UnpackedTarball/libpng/arm/palette_neon_intrinsics \
) \
 ))
 
___
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/co-6.0-29'

[Aron Budea (via logerrit)]

Tag 'co-6.0-29' created by Andras Timar  at 
2019-05-06 09:40 +

co-6.0-29

Changes since co-6.0-28-19:
---
 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-6.0' - wizards/source

[Aron Budea (via logerrit)]

 wizards/source/tools/Misc.xba |   87 +++---
 1 file changed, 56 insertions(+), 31 deletions(-)

New commits:
commit 5d307ea40061a06db12678139cff739e05c751e9
Author: Aron Budea 
AuthorDate: Mon May 6 07:36:14 2019 +0200
Commit: Andras Timar 
CommitDate: Mon May 6 11:35:25 2019 +0200

[cp] Updated Fix Table Properties macro

Change-Id: I7f8695789e1223df7bbb235fa6081ed91502ab99
Reviewed-on: https://gerrit.libreoffice.org/71838
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 7a001683c9bd..33f2456389df 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -841,36 +841,61 @@ End Function
 
 ' Sub that fixes various issues in tables imported from DOC/DOCX
 Sub FixTableProperties
-sumTables = 0
-sumSplit = 0
-sumRelativeWidth = 0
-sumRows = 0
-oTables = ThisComponent.TextTables
-For i = 0 To oTables.getCount() - 1
-oTable = oTables(i)
-sumTables = sumTables + 1
-If oTable.getPropertyValue("Split") = false Then
-sumSplit = sumSplit + 1
-oTable.setPropertyValue("Split", true)
-End If
-If oTable.getPropertyValue("HoriOrient") <> 6 And _
-   oTable.getPropertyValue("IsWidthRelative") = false Then
-sumRelativeWidth = sumRelativeWidth + 1
-oTable.setPropertyValue("RelativeWidth", 100)
-End If
-For j = 0 To oTable.getRows.getCount - 1
-oRow = oTable.getRows.getByIndex(j)
-If oRow.getPropertyValue("IsSplitAllowed") = false Then
-sumRows = sumRows + 1
-oRow.setPropertyValue("IsSplitAllowed", true)
-End If
-Next
-Next
-
-s = "Out of " & sumTables & " table(s)" & 
CHR(13) & _
-"Relative setting was added to: " & sumRelativeWidth 
& CHR(13) & _
-"Property to enable breaking across pages was enabled for: " 
& sumSplit & CHR(13) & CHR(13) & _
-"No. of rows property to enable breaking across pages was enabled 
for: " & sumRows & CHR(13) & CHR(13) & "Save the file 
afterwards!"
-MsgBox s, 0, "Result"
+   sumTables = 0
+   sumSplit = 0
+   sumRelativeWidth = 0
+   sumRows = 0
+   sumPara = 0
+   oTables = ThisComponent.TextTables
+   For i = 0 To oTables.getCount() - 1
+   oTable = oTables(i)
+   sumTables = sumTables + 1
+   If oTable.getPropertyValue("Split") = false Then
+   sumSplit = sumSplit + 1
+   oTable.setPropertyValue("Split", true)
+   End If
+   If oTable.getPropertyValue("HoriOrient") <> 6 
And _
+  oTable.getPropertyValue("IsWidthRelative") = false 
Then
+   sumRelativeWidth = sumRelativeWidth + 1
+   oTable.setPropertyValue("RelativeWidth", 100)
+   End If
+   For j = 0 To oTable.getRows.getCount - 1
+   oRow = oTable.getRows.getByIndex(j)
+   If oRow.getPropertyValue("IsSplitAllowed") = 
false Then
+   sumRows = sumRows + 1
+   
oRow.setPropertyValue("IsSplitAllowed", true)
+   End If
+   Next
+
+   sNames = oTable.getCellNames()
+   For k = LBound(sNames) To UBound(sNames)
+   oCell = oTable.getCellByName(sNames(k))
+   cType = oCell.getType()
+   If oCell.getType() = 
com.sun.star.table.CellContentType.TEXT Then
+   oCellCursor = oCell.createTextCursor()
+   oParEnum = oCell.createEnumeration()
+   Do While oParEnum.hasMoreElements()
+   oPar = oParEnum.nextElement()
+   leftMargin = 
oPar.getPropertyValue("ParaLeftMargin")
+   rightMargin = 
oPar.getPropertyValue("ParaRightMargin")
+   firstLineIndent = 
oPar.getPropertyValue("ParaFirstLineIndent")
+   'If any are < 0, consider bad, 
and reset all to 0
+   If leftMargin < 0 Or rightMargin 
< 0 Or firstLineIndent < 0 Then
+   sumPara = sumPara + 1
+   
oPar.setPropertyValue("ParaLeftMargin", 0)
+   
oPar.setPropertyValue("ParaRightMargin", 0)
+   
oPar.setPropertyValue("ParaFirstLineIndent", 0)
+   End If
+   Loop
+   End If
+   Next
+   Next
+
+   s = "Out o

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.0-29'

[Libreoffice Gerrit user]

Tag 'co-6.0-29' created by Andras Timar  at 
2019-05-06 09:40 +

co-6.0-29

Changes since co-6.0-24:
Andras Timar (1):
  tdf#123500 double '~' character in translation

---
 source/fr/officecfg/registry/data/org/openoffice/Office/UI.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
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/co-6.0-29'

[Libreoffice Gerrit user]

Tag 'co-6.0-29' created by Andras Timar  at 
2019-05-06 09:40 +

co-6.0-29

Changes since cp-6.0-19:
Andras Timar (1):
  remove executable bit from *.aff and *.dic files

---
 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/co-6.0-29'

[Libreoffice Gerrit user]

Tag 'co-6.0-29' created by Andras Timar  at 
2019-05-06 09:40 +

co-6.0-29

Changes since cp-6.0-7:
Adolfo Jayme Barrientos (1):
  .howtoget, now more Collabora-y

---
 help3xsl/default.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
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-6.0-29' - wizards/source

[Aron Budea (via logerrit)]

 wizards/source/tools/Misc.xba |   87 +++---
 1 file changed, 56 insertions(+), 31 deletions(-)

New commits:
commit 41d57bd387af44af6eeda27c692a6ac82c9d4b61
Author: Aron Budea 
AuthorDate: Mon May 6 07:36:14 2019 +0200
Commit: Andras Timar 
CommitDate: Mon May 6 11:35:15 2019 +0200

[cp] Updated Fix Table Properties macro

Change-Id: I7f8695789e1223df7bbb235fa6081ed91502ab99
Reviewed-on: https://gerrit.libreoffice.org/71852
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 7a001683c9bd..33f2456389df 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -841,36 +841,61 @@ End Function
 
 ' Sub that fixes various issues in tables imported from DOC/DOCX
 Sub FixTableProperties
-sumTables = 0
-sumSplit = 0
-sumRelativeWidth = 0
-sumRows = 0
-oTables = ThisComponent.TextTables
-For i = 0 To oTables.getCount() - 1
-oTable = oTables(i)
-sumTables = sumTables + 1
-If oTable.getPropertyValue("Split") = false Then
-sumSplit = sumSplit + 1
-oTable.setPropertyValue("Split", true)
-End If
-If oTable.getPropertyValue("HoriOrient") <> 6 And _
-   oTable.getPropertyValue("IsWidthRelative") = false Then
-sumRelativeWidth = sumRelativeWidth + 1
-oTable.setPropertyValue("RelativeWidth", 100)
-End If
-For j = 0 To oTable.getRows.getCount - 1
-oRow = oTable.getRows.getByIndex(j)
-If oRow.getPropertyValue("IsSplitAllowed") = false Then
-sumRows = sumRows + 1
-oRow.setPropertyValue("IsSplitAllowed", true)
-End If
-Next
-Next
-
-s = "Out of " & sumTables & " table(s)" & 
CHR(13) & _
-"Relative setting was added to: " & sumRelativeWidth 
& CHR(13) & _
-"Property to enable breaking across pages was enabled for: " 
& sumSplit & CHR(13) & CHR(13) & _
-"No. of rows property to enable breaking across pages was enabled 
for: " & sumRows & CHR(13) & CHR(13) & "Save the file 
afterwards!"
-MsgBox s, 0, "Result"
+   sumTables = 0
+   sumSplit = 0
+   sumRelativeWidth = 0
+   sumRows = 0
+   sumPara = 0
+   oTables = ThisComponent.TextTables
+   For i = 0 To oTables.getCount() - 1
+   oTable = oTables(i)
+   sumTables = sumTables + 1
+   If oTable.getPropertyValue("Split") = false Then
+   sumSplit = sumSplit + 1
+   oTable.setPropertyValue("Split", true)
+   End If
+   If oTable.getPropertyValue("HoriOrient") <> 6 
And _
+  oTable.getPropertyValue("IsWidthRelative") = false 
Then
+   sumRelativeWidth = sumRelativeWidth + 1
+   oTable.setPropertyValue("RelativeWidth", 100)
+   End If
+   For j = 0 To oTable.getRows.getCount - 1
+   oRow = oTable.getRows.getByIndex(j)
+   If oRow.getPropertyValue("IsSplitAllowed") = 
false Then
+   sumRows = sumRows + 1
+   
oRow.setPropertyValue("IsSplitAllowed", true)
+   End If
+   Next
+
+   sNames = oTable.getCellNames()
+   For k = LBound(sNames) To UBound(sNames)
+   oCell = oTable.getCellByName(sNames(k))
+   cType = oCell.getType()
+   If oCell.getType() = 
com.sun.star.table.CellContentType.TEXT Then
+   oCellCursor = oCell.createTextCursor()
+   oParEnum = oCell.createEnumeration()
+   Do While oParEnum.hasMoreElements()
+   oPar = oParEnum.nextElement()
+   leftMargin = 
oPar.getPropertyValue("ParaLeftMargin")
+   rightMargin = 
oPar.getPropertyValue("ParaRightMargin")
+   firstLineIndent = 
oPar.getPropertyValue("ParaFirstLineIndent")
+   'If any are < 0, consider bad, 
and reset all to 0
+   If leftMargin < 0 Or rightMargin 
< 0 Or firstLineIndent < 0 Then
+   sumPara = sumPara + 1
+   
oPar.setPropertyValue("ParaLeftMargin", 0)
+   
oPar.setPropertyValue("ParaRightMargin", 0)
+   
oPar.setPropertyValue("ParaFirstLineIndent", 0)
+   End If
+   Loop
+   End If
+   Next
+   Next
+
+   s = "Out o

Re: Question about submitting patch for dictionaries

[Michael Stahl]

On 05.05.19 14:33, julien2412 wrote:

Hello,

I'm trying to submit a patch for dictionaries part.
In /dictionaries I typed this:
../logerrit submit

After several minutes, it's still trying to send the patch.
Did I miss something?


apparently there was some network routing problem yesterday:

https://status.documentfoundation.org/incident/237/

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

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1ea27111034c5581a356b90b93f3741ca17f311e
Author: Caolán McNamara 
AuthorDate: Sun May 5 20:52:37 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 6 11:30:40 2019 +0200

call present after returning from shrunken mode

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b5ce2c75b4da..81694aa208b4 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3153,6 +3153,7 @@ public:
 if (GtkWidget* pActionArea = gtk_dialog_get_action_area(m_pDialog))
 gtk_widget_show(pActionArea);
 resize_to_request();
+present();
 }
 
 virtual void SetInstallLOKNotifierHdl(const Link&) override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 8f29d128c52a4f58116fe5474222a929937d0050
Author: Caolán McNamara 
AuthorDate: Sun May 5 20:53:30 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 6 11:30:54 2019 +0200

do focus in after all other focus handlers are run

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 81694aa208b4..b1c7cf963d3f 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1256,11 +1256,15 @@ protected:
 GtkWidget* m_pWidget;
 GtkInstanceBuilder* m_pBuilder;
 
+DECL_LINK(async_signal_focus_in, void*, void);
+
 static gboolean signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget)
 {
 GtkInstanceWidget* pThis = static_cast(widget);
-SolarMutexGuard aGuard;
-pThis->signal_focus_in();
+// in e.g. function wizard RefEdits we want to select all when we get 
focus
+// but there are pending gtk handlers which change selection after our 
handler
+// post our focus in event to happen after those finish
+Application::PostUserEvent(LINK(pThis, GtkInstanceWidget, 
async_signal_focus_in));
 return false;
 }
 
@@ -2061,6 +2065,11 @@ public:
 }
 };
 
+IMPL_LINK_NOARG(GtkInstanceWidget, async_signal_focus_in, void*, void)
+{
+signal_focus_in();
+}
+
 namespace
 {
 OString MapToGtkAccelerator(const OUString &rStr)
___
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-6.0' - desktop/source include/vcl sfx2/source vcl/source

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx|   11 +++
 include/vcl/lok.hxx|1 +
 sfx2/source/view/lokhelper.cxx |   10 +-
 vcl/source/app/svapp.cxx   |6 ++
 4 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 33bfff357d68a521186a493b31b795b85bde897c
Author: Michael Meeks 
AuthorDate: Sat Apr 27 13:37:52 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon May 6 11:19:33 2019 +0200

unipoll: emit user input-events & uno commands directly when in unipoll 
mode.

Rather than emitting asynchronously at idle.

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index da88ae1b28f8..52b7f399c38b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3004,10 +3004,13 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 
 std::vector 
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
 
-beans::PropertyValue aSynchronMode;
-aSynchronMode.Name = "SynchronMode";
-aSynchronMode.Value <<= false;
-aPropertyValuesVector.push_back(aSynchronMode);
+if (!vcl::lok::isUnipoll())
+{
+beans::PropertyValue aSynchronMode;
+aSynchronMode.Name = "SynchronMode";
+aSynchronMode.Value <<= false;
+aPropertyValuesVector.push_back(aSynchronMode);
+}
 
 int nView = SfxLokHelper::getView();
 if (nView < 0)
diff --git a/include/vcl/lok.hxx b/include/vcl/lok.hxx
index 5c30b6290221..2dbc0443d7b7 100644
--- a/include/vcl/lok.hxx
+++ b/include/vcl/lok.hxx
@@ -18,6 +18,7 @@ namespace vcl
 {
 namespace lok
 {
+bool VCL_DLLPUBLIC isUnipoll();
 void VCL_DLLPUBLIC registerPollCallbacks(LibreOfficeKitPollCallback 
pPollCallback,
  LibreOfficeKitWakeCallback 
pWakeCallback, void* pData);
 }
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 85834534316c..98b76d43514c 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -12,6 +12,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -308,7 +309,14 @@ namespace
 }
 
 pEvent->mnView = SfxLokHelper::getView(nullptr);
-Application::PostUserEvent(Link(pEvent, 
LOKPostAsyncEvent));
+if (vcl::lok::isUnipoll())
+{
+if (Application::GetMainThreadIdentifier() != 
::osl::Thread::getCurrentIdentifier())
+SAL_WARN("lok", "Posting event directly but not called from 
main thread!");
+LOKPostAsyncEvent(pEvent, nullptr);
+}
+else
+Application::PostUserEvent(Link(pEvent, 
LOKPostAsyncEvent));
 }
 }
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 5e97a2629641..70cc7287acec 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1722,6 +1722,12 @@ void registerPollCallbacks(
 }
 }
 
+bool isUnipoll()
+{
+ImplSVData * pSVData = ImplGetSVData();
+return pSVData && pSVData->mpPollClosure != nullptr;
+}
+
 } } // namespace lok, namespace vcl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/filter/html/parcss1.cxx |  428 +++---
 sw/source/filter/html/parcss1.hxx |   26 +-
 2 files changed, 227 insertions(+), 227 deletions(-)

New commits:
commit 768708ea349519b61fff5b2b7bdd5acd660e80d4
Author: Miklos Vajna 
AuthorDate: Mon May 6 09:12:11 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 6 11:03:34 2019 +0200

sw: prefix members of CSS1Parser

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

diff --git a/sw/source/filter/html/parcss1.cxx 
b/sw/source/filter/html/parcss1.cxx
index 9a14ddc1be07..f5ab8dd00cab 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -40,11 +40,11 @@
 #define LOOP_CHECK_RESTART \
 nOldInPos = SAL_MAX_INT32;
 #define LOOP_CHECK_CHECK( where ) \
-OSL_ENSURE( nOldInPos!=nInPos || cNextCh==sal_Unicode(EOF), where );\
-if( nOldInPos==nInPos && cNextCh!=sal_Unicode(EOF) )\
+OSL_ENSURE( nOldInPos!=m_nInPos || m_cNextCh==sal_Unicode(EOF), where );   
 \
+if( nOldInPos==m_nInPos && m_cNextCh!=sal_Unicode(EOF) )   
 \
 break;  \
 else\
-nOldInPos = nInPos;
+nOldInPos = m_nInPos;
 
 #else
 
@@ -58,38 +58,38 @@ const sal_Int32 MAX_LEN = 1024;
 
 void CSS1Parser::InitRead( const OUString& rIn )
 {
-nlLineNr = 0;
-nlLinePos = 0;
-
-bWhiteSpace = true; // if nothing was read it's like there was WS
-bEOF = false;
-eState = CSS1_PAR_WORKING;
-nValue = 0.;
-
-aIn = rIn;
-nInPos = 0;
-cNextCh = GetNextChar();
-nToken = GetNextToken();
+m_nlLineNr = 0;
+m_nlLinePos = 0;
+
+m_bWhiteSpace = true; // if nothing was read it's like there was WS
+m_bEOF = false;
+m_eState = CSS1_PAR_WORKING;
+m_nValue = 0.;
+
+m_aIn = rIn;
+m_nInPos = 0;
+m_cNextCh = GetNextChar();
+m_nToken = GetNextToken();
 }
 
 sal_Unicode CSS1Parser::GetNextChar()
 {
-if( nInPos >= aIn.getLength() )
+if( m_nInPos >= m_aIn.getLength() )
 {
-bEOF = true;
+m_bEOF = true;
 return sal_Unicode(EOF);
 }
 
-sal_Unicode c = aIn[nInPos];
-nInPos++;
+sal_Unicode c = m_aIn[m_nInPos];
+m_nInPos++;
 
 if( c == '\n' )
 {
-++nlLineNr;
-nlLinePos = 1;
+++m_nlLineNr;
+m_nlLinePos = 1;
 }
 else
-++nlLinePos;
+++m_nlLinePos;
 
 return c;
 }
@@ -105,29 +105,29 @@ sal_Unicode CSS1Parser::GetNextChar()
 CSS1Token CSS1Parser::GetNextToken()
 {
 CSS1Token nRet = CSS1_NULL;
-aToken.clear();
+m_aToken.clear();
 
 do {
 // remember if white space was read
-bool bPrevWhiteSpace = bWhiteSpace;
-bWhiteSpace = false;
+bool bPrevWhiteSpace = m_bWhiteSpace;
+m_bWhiteSpace = false;
 
 bool bNextCh = true;
-switch( cNextCh )
+switch( m_cNextCh )
 {
 case '/': // COMMENT | '/'
 {
-cNextCh = GetNextChar();
-if( '*' == cNextCh )
+m_cNextCh = GetNextChar();
+if( '*' == m_cNextCh )
 {
 // COMMENT
-cNextCh = GetNextChar();
+m_cNextCh = GetNextChar();
 
 bool bAsterisk = false;
-while( !(bAsterisk && '/'==cNextCh) && !IsEOF() )
+while( !(bAsterisk && '/'==m_cNextCh) && !IsEOF() )
 {
-bAsterisk = ('*'==cNextCh);
-cNextCh = GetNextChar();
+bAsterisk = ('*'==m_cNextCh);
+m_cNextCh = GetNextChar();
 }
 }
 else
@@ -141,30 +141,30 @@ CSS1Token CSS1Parser::GetNextToken()
 
 case '@': // '@import' | '@XXX'
 {
-cNextCh = GetNextChar();
-if (rtl::isAsciiAlpha(cNextCh))
+m_cNextCh = GetNextChar();
+if (rtl::isAsciiAlpha(m_cNextCh))
 {
 // scan the next identifier
 OUStringBuffer sTmpBuffer(32);
 do {
-sTmpBuffer.append( cNextCh );
-cNextCh = GetNextChar();
-} while( (rtl::isAsciiAlphanumeric(cNextCh) ||
- '-' == cNextCh) && !IsEOF() );
+sTmpBuffer.append( m_cNextCh );
+m_cNextCh = GetNextChar();
+} while( (rtl::isAsciiAlphanumeric(m_cNextCh) ||
+ '-' == m_cNextCh) && !IsEOF() );
 
-aToken += sTmpBuffer;
+

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

[Johnny_M (via logerrit)]

 sd/source/filter/html/pubdlg.cxx |   84 +++
 sd/source/ui/inc/pubdlg.hxx  |   24 +--
 2 files changed, 54 insertions(+), 54 deletions(-)

New commits:
commit 25bd09a9bf3c145fe491c0035150867d2dbb97b2
Author: Johnny_M 
AuthorDate: Sat May 4 11:22:17 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon May 6 11:07:00 2019 +0200

Translate German variable names

Titel -> Title

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

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index cdf1d10f00bd..ebcfd52417e9 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -481,7 +481,7 @@ SdPublishingDlg::~SdPublishingDlg()
 void SdPublishingDlg::dispose()
 {
 pPage1.clear();
-pPage1_Titel.clear();
+pPage1_Title.clear();
 pPage1_NewDesign.clear();
 pPage1_OldDesign.clear();
 pPage1_Designs.clear();
@@ -491,7 +491,7 @@ void SdPublishingDlg::dispose()
 pPage2Frame2.clear();
 pPage2Frame3.clear();
 pPage2Frame4.clear();
-pPage2_Titel.clear();
+pPage2_Title.clear();
 pPage2_Standard.clear();
 pPage2_Frames.clear();
 pPage2_SingleDocument.clear();
@@ -501,10 +501,10 @@ void SdPublishingDlg::dispose()
 pPage2_Frames_FB.clear();
 pPage2_Kiosk_FB.clear();
 pPage2_WebCast_FB.clear();
-pPage2_Titel_Html.clear();
+pPage2_Title_Html.clear();
 pPage2_Content.clear();
 pPage2_Notes.clear();
-pPage2_Titel_WebCast.clear();
+pPage2_Title_WebCast.clear();
 pPage2_ASP.clear();
 pPage2_PERL.clear();
 pPage2_URL_txt.clear();
@@ -513,43 +513,43 @@ void SdPublishingDlg::dispose()
 pPage2_CGI.clear();
 pPage2_Index_txt.clear();
 pPage2_Index.clear();
-pPage2_Titel_Kiosk.clear();
+pPage2_Title_Kiosk.clear();
 pPage2_ChgDefault.clear();
 pPage2_ChgAuto.clear();
 pPage2_Duration_txt.clear();
 pPage2_Duration.clear();
 pPage2_Endless.clear();
 pPage3.clear();
-pPage3_Titel1.clear();
+pPage3_Title1.clear();
 pPage3_Png.clear();
 pPage3_Gif.clear();
 pPage3_Jpg.clear();
 pPage3_Quality_txt.clear();
 pPage3_Quality.clear();
-pPage3_Titel2.clear();
+pPage3_Title2.clear();
 pPage3_Resolution_1.clear();
 pPage3_Resolution_2.clear();
 pPage3_Resolution_3.clear();
-pPage3_Titel3.clear();
+pPage3_Title3.clear();
 pPage3_SldSound.clear();
 pPage3_HiddenSlides.clear();
 pPage4.clear();
-pPage4_Titel1.clear();
+pPage4_Title1.clear();
 pPage4_Author_txt.clear();
 pPage4_Author.clear();
 pPage4_Email_txt.clear();
 pPage4_Email.clear();
 pPage4_WWW_txt.clear();
 pPage4_WWW.clear();
-pPage4_Titel2.clear();
+pPage4_Title2.clear();
 pPage4_Misc.clear();
 pPage4_Download.clear();
 pPage5.clear();
-pPage5_Titel.clear();
+pPage5_Title.clear();
 pPage5_TextOnly.clear();
 pPage5_Buttons.clear();
 pPage6.clear();
-pPage6_Titel.clear();
+pPage6_Title.clear();
 pPage6_Default.clear();
 pPage6_User.clear();
 pPage6_Back.clear();
@@ -571,13 +571,13 @@ void SdPublishingDlg::CreatePages()
 {
 // Page 1
 get(pPage1, "page1");
-get(pPage1_Titel, "assignLabel");
+get(pPage1_Title, "assignLabel");
 get(pPage1_NewDesign, "newDesignRadiobutton");
 get(pPage1_OldDesign, "oldDesignRadiobutton");
 get(pPage1_DelDesign, "delDesingButton");
 get(pPage1_Desc, "descLabel");
 aAssistentFunc.InsertControl(1, pPage1);
-aAssistentFunc.InsertControl(1, pPage1_Titel);
+aAssistentFunc.InsertControl(1, pPage1_Title);
 aAssistentFunc.InsertControl(1, pPage1_NewDesign);
 aAssistentFunc.InsertControl(1, pPage1_OldDesign);
 aAssistentFunc.InsertControl(1, pPage1_Designs);
@@ -589,7 +589,7 @@ void SdPublishingDlg::CreatePages()
 get(pPage2Frame2, "page2.2");
 get(pPage2Frame3, "page2.3");
 get(pPage2Frame4, "page2.4");
-get(pPage2_Titel, "publicationLabel");
+get(pPage2_Title, "publicationLabel");
 get(pPage2_Standard, "standardRadiobutton");
 get(pPage2_Frames, "framesRadiobutton");
 get(pPage2_SingleDocument, "singleDocumentRadiobutton");
@@ -599,7 +599,7 @@ void SdPublishingDlg::CreatePages()
 aAssistentFunc.InsertControl(2, pPage2Frame2);
 aAssistentFunc.InsertControl(2, pPage2Frame3);
 aAssistentFunc.InsertControl(2, pPage2Frame4);
-aAssistentFunc.InsertControl(2, pPage2_Titel);
+aAssistentFunc.InsertControl(2, pPage2_Title);
 aAssistentFunc.InsertControl(2, pPage2_Standard);
 aAssistentFunc.InsertControl(2, pPage2_Frames);
 aAssistentFunc.InsertControl(2, pPage2_SingleDocument);
@@ -610,15 +610,15 @@ void SdPublishingDlg::CreatePages()
 aAssistentFunc.InsertControl(2, pPage2_Kiosk_FB);
 aAssistentFunc.InsertControl(2, pPag

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

[Johnny_M (via logerrit)]

 sw/inc/strings.hrc|   24 
 sw/source/uibase/fldui/fldmgr.cxx |   24 
 2 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit e3e51c9e04d5a73ddfce959f718f7549f9fdd834
Author: Johnny_M 
AuthorDate: Sat May 4 13:17:55 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon May 6 11:06:11 2019 +0200

Translate German variable names

Translated the defines, but kept the their NC_(...) translation
references to prevent a need to update translations.

Standardized terms from 
http://www.upu.int/en/activities/addressing/s42-standard.html
were used, although textual strings use US English terms.

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

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 5ee7196700e5..621e139b8262 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -916,21 +916,21 @@
 /*
 Description: SubType Extuser
  */
-#define FLD_EU_FIRMANC_("FLD_EU_FIRMA", "Company")
-#define FLD_EU_VORNAME  NC_("FLD_EU_VORNAME", "First 
Name")
-#define FLD_EU_NAME NC_("FLD_EU_NAME", "Last Name")
-#define FLD_EU_ABK  NC_("FLD_EU_ABK", "Initials")
-#define FLD_EU_STRASSE  NC_("FLD_EU_STRASSE", "Street")
-#define FLD_EU_LAND NC_("FLD_EU_LAND", "Country")
-#define FLD_EU_PLZ  NC_("FLD_EU_PLZ", "Zip code")
-#define FLD_EU_ORT  NC_("FLD_EU_ORT", "City")
-#define FLD_EU_TITELNC_("FLD_EU_TITEL", "Title")
+#define FLD_EU_COMPANY  NC_("FLD_EU_FIRMA", "Company")
+#define FLD_EU_GIVENNAMENC_("FLD_EU_VORNAME", "First 
Name")
+#define FLD_EU_SURNAME  NC_("FLD_EU_NAME", "Last Name")
+#define FLD_EU_INITIALS NC_("FLD_EU_ABK", "Initials")
+#define FLD_EU_STREET   NC_("FLD_EU_STRASSE", "Street")
+#define FLD_EU_COUNTRY  NC_("FLD_EU_LAND", "Country")
+#define FLD_EU_POSTCODE NC_("FLD_EU_PLZ", "Zip code")
+#define FLD_EU_TOWN NC_("FLD_EU_ORT", "City")
+#define FLD_EU_TITLENC_("FLD_EU_TITEL", "Title")
 #define FLD_EU_POS  NC_("FLD_EU_POS", "Position")
-#define FLD_EU_TELPRIV  NC_("FLD_EU_TELPRIV", "Tel. 
(Home)")
-#define FLD_EU_TELFIRMA NC_("FLD_EU_TELFIRMA", "Tel. 
(Work)")
+#define FLD_EU_TELPERSONAL  NC_("FLD_EU_TELPRIV", "Tel. 
(Home)")
+#define FLD_EU_TELWORK  NC_("FLD_EU_TELFIRMA", "Tel. 
(Work)")
 #define FLD_EU_FAX  NC_("FLD_EU_FAX", "Fax")
 #define FLD_EU_EMAILNC_("FLD_EU_EMAIL", "Email")
-#define FLD_EU_STATENC_("FLD_EU_STATE", "State")
+#define FLD_EU_REGION   NC_("FLD_EU_STATE", "State")
 #define FLD_PAGEREF_OFF NC_("FLD_PAGEREF_OFF", "off")
 #define FLD_PAGEREF_ON  NC_("FLD_PAGEREF_ON", "on")
 /*
diff --git a/sw/source/uibase/fldui/fldmgr.cxx 
b/sw/source/uibase/fldui/fldmgr.cxx
index 5e3194623f11..d7ccd768723b 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -139,21 +139,21 @@ static const sal_uInt16 VF_DB_COUNT = 1; // { 
nsSwExtendedSubType::SUB_OWN_FMT }
 
 static const char* FLD_EU_ARY[] =
 {
-FLD_EU_FIRMA,
-FLD_EU_VORNAME,
-FLD_EU_NAME,
-FLD_EU_ABK,
-FLD_EU_STRASSE,
-FLD_EU_LAND,
-FLD_EU_PLZ,
-FLD_EU_ORT,
-FLD_EU_TITEL,
+FLD_EU_COMPANY,
+FLD_EU_GIVENNAME,
+FLD_EU_SURNAME,
+FLD_EU_INITIALS,
+FLD_EU_STREET,
+FLD_EU_COUNTRY,
+FLD_EU_POSTCODE,
+FLD_EU_TOWN,
+FLD_EU_TITLE,
 FLD_EU_POS,
-FLD_EU_TELPRIV,
-FLD_EU_TELFIRMA,
+FLD_EU_TELPERSONAL,
+FLD_EU_TELWORK,
 FLD_EU_FAX,
 FLD_EU_EMAIL,
-FLD_EU_STATE
+FLD_EU_REGION
 };
 
 static const char* FMT_AUTHOR_ARY[] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/qa

[Noel Grandin (via logerrit)]

 vcl/qa/cppunit/pdfexport/pdfexport.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d1e9f1b237e4290eeb4e948e96750eb959881171
Author: Noel Grandin 
AuthorDate: Wed Apr 24 08:32:39 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon May 6 10:50:45 2019 +0200

disable some more pdfexport tests

Change-Id: Ifdee7c4bd9ed3306530c7bc4ecf3017008e90c3d
Reviewed-on: https://gerrit.libreoffice.org/71215
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 57edcf98dbd2471078d32ceeda9eba502b694496)
Reviewed-on: https://gerrit.libreoffice.org/71727
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 5c4b4a8c7141..b8638f6994c0 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -1244,6 +1244,8 @@ void PdfExportTest::testTdf66597_2()
 // This requires Gentium Basic font, if it is missing the test will fail.
 void PdfExportTest::testTdf66597_3()
 {
+// fails on some of the windows tinderboxes
+#if !defined _WIN32
 vcl::filter::PDFDocument aDocument;
 load("tdf66597-3.odt", aDocument);
 
@@ -1319,6 +1321,7 @@ void PdfExportTest::testTdf66597_3()
 }
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of ActualText entries does not 
match!", static_cast(4), nCount);
 }
+#endif // __WIN32
 }
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus external/libwps

[Luboš Luňák (via logerrit)]

 external/liborcus/ExternalProject_liborcus.mk |8 
 external/liborcus/UnpackedTarball_liborcus.mk |1 +
 external/liborcus/libtool.patch.0 |   11 +++
 external/libwps/ExternalProject_libwps.mk |   23 +++
 external/libwps/UnpackedTarball_libwps.mk |1 +
 external/libwps/libtool.patch.0   |   11 +++
 6 files changed, 51 insertions(+), 4 deletions(-)

New commits:
commit ddea172792d13516ff7e0dd43f1f78b74ade8914
Author: Luboš Luňák 
AuthorDate: Sun May 5 15:49:16 2019 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 6 10:33:18 2019 +0200

enable gdb-index also for liborcus and libwps if possible

These are larger C++ libs and without gdb-index gdb takes a moment
to load such libs.

Change-Id: I555a629199f761060199a528415f7d5fbe9d9533
Reviewed-on: https://gerrit.libreoffice.org/71822
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/external/liborcus/ExternalProject_liborcus.mk 
b/external/liborcus/ExternalProject_liborcus.mk
index f1e82f54f4f7..8cc1c030fa98 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -82,6 +82,14 @@ ifeq ($(OS),LINUX)
 liborcus_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\ORIGIN
 endif
 
+ifeq ($(ENABLE_GDB_INDEX),TRUE)
+liborcus_LDFLAGS+=-Wl,--gdb-index
+liborcus_CXXFLAGS+=-ggnu-pubnames
+ifneq ($(USE_LD),)
+liborcus_LDFLAGS += -fuse-ld=$(USE_LD)
+endif
+endif
+
 $(call gb_ExternalProject_get_state_target,liborcus,build) :
$(call gb_ExternalProject_run,build,\
$(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 6814782bd9e2..e1d810a49dc2 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
external/liborcus/version.patch.0 \
+   external/liborcus/libtool.patch.0 \
external/liborcus/0001-Prevent-unsigned-integer-underflow.patch \
 ))
 
diff --git a/external/liborcus/libtool.patch.0 
b/external/liborcus/libtool.patch.0
new file mode 100644
index ..93b677303374
--- /dev/null
+++ b/external/liborcus/libtool.patch.0
@@ -0,0 +1,11 @@
+--- ltmain.sh.sav  2018-09-14 23:47:13.0 +0200
 ltmain.sh  2019-05-05 23:11:30.406904472 +0200
+@@ -7278,7 +7278,7 @@ func_mode_link ()
+   -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+   
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+   
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-  -specs=*|-fsanitize=*)
++  -specs=*|-fsanitize=*|-fuse-ld=*)
+ func_quote_for_eval "$arg"
+   arg=$func_quote_for_eval_result
+ func_append compile_command " $arg"
diff --git a/external/libwps/ExternalProject_libwps.mk 
b/external/libwps/ExternalProject_libwps.mk
index 9c6a5ea137b3..bb8a5d977b6e 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -25,6 +25,23 @@ libwps_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
+libwps_CXXFLAGS=$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))
+
+libwps_LDFLAGS=
+ifeq ($(OS),LINUX)
+ifeq ($(SYSTEM_REVENGE),)
+libwps_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\ORIGIN
+endif
+endif
+
+ifeq ($(ENABLE_GDB_INDEX),TRUE)
+libwps_LDFLAGS+=-Wl,--gdb-index
+libwps_CXXFLAGS+=-ggnu-pubnames
+ifneq ($(USE_LD),)
+libwps_LDFLAGS += -fuse-ld=$(USE_LD)
+endif
+endif
+
 $(call gb_ExternalProject_get_state_target,libwps,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
@@ -41,11 +58,9 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
+   $(if $(libwps_CXXFLAGS),CXXFLAGS='$(libwps_CXXFLAGS)') \
$(if $(libwps_CPPFLAGS),CPPFLAGS='$(libwps_CPPFLAGS)') \
-   $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
-   'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-   -Wl$(COMMA)-rpath$(COMMA)\ORIGIN')) 
\
+   $(if $(libwps_LDFLAGS),LDFLAGS='$(libwps_LDFLAGS)') \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.

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

[Adam Kovacs (via logerrit)]

 
sw/qa/extras/ooxmlexport/data/tdf113483_crossreflink_nonascii_bookmarkname.docx 
|binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
 |   10 ++
 sw/source/filter/ww8/docxattributeoutput.cxx   
 |9 -
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit b9afb9959c31c3c57d0f2fe91107a92abfd82cdb
Author: Adam Kovacs 
AuthorDate: Tue Apr 30 10:53:08 2019 +0200
Commit: László Németh 
CommitDate: Mon May 6 10:29:48 2019 +0200

tdf#113483: DOCX: fix encoding of bookmarks with non-ASCII letters

Non-ASCII letters were stored using percent-encoding, resulting
broken bookmark names after export/import. For example, the word "Első"
became the wrong "Els%C5%91". Now only the reversed ASCII characters
are stored in percent-encoding.

For example, the name "Első!" stored in the following form:


 REF Első%21 \h 

Change-Id: I65168e071b6baa12385c0aaa12d9f2ae4ccf9f98
Reviewed-on: https://gerrit.libreoffice.org/71299
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf113483_crossreflink_nonascii_bookmarkname.docx
 
b/sw/qa/extras/ooxmlexport/data/tdf113483_crossreflink_nonascii_bookmarkname.docx
new file mode 100644
index ..ec129909bc01
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf113483_crossreflink_nonascii_bookmarkname.docx
 differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index dfde7c2f399a..aae0813900ed 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -261,6 +261,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf123460, "tdf123460.docx")
 CPPUNIT_ASSERT_EQUAL(true, bCaught);
 }
 
+//tdf#113483: fix handling of non-ascii characters in bookmark names and 
instrText xml tags
+DECLARE_OOXMLEXPORT_TEST(testTdf113483, 
"tdf113483_crossreflink_nonascii_bookmarkname.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:bookmarkStart[1]", 
"name", OUString::fromUtf8("Els\u0151"));
+assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:p[5]/w:r[2]/w:instrText[1]", OUString::fromUtf8(" REF 
Els\u0151 \\h "));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bc20d072a38c..d351101cf4a7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -96,6 +96,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1611,7 +1612,7 @@ void DocxAttributeOutput::DoWriteBookmarkTagStart(const 
OUString & bookmarkName)
 {
 m_pSerializer->singleElementNS(XML_w, XML_bookmarkStart,
 FSNS(XML_w, XML_id), OString::number(m_nNextBookmarkId),
-FSNS(XML_w, XML_name), BookmarkToWord(bookmarkName).toUtf8());
+FSNS(XML_w, XML_name), 
INetURLObject::decode(BookmarkToWord(bookmarkName), 
INetURLObject::DecodeMechanism::Unambiguous, RTL_TEXTENCODING_UTF8).toUtf8());
 }
 
 void DocxAttributeOutput::DoWriteBookmarkTagEnd(const OUString & bookmarkName)
@@ -1980,6 +1981,12 @@ void DocxAttributeOutput::CmdField_Impl( const 
SwTextNode* pNode, sal_Int32 nPos
sToken = sToken.replaceAll("", "");
sToken = sToken.replaceAll("NN", "ddd");
 }
+//tdf#113483: fix non-ascii characters inside instrText xml tags
+else if ( rInfos.eType ==  ww::eREF
+  || rInfos.eType ==  ww::ePAGEREF )
+{
+sToken = INetURLObject::decode(sToken, 
INetURLObject::DecodeMechanism::Unambiguous, RTL_TEXTENCODING_UTF8);
+}
 
 // Write the Field command
 DoWriteCmd( sToken );
___
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-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.LokDialog.js |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 52bfff983e49043c03bdef5f64131171e1bb3f93
Author: Henry Castro 
AuthorDate: Thu Apr 18 18:26:33 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Mon May 6 10:15:07 2019 +0200

loleaflet: add 'paste' event listener to dialog

Change-Id: I2ec69117683e4dd75722b1873a373ee6b7ec7782
Reviewed-on: https://gerrit.libreoffice.org/70961
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/71371
Reviewed-by: Ashod Nakashian 
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 5961b165f..6b5f8756e 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -600,6 +600,30 @@ L.Control.LokDialog = L.Control.extend({
  // Keep map active while user is playing 
with sidebar/dialog.
  this._map.lastActiveTime = Date.now();
  }, this);
+   L.DomEvent.on(dlgInput, 'paste', function(e) {
+   var clipboardData = e.clipboardData || 
window.clipboardData;
+   var data, blob;
+
+   L.DomEvent.preventDefault(e);
+   if (clipboardData) {
+   data = clipboardData.getData('text/plain') || 
clipboardData.getData('Text');
+   if (data) {
+   var cmd = {
+   MimeType: {
+   type: 'string',
+   value: 
'mimetype=text/plain;charset=utf-8'
+   },
+   Data: {
+   type: '[]byte',
+   value: data
+   }
+   };
+
+   blob = new Blob(['windowcommand ' + id 
+ ' paste ', encodeURIComponent(JSON.stringify(cmd))]);
+   this._map._socket.sendMessage(blob);
+   }
+   }
+   }, this);
L.DomEvent.on(dlgInput, 'contextmenu', function() {
return false;
});
___
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-4' - bundled/include kit/ChildSession.cpp

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h  |2 +-
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx|4 ++--
 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |3 ++-
 kit/ChildSession.cpp |   17 -
 4 files changed, 21 insertions(+), 5 deletions(-)

New commits:
commit 41163339ba7239c603d2145ea62262258e7a9e42
Author: Henry Castro 
AuthorDate: Thu Apr 18 18:22:18 2019 -0400
Commit: Jan Holesovsky 
CommitDate: Mon May 6 10:13:18 2019 +0200

wsd: allow paste content to tunneled dialog

Change-Id: I32fabaa533a0e9d853226b329d2d8b1c489dd776
Reviewed-on: https://gerrit.libreoffice.org/70960
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/71370
Reviewed-by: Ashod Nakashian 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 1277d19b8..4b3800357 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -288,7 +288,7 @@ struct _LibreOfficeKitDocumentClass
  const int width, const int height);
 
 /// @see lok::Document::postWindow().
-void (*postWindow) (LibreOfficeKitDocument* pThis, unsigned nWindowId, int 
nAction);
+void (*postWindow) (LibreOfficeKitDocument* pThis, unsigned nWindowId, int 
nAction, const char* pData);
 
 /// @see lok::Document::postWindowKeyEvent().
 void (*postWindowKeyEvent) (LibreOfficeKitDocument* pThis,
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 32fd0ff04..895ca5bf5 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -188,9 +188,9 @@ public:
  *
  * @param nWindowid
  */
-void postWindow(unsigned nWindowId, int nAction)
+void postWindow(unsigned nWindowId, int nAction, const char* pData)
 {
-return mpDoc->pClass->postWindow(mpDoc, nWindowId, nAction);
+return mpDoc->pClass->postWindow(mpDoc, nWindowId, nAction, pData);
 }
 
 /**
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index b7e3c199a..c8168f9b7 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -42,7 +42,8 @@ LibreOfficeKitTileMode;
 
 typedef enum
 {
-LOK_WINDOW_CLOSE
+LOK_WINDOW_CLOSE,
+LOK_WINDOW_PASTE
 }
 LibreOfficeKitWindowAction;
 
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 07fd7c0c9..11b552e62 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1388,7 +1388,22 @@ bool ChildSession::sendWindowCommand(const char* 
/*buffer*/, int /*length*/, con
 getLOKitDocument()->setView(_viewId);
 
 if (tokens.size() > 2 && tokens[2] == "close")
-getLOKitDocument()->postWindow(winId, LOK_WINDOW_CLOSE);
+getLOKitDocument()->postWindow(winId, LOK_WINDOW_CLOSE, nullptr);
+else if (tokens.size() > 3 && tokens[2] == "paste")
+{
+std::string data;
+try
+{
+URI::decode(tokens[3], data);
+}
+catch (Poco::SyntaxException& exc)
+{
+sendTextFrame("error: cmd=windowcommand kind=syntax");
+return false;
+}
+
+getLOKitDocument()->postWindow(winId, LOK_WINDOW_PASTE, data.c_str());
+}
 
 return true;
 }
___
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-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.LokDialog.js |   12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 0c5524f89a405ab30ae91c4d75e72343195f8942
Author: Tor Lillqvist 
AuthorDate: Sat Apr 20 23:32:37 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 6 10:06:32 2019 +0200

tdf#124235: Fix the same problem on all platforms the same way

Reviewed-on: https://gerrit.libreoffice.org/71023
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
(cherry picked from commit ede2c3432f1d25c1c74b94f8fd5686fd59750e7b)

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

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index b3e4bcd08..5961b165f 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -860,17 +860,7 @@ L.Control.LokDialog = L.Control.extend({
var dialogTitle = $('.lokdialog_notitle');
if (dialogTitle != null && dialogTitle.length == 0) {
var dialogTitleBar = $('.ui-dialog-titlebar');
-   // tdf#124235: At least in the iOS app, multiplying with
-   // L.getDpiScaleFactor() below causes the child of a 
combo box to be
-   // displaced from the fixed part. I see the same 
problem also when using
-   // Safari on a Retuna Mac against normal online. But as 
I don't know whether
-   // it happens also for other browsers on other 
platforms on hidpi displays,
-   // I will fix this for the iOS app only for now.
-   if (!window.ThisIsTheiOSApp) {
-   top += dialogTitleBar.outerHeight() * 
L.getDpiScaleFactor();
-   } else {
-   top += dialogTitleBar.outerHeight();
-   }
+   top += dialogTitleBar.outerHeight();
}
 
floatingCanvas.id = strId + '-floating';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/admin/main-admin.js |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 203c8be2172bf70aacf12dc26add85127f284e90
Author: Samuel Mehrbrodt 
AuthorDate: Mon May 6 08:02:52 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon May 6 09:00:10 2019 +0200

Fix admin dasboard after vex update

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

diff --git a/loleaflet/admin/main-admin.js b/loleaflet/admin/main-admin.js
index f3d9a52ed..a2964bcd2 100644
--- a/loleaflet/admin/main-admin.js
+++ b/loleaflet/admin/main-admin.js
@@ -3,8 +3,8 @@
 require('bootstrap/dist/css/bootstrap.css');
 require('./bootstrap/ie10-viewport-bug-workaround.css');
 require('./bootstrap/dashboard.css');
-require('vex-js/css/vex.css');
-require('vex-js/css/vex-theme-plain.css');
+require('vex-js/dist/css/vex.css');
+require('vex-js/dist/css/vex-theme-plain.css');
 
 var $ = require('jquery');
 global.$ = global.jQuery = $;
@@ -12,8 +12,7 @@ global.$ = global.jQuery = $;
 require('json-js/json2');
 require('l10n-for-node');
 
-var vex = require('vex-js');
-vex.dialog = require('vex-js/js/vex.dialog.js');
+var vex = require('vex-js/dist/js/vex.combined.js');
 vex.defaultOptions.className = 'vex-theme-plain';
 global.vex = vex;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits