Re: Clang trunk build failure in external/librevenge

[Stephan Bergmann]

On 13/05/2019 04:21, Luke Benes wrote:
After commit: 
http://llvm.org/viewvc/llvm-project?view=revision&revision=360308


Clang builds are failing on both Arch and Ubuntu with the following error:

checking for boost/spirit/include/classic.hpp... no


You'd need to look into workdir/UnpackedTarball/librevenge/config.log to 
see why compiling the test source containing


  #include 

fails.  (The symptoms look similar to 
 "[10 Regression] 
ICE in linemap_macro_map_loc_to_exp_point, at libcpp/line-map.c:1061" 
which I encountered in external/libetonyek, but that was with GCC not 
Clang.)



configure: error: Required boost headers not found.
make[1]: *** 
[/core/external/librevenge/ExternalProject_librevenge.mk:23:  
/core/workdir/ExternalProject/librevenge/build] Error 1

make[1]: *** Waiting for unfinished jobs
32 warnings generated.
114 warnings generated.
40 warnings generated.
make: *** [Makefile:282: build] Error 2

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

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2import.cxx |2 +-
 oox/source/core/xmlfilterbase.cxx |9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 642389768e634b739a1d8354259b16bfcc695d17
Author: Balazs Varga 
AuthorDate: Mon May 13 16:23:38 2019 +0200
Commit: László Németh 
CommitDate: Tue May 14 08:19:45 2019 +0200

tdf#100084 XLSX import: fix missing charts clean-up

Clean-up the b2fc2ad7beceaff660de684435a5c37d69cf8ae9
commit.

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index affab028f46e..cd5e61d03f21 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -887,7 +887,7 @@ void Chart2ImportTest::testTdf108021()
 
 void Chart2ImportTest::testTdf100084()
 {
-// The test file was created with IBM Cognos, so just check there is a 
diagram.
+// The test file was created with IBM Cognos, make sure there is a diagram.
 load("/chart2/qa/extras/data/xlsx/", "tdf100084.xlsx");
 Reference xChartDoc = getChartDocFromSheet(0, 
mxComponent);
 CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index be9b2261c272..6e26fa86595a 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -385,15 +385,16 @@ bool XmlFilterBase::importFragment( const 
rtl::Reference& rxHan
 handler to create specialized input streams, e.g. VML streams that
 have to preprocess the raw input data. */
 Reference< XInputStream > xInStrm = rxHandler->openFragmentStream();
-// Check again the aFragmentPath route if there is no any file with 
lowercase letter. (tdf#100084)
+/*  tdf#100084 Check again the aFragmentPath route with lowercase file 
name
+TODO: complete handling of case-insensitive file paths */
 if ( !xInStrm.is() )
 {
 sal_Int32 nPathLen = aFragmentPath.lastIndexOf('/') + 1;
 OUString fileName = aFragmentPath.copy(nPathLen);
-if ( fileName != fileName.toAsciiLowerCase() )
+OUString sLowerCaseFileName = fileName.toAsciiLowerCase();
+if ( fileName != sLowerCaseFileName )
 {
-fileName = fileName.toAsciiLowerCase();
-aFragmentPath = OUStringBuffer(aFragmentPath.copy(0, 
nPathLen)).append(fileName).makeStringAndClear();
+aFragmentPath = aFragmentPath.copy(0, nPathLen) + 
sLowerCaseFileName;
 xInStrm = openInputStream(aFragmentPath);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/html/framed.html|   17 -
 loleaflet/reference.html  |   14 +++
 loleaflet/src/map/Map.js  |   63 --
 loleaflet/src/map/handler/Map.WOPI.js |6 +++
 4 files changed, 74 insertions(+), 26 deletions(-)

New commits:
commit 9e529e84bf1c4d22066cf5431427658068b2ac3d
Author: Samuel Mehrbrodt 
AuthorDate: Mon May 13 17:29:02 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue May 14 08:19:41 2019 +0200

Add UI customizing example to framed.html

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

diff --git a/loleaflet/html/framed.html b/loleaflet/html/framed.html
index c3f46f39b..ee216ce14 100644
--- a/loleaflet/html/framed.html
+++ b/loleaflet/html/framed.html
@@ -117,6 +117,12 @@
  '*');
   }
 
+  function ShowMenubar(visible) {
+var messageId = visible ? 'Show_Menubar' : 'Hide_Menubar';
+window.frames[0].postMessage(JSON.stringify({'MessageId': 
'Host_PostmessageReady'}), '*');
+window.frames[0].postMessage(JSON.stringify({'MessageId': messageId}), 
'*');
+  }
+
   // This function is invoked when the iframe posts a message back.
 
   function receiveMessage(event) {
@@ -172,7 +178,7 @@
   
 
   
-
+Calc functions
 
   
Cell: (, 
),
@@ -199,6 +205,15 @@
   Click here to delete the named range called 
 
 
+UI modification
+
+  Hide Menubar
+  Show Menubar
+
+
+
+Document frame
+
 

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini (via logerrit)]

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

New commits:
commit d1fcb0ec92ea7935b9f92a15a922fb9dccfe1968
Author: Andrea Gelmini 
AuthorDate: Mon May 13 23:57:58 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 14 07:09:48 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix typos

Change-Id: I79db4363c15786f3829faf24621f073cf481191a
Reviewed-on: https://gerrit.libreoffice.org/72257
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/helpcontent2 b/helpcontent2
index ec92232db1d9..bb77ba985843 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ec92232db1d9ce394b94778f9e7adaf02bfa2da1
+Subproject commit bb77ba985843f99ccf7df959a97c08e6fe913d2e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/scalc/01/1207.xhp  |2 +-
 source/text/shared/02/01170101.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bb77ba985843f99ccf7df959a97c08e6fe913d2e
Author: Andrea Gelmini 
AuthorDate: Mon May 13 23:57:58 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue May 14 07:09:48 2019 +0200

Fix typos

Change-Id: I79db4363c15786f3829faf24621f073cf481191a
Reviewed-on: https://gerrit.libreoffice.org/72257
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/source/text/scalc/01/1207.xhp 
b/source/text/scalc/01/1207.xhp
index fdbe54615..296d6958e 100644
--- a/source/text/scalc/01/1207.xhp
+++ b/source/text/scalc/01/1207.xhp
@@ -45,7 +45,7 @@
 
 
 Source 
data range
-Specifies the cell range 
that you want to consolidate with the cell ranges listed in the 
Consolidation ranges box. Select a cell range in a sheet, and then 
click Add. You can also select a the name of a predefined cell 
from the Source data range list.
+Specifies the cell range 
that you want to consolidate with the cell ranges listed in the 
Consolidation ranges box. Select a cell range in a sheet, and then 
click Add. You can also select the name of a predefined cell from 
the Source data range list.
 
 
 
diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index bdcc091f9..749fd2372 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -515,7 +515,7 @@
 
 
 Hide 
selectionUFI: see dba spec 
form_controls_interop_1.sxw
-  Specifies whether a text 
selection on a control remains selected when a the focus is no longer on a 
control. If you set Hide selection to "No", the selected 
text remains selected when the focus is no longer on the control that contains 
the text.
+  Specifies whether a text 
selection on a control remains selected when the focus is no longer on a 
control. If you set Hide selection to "No", the selected 
text remains selected when the focus is no longer on the control that contains 
the text.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 desktop/test/deployment/executable_content/readme.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9eacac96006a59c4c28cb32808b1c00a2c92eb7f
Author: Andrea Gelmini 
AuthorDate: Mon May 13 22:01:36 2019 +
Commit: Julien Nabet 
CommitDate: Tue May 14 07:08:29 2019 +0200

Fix typos

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

diff --git a/desktop/test/deployment/executable_content/readme.txt 
b/desktop/test/deployment/executable_content/readme.txt
index ad3c01097e14..2c336de723bb 100644
--- a/desktop/test/deployment/executable_content/readme.txt
+++ b/desktop/test/deployment/executable_content/readme.txt
@@ -9,4 +9,4 @@ solaris,
 linux
 
 Each directory contains a hello executable. On linux one should execute it in 
a 
-shell with an build environment, so that the c++ runtime is found.
+shell with a build environment, so that the C++ runtime is found.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 desktop/test/deployment/update/license/readme.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0581c2f30fed420a696897e8a80ad7e2d96e33d5
Author: Andrea Gelmini 
AuthorDate: Mon May 13 19:43:34 2019 +
Commit: Julien Nabet 
CommitDate: Tue May 14 07:07:44 2019 +0200

Fix typo

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

diff --git a/desktop/test/deployment/update/license/readme.txt 
b/desktop/test/deployment/update/license/readme.txt
index 8c2a4d4f0412..6040da04c4d1 100644
--- a/desktop/test/deployment/update/license/readme.txt
+++ b/desktop/test/deployment/update/license/readme.txt
@@ -1,4 +1,4 @@
-The extensions contain a license which is displayed during installation. If a 
the license is displayed during a update can be determined by the attribute
+The extensions contain a license which is displayed during installation. If 
the license is displayed during an update can be determined by the attribute
 /description/registration/simple-license/@suppress-on-update
 
 The default value is false, which means that the attribute is not set, then 
the license is displayed during an update.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 desktop/source/migration/migration_impl.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87580f6a49f2299971a7cb7f5a3a90415ad8b24b
Author: Andrea Gelmini 
AuthorDate: Wed May 8 10:13:05 2019 +
Commit: Julien Nabet 
CommitDate: Tue May 14 07:07:06 2019 +0200

Fix typo

Change-Id: Ied41845bd6c2e42e14a16c72c1e7d3a527502375
Reviewed-on: https://gerrit.libreoffice.org/72261
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/desktop/source/migration/migration_impl.hxx 
b/desktop/source/migration/migration_impl.hxx
index f065ab1b5f39..c4eb5ed8f07d 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -81,7 +81,7 @@ inline bool areBothOpenFrom(OUString const & cmd1, OUString 
const & cmd2)
 
 /**
 define the item, e.g.:menuitem, toolbaritem, to be migrated. we keep the 
information
-of the command URL, the previous sibling node and the parent node of a item
+of the command URL, the previous sibling node and the parent node of an 
item
 */
 struct MigrationItem
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 0c456383c10d5b468b78fd5bc407be219402785f
Author: Andrea Gelmini 
AuthorDate: Wed May 8 10:13:07 2019 +
Commit: Julien Nabet 
CommitDate: Tue May 14 07:06:35 2019 +0200

Fix typo

Change-Id: Ia8f5ca10c974a0ba2d1686b341ef2a1dd44b824d
Reviewed-on: https://gerrit.libreoffice.org/72260
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 21fac8a348e7..fc4f2aa4881c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1326,7 +1326,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)

aOldTree.get("rectangle", "").empty();
});
 
-// we found a invalidate-all window callback
+// we found an invalidate-all window callback
 if (invAllExist)
 {
 SAL_INFO("lok.dialog", "Skipping queue [" << type 
<< "]: [" << payload << "] since whole window needs to be invalidated.");
@@ -2010,7 +2010,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, 
const char* sUrl, const cha
 // add interaction handler too
 if (gImpl)
 {
-// gImpl does not have to exist when running from a unit test
+// gImpl does not have to exist when running from an unit test
 rtl::Reference const pInteraction(
 new LOKInteractionHandler("saveas", gImpl, pDocument));
 uno::Reference const 
xInteraction(pInteraction.get());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 desktop/source/offacc/acceptor.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51239fde4182aed2e4121b44731f0c1ce437c26a
Author: Andrea Gelmini 
AuthorDate: Wed May 8 10:13:04 2019 +
Commit: Julien Nabet 
CommitDate: Tue May 14 07:05:56 2019 +0200

Fix typo

Change-Id: I305e152b6d6e71eba8d568b66c80b53e3bf27db0
Reviewed-on: https://gerrit.libreoffice.org/72262
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/desktop/source/offacc/acceptor.cxx 
b/desktop/source/offacc/acceptor.cxx
index 894f20623e78..26fcab414c4c 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -106,7 +106,7 @@ void Acceptor::run()
 
 // accept connection
 Reference< XConnection > rConnection = m_rAcceptor->accept( 
m_aConnectString );
-// if we return without a valid connection we mus assume that the 
acceptor
+// if we return without a valid connection we must assume that the 
acceptor
 // is destructed so we break out of the run method terminating the 
thread
 if (! rConnection.is()) break;
 OUString aDescription = rConnection->getDescription();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC 2019] Commuity Bonding Period

[shubham goyal]

Hi Jonathon,

It question is valid. It will not offer something very different for now.
But this project is one of the secondary preparations to make mail-merge
happen in LibreOffice.

See more about mail-merge in LO

https://bugs.documentfoundation.org/show_bug.cgi?id=87195
Word - https://code.adonline.id.au/qr-codes-in-microsoft-word/

Thanks, for asking :)

On Tue, 14 May 2019 at 05:26, jonathon  wrote:

>
>
> On 5/12/19 11:12 AM, shubham goyal wrote:
>
> > My project aims to integrate support to generate QR code within LO
> itself.
>
> CF: https://extensions.openoffice.org/en/project/qr-code-generator-0
>
> What does your proposal offer, that is not currently done by that
> extension?
>
> jonathon
> ___
> 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: editeng/source include/editeng starmath/inc starmath/source

[Jan-Marek Glogowski (via logerrit)]

 editeng/source/editeng/editeng.cxx  |   10 +
 editeng/source/editeng/impedit.hxx  |4 +++
 editeng/source/editeng/impedit2.cxx |1 
 editeng/source/editeng/impedit3.cxx |4 ++-
 include/editeng/editeng.hxx |2 +
 starmath/inc/document.hxx   |3 +-
 starmath/inc/edit.hxx   |2 -
 starmath/source/document.cxx|   27 
 starmath/source/edit.cxx|   40 ++--
 starmath/source/smmod.cxx   |3 --
 10 files changed, 56 insertions(+), 40 deletions(-)

New commits:
commit ea191cf9807d0b0725fbc4831053a26ba71c2328
Author: Jan-Marek Glogowski 
AuthorDate: Sun May 12 13:19:56 2019 +
Commit: Tomaž Vajngerl 
CommitDate: Tue May 14 03:23:20 2019 +0200

tdf#90297 use field colors for math's edit engine

This adds a maTextColor to the EditEngine, which will override
the default AutoColor.

There is also a NOCOLORS mode and I thought about using it
instead, but it defaults to COL_BLACK and overriding this seems
wrong.

Since the EditEngine does the whole drawing and now has the
explicit FieldColor() and FieldTextColor() for background and
text, my guess is we don't need an ApplySettings implementation.

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

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 458f71b34d3f..5faf9eb9f3f3 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -183,6 +183,16 @@ Color const & EditEngine::GetBackgroundColor() const
 return pImpEditEngine->GetBackgroundColor();
 }
 
+void EditEngine::SetTextColor( const Color& rColor )
+{
+pImpEditEngine->SetTextColor( rColor );
+}
+
+Color const & EditEngine::GetTextColor() const
+{
+return pImpEditEngine->GetTextColor();
+}
+
 Color EditEngine::GetAutoColor() const
 {
 return pImpEditEngine->GetAutoColor();
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 9f0e27909515..987281ef89e4 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -463,6 +463,7 @@ private:
 EditSelectionEngine aSelEngine;
 
 Color   maBackgroundColor;
+Color   maTextColor;
 
 sal_uInt16  nStretchX;
 sal_uInt16  nStretchY;
@@ -678,6 +679,9 @@ private:
 voidSetBackgroundColor( const Color& rColor ) { 
maBackgroundColor = rColor; }
 const Color&GetBackgroundColor() const { return maBackgroundColor; 
}
 
+voidSetTextColor( const Color& rColor ) { maTextColor = 
rColor; }
+const Color&GetTextColor() const { return maTextColor; }
+
 longCalcVertLineSpacing(Point& rStartPos) const;
 
 Color   GetAutoColor() const;
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 6b4b8da61b2e..0d1d3b399f93 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -124,6 +124,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* 
pItemPool ) :
 
 eDefLanguage= LANGUAGE_DONTKNOW;
 maBackgroundColor   = COL_AUTO;
+maTextColor = COL_AUTO;
 
 nAsianCompressionMode = CharCompressType::NONE;
 
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index ec3e10cf1290..0cdee12d70ae 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4418,7 +4418,9 @@ Reference < i18n::XExtendedInputSequenceChecker > const & 
ImpEditEngine::ImplGet
 
 Color ImpEditEngine::GetAutoColor() const
 {
-Color aColor = GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor;
+Color aColor = GetTextColor();
+if ( aColor == COL_AUTO )
+aColor = GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor;
 
 if ( GetBackgroundColor() != COL_AUTO )
 {
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index f585ce8b5796..dfb39a0b8e94 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -216,6 +216,8 @@ public:
 
 voidSetBackgroundColor( const Color& rColor );
 Color const &   GetBackgroundColor() const;
+voidSetTextColor( const Color& rColor );
+Color const &   GetTextColor() const;
 Color   GetAutoColor() const;
 voidEnableAutoColor( bool b );
 voidForceAutoColor( bool b );
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 311cece64cdb..ec4b016f12b9 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -75,7 +75,6 @@ public:
 OutputDevice* GetRefDev()  { return pRefDev.get(); }
 };
 
-void SetEditEngineDefa

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

[Jan-Marek Glogowski (via logerrit)]

 include/tools/color.hxx |   10 +-
 include/vcl/BitmapColor.hxx |   11 ---
 tools/qa/cppunit/test_color.cxx |   20 ++--
 tools/source/generic/color.cxx  |9 -
 vcl/source/window/decoview.cxx  |8 
 5 files changed, 23 insertions(+), 35 deletions(-)

New commits:
commit d14d1341f2b0cd62098425b36438ae20b887fe93
Author: Jan-Marek Glogowski 
AuthorDate: Mon May 13 14:00:10 2019 +
Commit: Tomaž Vajngerl 
CommitDate: Tue May 14 03:20:50 2019 +0200

Switch everyone to stricter GetColorError

This replaces the variant in Color with the stricter one of
BitmapColor. I couldn't find any reasoning for the lazy variant
used in Color.

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

diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index ed8b8813afee..fa62f28f362b 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -126,7 +126,7 @@ public:
 return color::extractRGB(mValue);
 }
 
-sal_uInt8 GetColorError(const Color& rCompareColor) const;
+sal_uInt16 GetColorError(const Color& rCompareColor) const;
 
 sal_uInt8 GetLuminance() const;
 void IncreaseLuminance(sal_uInt8 cLumInc);
@@ -224,6 +224,14 @@ inline void Color::Invert()
 B = ~B;
 }
 
+inline sal_uInt16 Color::GetColorError( const Color& rColor ) const
+{
+return static_cast(
+abs(static_cast(GetBlue()) - rColor.GetBlue()) +
+abs(static_cast(GetGreen()) - rColor.GetGreen()) +
+abs(static_cast(GetRed()) - rColor.GetRed()));
+}
+
 inline void Color::Merge( const Color& rMergeColor, sal_uInt8 cTransparency )
 {
 R = ColorChannelMerge(R, rMergeColor.R, cTransparency);
diff --git a/include/vcl/BitmapColor.hxx b/include/vcl/BitmapColor.hxx
index 4344a7bd242f..f6e1751a3be5 100644
--- a/include/vcl/BitmapColor.hxx
+++ b/include/vcl/BitmapColor.hxx
@@ -22,7 +22,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 class VCL_DLLPUBLIC BitmapColor final : public Color
@@ -39,8 +38,6 @@ public:
 
 inline sal_uInt8GetAlpha() const;
 inline void SetAlpha( sal_uInt8 cAlpha );
-
-inline sal_uInt16 GetColorError( const BitmapColor& rColor ) const;
 };
 
 inline BitmapColor::BitmapColor()
@@ -82,14 +79,6 @@ inline void BitmapColor::SetAlpha( sal_uInt8 cAlpha )
 SetTransparency(cAlpha);
 }
 
-inline sal_uInt16 BitmapColor::GetColorError( const BitmapColor& rColor ) const
-{
-return static_cast(
-abs( static_cast(GetBlue()) - static_cast(rColor.GetBlue()) 
) +
-abs( static_cast(GetGreen()) - 
static_cast(rColor.GetGreen()) ) +
-abs( static_cast(GetRed()) - static_cast(rColor.GetRed()) ) 
);
-}
-
 #endif // INCLUDED_VCL_BITMAPCOLOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/qa/cppunit/test_color.cxx b/tools/qa/cppunit/test_color.cxx
index 9c2a4d9c7049..5bec65027b94 100644
--- a/tools/qa/cppunit/test_color.cxx
+++ b/tools/qa/cppunit/test_color.cxx
@@ -163,19 +163,19 @@ void Test::test_ApplyTintOrShade()
 
 void Test::testGetColorError()
 {
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), Color(0xAA, 0xBB, 
0xCC).GetColorError(Color(0xAA, 0xBB, 0xCC)));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), Color(0xAA, 0xBB, 
0xCC).GetColorError(Color(0xAA, 0xBB, 0xCC)));
 
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB0, 0xC0)));
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA0, 0xB1, 0xC0)));
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA0, 0xB0, 0xC1)));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB0, 0xC0)));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA0, 0xB1, 0xC0)));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA0, 0xB0, 0xC1)));
 
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB1, 0xC0)));
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA0, 0xB1, 0xC1)));
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB0, 0xC1)));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB1, 0xC0)));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA0, 0xB1, 0xC1)));
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB0, 0xC1)));
 
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB1, 0xC1)));
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(1), Color(0xA0, 0xB0, 
0xC0).GetColorError(Color(0xA1, 0xB1, 0xC1)));
-CPPUNIT_ASSERT_EQUAL(sal_uInt8(1), Color(0xA0, 0xB0, 
0xC0).GetColorEr

Struggling with unit test

[Regina Henschel]

Hi all,

I need help again. I try to write a unit test 
https://gerrit.libreoffice.org/#/c/72229/

It works with Windows10. But Jenkins fails on Mac with message
https://ci.libreoffice.org/job/gerrit_mac/32803/

Undefined symbols for architecture x86_64:
  "SdrObjCustomShape::DragMoveCustomShapeHdl(Point const&, unsigned 
short, bool)", referenced from:
  (anonymous namespace)::testTdf115813_OOXML_XY_handle::TestBody() 
in customshapes.o

  "SdrObjCustomShape::GetInteractionHandles() const", referenced from:
  (anonymous namespace)::testTdf115813_OOXML_XY_handle::TestBody() 
in customshapes.o

ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see 
invocation)


I have now build it in a VM with Ubuntu 16.0 LTS. There too I get an 
error. Here the message is

cd /home/vmregina/lo/core/svx && make -j 4 -rs check
[build DEP] LNK:CppunitTest/libtest_svx_unit.so
[build LNK] CppunitTest/libtest_svx_unit.so
/usr/bin/ld.gold: error: 
/home/vmregina/lo/core/workdir/CxxObject/svx/qa/unit/customshapes.o: 
requires dynamic R_X86_64_PC32 reloc against 
'_ZNK17SdrObjCustomShape21GetInteractionHandlesEv' which may overflow at 
runtime; recompile with -fPIC
/home/vmregina/lo/core/svx/qa/unit/customshapes.cxx:361: error: 
undefined reference to 'SdrObjCustomShape::GetInteractionHandles() const'
/home/vmregina/lo/core/svx/qa/unit/customshapes.cxx:365: error: 
undefined reference to 'SdrObjCustomShape::GetInteractionHandles() const'
/home/vmregina/lo/core/svx/qa/unit/customshapes.cxx:369: error: 
undefined reference to 'SdrObjCustomShape::DragMoveCustomShapeHdl(Point 
const&, unsigned short, bool)'
/home/vmregina/lo/core/svx/qa/unit/customshapes.cxx:371: error: 
undefined reference to 'SdrObjCustomShape::GetInteractionHandles() const'

collect2: error: ld returned 1 exit status
/home/vmregina/lo/core/solenv/gbuild/LinkTarget.mk:635: recipe for 
target 
'/home/vmregina/lo/core/workdir/LinkTarget/CppunitTest/libtest_svx_unit.so' 
failed
make[1]: *** 
[/home/vmregina/lo/core/workdir/LinkTarget/CppunitTest/libtest_svx_unit.so] 
Error 1

Makefile:120: recipe for target 'svx.check' failed
make: *** [svx.check] Error 2

What is needed for these systems? Does it make a difference whether it 
is a debug build or not? My current Windows setting is a non-debug 
build, in the Linux VM it is a debug-build.


Kind regards
Regina





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

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 0a3f9a7e113c184355d49dbd6bd2ed75b0980b1e
Author: Olivier Hallot 
AuthorDate: Tue May 14 02:22:20 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Tue May 14 02:31:47 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix typo

Courtesy of Cathy Crumbley

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

diff --git a/helpcontent2 b/helpcontent2
index 8ba1c1976c65..ec92232db1d9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8ba1c1976c652b804a02267a8035606b10db2682
+Subproject commit ec92232db1d9ce394b94778f9e7adaf02bfa2da1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/schart/00/0004.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ec92232db1d9ce394b94778f9e7adaf02bfa2da1
Author: Olivier Hallot 
AuthorDate: Tue May 14 02:22:20 2019 +0200
Commit: Olivier Hallot 
CommitDate: Tue May 14 02:31:47 2019 +0200

Fix typo

Courtesy of Cathy Crumbley

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

diff --git a/source/text/schart/00/0004.xhp 
b/source/text/schart/00/0004.xhp
index e04f350d3..01d205577 100644
--- a/source/text/schart/00/0004.xhp
+++ b/source/text/schart/00/0004.xhp
@@ -227,7 +227,7 @@
 
 Double-click a chart, then choose Format - Data 
Ranges
 
-In the Chart Type dialog of a Line chart or XY chart that displays 
lines, choose Smooth in the Lines type dropdown, then click the Properties 
button.
-In the Chart Type dialog of a Line chart or XY chart that displays 
lines, choose Stepped in the Lines type dropdown, then click the Properties 
button.
+In the Chart Type dialog of a Line chart or XY chart that displays 
lines, choose Smooth in the Lines type drop-down, then click the Properties 
button.
+In the Chart Type dialog of a Line chart or XY chart that displays 
lines, choose Stepped in the Lines type drop-down, then click the Properties 
button.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC 2019] Commuity Bonding Period

[jonathon]

On 5/12/19 11:12 AM, shubham goyal wrote:

> My project aims to integrate support to generate QR code within LO itself.

CF: https://extensions.openoffice.org/en/project/qr-code-generator-0

What does your proposal offer, that is not currently done by that extension?

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

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

[Olivier Hallot (via logerrit)]

 cui/inc/tipoftheday.hrc |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit e92dcfdc7bd7b237e0bee26ff226a102d9e8e766
Author: Olivier Hallot 
AuthorDate: Mon May 13 16:14:20 2019 +0200
Commit: Olivier Hallot 
CommitDate: Tue May 14 00:15:33 2019 +0200

Add more %PRODUCTNAME here and there

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

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 24987ca49d93..d20bfaa3ceaf 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -48,7 +48,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "With File > Versions you can store multiple 
versions of the document in the same file. You can also open, delete, and 
compare previous versions."), "sfx/ui/versionsofdialog/VersionsOfDialog", ""}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/01/0119.html
  { NC_("RID_CUI_TIPOFTHEDAY", "You can create an illustration index from 
object names, not only from captions."), 
"cui/ui/objectnamedialog/ObjectNameDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/01/0519.html
  { NC_("RID_CUI_TIPOFTHEDAY", "To temporarily starts with a fresh user 
profile or to restore a non-working %PRODUCTNAME instance start Help > Restart 
in Safe Mode."), "svx/ui/safemodedialog/SafeModeDialog", ""}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/01/profile_safe_mode.html
- { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > Writer > Basic Fonts."), 
"modules/swriter/ui/optfonttabpage/OptFontTabPage", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01040300.html
+ { NC_("RID_CUI_TIPOFTHEDAY", "Change the basic fonts for the predefined 
template or current document per Tools > Options > %PRODUCTNAME Writer > Basic 
Fonts."), "modules/swriter/ui/optfonttabpage/OptFontTabPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01040300.html
  { NC_("RID_CUI_TIPOFTHEDAY", "Define texts that you often use as 
AutoText. You will be able to insert them by their name, shortcut or toolbar in 
any Writer document."), "modules/swriter/ui/autotext/AutoTextDialog", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/swriter/guide/autotext.html
  { NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME can automatically add a 
numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME 
Writer > AutoCaption."), "modules/swriter/ui/optcaptionpage/OptCaptionPage", 
"tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01041100.html
  { NC_("RID_CUI_TIPOFTHEDAY", "You can sort paragraphs or table rows 
alphabetically or numerically per Tools > Sort."), 
"modules/swriter/ui/sortdialog/SortDialog", "tipoftheday_w.png"}, 
//https://help.libreoffice.org/6.2/en-US/text/swriter/01/0610.html
@@ -69,7 +69,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "You want to add x months to a date? Use 
=EDATE(date;months)."), 
"https://help.libreoffice.org/6.2/en-US/text/scalc/01/func_edate.html";, 
"tipoftheday_c.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Trace cells used in a formula, precedents 
(Shift+F9) or dependants (Shift+F5) (or use Tools > Detective). For each hit 
you go one more step in the chain."), 
"https://help.libreoffice.org/6.2/en-US/text/scalc/01/0603.html";, 
"tipoftheday_c.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "You need to fill a serie? Select the cell 
range and Sheet > Fill Cells > Fill Series and choose between Linear, Growth, 
Date and AutoFill."), 
"https://help.libreoffice.org/6.2/en-US/text/scalc/guide/calc_series.html";, 
"tipoftheday_c.png"}, //local help missing
- { NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME you can use your Google 
Mail account to do a mail merge. Fill in Tools > Options > Writer > Mail Merge 
Email."), 
"https://help.libreoffice.org/6.2/en-US/text/swriter/guide/form_letters_main.html";,
 "tipoftheday_w.png"}, //local help missing
+ { NC_("RID_CUI_TIPOFTHEDAY", "With %PRODUCTNAME you can use your Google 
Mail account to do a mail merge. Fill in Tools > Options > %PRODUCTNAME Writer 
> Mail Merge Email."), 
"https://help.libreoffice.org/6.2/en-US/text/swriter/guide/form_letters_main.html";,
 "tipoftheday_w.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Data > Validity allows you to create 
drop-down lists where the user selects a value instead of typing."), 
"https://help.libreoffice.org/6.2/en-US/text/scalc/guide/validity.html";, 
"tipoftheday_c.png"}, //local help missing
  { NC_("RID_CUI_TIPOFTHEDAY", "Use View > Value Highlighting to display 
cell

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

[Julien Nabet (via logerrit)]

 cppcanvas/qa/extras/emfplus/emfplus.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e748bd232b06604999daaf09fa8d209afa4e03f7
Author: Julien Nabet 
AuthorDate: Mon May 13 21:12:41 2019 +0200
Commit: Julien Nabet 
CommitDate: Mon May 13 22:48:33 2019 +0200

Fix emfplus.cxx cppcanvas/qa

/home/julien/lo/libreoffice/cppcanvas/qa/extras/emfplus/emfplus.cxx: In 
member function ‘void testFdo77229::TestBody()’:
/home/julien/lo/libreoffice/cppcanvas/qa/extras/emfplus/emfplus.cxx:79:46: 
error: ‘class BitmapColor’ has no member named ‘GetColor’; did you mean 
‘getBColor’?
 Color aColor(pAccess->GetPixel(142, 140).GetColor());
  ^~~~
  getBColor

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

diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx 
b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index b684d9ccee9a..13246ee24cec 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -76,7 +76,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo77229)
 Bitmap aBitmap = load("fdo77229.emf");
 Bitmap::ScopedReadAccess pAccess(aBitmap);
 // The green star was missing.
-Color aColor(pAccess->GetPixel(142, 140).GetColor());
+Color aColor(pAccess->GetPixel(142, 140));
 CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetRed());
 CPPUNIT_ASSERT_EQUAL(sal_uInt8(0), aColor.GetBlue());
 CPPUNIT_ASSERT(aColor.GetGreen() == 0xfe || aColor.GetGreen() == 0xff);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand (via logerrit)]

 include/item/base/ItemBase.hxx|   46 +
 include/item/base/ItemBuffered.hxx|4 
 include/item/base/ModelSpecificItemValues.hxx |   74 
 include/item/simple/CntInt16.hxx  |   21 +-
 include/item/simple/CntOUString.hxx   |   29 ++-
 item/Library_item.mk  |   11 -
 item/source/base/ItemBase.cxx |   90 ++
 item/source/base/ItemBuffered.cxx |9 -
 item/source/base/ModelSpecificItemValues.cxx  |   93 ++-
 item/source/simple/CntInt16.cxx   |   46 +++--
 item/source/simple/CntOUString.cxx|   45 +++--
 item/test/ItemTest.cxx|  218 +++---
 svl/source/items/itempool.cxx |   15 +
 13 files changed, 575 insertions(+), 126 deletions(-)

New commits:
commit 144ae8582176d87f05850db19a35b920f2ea3a0a
Author: Armin Le Grand 
AuthorDate: Mon May 13 22:31:49 2019 +0200
Commit: Armin Le Grand 
CommitDate: Mon May 13 22:31:49 2019 +0200

WIP: Continued Item stuff changes

Checked what else is needed at the ItemBase stuff,
checked and added getPresentation, scaleMetrics,
query/putValue stuff and dunmAsXml, made quite some
notes about it. Added basiic functionality to basic
sal_Int16 and OUString-Items, also made these tooling
base classes as preparation for type-safe simple
derivations.

Deep check of defaults at currentItemPool, two (static
and default) are used, adapted ModelSpecificItemValues
and added quite some comments about findings. This is
highly copmplex calling stuff, esp. MapMode usages due
to the apps using different basic MapModes what is not
represented in the items - these have no unit.

Adapted tests accordingly - test implementations/derivations
of basic Item implementations used now

Change-Id: Ieac1ef2c62b0bfae97753b15bd8bd61803c8906c

diff --git a/include/item/base/ItemBase.hxx b/include/item/base/ItemBase.hxx
index f0f746b5a036..d099bb4a93ea 100644
--- a/include/item/base/ItemBase.hxx
+++ b/include/item/base/ItemBase.hxx
@@ -23,13 +23,31 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
 ///
+// predefines
+
+class IntlWrapper;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
+
+///
 
 namespace Item
 {
+/*
+* The values of this enum describe the degree of textual
+* representation of an item after calling the virtual
+* method .
+*/
+enum class SfxItemPresentation
+{
+Nameless,
+Complete
+};
+
 class ItemControlBlock;
 
 // Baseclass for implementation of (refactored) Items. It is
@@ -57,7 +75,7 @@ namespace Item
 // is reached. That again will - due to the Item-incarnation
 // referencing the ItemData - also have small footprint and simple
 // copyability, but be a bit harder to implement.
-// Note: All Items can be implemented either way, the diecision should
+// Note: All Items can be implemented either way, the decision should
 // be made upon size of one incarnation and copyability (some are better
 // refCnted). (2) has all the tooling to do that in a unified way.
 // For examples how to implement your Item, check
@@ -75,7 +93,7 @@ namespace Item
 
 // PutValue/Any interface for automated instance creation from SfxType
 // mechanism (UNO API and sfx2 stuff)
-void putAnyValues(const AnyIDArgs& rArgs);
+bool putAnyValues(const AnyIDArgs& rArgs);
 
 private:
 // local reference to instance of ItemControlBlock for this
@@ -88,7 +106,7 @@ namespace Item
 protected:
 // PutValue/Any interface for automated instance creation from SfxType
 // mechanism (UNO API and sfx2 stuff)
-virtual void putAnyValue(const css::uno::Any& rVal, sal_uInt8 
nMemberId);
+virtual bool putAnyValue(const css::uno::Any& rVal, sal_uInt8 
nMemberId);
 
 // constructor for derived classes, thus protected. Derived
 // classes hand in their specific ItemControlBlock to be used
@@ -112,6 +130,28 @@ namespace Item
 // clone-op, secured by returning a std::unique_ptr to make
 // explicit the ownership you get when calling this
 std::unique_ptr clone() const;
+
+// ca. 220 impls
+// /**  @return true if it has a valid string representation */
+virtual bool getPresentation(
+SfxItemPresentation ePresentation,
+MapUnit eCoreMetric,
+MapUnit ePresentationMetric,
+OUString &rText,
+const IntlWrapper& rIntlWrapper) const;
+
+// ::ScaleMetrics 18 implementations
+// used by sdr::properties::ScaleItemSet / itemSetTools only
+// used by DefaultProperties::DefaultP

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 2c9082ed60d13aecb5eaeadc5b14a5a87896a907
Author: Caolán McNamara 
AuthorDate: Mon May 13 15:57:07 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 13 22:19:40 2019 +0200

fix up GtkToolButton images

Change-Id: I68d3fac978531e780c16e4a41a619d7a6c00cabb
Reviewed-on: https://gerrit.libreoffice.org/72248
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 cf554c95f6f5..d92c81c0c426 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -9690,6 +9690,24 @@ private:
 }
 }
 }
+else if (GTK_IS_TOOL_BUTTON(pWidget))
+{
+GtkToolButton* pToolButton = GTK_TOOL_BUTTON(pWidget);
+const gchar* icon_name = 
gtk_tool_button_get_icon_name(pToolButton);
+if (icon_name)
+{
+OUString aIconName(icon_name, strlen(icon_name), 
RTL_TEXTENCODING_UTF8);
+GdkPixbuf* pixbuf = load_icon_by_name(aIconName, m_aIconTheme, 
m_aUILang);
+if (pixbuf)
+{
+GtkWidget* pImage = gtk_image_new_from_pixbuf(pixbuf);
+g_object_unref(pixbuf);
+gtk_tool_button_set_icon_widget(pToolButton, pImage);
+gtk_widget_show(pImage);
+}
+}
+}
+
 //set helpids
 const gchar* pStr = gtk_buildable_get_name(GTK_BUILDABLE(pWidget));
 size_t nLen = pStr ? strlen(pStr) : 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src test/Makefile.am test/UnitWOPIRenameFile.cpp test/WopiTestServer.hpp wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/Storage.cpp

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.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|   18 +-
 wsd/DocumentBroker.cpp   |   33 ---
 wsd/DocumentBroker.hpp   |4 -
 wsd/Storage.cpp  |   40 -
 wsd/Storage.hpp  |   20 +-
 13 files changed, 224 insertions(+), 42 deletions(-)

New commits:
commit 0dbf9bcf27155fa846977bdf0b8e990e0bc07211
Author: merttumer 
AuthorDate: Tue Apr 30 17:21:44 2019 +0300
Commit: merttumer 
CommitDate: Mon May 13 22:29:40 2019 +0300

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 
Signed-off-by: merttumer 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 287a1598d..14a762315 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1151,7 +1151,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 3258e8b10..f75c0ae31 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 7f45eb73a..3a3d8f269 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -433,6 +433,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;
}
@@ -628,7 +631,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 ser

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

[Andrea Gelmini (via logerrit)]

 desktop/source/deployment/registry/package/dp_package.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdfde111d014703799f3e997501fbc1cd14e638f
Author: Andrea Gelmini 
AuthorDate: Wed May 8 10:13:09 2019 +
Commit: Julien Nabet 
CommitDate: Mon May 13 21:11:07 2019 +0200

Fix typo

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

diff --git a/desktop/source/deployment/registry/package/dp_package.cxx 
b/desktop/source/deployment/registry/package/dp_package.cxx
index 5e16ef6b862a..e5167eaf6631 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -95,7 +95,7 @@ class BackendImpl : public ImplBaseT
 class PackageImpl : public ::dp_registry::backend::Package
 {
 BackendImpl * getMyBackend() const;
-/** constains the old tooltip description for the Extension Manager 
GUI in OOo v.2.x
+/** contains the old tooltip description for the Extension Manager GUI 
in OOo v.2.x
 We keep it for backward compatibility.
 */
 OUString m_oldDescription;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 desktop/source/deployment/registry/inc/dp_backend.h |2 +-
 qadevOOo/tests/java/ifc/container/_XContainerQuery.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89fd86540580ebbc269848b3c4b6539e070829a0
Author: Andrea Gelmini 
AuthorDate: Mon May 13 13:54:15 2019 +
Commit: Julien Nabet 
CommitDate: Mon May 13 20:30:43 2019 +0200

Fix typo

Change-Id: I93cefdcf044854bb20a9524351548bb9721d393e
Reviewed-on: https://gerrit.libreoffice.org/72242
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java 
b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java
index 20e49b7e29ef..68cacca00a45 100644
--- a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java
+++ b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java
@@ -85,7 +85,7 @@ public class _XContainerQuery extends MultiMethodTest {
  * If object relation is available, the function was called with relation
  * as parameter. The returned XEnumeration must not be null 
and
  * elements of it must be valid.
- * If object relation is not available, the result is always 
true
+ * If object relation is not available, the result is always 
true
 */
 public void _createSubSetEnumerationByQuery() {
 
commit 2c1190a21f812667097409256b96754651a74cfd
Author: Andrea Gelmini 
AuthorDate: Wed May 8 10:13:10 2019 +
Commit: Julien Nabet 
CommitDate: Mon May 13 20:30:19 2019 +0200

Fix typo

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

diff --git a/desktop/source/deployment/registry/inc/dp_backend.h 
b/desktop/source/deployment/registry/inc/dp_backend.h
index 03f2640a4cf4..319c0904541c 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -201,7 +201,7 @@ class PackageRegistryBackend
 {
 //The map held originally WeakReferences. The map entries are removed in 
the disposing
 //function, which is called when the XPackages are destructed or they are
-//explicitly disposed. The latter happens, for example, when a extension is
+//explicitly disposed. The latter happens, for example, when an extension 
is
 //removed (see dp_manager.cxx). However, because of how the help systems 
work, now
 // XPackageManager::getDeployedPackages is called often. This results in a 
lot
 //of bindPackage calls which are costly. Therefore we keep hard references 
in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 desktop/source/deployment/misc/dp_descriptioninfoset.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3cd3ba0e127005cfd1de65f2e3cfc7dc6ad4e623
Author: Andrea Gelmini 
AuthorDate: Wed May 8 10:13:12 2019 +
Commit: Julien Nabet 
CommitDate: Mon May 13 20:29:59 2019 +0200

Fix typo

Change-Id: Ie7861296de4d70dc03889212a359537d45a0c7bd
Reviewed-on: https://gerrit.libreoffice.org/72250
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx 
b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index ecd14d1b1755..3e10663ef8db 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -174,7 +174,7 @@ ExtensionDescription::ExtensionDescription(
 Reference xFilter = new 
FileDoesNotExistFilter(xCmdEnv);
 ::ucbhelper::Content descContent(sDescriptionUri, xFilter, xContext);
 
-//throws an css::uno::Exception if the file is not available
+//throws a css::uno::Exception if the file is not available
 Reference xIn;
 try
 {   //throws com.sun.star.ucb.InteractiveIOException
___
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' - sc/source

[Serge Krot (via logerrit)]

 sc/source/core/data/table1.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 5f410088767e05ef5b5a7a7d5bebdce899cfe86a
Author: Serge Krot 
AuthorDate: Tue May 7 10:10:33 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Mon May 13 20:23:09 2019 +0200

tdf#124829 sc: fix crash during progress update

Call reschedule() during update of the cells height is not
thread safe.

Change-Id: Ia938aead79a048f12a53aa55c034e84ce3bf433b
Reviewed-on: https://gerrit.libreoffice.org/71892
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/72236
Tested-by: Thorsten Behrens 

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 3062de5a3dca..240a89a02a75 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -114,7 +114,6 @@ void GetOptimalHeightsInColumn(
 
 sal_uLong nWeightedCount = nProgressStart + 
rCol.back().GetWeightedCount(nStartRow, nEndRow);
 const SCCOL maxCol = (rCol.size() - 1); // last col done already above
-const SCCOL progressUpdateStep = rCol.size() / 10;
 for (SCCOL nCol=0; nColSetState( nWeightedCount );
-
-if ((nCol % progressUpdateStep) == 0)
-{
-// try to make sure the progress dialog is painted before 
continuing
-Application::Reschedule(true);
-}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

NLPSolver - range of FACTOR coefficient in Differential Evolution?

[Todor Balabanov]

Hello!

Currently DE implementation in NLPSover has a coefficient called FACTOR:

https://github.com/LibreOffice/core/blob/f4ba484183a1e7b9824f10580d633466c266828f/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java#L41

https://github.com/LibreOffice/core/blob/330df37c7e2af0564bcd2de1f171bed4befcc074/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/DEPSSolverImpl.java#L129

There are some researches about multiple values of the scaling factor:

https://www.sciencedirect.com/science/article/pii/S0020025511000909

My idea is FACTOR to be replaced with two coefficients:

MIN_FACTOR

MAX_FACTOR

We can keep default values for them 0.5, as it is in the source code now.
When we have MIN_FACTOR == MAX_FACTOR the algorithm will believe as it
behaves now. When we have MIN_FACTOR < MAX_FACTOR each time when FACTOR is
needed we can select random uniform value in the range.

What do you think?

All the best,
Todor
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: qa/bugzillaAutomation.py

[Libreoffice Gerrit user]

 qa/bugzillaAutomation.py |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 71b8e958e2ed26596440320936f63594697ff7db
Author: Xisco Fauli 
AuthorDate: Mon May 13 19:56:16 2019 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 19:56:41 2019 +0200

QA: remove duplicate variable

diff --git a/qa/bugzillaAutomation.py b/qa/bugzillaAutomation.py
index 669b2ca..aae68c4 100755
--- a/qa/bugzillaAutomation.py
+++ b/qa/bugzillaAutomation.py
@@ -22,9 +22,6 @@ needInfoFollowUpPingPeriodDays = 30
 
 needsCommentPeriodDays = 14
 
-#Path to addObsolete.txt
-addObsoleteDir = '/home/xisco/dev-tools/qa'
-
 def util_create_statList():
 return {
 'tags':
@@ -217,7 +214,7 @@ def automated_tagging(statList):
 
 print('== Obsolete comments ==')
 lAddObsolete = []
-filename = addObsoleteDir + "addObsolete.txt"
+filename = common.configDir + "addObsolete.txt"
 if os.path.exists(filename):
 f = open(filename, 'r')
 lAddObsolete = f.read().splitlines()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Jenkins_Callgrind failing with error: use of deleted function

[Noel Grandin]

fixed with commit 87fed4d9ce4259ed2a0a9172b13bf416cd9301c4
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin (via logerrit)]

 sc/qa/perf/scperfobj.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 87fed4d9ce4259ed2a0a9172b13bf416cd9301c4
Author: Noel Grandin 
AuthorDate: Mon May 13 19:57:56 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon May 13 19:59:06 2019 +0200

fix uno::Reference flags in sc/perfcheck

after
commit a361231b1363d072d737e9b1d411b71aa9550d84
Date:   Fri May 10 10:13:12 2019 +0200
fix wrong SET/QUERY flags passed to uno::Reference

Change-Id: I1c01f185883b63294f190a147d5ca09a4f7c33e7

diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
index b7e1cb33617f..17b7345cb2f5 100644
--- a/sc/qa/perf/scperfobj.cxx
+++ b/sc/qa/perf/scperfobj.cxx
@@ -234,7 +234,7 @@ void ScPerfObj::testSheets()
 uno::Reference< sheet::XSpreadsheetDocument > xDoc(init("scBigFile.ods"), 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 OUString aSheetName = "NewSheet";
 
@@ -249,7 +249,7 @@ void ScPerfObj::testSheets()
 xSheets->copyByName(aSourceSheetName, aTargetSheetName, 70);
 callgrindDump("sc:copy_sheet_by_name");
 
-uno::Reference< sheet::XSpreadsheets > xSheetsNameContainer (xSheets, 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheetsNameContainer (xSheets, 
UNO_SET_THROW);
 
 callgrindStart();
 xSheetsNameContainer->removeByName(aSheetName);
@@ -264,7 +264,7 @@ void ScPerfObj::testSum()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("SumSheet");
 
@@ -302,7 +302,7 @@ void ScPerfObj::testFTest()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("FTestSheet");
 
@@ -325,7 +325,7 @@ void ScPerfObj::testChiTest()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("ChiTestSheet");
 
@@ -348,7 +348,7 @@ void ScPerfObj::testSumX2PY2Test()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("SumX2PY2Sheet");
 
@@ -371,7 +371,7 @@ void ScPerfObj::testTTest()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("TTestSheet");
 
@@ -394,7 +394,7 @@ void ScPerfObj::testLcm()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("LCMSheet");
 
@@ -417,7 +417,7 @@ void ScPerfObj::testGcd()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("GCDSheet");
 
@@ -440,7 +440,7 @@ void ScPerfObj::testPearson()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_QUERY_THROW);
+uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), 
UNO_SET_THROW);
 
 uno::Any rSheet = xSheets->getByName("PearsonSheet");
 
@@ -463,7 +463,7 @@ void ScPerfObj::testSubTotalWithFormulas()
 uno::Reference< sheet::XCalculatable > xCalculatable(xDoc, 
UNO_QUERY_THROW);
 
 // get getSheets
-uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getShe

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

[Noel Grandin (via logerrit)]

 vcl/source/control/listbox.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3841143d9abf6b1c2ccf4839e9a1168dbaaf0568
Author: Noel Grandin 
AuthorDate: Mon May 13 15:17:58 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon May 13 19:58:24 2019 +0200

sizing button wrong in ListBox::Resize

Passing a right edge co-ordinate to a width param, ever since
   commit 4849fb6d668f6cf8fa7e6bf33c15db4696355001
   Date:   Mon May 10 14:47:20 2004 +
   INTEGRATION: CWS nwf (1.25.36); FILE MERGED

Probably only works because the button is on the right edge, and
consequently the width will be clamped to the widget area.

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

diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 050faa2d13d8..08855cef701d 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -590,14 +590,13 @@ void ListBox::Resize()
 if ( GetNativeControlRegion( ControlType::Listbox, 
ControlPart::ButtonDown,
 aArea, ControlState::NONE, aControlValue, aBound, 
aContent) )
 {
-long nTop = 0;
 // Convert back from border space to local coordinates
 aPoint = pBorder->ScreenToOutputPixel( OutputToScreenPixel( aPoint 
) );
 aContent.Move( -aPoint.X(), -aPoint.Y() );
 
 // Use the themes drop down size for the button
 aOutSz.setWidth( aContent.Left() );
-mpBtn->setPosSizePixel( aContent.Left(), nTop, aContent.Right(), 
(nBottom-nTop) );
+mpBtn->setPosSizePixel( aContent.Left(), 0, aContent.GetWidth(), 
nBottom );
 
 // Adjust the size of the edit field
 if ( GetNativeControlRegion( ControlType::Listbox, 
ControlPart::SubEdit,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57c' - 37 commits - configure.ac desktop/source download.lst external/libxslt filter/source filter/uiconfig framework/source include/vcl jvm

[Samuel Mehrbrodt (via logerrit)]

Rebased ref, commits from common ancestor:
commit ca35a204bb19ccba00648418ac1bdc11eb56183b
Author: Samuel Mehrbrodt 
AuthorDate: Tue Apr 30 12:47:00 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Mon May 13 19:51:51 2019 +0200

Load explorerframe.dll at startup

Change-Id: I8d129a4af589cd2b6af446e56309b51b79f6fb68

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c83d424f8a30..5d7a629453b6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -119,6 +119,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "langselect.hxx"
 
@@ -439,6 +440,13 @@ Desktop::Desktop()
 m_firstRunTimer.SetTimeout(3000); // 3 sec.
 m_firstRunTimer.SetInvokeHandler(LINK(this, Desktop, AsyncInitFirstRun));
 m_firstRunTimer.SetDebugName( "desktop::Desktop m_firstRunTimer" );
+
+static ::osl::Module aMod;
+aMod.load("explorerframe.dll");
+if (aMod.is())
+SAL_WARN("desktop.app", "loading explorerframe.dll successful");
+else
+SAL_WARN("desktop.app", "loading explorerframe.dll failed");
 }
 
 Desktop::~Desktop()
commit 871eeb3b99d32564ff5266d4fe588c0652db7d00
Author: Katarina Behrens 
AuthorDate: Tue May 7 16:27:22 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Mon May 13 19:51:05 2019 +0200

tdf#83722: don't recycle frame with unmodified template

a frame that contained valid but unmodified document opened from
template or explicitly opened by the user (File > New) was treated
the same as blank document i.e. it was reused and the content was
overwritten by newly opened document (even if it already had
non-empty content provided by the template).

So let's not do that and let's open a new document in a new frame
instead

Change-Id: I10252d114e8cc5fcad3c98194ef07fd59873d6da
Reviewed-on: https://gerrit.libreoffice.org/71919
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Katarina Behrens 

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index b527d0259e77..4f9cfe71d567 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1072,7 +1072,7 @@ bool LoadEnv::impl_loadContent()
 // if it will be run out of scope.
 
 // Note further: ignore if this internal guard already contains a resource.
-// Might impl_searchRecylcTarget() set it before. But in case this 
impl-method wasn't used
+// Might impl_searchRecycleTarget() set it before. But in case this 
impl-method wasn't used
 // and the target frame was new created ... this lock here must be set!
 css::uno::Reference< css::document::XActionLockable > 
xTargetLock(xTargetFrame, css::uno::UNO_QUERY);
 m_aTargetLock.setResource(xTargetLock);
@@ -1512,6 +1512,15 @@ css::uno::Reference< css::frame::XFrame > 
LoadEnv::impl_searchRecycleTarget()
 css::uno::Reference< css::frame::XController > xOldDoc = 
xTask->getController();
 if (xOldDoc.is())
 {
+utl::MediaDescriptor lOldDocDescriptor(xModel->getArgs());
+bool bFromTemplate = 
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE()
 , false);
+OUString sReferrer = 
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(),
 OUString());
+
+// tdf#83722: valid but unmodified document, either from template
+// or opened by the user (File > New)
+if (bFromTemplate || !sReferrer.isEmpty())
+return css::uno::Reference< css::frame::XFrame >();
+
 bReactivateOldControllerOnError = xOldDoc->suspend(true);
 if (! bReactivateOldControllerOnError)
 return css::uno::Reference< css::frame::XFrame >();
commit 911c76ff790ecc8a3fd3cdeeff527ac5598375d8
Author: Michael Stahl 
AuthorDate: Mon Apr 29 17:40:45 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Mon May 13 19:51:05 2019 +0200

tdf#122607 sw: restore CalcLayout() call in getRendererCount()

Effectively revert commit 1ecca673b40fedc53db125e332b087d1c120a254.

There are some documents that aren't formatted correctly.

(cherry picked from commit 5879351aeb1935e2bf86fda59703f7d49fdeb6ed)

Change-Id: I4b0cf6313c249a0ed916c2630cd5194d809bfb48

diff --git a/sw/qa/extras/layout/data/tdf122607_leerzeile.odt 
b/sw/qa/extras/layout/data/tdf122607_leerzeile.odt
new file mode 100644
index ..9819a229344a
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf122607_leerzeile.odt 
differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 615061572ec1..a107d6472aa3 100755
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -34,6 +34,7 @@ public:
 void testTdf119875();
 void testTdf116989();
 void testTdf122607();
+void testTdf122607_regression();
 void testTdf123898();
 
 CPPUNIT_TEST_SUITE(SwLayoutWriter);
@@ -53,6 +54,7

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

[Michael Weghorn (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |   19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 0e3c3b842e14b9646d3697cf1266be21359e0f13
Author: Michael Weghorn 
AuthorDate: Sat May 11 21:31:33 2019 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 13 19:44:33 2019 +0200

tdf#122293 qt5: Use "alien widgets" by default on Wayland

As described in QWidget doc [1], calling 'QWidget::winId()',
implicitly enforces a native window, i.e. one that has a
native window associated with it.
For this reason, avoid calling 'QWidget::winId()' for the Wayland
case. Quoting QWidget doc:
> Introduced in Qt 4.4, alien widgets are widgets unknown to the windowing
> system. They do not have a native window handle associated with them.
> This feature significantly speeds up widget painting, resizing, and
> removes flicker.

This in particular avoids tdf#122293/QTBUG-75766, which led to
'mousePressEvent's not being emitted unless a mouse button was pressed,
causing non-existent reaction to hovering over objects.

As a consequence to widgets being non-native by default on Wayland,
'Qt5Frame::windowHandle' needs to be adapted to make sure that the
widgets handled in there are native ones, otherwise no window handle
is associated with them.

Probably more needs to be done here to make video playback via GStreamer
work under Wayland, s.a. commit c0d4f3ad3307c ("implement wayland handle
passing for gstreamer") for how it was done for gtk3.

With and without this change, slideshows with videos are currently not
handled properly with kde5 on Wayland (s. tdf#125219).

[1] https://doc.qt.io/qt-5/qwidget.html#native-widgets-vs-alien-widgets

Change-Id: Id46678e0ea594220a1765c3e59d39c41cb8bfe25
Reviewed-on: https://gerrit.libreoffice.org/72164
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index acb43e515983..3cfb5d5d9e33 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -156,7 +156,17 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 }
 
 m_aSystemData.nSize = sizeof(SystemEnvData);
-m_aSystemData.aWindow = m_pQWidget->winId();
+
+// Calling 'QWidget::winId()' implicitly enables native windows to be used
+// rather than "alien widgets" that are unknown to the windowing system,
+// s. https://doc.qt.io/qt-5/qwidget.html#native-widgets-vs-alien-widgets
+// Avoid this on Wayland due to problems with missing 'mouseMoveEvent's,
+// s. tdf#122293/QTBUG-75766
+if (QGuiApplication::platformName() != "wayland")
+m_aSystemData.aWindow = m_pQWidget->winId();
+// TODO implement as needed for Wayland,
+// s.a. commit c0d4f3ad3307c which did this for gtk3
+
 m_aSystemData.aShellWindow = reinterpret_cast(this);
 //m_aSystemData.pSalFrame = this;
 //m_aSystemData.pWidget = m_pQWidget;
@@ -265,10 +275,17 @@ bool Qt5Frame::isWindow() const
 
 QWindow* Qt5Frame::windowHandle() const
 {
+// set attribute 'Qt::WA_NativeWindow' first to make sure a window handle 
actually exists
 if (m_pTopLevel)
+{
+m_pTopLevel->setAttribute(Qt::WA_NativeWindow);
 return m_pTopLevel->windowHandle();
+}
 else
+{
+m_pQWidget->setAttribute(Qt::WA_NativeWindow);
 return m_pQWidget->windowHandle();
+}
 }
 
 QScreen* Qt5Frame::screen() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Jenkins_Callgrind failing with error: use of deleted function

[Luke Benes]

After commit:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=a361231b1363

fix wrong SET/QUERY flags passed to uno::Reference

Jenkins_Callgrind is failing with the following error:

/lo_callgrind_linux/sc/qa/perf/scperfobj.cxx:623:87: error: use of deleted 
function ‘com::sun::star::uno::Reference<  
>::Reference(const com::sun::star::uno::Reference<  >&, 
com::sun::star::uno::UnoReference_QueryThrow) 

For detailed log:
https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1557756030.19348
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tamas Bunth (via logerrit)]

 oox/inc/drawingml/graphicproperties.hxx |3 ++-
 oox/source/drawingml/fillproperties.cxx |   12 ++--
 oox/source/drawingml/shape.cxx  |   17 ++---
 3 files changed, 26 insertions(+), 6 deletions(-)

New commits:
commit f4ba484183a1e7b9824f10580d633466c266828f
Author: Tamas Bunth 
AuthorDate: Mon May 13 01:02:07 2019 +0200
Commit: Tamás Bunth 
CommitDate: Mon May 13 18:14:26 2019 +0200

ooxml import: supprt cropping to shape

Change-Id: I7bdc959921ecb0cbf19037a78b63eaeb8fc52814
Reviewed-on: https://gerrit.libreoffice.org/72206
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/oox/inc/drawingml/graphicproperties.hxx 
b/oox/inc/drawingml/graphicproperties.hxx
index 01dd96cf8f2d..7a227f8cc949 100644
--- a/oox/inc/drawingml/graphicproperties.hxx
+++ b/oox/inc/drawingml/graphicproperties.hxx
@@ -40,12 +40,13 @@ struct GraphicProperties
 {
 BlipFillProperties  maBlipProps;///< Properties for the 
graphic.
 OUStringm_sMediaPackageURL; ///< Audio/Video URL.
+boolmbIsCustomShape = false;
 css::uno::Reference m_xMediaStream; ///< 
Audio/Video input stream.
 
 /** Writes the properties to the passed property map. */
 voidpushToPropMap(
 PropertyMap& rPropMap,
-const GraphicHelper& rGraphicHelper ) const;
+const GraphicHelper& rGraphicHelper) const;
 };
 
 } // namespace drawingml
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 0b99d83733f3..9c5338ce8975 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -739,7 +739,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 }
 }
 
-void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const 
GraphicHelper& rGraphicHelper ) const
+void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const 
GraphicHelper& rGraphicHelper) const
 {
 sal_Int16 nBrightness = getLimitedValue< sal_Int16, sal_Int32 >( 
maBlipProps.moBrightness.get( 0 ) / PER_PERCENT, -100, 100 );
 sal_Int16 nContrast = getLimitedValue< sal_Int16, sal_Int32 >( 
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
@@ -770,7 +770,15 @@ void GraphicProperties::pushToPropMap( PropertyMap& 
rPropMap, const GraphicHelpe
 nBrightness = 0;
 nContrast = 0;
 }
-rPropMap.setProperty(PROP_Graphic, xGraphic);
+if(mbIsCustomShape)
+{
+// it is a cropped graphic.
+rPropMap.setProperty(PROP_FillStyle, FillStyle_BITMAP);
+rPropMap.setProperty(PROP_FillBitmapMode, BitmapMode_STRETCH);
+rPropMap.setProperty(PROP_FillBitmap, xGraphic);
+}
+else
+rPropMap.setProperty(PROP_Graphic, xGraphic);
 
 // cropping
 if ( maBlipProps.moClipRect.has() )
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 64c80568f7a8..1003b66e386c 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -658,8 +658,18 @@ Reference< XShape > const & Shape::createAndInsert(
 {
 aServiceName = finalizeServiceName( rFilterBase, rServiceName, 
aShapeRectHmm );
 }
+// Use custom shape instead of GraphicObjectShape if the image is cropped 
to
+// shape. Except rectangle, which does not require further cropping
+bool bIsCroppedGraphic = (aServiceName == 
"com.sun.star.drawing.GraphicObjectShape" && 
mpCustomShapePropertiesPtr->getShapePresetType() >= 0
+&& mpCustomShapePropertiesPtr->getShapePresetType() != XML_Rect && 
mpCustomShapePropertiesPtr->getShapePresetType() != XML_rect);
 bool bIsCustomShape = ( aServiceName == "com.sun.star.drawing.CustomShape" 
||
-aServiceName == 
"com.sun.star.drawing.ConnectorShape" );
+aServiceName == 
"com.sun.star.drawing.ConnectorShape" ||
+bIsCroppedGraphic);
+if(bIsCroppedGraphic)
+{
+aServiceName = "com.sun.star.drawing.CustomShape";
+mpGraphicPropertiesPtr->mbIsCustomShape = true;
+}
 bool bUseRotationTransform = ( !mbWps ||
 aServiceName == "com.sun.star.drawing.LineShape" ||
 aServiceName == "com.sun.star.drawing.GroupShape" ||
@@ -971,13 +981,14 @@ Reference< XShape > const & Shape::createAndInsert(
 // applying properties
 aShapeProps.assignUsed( getShapeProperties() );
 aShapeProps.assignUsed( maDefaultShapeProperties );
-if ( bIsEmbMedia || aServiceName == 
"com.sun.star.drawing.GraphicObjectShape" || aServiceName == 
"com.sun.star.drawing.OLE2Shape" )
+if ( bIsEmbMedia || aServiceName == 
"com.sun.star.drawing.GraphicObjectShape" || aServiceName == 
"com.sun.star.drawing.OLE2Shape" || bIsCustomShape )

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

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f71c1124d0e963872db39c1724d61e9b9f02820b
Author: Tor Lillqvist 
AuthorDate: Mon May 13 18:06:13 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 13 18:45:25 2019 +0300

Fix comment to match reality

lo_runLoop() *is* used in the "Unipoll" case (i.e. current Online and
mobile apps).

Change-Id: I01ef3d8bc8140531f697952ef142150fc905a8d4

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f0453fefcad1..93e49ec4447d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4621,7 +4621,7 @@ static void lo_startmain(void*)
 Application::ReleaseSolarMutex();
 }
 
-// pre-unipoll version.
+// unipoll version.
 static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitPollCallback pPollCallback,
LibreOfficeKitWakeCallback pWakeCallback,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Android Viewer(Online) - Weekly report [7 May - 10 May]

[Kaishu Sahu]

Project: LibreOffice Android Viewer(Online)

This week (from 7th May to 10th May):
1. I have added a feature in the document viewer to insert image in a
document from the phone's internal/external storage(Task#01). The task of
image insertion is handled by the browser i.e. the process of taking an
image from the disk and uploading but in the case of Android Viewer, there
wasn't any implementation in the webView.
2. I have tried to understand Loleaflet's(javascript part) internal
working. Addition of sidebar or changes in the document viewer may require
some understanding of Loleaflet.

*TL;DR*
added insert image feature(under review), tried to understand Loleaflets
working.

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

Master build unit test failed

[Franklin Weng]

Hi,

I tried to build the master branch and failed in the unit test.

./autogen.sh --with-language="en-US zh-TW" --with-locales="zh_TW en_US"
make -j4

The first time failed messages:
https://pastebin.com/D04KuJuJ

The second time failed messages:
https://pastebin.com/tQHPxVk8

During these two times I built it with build-nocheck and succeeded.

Would anyone please take a look at it?

Thanks,
Franklin

-- 
Franklin Weng
Member, Board of Director & Certification Committee
The Document Foundation, Kurfürstendamm 188, 10707 Berlin, DE
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: https://www.documentfoundation.org/imprint




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

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

[Andrea Gelmini (via logerrit)]

 filter/qa/complex/filter/detection/typeDetection/TypeDetection.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8401a26363bf7cb3c30bf783b3f8978f4b69e4c4
Author: Andrea Gelmini 
AuthorDate: Mon May 13 13:56:27 2019 +
Commit: Julien Nabet 
CommitDate: Mon May 13 17:25:29 2019 +0200

Fix typo

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

diff --git 
a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java 
b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index f46b85f38371..ea5a54c102c2 100644
--- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -176,7 +176,7 @@ public class TypeDetection extends ComplexTestCase {
 
 /**
  * @member m_xDetection the object to test
- * @member helper   instacne of helper class
+ * @member helper   instance of helper class
  */
 
 static XTypeDetection   m_xDetection;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 991f7bf545872ead25513cec761c603bb502e587
Author: Tor Lillqvist 
AuthorDate: Mon May 13 18:06:13 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 13 18:15:13 2019 +0300

Fix comment to match reality

lo_runLoop() *is* used in the "Unipoll" case (i.e. current Online and
mobile apps).

Change-Id: I01ef3d8bc8140531f697952ef142150fc905a8d4

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7b46ee397904..21fac8a348e7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4516,7 +4516,7 @@ static void lo_startmain(void*)
 Application::ReleaseSolarMutex();
 }
 
-// pre-unipoll version.
+// unipoll version.
 static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitPollCallback pPollCallback,
LibreOfficeKitWakeCallback pWakeCallback,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/indexentry.ui |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c815d2e5a45f7436121da8b19614a208b1d2d070
Author: Caolán McNamara 
AuthorDate: Thu May 9 21:41:33 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 13 17:14:49 2019 +0200

Resolves: tdf#124455 GtkComboBox text entry greyed out

Change-Id: Icc3b4daa50305da0d74f63647c98b887df210a10
Reviewed-on: https://gerrit.libreoffice.org/72079
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit d49255efea55252d6a92a000b1c53d35c2c5ac8d)
Reviewed-on: https://gerrit.libreoffice.org/72225
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 
Reviewed-by: Katarina Behrens 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/uiconfig/swriter/ui/indexentry.ui 
b/sw/uiconfig/swriter/ui/indexentry.ui
index a4157d054496..f9457f26f5e4 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -369,8 +369,7 @@
 True
 
   
-False
-False
+True
 True
   
 
@@ -389,8 +388,7 @@
 True
 
   
-False
-False
+True
 True
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Katarina Behrens (via logerrit)]

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

New commits:
commit 124d6bd1e14eac32b8df93880288e8e937fa335e
Author: Katarina Behrens 
AuthorDate: Thu May 9 20:53:36 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Mon May 13 16:45:11 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - More detailed help of Calc's Sheet > Link to external data

Make it more clear there has to be at least 1 named range in
Excel of Calc documents

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

diff --git a/helpcontent2 b/helpcontent2
index 2f8fbb8c0aa8..8ba1c1976c65 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2f8fbb8c0aa867e8986a496820cf79d75a5d5ea1
+Subproject commit 8ba1c1976c652b804a02267a8035606b10db2682
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/scalc/01/0409.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8ba1c1976c652b804a02267a8035606b10db2682
Author: Katarina Behrens 
AuthorDate: Thu May 9 20:53:36 2019 +0200
Commit: Olivier Hallot 
CommitDate: Mon May 13 16:45:11 2019 +0200

More detailed help of Calc's Sheet > Link to external data

Make it more clear there has to be at least 1 named range in
Excel of Calc documents

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

diff --git a/source/text/scalc/01/0409.xhp 
b/source/text/scalc/01/0409.xhp
index ef44299c1..618a92604 100644
--- a/source/text/scalc/01/0409.xhp
+++ b/source/text/scalc/01/0409.xhp
@@ -30,7 +30,7 @@
   
  
 
-Locate the file 
containing the data you want to insert.
+Open a file 
dialog to locate the file containing the data you want to 
insert.
 
 
 
@@ -42,11 +42,11 @@
   
 
 URL of 
external data source.
-Enter the URL or the file name that 
contains the data that you want to insert, and then press Enter. Only 
then the URL will be requested from the network or file system.
+Enter the URL or the file name that 
contains the data that you want to insert, and then press Enter. 
Alternatively, click Browse button to select the file name from a 
file dialog that opens. Only then will the URL be requested from the network or 
file system.
 A dialog for CSV data 
import appears when linking to external CSV file.
 
 Available tables/ranges
-  Select the table or the data range 
that you want to insert.
+  Select the table or the data range 
that you want to insert. If the selected Calc or Excel document 
contains no named range, spreadsheet data cannot be inserted and 
OK button will remain inactive 
 
 
 Update 
every
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/inc/strings.hrc |2 +-
 sw/source/core/undo/undobj.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2995cb53b5a2797787872fc94fbf8ecf8bf960b5
Author: Andrea Gelmini 
AuthorDate: Thu Apr 11 12:47:11 2019 +0200
Commit: Andras Timar 
CommitDate: Mon May 13 16:37:31 2019 +0200

Fix typo in code

Change-Id: Iae494674972ced3d4808f57440757ae4ae6988f1
Reviewed-on: https://gerrit.libreoffice.org/70632
Tested-by: Jenkins
Reviewed-by: himajin10 
Reviewed-by: Julien Nabet 
Reviewed-by: Andras Timar 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 621e139b8262..88171b13d638 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -541,7 +541,7 @@
 #define STR_PARAGRAPH_UNDO  NC_("STR_PARAGRAPH_UNDO", 
"paragraph")
 #define STR_PARAGRAPH_SIGN_UNDO NC_("STR_PARAGRAPH_SIGN_UNDO", 
"Paragraph sign")
 #define STR_UNDO_FLYFRMFMT_TITLE
NC_("STR_UNDO_FLYFRMFMT_TITLE", "Change object title of $1")
-#define STR_UNDO_FLYFRMFMT_DESCRITPTION 
NC_("STR_UNDO_FLYFRMFMT_DESCRITPTION", "Change object description of $1")
+#define STR_UNDO_FLYFRMFMT_DESCRIPTION 
NC_("STR_UNDO_FLYFRMFMT_DESCRIPTION", "Change object description of $1")
 #define STR_UNDO_TBLSTYLE_CREATE
NC_("STR_UNDO_TBLSTYLE_CREATE", "Create table style: $1")
 #define STR_UNDO_TBLSTYLE_DELETE
NC_("STR_UNDO_TBLSTYLE_DELETE", "Delete table style: $1")
 #define STR_UNDO_TBLSTYLE_UPDATE
NC_("STR_UNDO_TBLSTYLE_UPDATE", "Update table style: $1")
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index a294c7e7e1c5..7e9c54ae2bc5 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -580,7 +580,7 @@ OUString GetUndoComment(SwUndoId eId)
 pId = STR_UNDO_FLYFRMFMT_TITLE;
 break;
 case SwUndoId::FLYFRMFMT_DESCRIPTION:
-pId = STR_UNDO_FLYFRMFMT_DESCRITPTION;
+pId = STR_UNDO_FLYFRMFMT_DESCRIPTION;
 break;
 case SwUndoId::TBLSTYLE_CREATE:
 pId = STR_UNDO_TBLSTYLE_CREATE;
___
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 loleaflet/src

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |2 ++
 loleaflet/src/control/Control.LokDialog.js   |4 
 2 files changed, 6 insertions(+)

New commits:
commit 573c1970288deeb15831afd4bbdb4ea543fc52a1
Author: Szymon Kłos 
AuthorDate: Mon Apr 29 17:51:41 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Mon May 13 16:36:58 2019 +0200

loleaflet: Allow to hide dialog

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

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 7ff69d1b3..2c29ef201 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/bundled/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/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 6b5f8756e..5c292b297 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -303,6 +303,10 @@ L.Control.LokDialog = L.Control.extend({
this._onSidebarClose(e.id);
else
this._onDialogClose(e.id, false);
+   } else if (e.action === 'hide') {
+   $('#' + strId).parent().css({display: 'none'});
+   } else if (e.action === 'show') {
+   $('#' + strId).parent().css({display: 'block'});
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.0.0.alpha1' created by Christian Lohmaier 
 at 2019-05-13 14:21 +

Tag libreoffice-6.3.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzZfV0ACgkQ9DSh76/u
rqMVuxAAy1ZTBo2ht25uKlVIrReULXF8uWpsFQvE2Sr2jZ0kVoTNS6AYGeIJJBFv
J9muVt/RvtcaDdJKVMEdSNXfCr/AJoSDBKX1kFrmPad2b6Zl3i37WCxGmr26LjA7
gsV/lgTbLG9zTz0LnxdgOGKmK3Q7G16bUx64EdBwDgZKiar6N/dW732Nlr7x1C1O
jt+rcgM25lox51YuAPnBtqIMaxwYc6u2nebg7zqKWj1Qumo09jVXS5747pXZo4W+
2NtaybWOr2dPKmfuN/m3TAOGwy0SeE7cvZKZRILXY386riS1WLZ5Qez7I+7A6uK7
02QHckGVM77pPTGQ/5Y8nGzQr4CTcN94kNWrBsO8VKiv4UmvoBNnIT6+yO+0/3MS
hKUeuDyp3l5G6XQw9eg7Z9cgWVnyORWk1n9BnngwVsgMinq0i0IPsw4thg5eG3PL
dev9e27s/ykcYvRj0S8veIdVXv9uqrBecdr3p7CpXReSM3E8uzToZwiLRrdTnStq
XTDgnZTW9TKjwfEuAgdrRNdLY8Dtgca2aHy0tpdvw3mEcM8xSB8dRvJdr9mxRKUg
O41zKq/9gtHL8P00V+gSj9qKS9aZVk2eE1CRPka25zFRrdxo7ivLhgb/dvkbAYUn
siou70y1XypnNdV8iJIQfQYOZ9thkpwkEeHqOGZLTsw11jTI8/w=
=PZuR
-END PGP SIGNATURE-

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

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

[Libreoffice Gerrit user]

Tag 'libreoffice-6.3.0.0.alpha1' created by Christian Lohmaier 
 at 2019-05-13 14:21 +

Tag libreoffice-6.3.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzZfV0ACgkQ9DSh76/u
rqPV9BAAhtLbTD/ZOiMkHaKNHqJVE7SOepxwZrdfawV1fh2jiAJMwoTESCFjdTE1
Ig5Hr/EmcLA+d9HzfSzQJcG7Nh37vAQJvV1UAAYfLkzZwyzaYQOSszQtFFE41BQu
JM85T7+/3rn0yx6gAPiwJkAczUOzKLX6Upu+FYzwQ9ueal99JIdaX1u4igV/Y7y/
viPCkPdveThLKuKFnOlOG2F6kYyJME6kczfMStcvQRoEbHUM3kACtClri0OKtu5k
USB3sRTccF1KbL+JvXKqv4QKtgbBHBLdtAxtNcfUODsy1XocQ7FnCaphDsro19Fw
7A+42/TYdIkhI9h1939Hbd2SdA5zU4gBoDLc8NoduN4hMT818D9Xzse1dblwNaAs
+bEij0zedWUkU1q71KfpAABmay4VPnyvmMQ4W/A+yDTXh/Klow3nRpufmYbhhNlT
Km6dwBJ/nrfi0Auf8Bp6swuDsHPL0Q4n/yihpjCnAySmre1iPmLKUgiGOoN1Efev
3hfTYoXwuKwIbEm76DK7mnTHpplVaQgUSx3pcilrXAeCEOT0ZjLeSqi4oZXtIaUb
sFaFv+thObzXCcm9QL9UFKWI7VT7nN4faqZ4Fz9v26jL7JzvlgvSQs4UJoNkQMR8
qVD3hfVz0bH0GcPoNMBdkNWfP4KJhki5QRgDvDW46swOfPkfX28=
=KCeq
-END PGP SIGNATURE-

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

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

[Libreoffice Gerrit user]

Tag 'libreoffice-6.3.0.0.alpha1' created by Christian Lohmaier 
 at 2019-05-13 14:21 +

Tag libreoffice-6.3.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzZfV0ACgkQ9DSh76/u
rqNJeg//TImneFxT2oLqIkNduRxUmpTwJBzTKGboILCzeVAdw+45azcbQ75sT1Q6
1+jmzwq2ctmuJ2591xa0drE4zJIqJsw/jKjn8QClbR53UUeSt6gFpRuIg2OgNf2N
diyZieYioTFuuFvG0n0yvdpb94Uaud4E/qrTBdHGQ1k9C1RGHuImYgw1jqOs/jty
eGbZkKga6pEHv1yWbMHS2Yz4T3SXVLzD6WwgHSa/BghEk0pC6uglWzXM/SR1+0b2
8KjOe/t8hnt5ZRNWIV7rTnPG5QWpBQDbcG3GKVci9K8YCfr5LmJ4QkzgccVUI4WV
pjPOSF8JMXGvSauJfwE3SYjcv1kVpQq7Jq8E8TQFIErKn6GHy7QQI4/wxoNdVs8g
rV6kfRmHtnROGLEeDSsd8EWiIEjItAuyCjT1NZM+ZW4Clkkvy9dq8RS+5+Q+p7h+
BUgLuXJ8dz5n0v3mk+Qf3CVVwzH+SDJfhnrbO5v1o5ov2iIIz2upzByEQxFU1LHc
qTX8TAmyct+OZH19wr3I+y7dKiw/w8+b3yfMVMd2iQhezy9BTgfSpensC+ZnnOZB
eGDOvFzjqdyfCn3hFlC9bYSnLFYsQ/7wXtPgW3aWtc3HA1kNPx40n8ROGu+Br9JE
LzEoF+H6lJ3NUjTuXIo1H43Js6+ZgepqGpmlvY2BTpmks6n/UWs=
=wTYw
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit b4acba6a16397e63f4fe2091426e7770121fcac2
Author: Christian Lohmaier 
AuthorDate: Mon May 13 16:21:51 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Mon May 13 16:21:51 2019 +0200

bump product version to 6.3.0.0.alpha1+

Change-Id: Ib43e7349bce04e42b247af3c87e0128350e6c1c1

diff --git a/configure.ac b/configure.ac
index 79416d79ecdb..89bb6abaa324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.0.0.alpha0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.0.0.alpha1+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
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/libreoffice-6.3.0.0.alpha1'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.3.0.0.alpha1' created by Christian Lohmaier 
 at 2019-05-13 14:21 +

Tag libreoffice-6.3.0.0.alpha1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlzZfVUACgkQ9DSh76/u
rqP12Q//Sg6Yvb2D2uVrzUzFDTiEipUqsLH+nVPIsmH6fe7ytnWAli8dFMWPAc3F
FCKKDVX9Ngs7pVkyvoZW42f+L/cf9ZXOAQirCNrA9hDjTJ80y3lzXZ1aFgJvDPDh
qadX6AabajxZQ/VMsk+JuzHPtmFNpA0Wkc8XO7HBUFD8QL3Y54a+sQHG2BfVIk4U
ZT6ciwMZd6wnp1VaWSAKxODindWkmP1xXy0pc4vGiIA9vRYE3KtvRwVJrXf8W2fY
Lj7AzCP/RM9plMOe/XZkLCyo/gPVeI8e4b/fMA6TMSYwsDD3/Km2PuwyB1AKT4KR
ik92l7cjN+NyGK0pRw5ok2uwfLvnNvf98UZBYrvvpsEnPPLuKqM9sPGhHZTz6OpP
pbpNZG1opN1U/bEm+n5DdXCtqE5JjJW2842oLPmaWejmTTEbyYDYodhRBgjT5RkA
Y6ARUoxziI9G3qe9i6ckDzEku6UFpnK6vjI0utDxLeqwk3ftGPHiSnzuXnNLqYPX
VPZIPHh5PD2Fw+m74/XbMONlUnKBIBi+r0jahVLsTOb65SHH/cg1M8pxem4Q+Y3S
oncoDRtpdj/KwEfYBV6iPzwZ4ql9nynsF325er2PJ+ISpd2YXLeFF4ar2G9MaeiH
fDPHYL+RT5QcPjJ3y0j4ArXYHK3o8x+3xmt2rAg8gaYgKZv8Yi0=
=k0XY
-END PGP SIGNATURE-

Changes since libreoffice-6-2-branch-point-14:
---
 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' - 2 commits - desktop/source vcl/headless

[Tor Lillqvist (via logerrit)]

 desktop/source/lib/init.cxx |4 
 vcl/headless/svpinst.cxx|   14 --
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit dfce90714dcc1d797d57578ec5f6f1f5f6db6af3
Author: Tor Lillqvist 
AuthorDate: Mon May 13 14:22:20 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 13 17:06:37 2019 +0300

Using the m_FeedbackFDs is now necessary also on iOS

Until recently we had managed without them on iOS, but that changed
with the recent "Unipoll" work, I think. (Without this change, the iOS
app now runs into assertion failures early on. But note that this
change is not enough to make it work fully again.)

Change-Id: I09d25326ba73ce897da5c91f30530f5b3d5fd272

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 96364ae07e54..7161521624d9 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -73,9 +73,7 @@ SvpSalInstance::SvpSalInstance( SalYieldMutex *pMutex )
 m_nTimeoutMS= 0;
 
 m_MainThread = osl::Thread::getCurrentIdentifier();
-#ifndef IOS
 CreateWakeupPipe(true);
-#endif
 if( s_pDefaultInstance == nullptr )
 s_pDefaultInstance = this;
 #if !defined(ANDROID) && !defined(IOS)
@@ -87,13 +85,9 @@ SvpSalInstance::~SvpSalInstance()
 {
 if( s_pDefaultInstance == this )
 s_pDefaultInstance = nullptr;
-#ifndef IOS
 CloseWakeupPipe(true);
-#endif
 }
 
-#ifndef IOS
-
 void SvpSalInstance::CloseWakeupPipe(bool log)
 {
 SvpSalYieldMutex *const 
pMutex(dynamic_cast(mpSalYieldMutex.get()));
@@ -149,8 +143,6 @@ void SvpSalInstance::CreateWakeupPipe(bool log)
 }
 }
 
-#endif
-
 void SvpSalInstance::TriggerUserEventProcessing()
 {
 Wakeup();
@@ -332,11 +324,7 @@ void SvpSalYieldMutex::doAcquire(sal_uInt32 const 
nLockCount)
 m_bNoYieldLock = true;
 bool const bEvents = pInst->DoYield(false, request == 
SvpRequest::MainThreadDispatchAllEvents);
 m_bNoYieldLock = false;
-#ifdef IOS
-(void)bEvents;
-#else
 write(m_FeedbackFDs[1], &bEvents, sizeof(bool));
-#endif
 }
 }
 while (true);
@@ -496,11 +484,9 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 : SvpRequest::MainThreadDispatchOneEvent);
 
 bool bDidWork(false);
-#ifndef IOS
 // blocking read (for synchronisation)
 auto const nRet = read(pMutex->m_FeedbackFDs[0], &bDidWork, 
sizeof(bool));
 assert(nRet == 1); (void) nRet;
-#endif
 if (!bDidWork && bWait)
 {
 // block & release YieldMutex until the main thread does something
commit 74264014090b6d31070b3bb38a1a2bb00f5b05ee
Author: Tor Lillqvist 
AuthorDate: Wed Apr 24 13:19:44 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 13 15:27:02 2019 +0300

tdf#124923: Need to call InitVCL() on iOS before using SolarMutexGuard

Change-Id: If5781ae101e58c26368e57787cb301f84ffa82a5

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index cd0d8677103f..f0453fefcad1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4627,6 +4627,10 @@ static void lo_runLoop(LibreOfficeKit* /*pThis*/,
LibreOfficeKitWakeCallback pWakeCallback,
void* pData)
 {
+#ifdef IOS // Maybe ANDROID, too?
+InitVCL();
+#endif
+
 SolarMutexGuard aGuard;
 
 vcl::lok::registerPollCallbacks(pPollCallback, pWakeCallback, pData);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gla11y solenv/sanitizers

[Samuel Thibault (via logerrit)]

 bin/gla11y   |4 ++--
 solenv/sanitizers/ui/cui.suppr   |5 -
 solenv/sanitizers/ui/filter.suppr|2 --
 solenv/sanitizers/ui/modules/scalc.suppr |2 --
 solenv/sanitizers/ui/sfx.suppr   |2 --
 solenv/sanitizers/ui/svx.false   |4 
 solenv/sanitizers/ui/uui.suppr   |1 -
 solenv/sanitizers/ui/xmlsec.suppr|1 -
 8 files changed, 2 insertions(+), 19 deletions(-)

New commits:
commit 7073d17fe5565589bdd3e6438cfa8b4d932acf8b
Author: Samuel Thibault 
AuthorDate: Fri May 10 23:19:08 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon May 13 16:06:50 2019 +0200

gla11y: whitelist GtkTreeViewColumn as not needing labelling

and remove corresponding suppressions.

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

diff --git a/bin/gla11y b/bin/gla11y
index 3fed400de699..f93121484648 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -10,7 +10,7 @@
 # This file incorporates work covered by the following license notice:
 #
 #   Copyright (c) 2018 Martin Pieuchot
-#   Copyright (c) 2018 Samuel Thibault 
+#   Copyright (c) 2018-2019 Samuel Thibault 
 #
 #   Permission to use, copy, modify, and distribute this software for any
 #   purpose with or without fee is hereby granted, provided that the above
@@ -145,6 +145,7 @@ widgets_ignored = widgets_toplevel + [
 'GtkTreeSelection',
 
 'GtkListBoxRow',
+'GtkTreeViewColumn',
 
 # Useless to label
 'GtkScrollbar',
@@ -216,7 +217,6 @@ widgets_labels = [
 
 # GtkCellView
 # GtkTreeView
-# GtkTreeViewColumn
 # GtkTextView
 # GtkIconView
 
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index 1fce68321a1c..4279ed553003 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -256,7 +256,6 @@ 
cui/uiconfig/ui/insertfloatingframe.ui://GtkLabel[@id='heightlabel'] orphan-labe
 cui/uiconfig/ui/insertfloatingframe.ui://GtkSpinButton[@id='width'] 
no-labelled-by
 cui/uiconfig/ui/insertfloatingframe.ui://GtkSpinButton[@id='height'] 
no-labelled-by
 cui/uiconfig/ui/insertoleobject.ui://GtkEntry[@id='urled'] no-labelled-by
-cui/uiconfig/ui/javastartparametersdialog.ui://GtkTreeViewColumn[@id='treeviewcolumn1']
 no-labelled-by
 cui/uiconfig/ui/javastartparametersdialog.ui://GtkLabel[@id='label6'] 
orphan-label
 cui/uiconfig/ui/lineendstabpage.ui://GtkLabel[@id='FT_LINE_END_STYLE'] 
orphan-label
 cui/uiconfig/ui/lineendstabpage.ui://GtkComboBox[@id='LB_LINEENDS'] 
no-labelled-by
@@ -281,7 +280,6 @@ 
cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='rightfunctionlabel'] orphan-la
 cui/uiconfig/ui/menuassignpage.ui://GtkLabel[@id='customizelabel'] orphan-label
 cui/uiconfig/ui/movemenu.ui://GtkLabel[@id='label1'] orphan-label
 cui/uiconfig/ui/movemenu.ui://GtkTreeView[@id='menulist'] no-labelled-by
-cui/uiconfig/ui/movemenu.ui://GtkTreeViewColumn[@id='treeviewcolumn1'] 
no-labelled-by
 cui/uiconfig/ui/multipathdialog.ui://svtlo-SvSimpleTableContainer[@id='paths'] 
no-labelled-by
 cui/uiconfig/ui/multipathdialog.ui://GtkLabel[@id='pathlist'] orphan-label
 cui/uiconfig/ui/newlibdialog.ui://GtkEntry[@id='entry'] duplicate-mnemonic
@@ -464,10 +462,7 @@ 
cui/uiconfig/ui/tsaurldialog.ui://GtkLabel[@id='enteraurl'] orphan-label
 cui/uiconfig/ui/twolinespage.ui://GtkLabel[@id='label29'] orphan-label
 cui/uiconfig/ui/twolinespage.ui://GtkLabel[@id='label30'] orphan-label
 cui/uiconfig/ui/twolinespage.ui://GtkTreeView[@id='startbracket'] 
no-labelled-by
-cui/uiconfig/ui/twolinespage.ui://GtkTreeViewColumn[@id='treeviewcolumn1'] 
no-labelled-by
 cui/uiconfig/ui/twolinespage.ui://GtkTreeView[@id='endbracket'] no-labelled-by
-cui/uiconfig/ui/twolinespage.ui://GtkTreeViewColumn[@id='treeviewcolumn2'] 
no-labelled-by
 cui/uiconfig/ui/wordcompletionpage.ui://GtkTreeView[@id='entries'] 
no-labelled-by
 cui/uiconfig/ui/wordcompletionpage.ui://GtkSpinButton[@id='maxentries'] 
duplicate-mnemonic
 cui/uiconfig/ui/wordcompletionpage.ui://GtkSpinButton[@id='minwordlen'] 
no-labelled-by
-cui/uiconfig/ui/wordcompletionpage.ui://GtkTreeViewColumn[@id='treeviewcolumn2']
 no-labelled-by
diff --git a/solenv/sanitizers/ui/filter.suppr 
b/solenv/sanitizers/ui/filter.suppr
index de80972e87e5..c0199933cfb6 100644
--- a/solenv/sanitizers/ui/filter.suppr
+++ b/solenv/sanitizers/ui/filter.suppr
@@ -23,5 +23,3 @@ 
filter/uiconfig/ui/testxmlfilter.ui://GtkLabel[@id='importxslttemplate'] orphan-
 filter/uiconfig/ui/testxmlfilter.ui://GtkLabel[@id='recentfilename'] 
orphan-label
 filter/uiconfig/ui/warnpdfdialog.ui://GtkLabel[@id='message'] orphan-label
 filter/uiconfig/ui/warnpdfdialog.ui://GtkTreeView[@id='errors'] no-labelled-by
-filter/uiconfig/ui/warnpdfdialog.ui://GtkTreeViewColumn[@id='treeviewcolumn1'] 
no-labelled-by
-filter/uiconfig/ui/warnpdfdialog.ui://GtkTreeViewColumn[@id='treeviewcolumn2'] 
no-labelle

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 2 commits - common/Log.cpp common/Log.hpp kit/Kit.cpp

[Libreoffice Gerrit user]

 common/Log.cpp |2 ++
 common/Log.hpp |2 ++
 kit/Kit.cpp|6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit eea64ece29f50770b8c81e9f398e5bb5d3a4bcf1
Author: Tor Lillqvist 
AuthorDate: Mon May 13 16:47:19 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 13 16:53:06 2019 +0300

Use consistent terminology in LOG_INF() calls around runLoop() call

Change-Id: I46d954250447dea6ffa60c6e0e341f23a9ad4ff9

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index c11be7662..19689f73f 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2769,7 +2769,7 @@ void lokit_main(
 
 loKit->runLoop(pollCallback, wakeCallback, &mainKit);
 
-LOG_INF("Kit poll terminated.");
+LOG_INF("Kit unipoll loop run terminated.");
 
 #if MOBILEAPP
 SocketPoll::wakeupWorld();
commit cdec6ac2a2d857b6fa06657cf6df4c12d9e4a818
Author: Tor Lillqvist 
AuthorDate: Mon May 13 16:45:24 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 13 16:52:50 2019 +0300

No need to call Log::shutdown() in a mobile app

The process never exists voluntarily. It is killed by the OS when
inactive and its resources are needed.

Change-Id: I9a7fa8200a44bba8dfcd2b09882f1b87814025be

diff --git a/common/Log.cpp b/common/Log.cpp
index eb3892643..51c100522 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -204,6 +204,7 @@ namespace Log
: Poco::Logger::get(Source.getInited() ? 
Source.getName() : std::string());
 }
 
+#if !MOBILEAPP
 void shutdown()
 {
 logger().shutdown();
@@ -214,6 +215,7 @@ namespace Log
 std::flush(std::cerr);
 fflush(stderr);
 }
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/common/Log.hpp b/common/Log.hpp
index bf05fc7ce..b8cf36878 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -45,8 +45,10 @@ namespace Log
 /// Returns the underlying logging system.
 Poco::Logger& logger();
 
+#if !MOBILEAPP
 /// Shutdown and release the logging system.
 void shutdown();
+#endif
 
 char* prefix(char* buffer, std::size_t len, const char* level);
 
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index fa80d1a69..c11be7662 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -2773,14 +2773,14 @@ void lokit_main(
 
 #if MOBILEAPP
 SocketPoll::wakeupWorld();
-#endif
-
+#else
 // Trap the signal handler, if invoked,
 // to prevent exiting.
 LOG_INF("Process finished.");
 Log::shutdown();
 
 // Let forkit handle the jail cleanup.
+#endif
 }
 catch (const Exception& exc)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 0 files changed

New commits:
commit c9cc70698c9ef17027bea7219f0460f9471e32b4
Author: Andrea Gelmini 
AuthorDate: Mon May 13 13:57:38 2019 +
Commit: Julien Nabet 
CommitDate: Mon May 13 16:03:06 2019 +0200

Removed executable bit on xlsx file

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

diff --git a/chart2/qa/extras/data/xlsx/tdf100084.xlsx 
b/chart2/qa/extras/data/xlsx/tdf100084.xlsx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 1101d550afd9720c9644b8b86beeef1bc9cfe4b6
Author: Christian Lohmaier 
AuthorDate: Mon May 13 15:44:49 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Mon May 13 15:55:43 2019 +0200

Update git submodules

* Update translations from branch 'master'
  - update translations

and force-fix errors using pocheck

Change-Id: I2afa34705cebda561eb974fedf7a921666089f2b

diff --git a/translations b/translations
index ab69d2fad951..acd9333176ee 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit ab69d2fad951d3f70dd77969c65ac9bedfdac384
+Subproject commit acd9333176eeb0205fd5984091bb5b15211bbcba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57c' - framework/source

[Katarina Behrens (via logerrit)]

 framework/source/loadenv/loadenv.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 367dfe659802bd46edad1b046a8651bfe26d87b0
Author: Katarina Behrens 
AuthorDate: Tue May 7 16:27:22 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon May 13 15:07:31 2019 +0200

tdf#83722: don't recycle frame with unmodified template

a frame that contained valid but unmodified document opened from
template or explicitly opened by the user (File > New) was treated
the same as blank document i.e. it was reused and the content was
overwritten by newly opened document (even if it already had
non-empty content provided by the template).

So let's not do that and let's open a new document in a new frame
instead

Change-Id: I10252d114e8cc5fcad3c98194ef07fd59873d6da
Reviewed-on: https://gerrit.libreoffice.org/71919
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Katarina Behrens 

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index b527d0259e77..4f9cfe71d567 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1072,7 +1072,7 @@ bool LoadEnv::impl_loadContent()
 // if it will be run out of scope.
 
 // Note further: ignore if this internal guard already contains a resource.
-// Might impl_searchRecylcTarget() set it before. But in case this 
impl-method wasn't used
+// Might impl_searchRecycleTarget() set it before. But in case this 
impl-method wasn't used
 // and the target frame was new created ... this lock here must be set!
 css::uno::Reference< css::document::XActionLockable > 
xTargetLock(xTargetFrame, css::uno::UNO_QUERY);
 m_aTargetLock.setResource(xTargetLock);
@@ -1512,6 +1512,15 @@ css::uno::Reference< css::frame::XFrame > 
LoadEnv::impl_searchRecycleTarget()
 css::uno::Reference< css::frame::XController > xOldDoc = 
xTask->getController();
 if (xOldDoc.is())
 {
+utl::MediaDescriptor lOldDocDescriptor(xModel->getArgs());
+bool bFromTemplate = 
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE()
 , false);
+OUString sReferrer = 
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(),
 OUString());
+
+// tdf#83722: valid but unmodified document, either from template
+// or opened by the user (File > New)
+if (bFromTemplate || !sReferrer.isEmpty())
+return css::uno::Reference< css::frame::XFrame >();
+
 bReactivateOldControllerOnError = xOldDoc->suspend(true);
 if (! bReactivateOldControllerOnError)
 return css::uno::Reference< css::frame::XFrame >();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: drawinglayer/source filter/source include/tools include/vcl sd/qa tools/source vcl/backendtest vcl/inc vcl/qa vcl/quartz vcl/source vcl/unx vcl/win

[Jan-Marek Glogowski (via logerrit)]

 drawinglayer/source/texture/texture3d.cxx|2 
 filter/source/msfilter/msdffimp.cxx  |4 
 include/tools/color.hxx  |   30 +++-
 include/vcl/BitmapColor.hxx  |  167 ++-
 include/vcl/bitmapaccess.hxx |2 
 sd/qa/unit/import-tests.cxx  |6 
 tools/source/generic/color.cxx   |7 -
 vcl/backendtest/outputdevice/common.cxx  |2 
 vcl/inc/bitmap/ScanlineTools.hxx |6 
 vcl/qa/cppunit/BitmapProcessorTest.cxx   |6 
 vcl/qa/cppunit/BitmapTest.cxx|4 
 vcl/qa/cppunit/GraphicTest.cxx   |5 
 vcl/qa/cppunit/bitmapcolor.cxx   |   28 +---
 vcl/qa/cppunit/gen/gen.cxx   |4 
 vcl/qa/cppunit/jpeg/JpegReaderTest.cxx   |8 -
 vcl/qa/cppunit/outdev.cxx|8 -
 vcl/quartz/salbmp.cxx|6 
 vcl/source/bitmap/BitmapLightenFilter.cxx|3 
 vcl/source/bitmap/BitmapSolarizeFilter.cxx   |8 -
 vcl/source/bitmap/BitmapTools.cxx|   10 -
 vcl/source/bitmap/bitmappaint.cxx|   19 +--
 vcl/source/control/combobox.cxx  |2 
 vcl/source/control/imp_listbox.cxx   |2 
 vcl/source/filter/igif/gifread.cxx   |2 
 vcl/source/filter/png/pngread.cxx|7 -
 vcl/source/gdi/bitmapex.cxx  |9 -
 vcl/source/gdi/bmpacc2.cxx   |2 
 vcl/source/gdi/print2.cxx|2 
 vcl/source/graphic/UnoGraphicTransformer.cxx |6 
 vcl/source/outdev/bitmap.cxx |8 -
 vcl/source/outdev/transparent.cxx|6 
 vcl/unx/generic/gdi/gdiimpl.cxx  |4 
 vcl/win/gdi/gdiimpl.cxx  |4 
 33 files changed, 129 insertions(+), 260 deletions(-)

New commits:
commit c34bb163c38cfa893d1b5b0124ab9c5929dff16c
Author: Jan-Marek Glogowski 
AuthorDate: Sat May 11 11:49:21 2019 +
Commit: Jan-Marek Glogowski 
CommitDate: Mon May 13 15:43:17 2019 +0200

Make BitmapColor inherit from / merge into Color

BitmapColor itself is kept to distingish the Color usage as part
of a color palette, which continues to store the offset in the
blue value. The original special mbIndex handling is long gone
since commit 1fefdd6f3b41 ("Alpha channel in BitmapColor - change
bIndex to alpha"), so there is no data difference.

This also results in the following changes:

* now has a basic_ostream& operator<<
  (that was my actual starting point... for an other bug fix)
* there is a minimal difference for GetLiminance
  BGR(29,151,76) => BGR(28,151,77)
* no more return values for Merge and Invert
  (previously returning *this)
* replaces all GetBlueOrIndex with GetIndex

This leaves one "problematic" part: the GetColorError handling.
At first glance it should probably be virtual. The Color variant
is less strict then the BitmapColor one - for whatever reason.
BitmapColor is always used to search for the best match in a
Palette. Currently I'm simply leaving both variants. Would be
nice to have an explict for functions here.

Change-Id: I251ba3024a1d60f2a9d9fde9cd0a60f08e8322a7
Reviewed-on: https://gerrit.libreoffice.org/72181
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/drawinglayer/source/texture/texture3d.cxx 
b/drawinglayer/source/texture/texture3d.cxx
index 74c0766ad51c..3c5f7d5e29bf 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -130,7 +130,7 @@ namespace drawinglayer
 {
 const BitmapColor aBitmapColor(mpReadBitmap->GetColor(rY, 
rX));
 
-if(maBitmapEx.GetTransparentColor() == 
aBitmapColor.GetColor())
+if(maBitmapEx.GetTransparentColor() == aBitmapColor)
 {
 return 255;
 }
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index ee75a5d7848f..5b83d170b3f1 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1395,9 +1395,9 @@ void DffPropertyReader::ApplyFillAttributes( SvStream& 
rIn, SfxItemSet& rSet, co
 {
 Color aReadColor;
 if (pRead->HasPalette())
-aReadColor = 
pRead->GetPaletteColor(pRead->GetIndexFromData(pScanlineRead, x)).GetColor();
+aReadColor = 
pRead->GetPaletteColor(pRead->GetIndexFromData(pScanlineRead, x));
 else
-aReadColor = 
pRead->GetPixelFromData(pScanlineRead, x).GetColo

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

[Noel Grandin (via logerrit)]

 svl/source/inc/poolio.hxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0725e8a5d9add88b1289f5b1cb90b0b43059a734
Author: Noel Grandin 
AuthorDate: Mon May 13 11:07:28 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon May 13 15:18:22 2019 +0200

tdf#125215 Assertion when closing Database/Advanced Settings

This showed up as a segfault for me.

Sometimes we have sortable items, for which we store duplicates (because
those items are not poolable), in which case comparing by operator==
means that we sometimes end up deleting the wrong one.

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

diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 2939d50aaf2f..971fb86c9b1d 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -133,7 +133,8 @@ public:
 assert(false && "did not find item?");
 break;
 }
-if (**sortIt == *pNeedle)
+// need to compare by pointer here, since we might have 
duplicates
+if (*sortIt == pNeedle)
 {
 maSortablePoolItems.erase(sortIt);
 break;
@@ -141,7 +142,7 @@ public:
 ++sortIt;
 }
 }
-return maPoolItemSet.erase(it);
+maPoolItemSet.erase(it);
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[heiko tietze (via logerrit)]

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

New commits:
commit 9cbb98456a054b6b02e96c9d29f1b931893d4aed
Author: heiko tietze 
AuthorDate: Mon May 13 11:02:10 2019 +0200
Commit: Heiko Tietze 
CommitDate: Mon May 13 15:12:56 2019 +0200

Typo in UI (Sentence style)

Change-Id: I2013f36e5ccb2dda39ae2d1aa2e47eab8e072532
Reviewed-on: https://gerrit.libreoffice.org/72221
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index b2f6114e3dab..7238b8932f42 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -61,7 +61,8 @@
 
 
   
-Show "Tip of the day" Dialog on 
Start-up
+Show "Tip of the Day" dialog on 
start-up
+True
 True
 True
 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' - wsd/reference.md

[Libreoffice Gerrit user]

 wsd/reference.md |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5f1bb105b8f890dcc311dfcaea1f369cd3109420
Author: Szymon Kłos 
AuthorDate: Wed May 8 12:59:56 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Mon May 13 15:02:47 2019 +0200

Update WOPI Extensions docs: App_LoadingStatus

Change-Id: I245aec62da3b19e7b81275b0a0a5e84bf0f5b699
Reviewed-on: https://gerrit.libreoffice.org/71958
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 
(cherry picked from commit ded421bfd6a932434a480375a16c779ff7b3398a)
Reviewed-on: https://gerrit.libreoffice.org/72227
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/wsd/reference.md b/wsd/reference.md
index 78165b836..fdcd0c121 100644
--- a/wsd/reference.md
+++ b/wsd/reference.md
@@ -113,6 +113,12 @@ If set to a non-empty string, is used for rendering a 
watermark-like text on eac
 
 **Note:** It is possible to just hide print, save, export options while still 
being able to access them from other hosts using PostMessage API (see 
[loleaflet/reference.html](https://www.collaboraoffice.com/collabora-online-editor-api-reference/))
 
+PostMessage extensions
+--
+
+### App_LoadingStatus
+Was extended with field 'Status' with 'Document_Loaded' value when document 
was loaded successfully and 'Failed' in other case.
+
 Alternative authentication possibility
 --
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 configmgr/source/dconf.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 5097d1cabc806ee99b068b678982e215950c4f11
Author: Michael Stahl 
AuthorDate: Mon May 13 11:27:28 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon May 13 14:36:47 2019 +0200

configmgr: workaround GCC9 -Werror=sign-compare in static_assert

... which is quite unhelpful; any cast would have to make assumptions
about the size of types anyway...

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

diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
index c2b8c2cd1efc..da351bd917a0 100644
--- a/configmgr/source/dconf.cxx
+++ b/configmgr/source/dconf.cxx
@@ -1174,7 +1174,7 @@ bool addProperty(
 css::uno::Sequence seq(
 value.get>());
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 static_assert(
 sizeof (sal_Int8) == sizeof (guchar), "size mismatch");
@@ -1189,7 +1189,7 @@ bool addProperty(
 css::uno::Sequence seq(
 value.get>());
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 static_assert(sizeof (sal_Bool) == 1, "size mismatch");
 v.reset(
@@ -1203,7 +1203,7 @@ bool addProperty(
 css::uno::Sequence seq(
 value.get>());
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 static_assert(
 sizeof (sal_Int16) == sizeof (gint16), "size mismatch");
@@ -1219,7 +1219,7 @@ bool addProperty(
 css::uno::Sequence seq(
 value.get>());
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 static_assert(
 sizeof (sal_Int32) == sizeof (gint32), "size mismatch");
@@ -1235,7 +1235,7 @@ bool addProperty(
 css::uno::Sequence seq(
 value.get>());
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 static_assert(
 sizeof (sal_Int64) == sizeof (gint64), "size mismatch");
@@ -1251,7 +1251,7 @@ bool addProperty(
 css::uno::Sequence seq(
 value.get>());
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 static_assert(
 sizeof (double) == sizeof (gdouble), "size mismatch");
@@ -1278,7 +1278,7 @@ bool addProperty(
 vs.push_back(children.front().get());
 }
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 v.reset(
 g_variant_new_array(
@@ -1293,7 +1293,7 @@ bool addProperty(
 std::vector vs;
 for (sal_Int32 i = 0; i != seq.getLength(); ++i) {
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 static_assert(
 sizeof (sal_Int8) == sizeof (guchar), "size mismatch");
@@ -1315,7 +1315,7 @@ bool addProperty(
 return false;
 }
 static_assert(
-std::numeric_limits::max() <= G_MAXSIZE,
+sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 v.reset(
 g_variant_new_array(ty.get(), vs.data(), seq.getLength()));
___
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/build loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/build/deps.js   |2 
 loleaflet/src/control/Control.Tabs.js |   52 ++-
 loleaflet/src/dom/DomEvent.LongTap.js |  148 ++
 3 files changed, 177 insertions(+), 25 deletions(-)

New commits:
commit 42e7cd146575f0406964211761e83c8e2633c022
Author: Iván Sánchez Ortega 
AuthorDate: Fri May 10 11:54:52 2019 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 13 14:07:38 2019 +0200

loleaflet: Make Calc sheet context menu work on iOS safari

This is done with a combination of a 'contextment' event shim in
loleaflet/src/dom/DomEvent.LongTap.js, mimicking the technique from
loleaflet/src/map/handler/Map.Tap.js, and triggering the jQuery
contextmenu manually from such a shimmed 'contextmenu'.

Change-Id: I5cba975b7a5559315c91a8bf4c9a5ced00dfc6e1
Reviewed-on: https://gerrit.libreoffice.org/72115
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 
(cherry picked from commit d6fe8ff0856170d922d29dbb869496dd24aab233)
Reviewed-on: https://gerrit.libreoffice.org/72119
Reviewed-by: Iván Sánchez Ortega 

diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index a050edf47..c64a05bdf 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -344,6 +344,8 @@ var deps = {
 
ControlTabs: {
src: ['control/Control.js',
+ 'dom/DomEvent.js',
+ 'dom/DomEvent.LongTap.js',
  'control/Control.Tabs.js'],
heading: 'Controls',
desc: 'Tabs for switching sheets'
diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index e173c2bac..d120bb08a 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -20,7 +20,7 @@ L.Control.Tabs = L.Control.extend({
}
setTimeout(function() {
$('.spreadsheet-tab').contextMenu(e.perm === 'edit');
-   }, 1000);
+   }, 100);
 
if (window.mode.isMobile() == true) {
if (e.perm === 'edit') {
@@ -38,36 +38,28 @@ L.Control.Tabs = L.Control.extend({
this._initialized = true;
this._tabsInitialized = false;
this._spreadsheetTabs = {};
+   this._tabForContextMenu = 0;
var map = this._map;
var docContainer = map.options.documentContainer;
this._tabsCont = L.DomUtil.create('div', 
'spreadsheet-tabs-container', docContainer.parentElement);
-   L.DomEvent.on(this._tabsCont, 'touchstart',
-   function (e) {
-   if (e && e.touches.length > 1) {
-   L.DomEvent.preventDefault(e);
-   }
-   },
-   this);
 
$.contextMenu({
selector: '.spreadsheet-tab',
className: 'loleaflet-font',
-   callback: function(key, options) {
-   var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);
-
+   callback: (function(key) {
if (key === 'insertsheetbefore') {
-   map.insertPage(nPos);
+   map.insertPage(this._tabForContextMenu);
}
if (key === 'insertsheetafter') {
-   map.insertPage(nPos + 1);
+   map.insertPage(this._tabForContextMenu 
+ 1);
}
-   },
+   }).bind(this),
items: {
'insertsheetbefore': {name: _('Insert sheet 
before this')},
'insertsheetafter': {name: _('Insert sheet 
after this')},
'deletesheet': {name: _UNO('.uno:Remove', 
'spreadsheet', true),
-   callback: function(key, 
options) {
-   var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);
+   callback: (function(key, 
options) {
+   var nPos = 
this._tabForContextMenu;
vex.dialog.confirm({
message: _('Are 
you sure you want to delete sheet, %sheet% ?').replace('%sheet%', 
options.$trigger.text()),
callback: 
function(data) {
@@ -76,11 +68,11 @@ L.Control.Tabs = L.Control.extend({
  

[Libreoffice-commits] dev-tools.git: qa/checkreg.config qa/checkreg.sh

[Libreoffice Gerrit user]

 qa/checkreg.config |   16 +
 qa/checkreg.sh |   85 +
 2 files changed, 101 insertions(+)

New commits:
commit 22b5621eec10045f15374c7a406888489e3f2389
Author: Ilmari Lauhakangas 
AuthorDate: Mon Apr 22 16:54:59 2019 +0300
Commit: Xisco Faulí 
CommitDate: Mon May 13 14:01:18 2019 +0200

Script for checking fileopen/filesave regressions

Uses command line conversion to PDF. Works on *nix and cygwin.

Change-Id: I3af0cc842ff83b3212771f74958bdff4f724a2b0
Reviewed-on: https://gerrit.libreoffice.org/71069
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 

diff --git a/qa/checkreg.config b/qa/checkreg.config
new file mode 100644
index 000..0ceebea
--- /dev/null
+++ b/qa/checkreg.config
@@ -0,0 +1,16 @@
+# Configuration file for checkreg.sh regression checking script.
+# outDir works with or without a trailing slash.
+# Note: on Windows, with versions older than 6.3, you cannot use
+# a drive root like c:/ as the outdir. This is a bug in LibreOffice.
+
+declare -A versions
+
+# Windows cygwin example, note the forward slashes in outDir:
+#versions[330]="$(cygpath -u "C:\libo33\program\soffice.exe")"
+#versions[bibi43]="$(cygpath -u 
"Z:\bibisect-win32-4.3\instdir\program\soffice.exe")"
+#versions[master]="$(cygpath -u "C:\Program Files\LibreOfficeDev 
6\program\soffice.exe")"
+#outDir="c:/users/test/downloads/outdir"
+
+# Linux example:
+#versions[master]="/home/test/libreoffice/instdir/program/soffice"
+#outDir="/home/test/libobugs/outdir"
diff --git a/qa/checkreg.sh b/qa/checkreg.sh
new file mode 100755
index 000..5146168
--- /dev/null
+++ b/qa/checkreg.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+### DESCRIPTION
+#
+# This script is for triaging fileopen and filesave bugs in LibreOffice
+# using command line conversion.
+# It expects a checkreg.config file, where you specify the LibreOffice
+# executables, version identifiers and the output directory.
+# It produces PDFs with the version identifier appended to the file name.
+# In case of filesave, the saved documents are likewise left in the output 
directory.
+# It works in *nix systems and cygwin on Windows. It is not POSIX-compatible 
(using arrays).
+# You can use it with bibisect repos just as well as versions installed in 
parallel.
+
+usage="
+To get PDFs of fileopen with different versions into the specified outdir, run 
with
+./checkreg.sh open /path/to/file.ext
+To get PDFs of filesave to original format, run with
+./checkreg.sh save /path/to/file.ext
+To get PDFs of filesave to a different format, run with a third argument
+./checkreg.sh save /path/to/file.ext odt
+In cygwin, give input file argument in the format 
'c:\users\test\downloads\myfile.docx'
+"
+if [ ! "$2" ]; then
+echo "$usage"
+exit 1
+fi
+dir="$(dirname "${BASH_SOURCE[0]}")"
+. "$dir"/checkreg.config
+convType="$1"
+inputFile="$2"
+if [[ "$3" && $convType == "save" ]]; then
+fileType="$3"
+else
+fileType="${inputFile##*.}"
+fi
+# file name and path with extension removed
+pathNoExt="${inputFile%.*}"
+# file name with extension removed
+nameNoExt="$(basename "${pathNoExt}")"
+# directory name with no filename and no trailing slash
+inputDir="$(dirname "${inputFile}")"
+# add a trailing slash to outDir, if needed
+[[ "${outDir}" != */ ]] && outDir="${outDir}/"
+for version in "${!versions[@]}";
+do
+verName="${pathNoExt}$version.${inputFile##*.}"
+pdfName="${nameNoExt}.pdf"
+pdfTarget="${nameNoExt}$version.pdf"
+if [[ "$3" && $convType == "save" ]]; then
+verBase="$(basename "${pathNoExt}$version.$fileType")"
+else
+verBase="$(basename "${verName}")"
+fi
+if [[ $convType == "open" ]]; then
+# if version starts with 3, we use a single dash for the switches
+if [[ ${version::1} == "3" ]]; then
+"${versions[$version]}" -headless -nolockcheck -convert-to pdf 
-outdir "${outDir}" "${inputFile}"
+else
+"${versions[$version]}" --headless --nolockcheck --convert-to pdf 
--outdir "${outDir}" "${inputFile}"
+fi
+if ! mv "${outDir}${pdfName}" "${outDir}${pdfTarget}"; then
+echo "PDF creation for version $version failed"
+rm "${outDir}.~lock.${nameNoExt}.pdf#"
+fi
+elif [[ $convType == "save" ]]; then
+cp "${inputFile}" "${verName}";
+echo "Converting version $version to ${fileType}"
+if [[ ${version::1} == "3" ]]; then
+"${versions[$version]}" -headless -nolockcheck -convert-to 
"${fileType}" -outdir "${outDir}" "${verName}"
+"${versions[$version]}" -headless -nolockcheck -convert-to pdf 
-outdir "${outDir}" "${outDir}${verBase}"
+

[Libreoffice-commits] core.git: sc/IwyuFilter_sc.yaml sc/source sd/source svx/source sw/source

[Caolán McNamara (via logerrit)]

 sc/IwyuFilter_sc.yaml   |3 ---
 sc/source/filter/orcus/xmlcontext.cxx   |2 --
 sc/source/ui/condformat/condformatdlg.cxx   |3 +--
 sc/source/ui/condformat/condformatdlgentry.cxx  |1 +
 sc/source/ui/dbgui/PivotLayoutTreeList.cxx  |2 --
 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx  |2 --
 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx  |2 --
 sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx |2 --
 sc/source/ui/dbgui/filtdlg.cxx  |3 ++-
 sc/source/ui/dbgui/sfiltdlg.cxx |3 ++-
 sc/source/ui/dialogs/searchresults.cxx  |3 ---
 sc/source/ui/inc/condformatdlgentry.hxx |3 ---
 sc/source/ui/inc/consdlg.hxx|2 --
 sc/source/ui/inc/dbnamdlg.hxx   |5 -
 sc/source/ui/inc/filtdlg.hxx|3 ---
 sc/source/ui/inc/namemgrtable.hxx   |1 -
 sc/source/ui/inc/validate.hxx   |3 ---
 sc/source/ui/inc/xmlsourcedlg.hxx   |5 -
 sc/source/ui/miscdlgs/acredlin.cxx  |1 -
 sc/source/ui/miscdlgs/anyrefdg.cxx  |3 ---
 sc/source/ui/miscdlgs/crnrdlg.cxx   |3 +--
 sc/source/ui/miscdlgs/highred.cxx   |2 --
 sc/source/ui/namedlg/namemgrtable.cxx   |2 --
 sc/source/ui/pagedlg/areasdlg.cxx   |2 +-
 sc/source/ui/pagedlg/tphf.cxx   |1 -
 sc/source/ui/view/cellsh1.cxx   |1 +
 sc/source/ui/view/gridwin.cxx   |1 +
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |3 ---
 sd/source/ui/inc/tpaction.hxx   |2 --
 svx/source/dialog/ctredlin.cxx  |5 +
 sw/source/ui/chrdlg/break.cxx   |1 -
 sw/source/ui/envelp/labprt.hxx  |3 ---
 sw/source/ui/misc/insfnote.cxx  |1 -
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx   |1 -
 sw/source/uibase/inc/instable.hxx   |5 -
 sw/source/uibase/inc/wordcountdialog.hxx|2 --
 sw/source/uibase/misc/redlndlg.cxx  |2 --
 37 files changed, 11 insertions(+), 78 deletions(-)

New commits:
commit 00ae441bc7265b203e0ae2b95f14f7312172540d
Author: Caolán McNamara 
AuthorDate: Sun May 12 21:40:25 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 13 13:57:14 2019 +0200

drop some unneeded includes

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 43bbdc561c04..2508c5b6f78e 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -512,9 +512,6 @@ blacklist:
 sc/source/ui/inc/RandomNumberGeneratorDialog.hxx:
 # base class has to be a complete type
 - viewdata.hxx
-sc/source/ui/inc/searchresults.hxx:
-# Needed for VclPtr type
-- svtools/simptabl.hxx
 sc/source/ui/inc/StatisticsInputOutputDialog.hxx:
 # base class has to be a complete type
 - viewdata.hxx
diff --git a/sc/source/filter/orcus/xmlcontext.cxx 
b/sc/source/filter/orcus/xmlcontext.cxx
index 9cac43207cf4..2548f5b19d9f 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -13,8 +13,6 @@
 #include 
 #include 
 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index a103e220a89c..018907f5c500 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -11,8 +11,7 @@
 
 #include 
 #include 
-#include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index a55b5336622d..89588a107412 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index 19004643e846..c8d2aef69234 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -13,9 +13,7 @@
 #include 
 #include 
 
-#include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx 
b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
index c5f783ac18dc..2ae02800c032 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
@@ -12,8 +12,6 @@
 #include 
 #include 
 
-#include 
-
 
ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(std::unique_ptr
 xControl, SvPivotTreeListType eType)
 : mxControl(s

[Libreoffice-commits] online.git: wsd/reference.md

[Libreoffice Gerrit user]

 wsd/reference.md |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit ded421bfd6a932434a480375a16c779ff7b3398a
Author: Szymon Kłos 
AuthorDate: Wed May 8 12:59:56 2019 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 13 13:46:45 2019 +0200

Update WOPI Extensions docs: App_LoadingStatus

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

diff --git a/wsd/reference.md b/wsd/reference.md
index 78165b836..fdcd0c121 100644
--- a/wsd/reference.md
+++ b/wsd/reference.md
@@ -113,6 +113,12 @@ If set to a non-empty string, is used for rendering a 
watermark-like text on eac
 
 **Note:** It is possible to just hide print, save, export options while still 
being able to access them from other hosts using PostMessage API (see 
[loleaflet/reference.html](https://www.collaboraoffice.com/collabora-online-editor-api-reference/))
 
+PostMessage extensions
+--
+
+### App_LoadingStatus
+Was extended with field 'Status' with 'Document_Loaded' value when document 
was loaded successfully and 'Failed' in other case.
+
 Alternative authentication possibility
 --
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 comphelper/source/misc/anycompare.cxx |   11 +++
 include/comphelper/anycompare.hxx |4 +
 include/xmloff/xmlexppr.hxx   |8 +-
 xmloff/source/style/impastpl.cxx  |  110 --
 xmloff/source/style/xmlexppr.cxx  |  101 ++-
 5 files changed, 134 insertions(+), 100 deletions(-)

New commits:
commit 349919440b1454eda2de783a0c3e6bd3bae4542b
Author: Noel Grandin 
AuthorDate: Sat May 11 09:00:32 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon May 13 13:23:00 2019 +0200

tdf#107592 Impress PPS save to ODP slow

Takes the time from 20s to 5s on my PC.

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

diff --git a/comphelper/source/misc/anycompare.cxx 
b/comphelper/source/misc/anycompare.cxx
index 5a7859514ac9..f4d2a8b5d260 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -226,6 +226,17 @@ namespace comphelper
 return pComparator;
 }
 
+bool anyLess( css::uno::Any const & lhs, css::uno::Any const & rhs)
+{
+auto lhsTypeClass = lhs.getValueType().getTypeClass();
+auto rhsTypeClass = rhs.getValueType().getTypeClass();
+if (lhsTypeClass != rhsTypeClass)
+return lhsTypeClass < rhsTypeClass;
+std::unique_ptr< IKeyPredicateLess > pred = getStandardLessPredicate( 
lhs.getValueType(), Reference< XCollator >() );
+if (!pred) // type==VOID
+return false;
+return pred->isLess(lhs, rhs);
+}
 
 } // namespace comphelper
 
diff --git a/include/comphelper/anycompare.hxx 
b/include/comphelper/anycompare.hxx
index dd92d2734ca2..8b5a941a781c 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -205,6 +205,10 @@ namespace comphelper
 css::uno::Reference< css::i18n::XCollator > const & i_collator
 );
 
+/**
+Compare two Anys.
+*/
+bool COMPHELPER_DLLPUBLIC anyLess( css::uno::Any const & lhs, 
css::uno::Any const & rhs);
 
 } // namespace comphelper
 
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 28be918474ee..84d2d60c2fb5 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -124,10 +124,14 @@ public:
 std::vector FilterDefaults(
 const css::uno::Reference& rPropSet ) const;
 
-/** Compare to arrays of XMLPropertyState */
-bool Equals( const ::std::vector< XMLPropertyState >& aProperties1,
+/** Provides a partial ordering over two arrays of XMLPropertyState,
+   Partial because implementing a full order requires quite a lot of code. 
*/
+bool LessPartial( const ::std::vector< XMLPropertyState >& aProperties1,
  const ::std::vector< XMLPropertyState >& aProperties2 ) 
const;
 
+/** Compare two arrays of XMLPropertyState */
+bool Equals( const ::std::vector< XMLPropertyState >& aProperties1,
+ const ::std::vector< XMLPropertyState >& aProperties2 ) 
const;
 void exportXML(
 SvXMLExport& rExport,
 const ::std::vector< XMLPropertyState >& rProperties,
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 1b574adc8b97..c64a35d26141 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -270,39 +270,39 @@ XMLAutoStylePoolParent::~XMLAutoStylePoolParent()
 {
 }
 
+struct ComparePartial
+{
+const XMLAutoStyleFamily& rFamilyData;
+
+bool operator()(const vector< XMLPropertyState >& lhs,
+const std::unique_ptr& rhs) 
const
+{
+return rFamilyData.mxMapper->LessPartial(lhs, rhs->GetProperties());
+}
+bool operator()(const std::unique_ptr& lhs,
+const vector< XMLPropertyState >& rhs ) const
+{
+return rFamilyData.mxMapper->LessPartial(lhs->GetProperties(), rhs);
+}
+};
+
 // Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
 // if not added, yet.
 
 bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const 
vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
 {
-bool bAdded = false;
 XMLAutoStylePoolProperties *pProperties = nullptr;
-sal_Int32 nProperties = rProperties.size();
-size_t i = 0;
-for (size_t n = m_PropertiesList.size(); i < n; ++i)
-{
-XMLAutoStylePoolProperties *const pIS = m_PropertiesList[i].get();
-if( nProperties > static_cast(pIS->GetProperties().size()) )
-{
-continue;
-}
-else if( nProperties < 
static_cast(pIS->GetProperties().size()) )
-{
-break;
-}
-else if( !bDontSeek && rFamilyData.mxMapper->Equals( 
pIS->GetProperties(), rProperties ) )
-{
-pProperties = pIS;
-break;
-  

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

[Balazs Varga (via logerrit)]

 chart2/qa/extras/chart2import.cxx |   12 
 chart2/qa/extras/data/xlsx/tdf100084.xlsx |binary
 oox/source/core/xmlfilterbase.cxx |   14 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit b2fc2ad7beceaff660de684435a5c37d69cf8ae9
Author: Balazs Varga 
AuthorDate: Fri May 10 09:34:30 2019 +0200
Commit: László Németh 
CommitDate: Mon May 13 13:16:10 2019 +0200

tdf#100084 XLSX import: fix missing charts

caused by case-sensitive path handling of relationship files.

OOXML documents contain case-insensitive file paths, for example,
uppercase "Sheet.xml" can have a lowercase "sheet.xml.rels" in the ZIP
archive, as in the case of the XLSX documents generated by IBM Cognos.

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

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 4510ac447487..affab028f46e 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -70,6 +70,7 @@ public:
 void testTdf105517();
 void testTdf106217();
 void testTdf108021();
+void testTdf100084();
 void testAutoBackgroundXLSX();
 void testAutoChartAreaBorderPropXLSX();
 void testChartAreaStyleBackgroundXLSX();
@@ -158,6 +159,7 @@ public:
 CPPUNIT_TEST(testTdf105517);
 CPPUNIT_TEST(testTdf106217);
 CPPUNIT_TEST(testTdf108021);
+CPPUNIT_TEST(testTdf100084);
 CPPUNIT_TEST(testAutoBackgroundXLSX);
 CPPUNIT_TEST(testAutoChartAreaBorderPropXLSX);
 CPPUNIT_TEST(testChartAreaStyleBackgroundXLSX);
@@ -883,6 +885,16 @@ void Chart2ImportTest::testTdf108021()
 CPPUNIT_ASSERT(bTextBreak);
 }
 
+void Chart2ImportTest::testTdf100084()
+{
+// The test file was created with IBM Cognos, so just check there is a 
diagram.
+load("/chart2/qa/extras/data/xlsx/", "tdf100084.xlsx");
+Reference xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+Reference xDiagram(xChartDoc->getFirstDiagram(), 
UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("There should be a Diagram.", xDiagram.is());
+}
+
 void Chart2ImportTest::testTransparentBackground(OUString const & filename)
 {
 load("/chart2/qa/extras/data/xlsx/", filename);
diff --git a/chart2/qa/extras/data/xlsx/tdf100084.xlsx 
b/chart2/qa/extras/data/xlsx/tdf100084.xlsx
new file mode 100755
index ..5f03f39244e5
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf100084.xlsx differ
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 738412fb182c..be9b2261c272 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -342,7 +342,7 @@ bool XmlFilterBase::importFragment( const 
rtl::Reference& rxHan
 return false;
 
 // fragment handler must contain path to fragment stream
-const OUString aFragmentPath = rxHandler->getFragmentPath();
+OUString aFragmentPath = rxHandler->getFragmentPath();
 OSL_ENSURE( !aFragmentPath.isEmpty(), "XmlFilterBase::importFragment - 
missing fragment path" );
 if( aFragmentPath.isEmpty() )
 return false;
@@ -385,6 +385,18 @@ bool XmlFilterBase::importFragment( const 
rtl::Reference& rxHan
 handler to create specialized input streams, e.g. VML streams that
 have to preprocess the raw input data. */
 Reference< XInputStream > xInStrm = rxHandler->openFragmentStream();
+// Check again the aFragmentPath route if there is no any file with 
lowercase letter. (tdf#100084)
+if ( !xInStrm.is() )
+{
+sal_Int32 nPathLen = aFragmentPath.lastIndexOf('/') + 1;
+OUString fileName = aFragmentPath.copy(nPathLen);
+if ( fileName != fileName.toAsciiLowerCase() )
+{
+fileName = fileName.toAsciiLowerCase();
+aFragmentPath = OUStringBuffer(aFragmentPath.copy(0, 
nPathLen)).append(fileName).makeStringAndClear();
+xInStrm = openInputStream(aFragmentPath);
+}
+}
 
 // own try/catch block for showing parser failure assertion with 
fragment path
 if( xInStrm.is() ) try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/formula include/vcl sc/source svx/source sw/inc vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 include/formula/formula.hxx   |5 --
 include/vcl/weld.hxx  |1 
 sc/source/ui/inc/conflictsdlg.hxx |2 -
 svx/source/dialog/imapwnd.cxx |   65 --
 svx/source/dialog/imapwnd.hxx |4 +-
 sw/inc/pch/precompiled_sw.hxx |2 -
 vcl/source/app/salvtables.cxx |4 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   10 +
 8 files changed, 48 insertions(+), 45 deletions(-)

New commits:
commit fed7c693de1def5211992bac288c3e9936e863bc
Author: Caolán McNamara 
AuthorDate: Mon May 13 09:20:00 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 13 13:12:34 2019 +0200

weld imapmenu

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 646daa1aeea7..e6a28cef778b 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1631,6 +1631,7 @@ public:
 virtual OString popup_at_rect(weld::Widget* pParent, const 
tools::Rectangle& rRect) = 0;
 virtual void set_sensitive(const OString& rIdent, bool bSensitive) = 0;
 virtual void set_active(const OString& rIdent, bool bActive) = 0;
+virtual bool get_active(const OString& rIdent) const = 0;
 virtual void set_visible(const OString& rIdent, bool bVisible) = 0;
 
 virtual void insert(int pos, const OUString& rId, const OUString& rStr,
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 504f93a4d93f..f1c19d230ec6 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -491,20 +492,20 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
 
 if ( rCEvt.GetCommand() == CommandEventId::ContextMenu )
 {
-VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), 
"svx/ui/imapmenu.ui", "");
-VclPtr aMenu(aBuilder.get_menu("menu"));
+std::unique_ptr 
xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/imapmenu.ui"));
+mxPopupMenu = xBuilder->weld_menu("menu");
 const SdrMarkList&  rMarkList = pView->GetMarkedObjectList();
 const size_t nMarked = rMarkList.GetMarkCount();
 
-aMenu->EnableItem(aMenu->GetItemId("url"), false);
-aMenu->EnableItem(aMenu->GetItemId("active"), false);
-aMenu->EnableItem(aMenu->GetItemId("macro"), false);
-aMenu->EnableItem(aMenu->GetItemId("selectall"), 
pModel->GetPage(0)->GetObjCount() != pView->GetMarkedObjectCount());
+mxPopupMenu->set_sensitive("url", false);
+mxPopupMenu->set_sensitive("active", false);
+mxPopupMenu->set_sensitive("macro", false);
+mxPopupMenu->set_sensitive("selectall", 
pModel->GetPage(0)->GetObjCount() != pView->GetMarkedObjectCount());
 
 if ( !nMarked )
 {
-aMenu->EnableItem(aMenu->GetItemId("arrange"), false);
-aMenu->EnableItem(aMenu->GetItemId("delete"), false);
+mxPopupMenu->set_sensitive("arrange", false);
+mxPopupMenu->set_sensitive("delete", false);
 }
 else
 {
@@ -512,18 +513,19 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
 {
 SdrObject*  pSdrObj = GetSelectedSdrObject();
 
-aMenu->EnableItem(aMenu->GetItemId("url"));
-aMenu->EnableItem(aMenu->GetItemId("active"));
-aMenu->EnableItem(aMenu->GetItemId("macro"));
-aMenu->CheckItem("active", GetIMapObj(pSdrObj)->IsActive());
+mxPopupMenu->set_sensitive("url", true);
+mxPopupMenu->set_sensitive("active", true);
+mxPopupMenu->set_sensitive("macro", true);
+mxPopupMenu->set_active("active", 
GetIMapObj(pSdrObj)->IsActive());
 }
 
-aMenu->EnableItem(aMenu->GetItemId("arrange"));
-aMenu->EnableItem(aMenu->GetItemId("delete"));
+mxPopupMenu->set_sensitive("arrange", true);
+mxPopupMenu->set_sensitive("delete", true);
 }
 
-aMenu->SetSelectHdl( LINK( this, IMapWindow, MenuSelectHdl ) );
-aMenu->Execute( this, rCEvt.GetMousePosPixel() );
+MenuSelectHdl(mxPopupMenu->popup_at_rect(GetFrameWeld(), 
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1;
+
+mxPopupMenu.reset();
 }
 else
 Window::Command(rCEvt);
@@ -713,39 +715,30 @@ void IMapWindow::DoPropertyDialog()
 }
 }
 
-IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool )
+void IMapWindow::MenuSelectHdl(const OString& rId)
 {
-if (!pMenu)
-return false;
-
-OString sId = pMenu->GetCurItemIdent();
-
-if (sId == "url")
+if (rId == "url")
 DoPropertyDialog();
-else if (sId == "macro")
+else if (rId == "macro")
 DoM

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

[Muhammet Kara (via logerrit)]

 sfx2/inc/SfxRedactionHelper.hxx|   20 
 sfx2/source/doc/SfxRedactionHelper.cxx |  148 +
 2 files changed, 168 insertions(+)

New commits:
commit 57667603c52e7d6bb82f5040151c8b7defcc6f8a
Author: Muhammet Kara 
AuthorDate: Fri Mar 1 21:56:31 2019 +0300
Commit: Muhammet Kara 
CommitDate: Mon May 13 12:48:38 2019 +0200

Auto-redact - First stab

Add a SfxRedactionHelper::autoRedactPage method which searches for the 
given term
through the gdimetafile which has the whole content of an xPage (a Draw 
page),
and draws redaction rectangles at proper positions with proper sizes.

The search is case sensitive, and finds only the first occurences on a line.
Will switch to a proper search provider via a follow-up patch.

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

diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index ac15bb790fe9..44a78ab9b877 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -87,6 +88,25 @@ public:
  * pages inserted into Draw for redaction.
  * */
 static PageMargins 
getPageMarginsForCalc(css::uno::Reference& xModel);
+
+static void searchInMetaFile(const OUString& sSearchTerm, const 
GDIMetaFile& rMtf,
+ std::vector& 
aRedactionRectangles,
+ uno::Reference& xComponent);
+
+/*
+ * Draws a redaction rectangle on the draw page referenced with its page 
number (0-based)
+ * */
+static void addRedactionRectToPage(uno::Reference& xComponent,
+   uno::Reference& 
xPage,
+   const std::vector& 
aNewRectangles);
+
+/*
+ * Search for the given term through the gdimetafile, which has the whole 
content of a draw page,
+ * and draw redaction rectangles to the appropriate positions with 
suitable sizes.
+ * */
+static void autoRedactPage(const OUString& sRedactionTerm, const 
GDIMetaFile& rGDIMetaFile,
+   uno::Reference& xPage,
+   uno::Reference& xComponent);
 };
 
 #endif // INCLUDED_CUI_SOURCE_INC_SFXREDACTIONHELPER_HXX
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx 
b/sfx2/source/doc/SfxRedactionHelper.cxx
index 4f1c01da4907..59203b6467ec 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -10,6 +10,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -31,12 +32,17 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
@@ -105,8 +111,66 @@ void setPageMargins(uno::Reference& 
xPageProperySet,
 xPageProperySet->setPropertyValue("BorderLeft", 
css::uno::makeAny(aPageMargins.nLeft));
 xPageProperySet->setPropertyValue("BorderRight", 
css::uno::makeAny(aPageMargins.nRight));
 }
+
+// #i10613# Extracted from ImplCheckRect::ImplCreate
+tools::Rectangle ImplCalcActionBounds(const MetaAction& rAct, const 
OutputDevice& rOut,
+  const OUString& sSubString, const 
sal_Int32& nStrPos)
+{
+tools::Rectangle aActionBounds;
+
+switch (rAct.GetType())
+{
+case MetaActionType::TEXTARRAY:
+{
+const MetaTextArrayAction& rTextAct = static_cast(rAct);
+const OUString 
aString(rTextAct.GetText().copy(rTextAct.GetIndex(), rTextAct.GetLen()));
+
+if (!aString.isEmpty())
+{
+// #105987# ImplLayout takes everything in logical coordinates
+std::unique_ptr pSalLayout1 = rOut.ImplLayout(
+aString, 0, nStrPos, rTextAct.GetPoint(), 0, 
rTextAct.GetDXArray());
+std::unique_ptr pSalLayout2
+= rOut.ImplLayout(aString, 0, nStrPos + 
sSubString.getLength(),
+  rTextAct.GetPoint(), 0, 
rTextAct.GetDXArray());
+if (pSalLayout2)
+{
+tools::Rectangle aBoundRect2(
+
const_cast(rOut).ImplGetTextBoundRect(*pSalLayout2));
+aActionBounds = rOut.PixelToLogic(aBoundRect2);
+}
+if (pSalLayout1 && nStrPos > 0)
+{
+tools::Rectangle aBoundRect1(
+
const_cast(rOut).ImplGetTextBoundRect(*pSalLayout1));
+aActionBounds.SetLeft(rOut.PixelToLogic(aBoundRect1).getX()
+  + 
rOut.PixelToLogic(aBoundRect1).getWidth());
+}
+
+// FIXME: Is 

[Libreoffice-commits] dev-tools.git: qa/bugzillaAutomation.py

[Libreoffice Gerrit user]

 qa/bugzillaAutomation.py |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 971f488eaa29882a09d9b8be44faea310a604171
Author: Xisco Fauli 
AuthorDate: Mon May 13 11:55:01 2019 +0200
Commit: Xisco Fauli 
CommitDate: Mon May 13 11:55:01 2019 +0200

QA: Fix first line duplication

diff --git a/qa/bugzillaAutomation.py b/qa/bugzillaAutomation.py
index 7603f44..669b2ca 100755
--- a/qa/bugzillaAutomation.py
+++ b/qa/bugzillaAutomation.py
@@ -137,11 +137,13 @@ def post_comment(statList, keyInStatList, commentId, 
comment, addFirstLine, chan
 rGet.close()
 
 if commentId not in rawData['bugs'][bugId]['comments'][-1]['text']:
-
 if addFirstLine:
 firstLine = "Dear " + creator + ",\\n\\n"
-comment = firstLine + comment
-command = '{"comment" : "' + comment.replace('\n', '\\n') + '", 
"is_private" : false}'
+fullComment = firstLine + comment
+else:
+fullComment = comment
+
+command = '{"comment" : "' + fullComment.replace('\n', '\\n') + 
'", "is_private" : false}'
 urlPost = 'https://bugs.documentfoundation.org/rest/bug/' + bugId 
+ '/comment?api_key=' + cfg['configQA']['api-key']
 rPost = requests.post(urlPost, command.encode('utf-8'))
 print('Bug: ' + bugId + ' - Comment: ' + 
str(json.loads(rPost.text)['id']))
___
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/Qt5Frame.hxx|1 +
 vcl/inc/qt5/Qt5Instance.hxx |8 
 vcl/inc/qt5/Qt5Widget.hxx   |2 ++
 vcl/qt5/Qt5Frame.cxx|8 ++--
 vcl/qt5/Qt5Instance.cxx |   28 
 vcl/qt5/Qt5Widget.cxx   |   22 ++
 6 files changed, 67 insertions(+), 2 deletions(-)

New commits:
commit faecfd43646d9910e0409a39fecfd8816fe16cc9
Author: Jan-Marek Glogowski 
AuthorDate: Sun May 12 14:30:06 2019 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon May 13 12:22:46 2019 +0200

Qt5 handle theming-based change events

Qt generates three change events when changing the KDE theme:
FontChange, StyleChange and PaletteChange. LO has two:
SettingChanged and FontChanged. And like Qt LO will inform all
widgets / windows independently. To prevent several redraws,
this patch just collects all Qt's change events and notifies LO
once a bit later via a Timer.

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

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 1309c17d10a7..6fe1333bd138 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -66,6 +66,7 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public 
SalFrame
 bool m_bNullRegion;
 
 bool m_bGraphicsInUse;
+bool m_bGraphicsInvalid;
 SalFrameStyleFlags m_nStyle;
 Qt5Frame* m_pParent;
 PointerStyle m_ePointerStyle;
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index a9be3581f64b..52b45b12d2b8 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -58,6 +59,11 @@ class VCLPLUG_QT5_PUBLIC Qt5Instance : public QObject,
 std::unique_ptr m_pFakeArgv;
 std::unique_ptr m_pFakeArgc;
 
+Timer m_aUpdateStyleTimer;
+bool m_bUpdateFonts;
+
+DECL_LINK(updateStyleHdl, Timer*, void);
+
 private Q_SLOTS:
 bool ImplYield(bool bWait, bool bHandleAllCurrentEvents);
 void ImplRunInMain();
@@ -138,6 +144,8 @@ public:
 CreateClipboard(const css::uno::Sequence& i_rArguments) 
override;
 virtual css::uno::Reference CreateDragSource() 
override;
 virtual css::uno::Reference CreateDropTarget() 
override;
+
+void UpdateStyle(bool bFontsChanged);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index 8879bc10aef2..af48dbe5e4f5 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -27,6 +27,7 @@
 
 class Qt5Frame;
 class Qt5Object;
+class QEvent;
 class QFocusEvent;
 class QInputMethodEvent;
 class QKeyEvent;
@@ -66,6 +67,7 @@ class Qt5Widget : public QWidget
 virtual void showEvent(QShowEvent*) override;
 virtual void wheelEvent(QWheelEvent*) override;
 virtual void closeEvent(QCloseEvent*) override;
+virtual void changeEvent(QEvent*) override;
 
 void inputMethodEvent(QInputMethodEvent*) override;
 QVariant inputMethodQuery(Qt::InputMethodQuery) const override;
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 5ed722aad391..acb43e515983 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -65,6 +65,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 , m_pSvpGraphics(nullptr)
 , m_bNullRegion(true)
 , m_bGraphicsInUse(false)
+, m_bGraphicsInvalid(false)
 , m_ePointerStyle(PointerStyle::Arrow)
 , m_pDragSource(nullptr)
 , m_pDropTarget(nullptr)
@@ -215,21 +216,23 @@ SalGraphics* Qt5Frame::AcquireGraphics()
 
 if (m_bUseCairo)
 {
-if (!m_pOurSvpGraphics.get())
+if (!m_pOurSvpGraphics.get() || m_bGraphicsInvalid)
 {
 m_pOurSvpGraphics.reset(new SvpSalGraphics());
 InitSvpSalGraphics(m_pOurSvpGraphics.get());
+m_bGraphicsInvalid = false;
 }
 return m_pOurSvpGraphics.get();
 }
 else
 {
-if (!m_pQt5Graphics.get())
+if (!m_pQt5Graphics.get() || m_bGraphicsInvalid)
 {
 m_pQt5Graphics.reset(new Qt5Graphics(this));
 m_pQImage.reset(new QImage(m_pQWidget->size(), 
Qt5_DefaultFormat32));
 m_pQImage->fill(Qt::transparent);
 m_pQt5Graphics->ChangeQImage(m_pQImage.get());
+m_bGraphicsInvalid = false;
 }
 return m_pQt5Graphics.get();
 }
@@ -1015,6 +1018,7 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
 style.SetShadowColor(toColor(pal.color(QPalette::Disabled, 
QPalette::WindowText)));
 style.SetDarkShadowColor(toColor(pal.color(QPalette::Inactive, 
QPalette::WindowText)));
 
+m_bGraphicsInvalid = true;
 rSettings.SetStyleSettings(style);
 }
 
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index dd0edddc97c

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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 06c86a168dd1b2ee57a9e2b11fbd8667ea018b33
Author: Tor Lillqvist 
AuthorDate: Mon May 6 18:48:03 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 13 12:57:50 2019 +0300

Fix warning: unannotated fall-through between switch labels

Change-Id: Ieda620525bca6562327e304a91e4793bd9e90d7d

diff --git a/vcl/source/gdi/WidgetDefinition.cxx 
b/vcl/source/gdi/WidgetDefinition.cxx
index f9bad9aa7163..6eda113e0435 100644
--- a/vcl/source/gdi/WidgetDefinition.cxx
+++ b/vcl/source/gdi/WidgetDefinition.cxx
@@ -105,6 +105,7 @@ WidgetDefinitionPart::getStates(ControlType eType, 
ControlPart ePart, ControlSta
 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

Re: Android Viewer(Online) - Weekly report [7 May - 10 May]

[Jan Holesovsky]

Hi Kaishu,

Kaishu Sahu píše v Po 13. 05. 2019 v 03:20 +0530:

> This week (from 7th May to 10th May):
> 1. I have added a feature in the document viewer to insert image in a
> document from the phone's internal/external storage(Task#01). The
> task of image insertion is handled by the browser i.e. the process of
> taking an image from the disk and uploading but in the case of
> Android Viewer, there wasn't any implementation in the webView.
> 2. I have tried to understand Loleaflet's(javascript part) internal
> working. 

Very good - thank you!

> Addition of sidebar or changes in the document viewer may require
> some understanding of Loleaflet. 

Actually Florin (CC'd) is actually already working on the sidebar
support in parallel, so most probably it'll be done by the time you get
to that; so you don't have to worry about that, most probably you'll
just skip it, there's a lot of other stuff to work on :-)

All the best,
Kendy
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Katarina Behrens (via logerrit)]

 sc/inc/strings.hrc |1 +
 sc/source/ui/miscdlgs/linkarea.cxx |9 -
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 022deeb79ef693550ea762c9cc899806ae4b374c
Author: Katarina Behrens 
AuthorDate: Thu May 9 20:46:45 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon May 13 11:11:46 2019 +0200

Make it more obvious that there are no named ranges

and thus the selected doc can't be used as the source of external
data for this sheet. In other words, help the user figure out
why is OK button disabled

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

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 3a5e2710aed0..d5685ed3c626 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -370,6 +370,7 @@
 
 #define STR_NO_USER_DATA_AVAILABLE  
NC_("sharedocumentdlg|nouserdata", "No user data available.")
 #define STR_EXCLUSIVE_ACCESS
NC_("sharedocumentdlg|exclusive", "(exclusive access)")
+#define STR_NO_NAMED_RANGES_AVAILABLE   
NC_("STR_NO_NAMED_RANGES_AVAILABLE", "No named ranges available in the selected 
document")
 
 #endif
 
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx 
b/sc/source/ui/miscdlgs/linkarea.cxx
index eedb528c704e..1ad934835b26 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 ScLinkedAreaDlg::ScLinkedAreaDlg(weld::Window* pParent)
 : GenericDialogController(pParent, "modules/scalc/ui/externaldata.ui", 
"ExternalDataDialog")
@@ -260,8 +262,13 @@ void ScLinkedAreaDlg::UpdateSourceRanges()
 
 m_xLbRanges->thaw();
 
-if (m_xLbRanges->n_children() == 1)
+if (m_xLbRanges->n_children() >= 1)
 m_xLbRanges->select(0);
+else
+{
+m_xLbRanges->append_text(ScResId(STR_NO_NAMED_RANGES_AVAILABLE));
+m_xLbRanges->set_sensitive(false);
+}
 }
 
 void ScLinkedAreaDlg::UpdateEnable()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 cui/source/dialogs/tipofthedaydlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1d44e1dde7b1b6001e6b9c672770265ba9cb7db
Author: Justin Luth 
AuthorDate: Fri May 10 10:27:46 2019 +0300
Commit: Heiko Tietze 
CommitDate: Mon May 13 11:03:58 2019 +0200

tdf#124743 TipOfTheDay: Next tip should not be random

A user pressing "next tip" will expect to cycle sequentially
through the list of tips, and not get a random one each time.

Change-Id: I331d35d623b6449a9daef407a498b4ba08eaff6f
Reviewed-on: https://gerrit.libreoffice.org/72099
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index 0f634876ddd8..894768f5de99 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -127,8 +127,8 @@ IMPL_LINK_NOARG(TipOfTheDayDialog, OnLinkClick, 
weld::LinkButton&, void)
 
 IMPL_LINK_NOARG(TipOfTheDayDialog, OnNextClick, weld::Button&, void)
 {
-nCurrentTip = rand() % nNumberOfTips;
+nCurrentTip = (nCurrentTip + 1) % nNumberOfTips;
 UpdateTip();
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* 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: bin/get-bugzilla-attachments-by-mimetype

[Michael Stahl (via logerrit)]

 bin/get-bugzilla-attachments-by-mimetype |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ae8548370a5e5e6d2e3267f4d1e7713d7c64e9d6
Author: Michael Stahl 
AuthorDate: Mon May 13 10:53:31 2019 +0200
Commit: Michael Stahl 
CommitDate: Mon May 13 11:01:54 2019 +0200

get-bugzilla-attachments-by-mimetype: fix get_through_rss_query

This URL results in an error message and 0 results because "Changed" in
the UI translates to "delta_ts", not "changed" apparently.

Change-Id: I2bfdd682bb7fca229039970c209e7e409532059c
Reviewed-on: https://gerrit.libreoffice.org/72219
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index a704b5461d67..9fb3d1da997b 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -260,8 +260,8 @@ def get_through_rss_query(queryurl, mimetype, prefix, 
suffix):
 if files != []:
 print('looking for updated bugs having %s attachment(s)' % mimetype)
 query_changed = query.copy()
-query_changed['field0-1-0'] = 'changed'
-query_changed['type0-1-0'] = 'changedbefore'
+query_changed['field0-1-0'] = 'delta_ts'
+query_changed['type0-1-0'] = 'greaterthaneq'
 query_changed['value0-1-0'] = get_changed_date(files).isoformat()
 process(query_changed, False)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens (via logerrit)]

 framework/source/loadenv/loadenv.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit acd820fd39394acc9829836a597c277d8965242e
Author: Katarina Behrens 
AuthorDate: Tue May 7 16:27:22 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon May 13 10:57:24 2019 +0200

tdf#83722: don't recycle frame with unmodified template

a frame that contained valid but unmodified document opened from
template or explicitly opened by the user (File > New) was treated
the same as blank document i.e. it was reused and the content was
overwritten by newly opened document (even if it already had
non-empty content provided by the template).

So let's not do that and let's open a new document in a new frame
instead

Change-Id: I10252d114e8cc5fcad3c98194ef07fd59873d6da
Reviewed-on: https://gerrit.libreoffice.org/71919
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Katarina Behrens 

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 2ddfd34492d0..f37f267733b3 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1076,7 +1076,7 @@ bool LoadEnv::impl_loadContent()
 // if it will be run out of scope.
 
 // Note further: ignore if this internal guard already contains a resource.
-// Might impl_searchRecylcTarget() set it before. But in case this 
impl-method wasn't used
+// Might impl_searchRecycleTarget() set it before. But in case this 
impl-method wasn't used
 // and the target frame was new created ... this lock here must be set!
 css::uno::Reference< css::document::XActionLockable > 
xTargetLock(xTargetFrame, css::uno::UNO_QUERY);
 m_aTargetLock.setResource(xTargetLock);
@@ -1514,6 +1514,15 @@ css::uno::Reference< css::frame::XFrame > 
LoadEnv::impl_searchRecycleTarget()
 css::uno::Reference< css::frame::XController > xOldDoc = 
xTask->getController();
 if (xOldDoc.is())
 {
+utl::MediaDescriptor lOldDocDescriptor(xModel->getArgs());
+bool bFromTemplate = 
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE()
 , false);
+OUString sReferrer = 
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(),
 OUString());
+
+// tdf#83722: valid but unmodified document, either from template
+// or opened by the user (File > New)
+if (bFromTemplate || !sReferrer.isEmpty())
+return css::uno::Reference< css::frame::XFrame >();
+
 bReactivateOldControllerOnError = xOldDoc->suspend(true);
 if (! bReactivateOldControllerOnError)
 return css::uno::Reference< css::frame::XFrame >();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen (via logerrit)]

 sw/IwyuFilter_sw.yaml  |8 
 sw/inc/hintids.hxx |1 +
 sw/source/core/doc/docdesc.cxx |1 +
 sw/source/core/docnode/observablethread.cxx|1 +
 sw/source/core/inc/DropDownFormFieldButton.hxx |1 -
 sw/source/core/inc/GetMetricVal.hxx|2 +-
 sw/source/core/inc/MarkManager.hxx |1 -
 sw/source/core/inc/SwPortionHandler.hxx|3 ++-
 sw/source/core/inc/SwUndoFmt.hxx   |1 -
 sw/source/core/inc/SwUndoPageDesc.hxx  |1 -
 sw/source/core/inc/SwXMLBlockImport.hxx|4 ++--
 sw/source/core/inc/SwXMLTextBlocks.hxx |2 --
 sw/source/core/inc/SwXTextDefaults.hxx |2 +-
 sw/source/core/inc/frmtool.hxx |1 -
 sw/source/core/inc/layact.hxx  |4 +++-
 sw/source/core/inc/laycache.hxx|2 +-
 sw/source/core/inc/layfrm.hxx  |1 -
 sw/source/core/inc/observablethread.hxx|4 ++--
 sw/source/core/inc/pamtyp.hxx  |   11 +++
 sw/source/core/inc/retrievedinputstreamdata.hxx|4 ++--
 sw/source/core/inc/retrieveinputstream.hxx |1 +
 sw/source/core/inc/retrieveinputstreamconsumer.hxx |7 ---
 sw/source/core/inc/rolbck.hxx  |1 -
 sw/source/core/inc/rootfrm.hxx |1 -
 sw/source/core/inc/scriptinfo.hxx  |3 +--
 sw/source/core/inc/sortedobjs.hxx  |1 -
 sw/source/core/inc/swblocks.hxx|3 ++-
 sw/source/core/inc/swcache.hxx |2 +-
 sw/source/core/inc/swfont.hxx  |1 -
 sw/source/core/inc/swthreadjoiner.hxx  |5 -
 sw/source/core/inc/swthreadmanager.hxx |3 ++-
 sw/source/core/text/porlay.cxx |1 +
 sw/source/core/txtnode/txtedt.cxx  |1 +
 sw/source/core/unocore/SwXTextDefaults.cxx |1 +
 34 files changed, 50 insertions(+), 36 deletions(-)

New commits:
commit 572c5c6b229aba9188435901e1679f50149b8fcb
Author: Gabor Kelemen 
AuthorDate: Sat May 4 01:25:11 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 13 10:38:18 2019 +0200

tdf#42949 Fix IWYU warnings in sw/source/core/inc/[g-S]*hxx

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

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

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 7405d42fa7e0..15e849e77e29 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -262,6 +262,14 @@ blacklist:
 sw/source/core/inc/frame.hxx:
 # Needed for direct member access
 - com/sun/star/style/TabStop.hpp
+sw/source/core/inc/SwXTextDefaults.hxx:
+# Base class needs complete type
+- com/sun/star/beans/XPropertySet.hpp
+- com/sun/star/beans/XPropertyState.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+sw/source/core/inc/swthreadjoiner.hxx:
+# Needed for css shortcut
+- sal/types.h
 sw/qa/extras/odfexport/odfexport.cxx:
 # Needed for getProperty template
 - com/sun/star/graphic/XGraphic.hpp
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 609c705b1c20..72c20b21cc8a 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -36,6 +36,7 @@ class SwMsgPoolItem;
 class SwPtrMsgPoolItem;
 class SfxBoolItem;
 class SvxColorItem;
+class SvxLRSpaceItem;
 
 // For SwTextHints without end index the following char is added:
 
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index fe9cb3fdef82..ca14991405c5 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/docnode/observablethread.cxx 
b/sw/source/core/docnode/observablethread.cxx
index 479eb2c3feed..273dd45c2844 100644
--- a/sw/source/core/docnode/observablethread.cxx
+++ b/sw/source/core/docnode/observablethread.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 
 /* class for an observable thread
diff --git a/sw/source/core/inc/DropDownFormFieldButton.hxx 
b/sw/source/core/inc/DropDownFormFieldButton.hxx
index e8b9153cb1a6..1147f59dfc9b 100644
--- a/sw/source/core/inc/DropDownFormFieldButton.hxx
+++ b/sw/source/core/inc/DropDownFormFieldButton.hxx
@@ -13,7 +13,6 @@
 #include 
 #include 
 
-class SwFieldFormDropDownPortion;
 class SwEditWin;
 class FloatingWindow;
 namespace sw
diff --git a/sw/source/core/inc/GetMetricVal.hxx 
b/sw/source/core/inc/GetMetricVal.hxx
index eca6b9ef1701..9b17975d61cf 100644
--- a/sw/source/core/inc/GetMetricVal.hxx
+++ b/sw/source/core/inc/GetMetricV

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

[Miklos Vajna (via logerrit)]

 sfx2/source/view/viewsh.cxx|3 
 sw/qa/extras/tiledrendering/tiledrendering.cxx |  273 +
 2 files changed, 149 insertions(+), 127 deletions(-)

New commits:
commit c3fcb4a1c0fed9595abcda93b3bf0e1e9acab5b1
Author: Miklos Vajna 
AuthorDate: Fri May 10 16:41:11 2019 +0200
Commit: Michael Meeks 
CommitDate: Mon May 13 10:14:59 2019 +0200

CppunitTest_sw_tiledrendering: close the document while LOK is still active

This is the same type of problem that was fixed for
CppunitTest_desktop_lib in commit
da17ccaec39f50de68c3fdd431bc66a2bec04127 (CppunitTest_desktop_lib: close
the document while LOK is still active, 2019-05-09).

(cherry picked from commit c1486533818de626378ec67afa49845da164d00c)

Conflicts:
sw/qa/extras/tiledrendering/tiledrendering.cxx

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

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index c4d908fbd285..47f98c0bd98d 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1457,6 +1457,9 @@ void 
SfxViewShell::registerLibreOfficeKitViewCallback(LibreOfficeKitCallback pCa
 
 afterCallbackRegistered();
 
+if (!pCallback)
+return;
+
 // Ask other views to tell us about their cursors.
 SfxViewShell* pViewShell = SfxViewShell::GetFirst();
 while (pViewShell)
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 3db77a1c7f88..b7c0a03bee3d 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -55,6 +55,7 @@ class SwTiledRenderingTest : public SwModelTestBase
 {
 public:
 SwTiledRenderingTest();
+virtual void tearDown() override;
 void testRegisterCallback();
 void testPostKeyEvent();
 void testPostMouseEvent();
@@ -196,6 +197,27 @@ SwTiledRenderingTest::SwTiledRenderingTest()
 {
 }
 
+void SwTiledRenderingTest::tearDown()
+{
+if (mxComponent.is())
+{
+SwXTextDocument* pTextDocument = 
dynamic_cast(mxComponent.get());
+if (pTextDocument)
+{
+SwWrtShell* pWrtShell = 
pTextDocument->GetDocShell()->GetWrtShell();
+if (pWrtShell)
+{
+
pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(nullptr, 
nullptr);
+}
+}
+mxComponent->dispose();
+mxComponent.clear();
+}
+comphelper::LibreOfficeKit::setActive(false);
+
+test::BootstrapFixture::tearDown();
+}
+
 SwXTextDocument* SwTiledRenderingTest::createDoc(const char* pName)
 {
 if (!pName)
@@ -309,7 +331,6 @@ void SwTiledRenderingTest::testRegisterCallback()
 CPPUNIT_ASSERT(!m_aInvalidation.IsEmpty());
 tools::Rectangle aTopLeft(0, 0, 256*15, 256*15); // 1 px = 15 twips, 
assuming 96 DPI.
 CPPUNIT_ASSERT(m_aInvalidation.IsOver(aTopLeft));
-comphelper::LibreOfficeKit::setActive(false);
 }
 
 void SwTiledRenderingTest::testPostKeyEvent()
@@ -345,7 +366,6 @@ void SwTiledRenderingTest::testPostMouseEvent()
 Scheduler::ProcessEventsToIdle();
 // The new cursor position must be before the first word.
 CPPUNIT_ASSERT_EQUAL(static_cast(0), 
pShellCursor->GetPoint()->nContent.GetIndex());
-comphelper::LibreOfficeKit::setActive(false);
 }
 
 void SwTiledRenderingTest::testSetTextSelection()
@@ -404,8 +424,6 @@ void SwTiledRenderingTest::testGetTextSelection()
 ESelection aWordSelection(0, 0, 0, 5);
 rEditView.SetSelection(aWordSelection);
 CPPUNIT_ASSERT_EQUAL(OString("Shape"), 
pXTextDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
-
-comphelper::LibreOfficeKit::setActive(false);
 }
 
 void SwTiledRenderingTest::testSetGraphicSelection()
@@ -475,8 +493,6 @@ void SwTiledRenderingTest::testInsertShape()
 
 // check that it is in the foreground layer
 CPPUNIT_ASSERT(rDrawModelAccess.GetHeavenId() == pObject->GetLayer());
-
-comphelper::LibreOfficeKit::setActive(false);
 }
 
 void lcl_search(bool bBackward)
@@ -529,8 +545,6 @@ void SwTiledRenderingTest::testSearch()
 CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
 nActual = 
pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
 CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
-
-comphelper::LibreOfficeKit::setActive(false);
 }
 
 void SwTiledRenderingTest::testSearchViewArea()
@@ -573,8 +587,6 @@ void SwTiledRenderingTest::testSearchTextFrame()
 comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
 // This was empty: nothing was highlighted after searching for 'TextFrame'.
 CPPUNIT_ASSERT(!m_aTextSelection.isEmpty());
-
-comphelper::LibreOfficeKit::setActive(false);
 }
 
 void SwTiledRenderingTest::testSearchTextFrameWrapAround()
@@ -610

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

[Miklos Vajna (via logerrit)]

 sw/inc/view.hxx  |   14 +-
 sw/source/uibase/uiview/view.cxx |   12 -
 sw/source/uibase/uiview/viewmdi.cxx  |8 -
 sw/source/uibase/uiview/viewsrch.cxx |  236 +--
 4 files changed, 135 insertions(+), 135 deletions(-)

New commits:
commit 91887a3405023ab3ed36b8a5a367f90403b7d740
Author: Miklos Vajna 
AuthorDate: Mon May 13 09:03:08 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 13 10:12:44 2019 +0200

sw: prefix members of SwView

It has a number of static members, use m_ prefix only for non-static
members.

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

diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index d2fade9a1901..c1ed1d484b3a 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -149,17 +149,17 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 friend class SwClipboardChangeListener;
 
 // search & replace
-static SvxSearchItem   *m_pSrchItem;
+static SvxSearchItem   *s_pSrchItem;
 
 static sal_uInt16   m_nMoveType; // for buttons below the scrollbar 
(viewmdi)
 static sal_Int32m_nActMark; // current jump mark for unknown mark
 
-static bool m_bExtra;
-static bool m_bFound;
-static bool m_bJustOpened;
+static bool s_bExtra;
+static bool s_bFound;
+static bool s_bJustOpened;
 
-static SearchAttrItemList* m_pSrchList;
-static SearchAttrItemList* m_pReplList;
+static SearchAttrItemList* s_pSearchList;
+static SearchAttrItemList* s_pReplaceList;
 
 Timer   m_aTimer; // for delayed ChgLnks during an 
action
 OUStringm_sSwViewData,
@@ -629,7 +629,7 @@ public:
 SAL_DLLPRIVATE virtual bool  HasPrintOptionsPage() const override;
 SAL_DLLPRIVATE virtual VclPtr 
CreatePrintOptionsPage(TabPageParent pParent,
 const SfxItemSet& rSet) 
override;
-static SvxSearchItem* GetSearchItem() { return m_pSrchItem; }
+static SvxSearchItem* GetSearchItem() { return s_pSrchItem; }
 /// See SfxViewShell::getPart().
 int getPart() const override;
 /// See SfxViewShell::dumpAsXml().
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 67fce780a56a..6ba499250620 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -130,14 +130,14 @@ using namespace ::com::sun::star::scanner;
 
 bool bDocSzUpdated = true;
 
-SvxSearchItem*  SwView::m_pSrchItem   = nullptr;
+SvxSearchItem*  SwView::s_pSrchItem   = nullptr;
 
-boolSwView::m_bExtra  = false;
-boolSwView::m_bFound  = false;
-boolSwView::m_bJustOpened = false;
+boolSwView::s_bExtra  = false;
+boolSwView::s_bFound  = false;
+boolSwView::s_bJustOpened = false;
 
-SearchAttrItemList* SwView::m_pSrchList   = nullptr;
-SearchAttrItemList* SwView::m_pReplList   = nullptr;
+SearchAttrItemList* SwView::s_pSearchList   = nullptr;
+SearchAttrItemList* SwView::s_pReplaceList   = nullptr;
 
 SfxDispatcher &SwView::GetDispatcher()
 {
diff --git a/sw/source/uibase/uiview/viewmdi.cxx 
b/sw/source/uibase/uiview/viewmdi.cxx
index dc6b53d2fc92..95f524e74d46 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -533,15 +533,15 @@ IMPL_LINK( SwView, MoveNavigationHdl, void*, p, void )
 break;
 
 case NID_SRCH_REP:
-if(m_pSrchItem)
+if(s_pSrchItem)
 {
-bool bBackward = m_pSrchItem->GetBackward();
+bool bBackward = s_pSrchItem->GetBackward();
 if (rSh.HasSelection() && bNext != rSh.IsCursorPtAtEnd())
 rSh.SwapPam();
-m_pSrchItem->SetBackward(!bNext);
+s_pSrchItem->SetBackward(!bNext);
 SfxRequest aReq(FN_REPEAT_SEARCH, SfxCallMode::SLOT, GetPool());
 ExecSearch(aReq);
-m_pSrchItem->SetBackward(bBackward);
+s_pSrchItem->SetBackward(bBackward);
 }
 break;
 case NID_INDEX_ENTRY:
diff --git a/sw/source/uibase/uiview/viewsrch.cxx 
b/sw/source/uibase/uiview/viewsrch.cxx
index aa961ad914aa..44f3725d7b62 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -145,7 +145,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
 bQuiet = static_cast( pItem)->GetValue();
 
 sal_uInt16 nSlot = rReq.GetSlot();
-if (nSlot == FN_REPEAT_SEARCH && !m_pSrchItem)
+if (nSlot == FN_REPEAT_SEARCH && !s_pSrchItem)
 {
 if(bQuiet)
 {
@@ -160,13 +160,13 @@ void SwView::ExecSearch(SfxRequest& rReq)
 // for now do nothing
 case SID_SEARCH_ITEM:
 {
-delete m_pSrchIt

[Libreoffice-commits] core.git: config.guess config.sub

[Caolán McNamara (via logerrit)]

 config.guess |  297 +--
 config.sub   | 2468 +--
 2 files changed, 1476 insertions(+), 1289 deletions(-)

New commits:
commit 4bde8e28856efd18b1b4295bccf716bfe35a99a5
Author: Caolán McNamara 
AuthorDate: Sun May 12 19:13:45 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 13 10:07:05 2019 +0200

Update config.{guess,sub}

...to latest versions from 
 and 


but retain...

commit 25a09c8776cc6088a5b2bf13dc84eb386c26bb7e
Date:   Wed Jun 7 12:23:17 2017 +0200

iOS, add support for arm64

Added general support for arm64
Removed experimental/prototype from normal build

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

diff --git a/config.guess b/config.guess
index ae5ffc72f4be..4cd9454b35c4 100644
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2018-01-16'
+timestamp='2019-04-28'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2018 Free Software Foundation, Inc.
+Copyright 1992-2019 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,8 +84,6 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,34 +94,38 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && 
exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 
;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) 
; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating 
insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } 
;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)echo "int x;" > "$dummy.c" ;
-   for c in cc gcc c89 c99 ; do
- if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
-CC_FOR_BUILD="$c"; break ;
- fi ;
-   done ;
-   if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
-   fi
-   ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+: "${TMPDIR=/tmp}"
+# shellcheck disable=SC2039
+{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test -d "$tmp" ; } ||
+   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir 
"$tmp" 2>/dev/null) ; } ||
+   { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo 
"Warning: creating insecure temp directory" >&2 ; } ||
+   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 
1 ; }
+dummy=$tmp/dummy
+case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+   ,,)echo "int x;" > "$dummy.c"
+  for driver in cc gcc c89 c99 ; do
+  if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; 
then
+  CC_FOR_BUILD="$driver"
+  break
+  fi
+  done
+  if test x"$CC_FOR_BUILD" = x ; then
+  CC_FOR_BUILD=no_compiler_found
+  fi
+  ;;
+   ,,*)   CC_FOR_BUILD=$CC ;;
+   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (gh...@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
PATH=$PATH:/.attbin ; export PATH
 fi
 
@@ -138,7 +140,7 @@ Linux|GNU|GNU/*)
# We could

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

[Arkadiy Illarionov (via logerrit)]

 chart2/source/controller/dialogs/DialogModel.cxx |7 -
 chart2/source/controller/main/ChartController_Window.cxx |4 
 chart2/source/inc/ContainerHelper.hxx|   73 ---
 chart2/source/model/main/BaseCoordinateSystem.cxx|3 
 chart2/source/model/main/DataSeries.cxx  |5 -
 chart2/source/model/main/Title.cxx   |   13 +-
 chart2/source/tools/DataSeriesHelper.cxx |9 -
 chart2/source/tools/DiagramHelper.cxx|5 -
 chart2/source/tools/ErrorBar.cxx |3 
 chart2/source/tools/InternalDataProvider.cxx |7 -
 chart2/source/tools/PropertyHelper.cxx   |4 
 chart2/source/tools/RegressionEquation.cxx   |7 -
 chart2/source/view/axes/VCoordinateSystem.cxx|3 
 solenv/clang-format/blacklist|1 
 14 files changed, 33 insertions(+), 111 deletions(-)

New commits:
commit 1bf1c56ce05a08e09c3f7def4962ef7f7ae885d9
Author: Arkadiy Illarionov 
AuthorDate: Sun May 12 12:13:42 2019 +0300
Commit: Noel Grandin 
CommitDate: Mon May 13 10:02:02 2019 +0200

Remove ContainerHelper.hxx

Use comphelper::sequenceToContainer instead of 
ContainerHelper::SequenceToVector

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

diff --git a/chart2/source/controller/dialogs/DialogModel.cxx 
b/chart2/source/controller/dialogs/DialogModel.cxx
index 11a616a34f8e..a363c6cc6fc8 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -489,7 +488,7 @@ void addNewSeriesToContainer(
 const Reference& xNewSeries )
 {
 Reference xSeriesCnt(xChartType, 
uno::UNO_QUERY_THROW);
-std::vector > aSeries = 
ContainerHelper::SequenceToVector(xSeriesCnt->getDataSeries());
+auto aSeries = 
comphelper::sequenceToContainer 
>>(xSeriesCnt->getDataSeries());
 
 std::vector >::iterator aIt =
 std::find( aSeries.begin(), aSeries.end(), xSeries);
@@ -819,8 +818,8 @@ void DialogModel::applyInterpretedData(
 
 // data series
 std::vector< Reference< XDataSeriesContainer > > aSeriesCnt( 
getAllDataSeriesContainers());
-std::vector< Sequence< Reference< XDataSeries > > > aNewSeries(
-ContainerHelper::SequenceToVector( rNewData.Series ));
+auto aNewSeries(
+comphelper::sequenceToContainer > >>( rNewData.Series ));
 
 OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size());
 
diff --git a/chart2/source/controller/main/ChartController_Window.cxx 
b/chart2/source/controller/main/ChartController_Window.cxx
index f63126747058..c928be0e3a17 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -63,6 +62,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1054,7 +1054,7 @@ void ChartController::execute_Command( const 
CommandEvent& rCEvt )
 {
 if( bIsPoint )
 {
-std::vector< sal_Int32 > aIndices( 
ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
+auto aIndices( 
comphelper::sequenceToContainer>( 
aAttributedDataPointIndexList ) );
 std::vector< sal_Int32 >::iterator aIt = 
std::find( aIndices.begin(), aIndices.end(), nPointIndex );
 if( aIt != aIndices.end())
 bSelectedPointIsFormatted = true;
diff --git a/chart2/source/inc/ContainerHelper.hxx 
b/chart2/source/inc/ContainerHelper.hxx
deleted file mode 100644
index 014d3c1033d5..
--- a/chart2/source/inc/ContainerHelper.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- 

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

[Michael Stahl (via logerrit)]

 sw/source/core/layout/layact.cxx |2 ++
 sw/source/core/layout/tabfrm.cxx |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a813b7bf01f6399a0a58e99c0dab85548c154198
Author: Michael Stahl 
AuthorDate: Wed May 8 16:23:25 2019 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 13 09:52:38 2019 +0200

tdf#124675 sw: fix crash when moving SwTextFrame in table to prev page

The problem is that the SwTabFrame and SwRowFrame that are being
iterated are deleted:

 7 SwFrame::DestroyFrame(SwFrame*) (pFrame=0x79052c0) at 
sw/source/core/layout/ssfrm.cxx:386
 8 SwTabFrame::RemoveFollowFlowLine() (this=0x5bf07d0) at 
sw/source/core/layout/tabfrm.cxx:907
 9 SwTabFrame::MakeAll(OutputDevice*) (this=0x5bf07d0) at 
sw/source/core/layout/tabfrm.cxx:1839
10 SwFrame::PrepareMake(OutputDevice*) (this=0x5bf07d0) at 
sw/source/core/layout/calcmove.cxx:344
11 SwFrame::Calc(OutputDevice*) const (this=0x5bf07d0) at 
sw/source/core/layout/trvlfrm.cxx:1790
12 SwFrame::PrepareMake(OutputDevice*) (this=0x603a570) at 
sw/source/core/layout/calcmove.cxx:247
13 SwFrame::Calc(OutputDevice*) const (this=0x603a570) at 
sw/source/core/layout/trvlfrm.cxx:1790
14 SwFrame::PrepareMake(OutputDevice*) (this=0x5daf120) at 
sw/source/core/layout/calcmove.cxx:247
15 SwFrame::Calc(OutputDevice*) const (this=0x5daf120) at 
sw/source/core/layout/trvlfrm.cxx:1790
16 SwFrame::PrepareMake(OutputDevice*) (this=0x6005ca0) at 
sw/source/core/layout/calcmove.cxx:247
17 SwFrame::Calc(OutputDevice*) const (this=0x6005ca0) at 
sw/source/core/layout/trvlfrm.cxx:1790
18 SwFrame::MakePos() (this=0x6094330) at 
sw/source/core/layout/calcmove.cxx:490
19 SwTextFrame::MakePos() (this=0x6094330) at 
sw/source/core/text/frmform.cxx:343
20 SwContentFrame::MakeAll(OutputDevice*) (this=0x6094330) at 
sw/source/core/layout/calcmove.cxx:1346
21 SwFrame::OptPrepareMake() (this=0x6094330) at 
sw/source/core/layout/calcmove.cxx:368
22 SwFrame::OptCalc() const (this=0x6094330) at 
sw/source/core/inc/frame.hxx:1060
23 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) 
(this=0x7ffc6da48350, pLay=0x8a349c0, bAddRect=false) at 
sw/source/core/layout/layact.cxx:1362
24 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) 
(this=0x7ffc6da48350, pLay=0x79052c0, bAddRect=false) at 
sw/source/core/layout/layact.cxx:1357
25 SwLayAction::FormatLayoutTab(SwTabFrame*, bool) (this=0x7ffc6da48350, 
pTab=0x7a9c300, bAddRect=false) at sw/source/core/layout/layact.cxx:1569
26 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) 
(this=0x7ffc6da48350, pLay=0x7c30300, bAddRect=true) at 
sw/source/core/layout/layact.cxx:1354
27 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool) 
(this=0x7ffc6da48350, pLay=0x79e1780, bAddRect=true) at 
sw/source/core/layout/layact.cxx:1357
28 SwLayAction::InternalAction(OutputDevice*) (this=0x7ffc6da48350) at 
sw/source/core/layout/layact.cxx:546

They are deleted because the last SwTextFrame was moved via MoveBwd() to
the previous page, and is formatted there.
(regression from commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50)

Prevent this via:

* delete-guard for the SwRowFrame - causing RemoveFollowFlowLine() to
  return early (also, let it return false, so the Join() isn't even
  called, although that doesn't make a difference in practice because
  of the next item:)

* join-guard for the SwTabFrame - otherwise tabfrm.cxx:2199 will Join()
  it anyway

This means that when the page with the follow-frame is done formatting,
the empty SwTabFrame with no SwTextFrame in it will remain.  Fortunately
this is not a problem, because due to the moving, the previous page will
be invalid and layact.cxx:613 will iterate to the previous page and
format it again; then tabfrm:2199 of the master SwTabFrame will detect
that the follow SwTabFrame is empty and Join() it.

Change-Id: I2cca89d63b81e7d4909319fa4feab2f5d67a6ff3
Reviewed-on: https://gerrit.libreoffice.org/71996
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit cc5916cd314a27b0cc99560ab887480026630a95)
Reviewed-on: https://gerrit.libreoffice.org/72031
Tested-by: Xisco Faulí 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 232b467083dd3b55f261bebe084e696bee200ec9)
Reviewed-on: https://gerrit.libreoffice.org/72134
Reviewed-by: Xisco Faulí 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 62028b741499..bde5550dd5af 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1561,9 +1561,11 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab, 
bool bAddRect )
 // format lowers, only if table frame is valid
 if ( pTab->isFrameAreaDefiniti

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

[Michael Meeks (via logerrit)]

 libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |   15 ++
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx |2 
 libreofficekit/qa/gtktiledviewer/gtv-application.cxx|5 
 libreofficekit/source/gtk/lokdocview.cxx|   63 
 4 files changed, 81 insertions(+), 4 deletions(-)

New commits:
commit d06197f68f5c5f923689111220648a5d43ae4642
Author: Michael Meeks 
AuthorDate: Thu May 9 18:25:22 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon May 13 09:25:57 2019 +0200

unipoll: add a --unipoll parameter to gtktiledviewer.

Arguably should be the default. Implementation is a bit cute -
re-starting the main-loop as a child of a callback from its
idle handler.

Change-Id: I95e87c8a4ae3de745d7ca1f636859dd1d8deca17
Reviewed-on: https://gerrit.libreoffice.org/72070
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index dee5058f3f54..fb5e946c3f77 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -348,9 +348,18 @@ gtv_application_window_load_document(GtvApplicationWindow* 
window,
 *(priv->m_pRenderingArgs) = *aArgs;
 
 // setup lokdocview
-window->lokdocview = 
lok_doc_view_new_from_user_profile(priv->m_pRenderingArgs->m_aLoPath.c_str(),
-
priv->m_pRenderingArgs->m_aUserProfile.empty() ? nullptr : 
priv->m_pRenderingArgs->m_aUserProfile.c_str(),
-  nullptr, nullptr);
+const char *pUserProfile = priv->m_pRenderingArgs->m_aUserProfile.empty() ?
+nullptr : priv->m_pRenderingArgs->m_aUserProfile.c_str();
+
+window->lokdocview = GTK_WIDGET(
+g_initable_new(LOK_TYPE_DOC_VIEW, nullptr, nullptr,
+   "lopath", priv->m_pRenderingArgs->m_aLoPath.c_str(),
+   "unipoll", priv->m_pRenderingArgs->m_bUnipoll,
+   "userprofileurl", pUserProfile,
+   "halign", GTK_ALIGN_CENTER,
+   "valign", GTK_ALIGN_CENTER,
+   nullptr));
+
 gtk_container_add(GTK_CONTAINER(window->scrolledwindow), 
window->lokdocview);
 
 setupDocView(window);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
index 748195c5aff0..21508097e077 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx
@@ -24,6 +24,7 @@ struct GtvRenderingArgs
 std::string m_aLoPath;
 std::string m_aUserProfile;
 bool m_bEnableTiledAnnotations;
+bool m_bUnipoll;
 
 std::string m_aBackgroundColor;
 bool m_bHidePageShadow;
@@ -31,6 +32,7 @@ struct GtvRenderingArgs
 
 GtvRenderingArgs()
 : m_bEnableTiledAnnotations(false),
+  m_bUnipoll(false),
   m_bHidePageShadow(false),
   m_bHideWhiteSpace(false)
 { }
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index cd0a88a85fe2..7481076778eb 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -52,6 +52,7 @@ gtv_application_init(GtvApplication* app)
 {
 { "version", 0, 0, G_OPTION_ARG_NONE, nullptr, "Show LOkit version", 
nullptr },
 { "lo-path", 0, 0, G_OPTION_ARG_STRING, nullptr, "LO path", nullptr },
+{ "unipoll", 0, 0, G_OPTION_ARG_NONE, nullptr, "Enable unified polling 
loop", nullptr },
 { "user-profile", 0, 0, G_OPTION_ARG_STRING, nullptr, "User profile to 
use", nullptr },
 { "enable-tiled-annotations", 0, 0, G_OPTION_ARG_NONE, nullptr, 
"Whether tiled annotations should be enabled", nullptr },
 { "background-color", 0, 0, G_OPTION_ARG_STRING, nullptr, "Background 
color", nullptr },
@@ -98,11 +99,13 @@ gtv_application_handle_local_options(GApplication* app, 
GVariantDict* options)
 return 1; // Cannot afford to continue in absence of this param
 }
 
+if (g_variant_dict_contains(options, "unipoll"))
+priv->m_pRenderingArgs->m_bUnipoll = true;
+
 if (g_variant_dict_contains(options, "version"))
 {
 if (!priv->m_pRenderingArgs->m_aLoPath.empty())
 {
-// FIXME: Crashes for some reason
 GtkWidget* pDocView = 
lok_doc_view_new(priv->m_pRenderingArgs->m_aLoPath.c_str(), nullptr, nullptr);
 const gchar* versionInfo = 
lok_doc_view_get_version_info(LOK_DOC_VIEW(pDocView));
 if (versionInfo)
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index eac27751eeb9..0bf095

Re: libPocoFoundation conflict

[Miklos Vajna]

Hi,

On Fri, May 10, 2019 at 11:33:56AM +0200, edoardo EMAT  
wrote:
> Then i've installed POCOaLL.zip.

Did you try to use poco from distro packages? What's what I do.

Regards,

Miklos


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

[Libreoffice-commits] core.git: nlpsolver/README

[Samuel Mehrbrodt (via logerrit)]

 nlpsolver/README |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 107d8c3de00d585eb84903acf841b6321231b9ac
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 8 15:24:32 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon May 13 09:14:44 2019 +0200

nlpsolver: This is considered internal code

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

diff --git a/nlpsolver/README b/nlpsolver/README
index 9288dcf7509a..4142e4344a0d 100644
--- a/nlpsolver/README
+++ b/nlpsolver/README
@@ -1 +1,4 @@
 This extension integrates into Calc and offers new Solver engines to use for 
optimizing nonlinear programming models.
+
+As there is no known upstream source for 
nlpsolver/ThirdParty/EvolutionarySolver,
+the code is considered internal and can be modified like any other internal 
code.
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/JunitTest_framework_complex.mk framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/tests

[Samuel Mehrbrodt (via logerrit)]

 framework/JunitTest_framework_complex.mk   |2 
 framework/qa/complex/XUserInputInterception/EventTest.java |  553 -
 qadevOOo/Jar_OOoRunner.mk  |1 
 qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java   |  528 
 4 files changed, 1084 deletions(-)

New commits:
commit ca7f34acabfbb92e76aa367458056a75bd1b
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 8 10:52:37 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon May 13 09:19:51 2019 +0200

Remove java mouse/keyboard event tests

These tests has been implemented as a UITest in 
sw/qa/uitest/writer_tests5/xwindow.py

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

diff --git a/framework/JunitTest_framework_complex.mk 
b/framework/JunitTest_framework_complex.mk
index d70666e4bf30..30f24b810458 100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\
 framework/qa/complex/loadAllDocuments/StatusIndicator \
 framework/qa/complex/broken_document/TestDocument \
 framework/qa/complex/broken_document/LoadDocument \
-framework/qa/complex/XUserInputInterception/EventTest \
 framework/qa/complex/framework/autosave/AutoSave \
 framework/qa/complex/framework/autosave/Protocol \
 framework/qa/complex/framework/autosave/ConfigHelper \
@@ -69,7 +68,6 @@ $(eval $(call gb_JunitTest_add_classes,framework_complex,\
 # these were disabled in the old build system too, please check
 # carefully before reenabling
 #  complex.ModuleManager.CheckXModuleManager \
-complex.XUserInputInterception.EventTest \
 complex.accelerators.AcceleratorsConfigurationTest \
 complex.api_internal.CheckAPI \
 complex.broken_document.LoadDocument \
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java 
b/framework/qa/complex/XUserInputInterception/EventTest.java
deleted file mode 100644
index 29c31ee5f79e..
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package complex.XUserInputInterception;
-
-import com.sun.star.accessibility.AccessibleRole;
-import com.sun.star.accessibility.XAccessible;
-import com.sun.star.accessibility.XAccessibleComponent;
-import com.sun.star.accessibility.XAccessibleContext;
-import com.sun.star.awt.KeyEvent;
-import com.sun.star.awt.MouseEvent;
-import com.sun.star.awt.Point;
-import com.sun.star.awt.Rectangle;
-import com.sun.star.awt.XKeyHandler;
-import com.sun.star.awt.XMouseClickHandler;
-import com.sun.star.awt.XUserInputInterception;
-import com.sun.star.awt.XWindow;
-import com.sun.star.frame.*;
-import com.sun.star.lang.*;
-import com.sun.star.lang.EventObject;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-import com.sun.star.util.*;
-import java.awt.Robot;
-import java.awt.event.InputEvent;
-
-import util.AccessibilityTools;
-import util.SOfficeFactory;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-
-/**
- * This ComplexTest checks the interface
- * XUserInputInterception. Therefore it creates a document,
- * adds a mouse and a key listener onto the interface and fire the
- * correspond events. If all listener works as expected the test results in
- * OK status.
- * @short Check the interface XUserInputIntercaption
- * @descr checks is a simple way the interface XUserInputInteraction
- */
-public class EventTest {
-
-// some const
-
-
-// member
-
-/** indicates if the mousePressed event was called*/
-private boolean m_mousePressed = false;
-/** indicates if the mouseReleased event was called*/
-private boolean m_mouseReleased = false;
-
-/** indicates if the mousePressed