GSoC "Extending the UITest framework" Week (5) Report

[ahmed El-Shreif]

Hello all,

here is my Week (5) report:
https://ahmedelshreifgsoc20.blogspot.com/2020/07/week-5-report.html

waiting for all your feedback.

Thanks,
Ahmed ElShreif
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist (via logerrit)]

 vcl/Library_vclplug_osx.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b9cd758f719951fd1d11b00979ca85cc79a1c2eb
Author: Tor Lillqvist 
AuthorDate: Sun Jul 5 19:22:31 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jul 6 08:57:26 2020 +0200

There is no QuickTime framework

The reference was a leftover from 32-bit times.

Change-Id: Ie453a4c644787a49f8742eab4b4ea9d49cddf32d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98175
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk
index 6b94c6c25df1..f0d22298a0c8 100644
--- a/vcl/Library_vclplug_osx.mk
+++ b/vcl/Library_vclplug_osx.mk
@@ -142,7 +142,6 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,vclplug_osx,\
 Cocoa \
 Carbon \
 CoreFoundation \
-$(if $(filter X86_64,$(CPUNAME)),,QuickTime) \
 ))
 
 ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 svl/source/numbers/zforfind.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 348e78b8ccd04b59140c7f83504c7823b2ffbe8c
Author: Eike Rathke 
AuthorDate: Sat Jul 4 01:17:13 2020 +0200
Commit: Eike Rathke 
CommitDate: Mon Jul 6 08:56:08 2020 +0200

Resolves: tdf#134490 do not skip all trailing '-' or '/' of the start string

Skip *one* of them under the condition that a month name was
actually recognized.

A horrible implementation of

commit b00fc9462d26083b6d09f72ea44abb1e11546b63
CommitDate: Wed Sep 15 11:54:10 2010 +0200

sc-date-fix.diff: Parse 'june-2007' as June 1 2007 in en-US locales

Change-Id: I0800c4f0b33aa1413bde558d710fe467e4380262
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97903
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 2e62b277e6c8..5a81e68af7a1 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2397,14 +2397,13 @@ bool ImpSvNumberInputScan::ScanStartString( const 
OUString& rString )
 }
 }
 }
+// Skip one trailing '-' or '/' character to recognize June-2007
+if (nMonth && nPos + 1 == rString.getLength())
+{
+SkipChar('-', rString, nPos) || SkipChar('/', rString, nPos);
+}
 }
 
-// skip any trailing '-' or '/' chars
-if (nPos < rString.getLength())
-{
-while (SkipChar ('-', rString, nPos) || SkipChar ('/', rString, nPos))
-; // do nothing
-}
 if (nPos < rString.getLength()) // not everything consumed
 {
 // Does input StartString equal StartString of format?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configmgr/Library_configmgr.mk configmgr/source solenv/bin

[Noel Grandin (via logerrit)]

 configmgr/Library_configmgr.mk |1 
 configmgr/source/configmgr.component   |   20 ---
 configmgr/source/configurationprovider.cxx |   75 +++---
 configmgr/source/configurationprovider.hxx |   12 
 configmgr/source/configurationregistry.cxx |   21 ++-
 configmgr/source/configurationregistry.hxx |   51 --
 configmgr/source/defaultprovider.cxx   |   16 +++--
 configmgr/source/defaultprovider.hxx   |   12 
 configmgr/source/readonlyaccess.cxx|   23 ++--
 configmgr/source/readonlyaccess.hxx|   39 -
 configmgr/source/readwriteaccess.cxx   |   22 ++-
 configmgr/source/readwriteaccess.hxx   |   39 -
 configmgr/source/services.cxx  |   82 -
 configmgr/source/update.cxx|   19 +-
 configmgr/source/update.hxx|   51 --
 solenv/bin/native-code.py  |8 ++
 16 files changed, 63 insertions(+), 428 deletions(-)

New commits:
commit 37b2c02bee606ee2238dc6b0c85f9d5da78a02ba
Author: Noel Grandin 
AuthorDate: Sun Jul 5 13:22:12 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jul 6 08:43:12 2020 +0200

configmgr: create instances with uno constructors

See tdf#74608 for motivation

Change-Id: I8d1419a9f2c0eb4d488b3f60b357f12e8177d7b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98134
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 19477b172308..e09abc6ad6c1 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
 configmgr/source/readwriteaccess \
 configmgr/source/rootaccess \
 configmgr/source/rootnode \
-configmgr/source/services \
 configmgr/source/setnode \
 configmgr/source/type \
 configmgr/source/update \
diff --git a/configmgr/source/configmgr.component 
b/configmgr/source/configmgr.component
index 24fd608c33fd..c8b0c4f01260 100644
--- a/configmgr/source/configmgr.component
+++ b/configmgr/source/configmgr.component
@@ -18,24 +18,30 @@
  -->
 
 http://openoffice.org/2010/uno-components";>
-  
+xmlns="http://openoffice.org/2010/uno-components";>
+  
 
   
-  
+  
 
   
-  
+  
 
 
   
-  
+  
 
   
-  
+  
 
   
-  
+  
 
 
   
diff --git a/configmgr/source/configurationprovider.cxx 
b/configmgr/source/configurationprovider.cxx
index 467d73bfdc23..2d9e1189dec0 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -116,7 +116,7 @@ private:
 {
 return default_
 ? default_provider::getImplementationName()
-: configuration_provider::getImplementationName();
+: "com.sun.star.comp.configuration.ConfigurationProvider";
 }
 
 virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) 
override
@@ -127,7 +127,7 @@ private:
 {
 return default_
 ? default_provider::getSupportedServiceNames()
-: configuration_provider::getSupportedServiceNames();
+: css::uno::Sequence { 
"com.sun.star.configuration.ConfigurationProvider" };
 }
 
 virtual css::uno::Reference< css::uno::XInterface > SAL_CALL 
createInstance(
@@ -342,53 +342,14 @@ void Service::flushModifications() const {
 components->flushModifications();
 }
 
-class Factory:
-public cppu::WeakImplHelper<
-css::lang::XSingleComponentFactory, css::lang::XServiceInfo >
-{
-public:
-Factory() {}
-
-private:
-Factory(const Factory&) = delete;
-Factory& operator=(const Factory&) = delete;
-
-virtual ~Factory() override {}
-
-virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-createInstanceWithContext(
-css::uno::Reference< css::uno::XComponentContext > const & Context) 
override;
-
-virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
-createInstanceWithArgumentsAndContext(
-css::uno::Sequence< css::uno::Any > const & Arguments,
-css::uno::Reference< css::uno::XComponentContext > const & Context) 
override;
-
-virtual OUString SAL_CALL getImplementationName() override
-{ return configuration_provider::getImplementationName(); }
-
-virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) 
override
-{ return cppu::supportsService(this, ServiceName); }
-
-virtual css::uno::Sequence< OUString > SAL_CALL
-getSupportedServiceNames() override
-{ return configuration_provider::getSupportedServiceNames(); }
-};
-
-css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
-css::uno::Reference< css::uno::XComponentContext > const & Context)
-{
-return createInstanceWithArgumentsAndContext(
-css::uno::Sequence< css::uno:

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/source/control/tabctrl.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9bb3b614300cd8b6572c9fa92fcd92a80d22fdc6
Author: Jan-Marek Glogowski 
AuthorDate: Mon Jun 15 19:45:50 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 6 08:42:13 2020 +0200

tdf#133877 use optimal size for hamburger button

This way it'll properly scale, instead of using the fixed 28 pixel
dimension. This is a hack, which is used a few more times in VCL.
Still this should not be needed, but done automatically.
If there aren't any constraints, just return the optimal size!

Change-Id: I8aa32645ea95cba28d0daf56f0be27c15153b6c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96390
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit eff34e639055701b1299c07e6cdc0ce07cfc0936)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96411
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 1c73b219487b2aa60d888755cf4eca082e6b00c0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97464

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index d39b50866366..cece38cc9f87 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -84,7 +84,6 @@ struct ImplTabCtrlData
 
 // for the Tab positions
 #define TAB_PAGERECT0x
-#define HAMBURGER_DIM   28
 
 void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle )
 {
@@ -2198,9 +2197,9 @@ 
NotebookbarTabControlBase::NotebookbarTabControlBase(vcl::Window* pParent)
 , eLastContext(vcl::EnumContext::Context::Any)
 {
 m_pOpenMenu = VclPtr::Create( this , WB_CENTER | WB_VCENTER );
-m_pOpenMenu->SetSizePixel(Size(HAMBURGER_DIM, HAMBURGER_DIM));
 m_pOpenMenu->SetClickHdl(LINK(this, NotebookbarTabControlBase, OpenMenu));
 m_pOpenMenu->SetModeImage(Image(StockImage::Yes, 
SV_RESID_BITMAP_NOTEBOOKBAR));
+m_pOpenMenu->SetSizePixel(m_pOpenMenu->GetOptimalSize());
 m_pOpenMenu->Show();
 }
 
@@ -2307,7 +2306,8 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long 
nWidth )
 if (!m_pOpenMenu || m_pOpenMenu->isDisposed())
 return false;
 
-long nMaxWidth = nWidth - HAMBURGER_DIM;
+const long nHamburgerWidth = m_pOpenMenu->GetSizePixel().Width();
+long nMaxWidth = nWidth - nHamburgerWidth;
 long nShortcutsWidth = m_pShortcuts != nullptr ? 
m_pShortcuts->GetSizePixel().getWidth() + 1 : 0;
 long nFullWidth = nShortcutsWidth;
 
@@ -2375,7 +2375,7 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long 
nWidth )
 
 long nPosY = (m_nHeaderHeight - m_pOpenMenu->GetSizePixel().getHeight()) / 
2;
 // position the menu
-m_pOpenMenu->SetPosPixel(Point(nWidth - HAMBURGER_DIM, nPosY));
+m_pOpenMenu->SetPosPixel(Point(nWidth - nHamburgerWidth, nPosY));
 
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 sc/source/ui/unoobj/docuno.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 508a596df1a75e27b199bfebb08ee66583e35d99
Author: Dennis Francis 
AuthorDate: Thu May 28 04:56:25 2020 +0530
Commit: Dennis Francis 
CommitDate: Mon Jul 6 08:41:41 2020 +0200

lokit: Do not assume 100% zoom for computing document-size

This fix prevents rendering issues (bottom/right area the sheet clipped
off/extra spaces) at the bottom/right of sheets with certain non default
zooms in online.

Change-Id: I2778d6259f8caf5a99d9eab57ae7b87751304ce3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98116
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 774509870c02..4f02c69ae818 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -626,20 +626,22 @@ Size ScModelObj::getDocumentSize()
 rDoc.GetTiledRenderingArea(nTab, nEndCol, nEndRow);
 
 const ScDocument* pThisDoc = &rDoc;
+const double fPPTX = pViewData->GetPPTX();
+const double fPPTY = pViewData->GetPPTY();
 
-auto GetColWidthPx = [pThisDoc, nTab](SCCOL nCol) {
+auto GetColWidthPx = [pThisDoc, fPPTX, nTab](SCCOL nCol) {
 const sal_uInt16 nSize = pThisDoc->GetColWidth(nCol, nTab);
-return ScViewData::ToPixel(nSize, 1.0 / TWIPS_PER_PIXEL);
+return ScViewData::ToPixel(nSize, fPPTX);
 };
 
 long nDocWidthPixel = 
pViewData->GetLOKWidthHelper().computePosition(nEndCol, GetColWidthPx);
-long nDocHeightPixel = pThisDoc->GetScaledRowHeight( 0, nEndRow, nTab, 1.0 
/ TWIPS_PER_PIXEL );
+long nDocHeightPixel = pThisDoc->GetScaledRowHeight(0, nEndRow, nTab, 
fPPTY);
 
 if (nDocWidthPixel > 0 && nDocHeightPixel > 0)
 {
 // convert to twips
-aSize.setWidth(nDocWidthPixel * TWIPS_PER_PIXEL);
-aSize.setHeight(nDocHeightPixel * TWIPS_PER_PIXEL);
+aSize.setWidth(nDocWidthPixel / fPPTX);
+aSize.setHeight(nDocHeightPixel / fPPTY);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 vcl/source/control/tabctrl.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 20f04a0c85e15aca46e181ac489b11d84d789a8e
Author: Szymon Kłos 
AuthorDate: Sat Apr 25 11:28:58 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 6 08:41:04 2020 +0200

tdf#123292 notebookbar: vertical align for shortcuts toolbar

Change-Id: I2f2ccee9d6c01962d5d8609ea55c0c2bca6b5cb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92892
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
(cherry picked from commit 96e5121869e95a8e28788a91ce0dc480e5f10c0b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97463
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 1f32f7de8c1a..d39b50866366 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2368,10 +2368,14 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long 
nWidth )
 
 // position the shortcutbox
 if (m_pShortcuts)
-m_pShortcuts->SetPosPixel(Point(0, 0));
+{
+long nPosY = (m_nHeaderHeight - 
m_pShortcuts->GetSizePixel().getHeight()) / 2;
+m_pShortcuts->SetPosPixel(Point(0, nPosY));
+}
 
+long nPosY = (m_nHeaderHeight - m_pOpenMenu->GetSizePixel().getHeight()) / 
2;
 // position the menu
-m_pOpenMenu->SetPosPixel(Point(nWidth - HAMBURGER_DIM, 0));
+m_pOpenMenu->SetPosPixel(Point(nWidth - HAMBURGER_DIM, nPosY));
 
 return true;
 }
___
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.4' - sc/source

[Dennis Francis (via logerrit)]

 sc/source/ui/unoobj/docuno.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 4c84a73d741022e6ee0015a4a6bd3e4e8dc884e7
Author: Dennis Francis 
AuthorDate: Thu May 28 04:56:25 2020 +0530
Commit: Dennis Francis 
CommitDate: Mon Jul 6 08:40:13 2020 +0200

lokit: Do not assume 100% zoom for computing document-size

This fix prevents rendering issues (bottom/right area the sheet clipped
off/extra spaces) at the bottom/right of sheets with certain non default
zooms in online.

Change-Id: I2778d6259f8caf5a99d9eab57ae7b87751304ce3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98052
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 416357b35bea..63aaf55bc3e6 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -620,20 +620,22 @@ Size ScModelObj::getDocumentSize()
 rDoc.GetTiledRenderingArea(nTab, nEndCol, nEndRow);
 
 const ScDocument* pThisDoc = &rDoc;
+const double fPPTX = pViewData->GetPPTX();
+const double fPPTY = pViewData->GetPPTY();
 
-auto GetColWidthPx = [pThisDoc, nTab](SCCOL nCol) {
+auto GetColWidthPx = [pThisDoc, fPPTX, nTab](SCCOL nCol) {
 const sal_uInt16 nSize = pThisDoc->GetColWidth(nCol, nTab);
-return ScViewData::ToPixel(nSize, 1.0 / TWIPS_PER_PIXEL);
+return ScViewData::ToPixel(nSize, fPPTX);
 };
 
 long nDocWidthPixel = 
pViewData->GetLOKWidthHelper().computePosition(nEndCol, GetColWidthPx);
-long nDocHeightPixel = pThisDoc->GetScaledRowHeight( 0, nEndRow, nTab, 1.0 
/ TWIPS_PER_PIXEL );
+long nDocHeightPixel = pThisDoc->GetScaledRowHeight(0, nEndRow, nTab, 
fPPTY);
 
 if (nDocWidthPixel > 0 && nDocHeightPixel > 0)
 {
 // convert to twips
-aSize.setWidth(nDocWidthPixel * TWIPS_PER_PIXEL);
-aSize.setHeight(nDocHeightPixel * TWIPS_PER_PIXEL);
+aSize.setWidth(nDocWidthPixel / fPPTX);
+aSize.setHeight(nDocHeightPixel / fPPTY);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 sc/source/ui/docshell/docsh4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53f151e6bb48de603595e519eb9e968c7f678224
Author: Dennis Francis 
AuthorDate: Thu May 28 04:27:50 2020 +0530
Commit: Dennis Francis 
CommitDate: Mon Jul 6 08:38:27 2020 +0200

lokit: Adjust nSize* to agree with the definition in tools::Rectangle

Change-Id: I6ebe539fe47403e4aa605c5ddfb6175080bd4655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98115
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 6e369608998e..ffb31aaeaa5f 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2505,7 +2505,7 @@ void 
ScDocShell::LOKCommentNotify(LOKCommentNotificationType nType, const ScDocu
 Point aTopLeft = pViewData->GetPrintTwipsPos(rPos.Col(), 
rPos.Row());
 long nSizeX, nSizeY;
 pViewData->GetMergeSizePrintTwips(rPos.Col(), rPos.Row(), 
nSizeX, nSizeY);
-aRectString = tools::Rectangle(aTopLeft, Size(nSizeX, 
nSizeY)).toString();
+aRectString = tools::Rectangle(aTopLeft, Size(nSizeX - 1, 
nSizeY - 1)).toString();
 }
 else
 {
___
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.4' - sc/source

[Dennis Francis (via logerrit)]

 sc/source/ui/docshell/docsh4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8eaf52648b429dc79e8e58316af87f65d8873bed
Author: Dennis Francis 
AuthorDate: Thu May 28 04:27:50 2020 +0530
Commit: Dennis Francis 
CommitDate: Mon Jul 6 08:36:25 2020 +0200

lokit: Adjust nSize* to agree with the definition in tools::Rectangle

Change-Id: I6ebe539fe47403e4aa605c5ddfb6175080bd4655
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98051
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 5e3a7b2117b0..cfe3832beb3d 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2508,7 +2508,7 @@ void 
ScDocShell::LOKCommentNotify(LOKCommentNotificationType nType, const ScDocu
 Point aTopLeft = pViewData->GetPrintTwipsPos(rPos.Col(), 
rPos.Row());
 long nSizeX, nSizeY;
 pViewData->GetMergeSizePrintTwips(rPos.Col(), rPos.Row(), 
nSizeX, nSizeY);
-aRectString = tools::Rectangle(aTopLeft, Size(nSizeX, 
nSizeY)).toString();
+aRectString = tools::Rectangle(aTopLeft, Size(nSizeX - 1, 
nSizeY - 1)).toString();
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - translations

[Andras Timar (via logerrit)]

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

New commits:
commit e20b40958dd500b77b6325b4ccdfa5d48cca7a20
Author: Andras Timar 
AuthorDate: Mon Jul 6 07:42:45 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jul 6 07:42:45 2020 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-0'
  to d992f2869bb1d5f30da035821e9ac0b591b547e0
  - Updated Slovenian translation

Change-Id: Iab81cbf61e2ad1a40508b08eb49fdb9a95cc73b4

diff --git a/translations b/translations
index 766bd781acad..d992f2869bb1 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 766bd781acadbf6bb80ed672114ee1061ed3d36a
+Subproject commit d992f2869bb1d5f30da035821e9ac0b591b547e0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-0' - source/sl

[Andras Timar (via logerrit)]

 source/sl/cui/messages.po |  133 -
 source/sl/helpcontent2/source/text/sbasic/python.po   |4 
 source/sl/helpcontent2/source/text/sbasic/shared.po   |4 
 source/sl/helpcontent2/source/text/scalc/01.po|   12 
 source/sl/helpcontent2/source/text/scalc/02.po|4 
 source/sl/helpcontent2/source/text/schart/01.po   |4 
 source/sl/helpcontent2/source/text/shared/00.po   |4 
 source/sl/helpcontent2/source/text/shared/01.po   |   38 ++
 source/sl/helpcontent2/source/text/shared/optionen.po |4 
 source/sl/helpcontent2/source/text/smath/01.po|4 
 source/sl/helpcontent2/source/text/swriter/guide.po   |4 
 source/sl/librelogo/source/pythonpath.po  |4 
 source/sl/scp2/source/ooo.po  |   20 +
 source/sl/sfx2/messages.po|  262 +-
 source/sl/starmath/messages.po|4 
 source/sl/svx/messages.po |4 
 16 files changed, 286 insertions(+), 223 deletions(-)

New commits:
commit d992f2869bb1d5f30da035821e9ac0b591b547e0
Author: Andras Timar 
AuthorDate: Mon Jul 6 07:42:37 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 07:42:37 2020 +0200

Updated Slovenian translation

Change-Id: Iab81cbf61e2ad1a40508b08eb49fdb9a95cc73b4

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index 085b2c377ef..84c4f9e989e 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2020-06-29 23:14+0200\n"
-"PO-Revision-Date: 2020-06-25 16:22+0200\n"
+"POT-Creation-Date: 2020-07-05 19:00+0200\n"
+"PO-Revision-Date: 2020-07-05 23:43+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1477,245 +1477,250 @@ msgstr "Oblikuj pripone vrstilnih števnikov (1st -> 
1^st)"
 #: cui/inc/strings.hrc:335
 msgctxt "RID_SVXSTR_OLD_HUNGARIAN"
 msgid "Transliterate to Old Hungarian if the text direction is from right to 
left"
-msgstr "Prečrkuj staro madžarsko besedilo, če poteka od desne proti levi"
+msgstr "Prečrkuj v staro madžarsko pisavo, če besedilo poteka od desne proti 
levi"
 
 #: cui/inc/strings.hrc:336
+msgctxt "RID_SVXSTR_ANGLE_QUOTES"
+msgid "Replace << and >> with angle quotes"
+msgstr "Zamenjaj << in >> z usredinjenimi narekovaji"
+
+#: cui/inc/strings.hrc:337
 msgctxt "RID_SVXSTR_DEL_EMPTY_PARA"
 msgid "Remove blank paragraphs"
 msgstr "Odstrani prazne odstavke"
 
-#: cui/inc/strings.hrc:337
+#: cui/inc/strings.hrc:338
 msgctxt "RID_SVXSTR_USER_STYLE"
 msgid "Replace Custom Styles"
 msgstr "Zamenjaj sloge po meri"
 
-#: cui/inc/strings.hrc:338
+#: cui/inc/strings.hrc:339
 msgctxt "RID_SVXSTR_BULLET"
 msgid "Replace bullets with: %1"
 msgstr "Zamenjaj vrstične oznake z: %1"
 
 #. To translators: %1 will be replaced with a percentage, e.g. "10%"
-#: cui/inc/strings.hrc:340
+#: cui/inc/strings.hrc:341
 msgctxt "RID_SVXSTR_RIGHT_MARGIN"
 msgid "Combine single line paragraphs if length greater than %1"
 msgstr "Združi enovrstične odstavke, če je dolžina večja od %1"
 
-#: cui/inc/strings.hrc:341
+#: cui/inc/strings.hrc:342
 msgctxt "RID_SVXSTR_NUM"
 msgid "Bulleted and numbered lists. Bullet symbol: %1"
 msgstr "Označeni in oštevilčeni seznami. Simbol za oznako: %1"
 
-#: cui/inc/strings.hrc:342
+#: cui/inc/strings.hrc:343
 msgctxt "RID_SVXSTR_BORDER"
 msgid "Apply border"
 msgstr "Uporabi robove"
 
-#: cui/inc/strings.hrc:343
+#: cui/inc/strings.hrc:344
 msgctxt "RID_SVXSTR_CREATE_TABLE"
 msgid "Create table"
 msgstr "Ustvari tabelo"
 
-#: cui/inc/strings.hrc:344
+#: cui/inc/strings.hrc:345
 msgctxt "RID_SVXSTR_REPLACE_TEMPLATES"
 msgid "Apply Styles"
 msgstr "Uporabi sloge"
 
-#: cui/inc/strings.hrc:345
+#: cui/inc/strings.hrc:346
 msgctxt "RID_SVXSTR_DEL_SPACES_AT_STT_END"
 msgid "Delete spaces and tabs at beginning and end of paragraph"
 msgstr "Izbriši presledke in tabulatorje na začetku in koncu odstavka"
 
-#: cui/inc/strings.hrc:346
+#: cui/inc/strings.hrc:347
 msgctxt "RID_SVXSTR_DEL_SPACES_BETWEEN_LINES"
 msgid "Delete spaces and tabs at end and start of line"
 msgstr "Izbriši presledke in tabulatorje na začetku in koncu vrstice"
 
-#: cui/inc/strings.hrc:347
+#: cui/inc/strings.hrc:348
 msgctxt "RID_SVXSTR_CONNECTOR"
 msgid "Connector"
 msgstr "Konektor"
 
-#: cui/inc/strings.hrc:348
+#: cui/inc/strings.hrc:349
 msgctxt "RID_SVXSTR_DIMENSION_LINE"
 msgid "Dimension line"
 msgstr "Kotirna črta

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - configure.ac debian/changelog loolwsd.spec.in

[Andras Timar (via logerrit)]

 configure.ac |2 +-
 debian/changelog |   42 ++
 loolwsd.spec.in  |2 +-
 3 files changed, 44 insertions(+), 2 deletions(-)

New commits:
commit 67245614fa44b654b26514ec9264b6edad3e8045
Author: Andras Timar 
AuthorDate: Fri Jun 19 12:27:54 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:41:49 2020 +0200

Bump package version to 4.2.5

Change-Id: I0c087b3519f3087006346d648e55fd3e06cc3053

diff --git a/configure.ac b/configure.ac
index c1595a9dd..27b8d887b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.2.4], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.5], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index a3139c31b..183e1e830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+loolwsd (4.2.5-5) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-5
+
+ -- Andras Timar   Thu, 02 Jul 2020 10:20:00 +0200
+
+loolwsd (4.2.5-4) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-4
+
+ -- Andras Timar   Wed, 01 Jul 2020 07:20:00 +0200
+
+loolwsd (4.2.5-3) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-3
+
+ -- Andras Timar   Mon, 29 Jun 2020 22:20:00 +0200
+
+loolwsd (4.2.5-2) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-2
+
+ -- Andras Timar   Fri, 26 Jun 2020 21:20:00 +0200
+
+loolwsd (4.2.5-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.5-1
+
+ -- Andras Timar   Wed, 24 Jun 2020 18:20:00 +0200
+
+loolwsd (4.2.4-6) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-6
+
+ -- Andras Timar   Sun, 21 Jun 2020 16:20:00 +0200
+
+loolwsd (4.2.4-5) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-5
+
+ -- Andras Timar   Fri, 19 Jun 2020 12:30:00 +0200
+
 loolwsd (4.2.4-4) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-4
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 67b759986..3918d5d1b 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:4%{?dist}
+Release:5%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:EULA
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - debian/loolwsd.postinst.in tools/Config.cpp

[Andras Timar (via logerrit)]

 debian/loolwsd.postinst.in |2 +-
 tools/Config.cpp   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e0673cd47d1e613e469a93050b3b217f73e7b902
Author: Andras Timar 
AuthorDate: Sun Jul 5 09:01:50 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:39:13 2020 +0200

systemplate files are not writable by lool user

See also f1be65668c749526011faa39266f289522a9cf68
systemplate files should not be writable by lool user

Change-Id: I5684248d3d4b4b0ba56f8c5ab490a6e7df0e0038
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98071
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index 41198e75a..f46e0ea81 100644
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -27,7 +27,7 @@ case "$1" in
loolwsd-generate-proof-key >/dev/null 2>&1
 cat << EOF > /etc/apt/apt.conf.d/25loolwsd
 // Rebuild systemplate of @APP_NAME@
-DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh 
-c 'loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null 
2>&1'"; };
+DPkg::Post-Invoke { "echo Updating loolwsd 
systemplate;loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ 
>/dev/null 2>&1"; };
 EOF
;;
 
diff --git a/tools/Config.cpp b/tools/Config.cpp
index 9c4093910..4bf297fb6 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -364,7 +364,7 @@ int Config::main(const std::vector& args)
 }
 else if (args[0] == "update-system-template")
 {
-const char command[] = "su lool --shell=/bin/sh -c 
'loolwsd-systemplate-setup /opt/lool/systemplate " LO_PATH " >/dev/null 2>&1'";
+const char command[] = "loolwsd-systemplate-setup 
/opt/lool/systemplate " LO_PATH " >/dev/null 2>&1";
 std::cout << "Running the following command:" << std::endl
   << command << std::endl;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/jmux/win-arm64'

[Jan-Marek Glogowski (via logerrit)]

New branch 'private/jmux/win-arm64' available with the following commits:
commit 23fb18be0ad5d07906f89d30edfa6c8e78488d43
Author: Jan-Marek Glogowski 
Date:   Mon Jul 6 06:30:54 2020 +0200

dummy catchall

Change-Id: Ie1852a38f9862f9472281185318b33f23e208da2

commit ee561a374b21d8b976f43aad8cedfb3f1bae18e0
Author: Jan-Marek Glogowski 
Date:   Sat Jul 4 20:17:31 2020 +0200

Revert "More WIP work for macOS on Apple Silicon"

This reverts commit 802161a505272732566210e9ebbd8fe1b23fb86d.

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 2 commits - android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |   22 
+-
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit c2c1e9dddb8965db9bdb9dbe27f3f52c957b5b4e
Author: Jan Holesovsky 
AuthorDate: Fri Jul 3 22:38:23 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:38:13 2020 +0200

android: Fallback to "w" mode, "wt" is not supported by Google Drive.

Would be cool to consolidate these two places actually to a common
method at some stage...

Change-Id: I5ff3aed134066f26bb058223b972ef11600fa887
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97911
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index ddb8a220e..855fa63b0 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -489,7 +489,13 @@ public class LOActivity extends AppCompatActivity {
 inputStream = new FileInputStream(mTempFile);
 
 Uri uri = getIntent().getData();
-outputStream = contentResolver.openOutputStream(uri, "wt");
+try {
+outputStream = contentResolver.openOutputStream(uri, "wt");
+}
+catch (FileNotFoundException e) {
+Log.i(TAG, "failed with the 'wt' mode, trying without: " + 
e.getMessage());
+outputStream = contentResolver.openOutputStream(uri);
+}
 
 byte[] buffer = new byte[1024];
 int length;
@@ -588,7 +594,13 @@ public class LOActivity extends AppCompatActivity {
 LOActivity.this.saveAs(tempFile.toURI().toString(), 
format);
 
 inputStream = new FileInputStream(tempFile);
-outputStream = 
getContentResolver().openOutputStream(intent.getData(), "wt");
+try {
+outputStream = 
getContentResolver().openOutputStream(intent.getData(), "wt");
+}
+catch (FileNotFoundException e) {
+Log.i(TAG, "failed with the 'wt' mode, trying 
without: " + e.getMessage());
+outputStream = 
getContentResolver().openOutputStream(intent.getData());
+}
 
 byte[] buffer = new byte[4096];
 int len;
commit 911d445fb21f13195898fd1db84ed9ea3b173f18
Author: Jan Holesovsky 
AuthorDate: Fri Jul 3 23:07:47 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:37:59 2020 +0200

android: On ChromeOS, load files from Google Drive read-only.

Apparently it is not possible to save to Google Drive yet.
Unfortunately I don't have a proof in the documentation or anywhere on
the net, but the good indication of this is that the
Intent.ACTION_CREATE_DOCUMENT does not offer Google Drive (while it does
on a "normal" Android).

Change-Id: I521b866fd783b81a2bb9eace84354b5564ebabee
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97913
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 8465ff5e1..ddb8a220e 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -262,6 +262,12 @@ public class LOActivity extends AppCompatActivity {
 
 if 
(getIntent().getData().getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
 isDocEditable = (getIntent().getFlags() & 
Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0;
+
+// turns out that on ChromeOS, it is not possible to save back
+// to Google Drive; detect it already here to avoid 
disappointment
+if 
(getIntent().getData().toString().startsWith("content://org.chromium.arc.chromecontentprovider/externalfile"))
+isDocEditable = false;
+
 if (!isDocEditable)
 Toast.makeText(this, 
getResources().getString(R.string.temp_file_saving_disabled), 
Toast.LENGTH_SHORT).show();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 2 commits - loleaflet/css

[Mike Kaganski (via logerrit)]

 loleaflet/css/loleaflet.css |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ccc030ad648468f41bc792c678a127e2a62defa5
Author: Mike Kaganski 
AuthorDate: Fri Jul 3 08:40:55 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:38:41 2020 +0200

Make the button animate on release, too

Change-Id: I188ee6b9af97e3018c06bca684cacce6fee1774c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97795
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mike Kaganski 
(cherry picked from commit ce2b95c99a4b8a21caa23276bf1de1184fb2bdd3)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97916
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index f8db7ae1a..2885dba2d 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -193,6 +193,8 @@ body {
border-radius: 50%;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 
0.19);
z-index: 1001;
+   transform: scale(1);
+   transition: transform 0.5s;
 }
 
 #mobile-edit-button.impress {
@@ -206,14 +208,14 @@ body {
width: 24px;
height: 24px;
background: url('images/baseline-edit-24px.svg') no-repeat center 
!important;
+   transform: rotate(0deg);
+   transition: transform 0.5s;
 }
 #mobile-edit-button:active{
transform: scale(1.2);
-   transition: transform 0.5s;
 }
 #mobile-edit-button:active > #mobile-edit-button-image {
transform: rotate(45deg);
-   transition: transform 0.5s;
 }
 
 .loleaflet-font {
commit 77eeff3b2a545d6fffd22ff938a3097deb0ffb1b
Author: Mike Kaganski 
AuthorDate: Thu Jul 2 22:45:48 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:38:28 2020 +0200

Use child combinator instead of separate :active pseudo-classes

This avoids the image not rotating when touching the edge of the button,
when the image is not active.

Ref.: https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator

Change-Id: I4a6d966743d6d07106dd0666f840d8d73ccdc8cc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97791
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 3ce83a527bbee5d7d89491e6370619ef09893f0d)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97915
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 03b13cd69..f8db7ae1a 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -211,7 +211,7 @@ body {
transform: scale(1.2);
transition: transform 0.5s;
 }
-#mobile-edit-button-image:active {
+#mobile-edit-button:active > #mobile-edit-button-image {
transform: rotate(45deg);
transition: transform 0.5s;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - test/WopiProofTests.cpp

[Mike Kaganski (via logerrit)]

 test/WopiProofTests.cpp |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 64e83c1640c581a38aa79a64c095004ac12cb709
Author: Mike Kaganski 
AuthorDate: Thu Jul 2 10:54:59 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:36:04 2020 +0200

tdf#134041: add a unit test

Change-Id: Ic040adb7a2a73635041146f6d6425db1b02c2e61
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97721
Tested-by: Jenkins
Tested-by: Mike Kaganski 
Reviewed-by: Michael Meeks 
(cherry picked from commit 04709ab7fc37f25b33be54c84fc262bc8e79e646)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97678
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/test/WopiProofTests.cpp b/test/WopiProofTests.cpp
index 3e4aa5418..cfa1f57dc 100644
--- a/test/WopiProofTests.cpp
+++ b/test/WopiProofTests.cpp
@@ -137,6 +137,21 @@ void WopiProofTests::testOurProof()
 
 int64_t ticks = std::stoll(timestamp.c_str(), nullptr, 10);
 verifySignature(access_token, uri, ticks, modulus, exponent, proof);
+
+// tdf#134041: test another data
+
+access_token = "~!@#$%^&*()_+`1234567890-=";
+uri = "https://us...@short.com:12345/blah?query_string=bar";;
+pairs = gen.GetProofHeaders(access_token, uri);
+len = pairs.size();
+LOK_ASSERT_EQUAL(2, len);
+LOK_ASSERT_EQUAL(pairs[0].first, std::string("X-WOPI-TimeStamp"));
+timestamp = pairs[0].second;
+LOK_ASSERT_EQUAL(pairs[1].first, std::string("X-WOPI-Proof"));
+proof = pairs[1].second;
+
+ticks = std::stoll(timestamp.c_str(), nullptr, 10);
+verifySignature(access_token, uri, ticks, modulus, exponent, proof);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(WopiProofTests);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - wsd/DocumentBroker.cpp

[Mike Kaganski (via logerrit)]

 wsd/DocumentBroker.cpp |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2149f25323405ce3ce89d4e3f6af9453f4f4694f
Author: Mike Kaganski 
AuthorDate: Wed Jul 1 13:38:06 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Jul 6 06:36:28 2020 +0200

Only lock documents in editing sessions

Change-Id: I97753541a944bb299b04c032790d6af7a9ee0f63
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97609
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 35f8788e1cae3d94ae9a39074aca83dddaea43d3)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97683
Reviewed-by: Andras Timar 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 5e647ec76..2c0ec41c2 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -785,7 +785,9 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 std::string localPath = _storage->loadStorageFileToLocal(
 session->getAuthorization(), session->getCookies(), *_lockCtx, 
templateSource);
 
-if (!_storage->updateLockState(session->getAuthorization(), 
session->getCookies(), *_lockCtx, true))
+// Only lock the document on storage for editing sessions
+if (!session->isReadOnly() &&
+!_storage->updateLockState(session->getAuthorization(), 
session->getCookies(), *_lockCtx, true))
 LOG_ERR("Failed to lock!");
 
 #if !MOBILEAPP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 9af38b4504ccda57a0c32eb8bdd03e5a8ca29ddc
Author: Andrea Gelmini 
AuthorDate: Mon Jul 6 00:07:29 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jul 6 01:40:39 2020 +0200

Fix typo

Change-Id: I82699bebb9b8ccee41cce3aabb092913df33b85d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98178
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/include/vcl/BitmapFilter.hxx b/include/vcl/BitmapFilter.hxx
index 0521ded42357..899d98047a03 100644
--- a/include/vcl/BitmapFilter.hxx
+++ b/include/vcl/BitmapFilter.hxx
@@ -20,7 +20,7 @@ namespace vcl::bitmap
 {
 // Generates strip ranges and run the input function with the start and
 // end as parameters. The additional parameter bLast denotes if the
-// iteration is teh last one.
+// iteration is the last one.
 //
 // Example:
 // first = 0, last = 100, STRIP_SIZE = 32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 vcl/osx/salframe.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a292d2e43fe7f23d90bf823d01a3280da290c5e9
Author: Tor Lillqvist 
AuthorDate: Sun Jul 5 19:23:27 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jul 6 01:10:46 2020 +0200

Avoid warning about deprecation in macOS 11.0

Change-Id: Ie1a7e19093b439eb133632ee881e1e3dbe58132d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98176
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6f7a395522cf..71cc5a4f1982 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1279,8 +1279,11 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
  
aStyleSettings.GetHighlightTextColor(), mpNSWindow ) );
 aStyleSettings.SetHighlightTextColor( aHighlightTextColor );
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 Color aMenuHighlightColor( getColor( [NSColor selectedMenuItemColor],
  
aStyleSettings.GetMenuHighlightColor(), mpNSWindow ) );
+#pragma clang diagnostic pop
 aStyleSettings.SetMenuHighlightColor( aMenuHighlightColor );
 Color aMenuHighlightTextColor( getColor( [NSColor 
selectedMenuItemTextColor],
  
aStyleSettings.GetMenuHighlightTextColor(), mpNSWindow ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Tor Lillqvist (via logerrit)]

 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02d931a59e2966d0c2736db8dee7be3e3dcd6bae
Author: Tor Lillqvist 
AuthorDate: Sun Jul 5 21:36:57 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon Jul 6 01:07:35 2020 +0200

When cross-compiling to DESKTOP, just make "build" for the build platform

Trying to fine-tune that exactly what is needed but nothing else is
built is very painful.

For instance, on macOS, if you build gengal but not soffice, you end
up with this error when trying to run the built gengal, because there
is no Info.plist in the app bundle in instdir_for_build: "No
Info.plist file in application bundle or no NSPrincipalClass in the
Info.plist file, exiting"

Change-Id: I63d766f0e7e72f55454d16c72c32e153cf976443
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98177
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/Makefile.in b/Makefile.in
index d0d19f9e0545..2f02914a8a82 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -294,7 +294,7 @@ cross-toolset: bootstrap fetch
 ifneq ($(OS),iOS)
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(BUILDDIR)/Makefile fetch
 endif
-   $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild build-tools
+   $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $(if $(filter 
DESKTOP,$(BUILD_TYPE)),build,build-tools)
 
 install-gdb-printers:
 ifneq ($(filter-out WNT MACOSX iOS,$(OS)),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 oox/source/core/xmlfilterbase.cxx |   18 +--
 oox/source/export/chartexport.cxx |   27 ++---
 oox/source/export/drawingml.cxx   |   45 -
 oox/source/export/shapes.cxx  |   14 +--
 sc/source/filter/excel/xecontent.cxx  |   12 +-
 sc/source/filter/excel/xeescher.cxx   |   34 +++
 sc/source/filter/excel/xeextlst.cxx   |6 -
 sc/source/filter/excel/xestyle.cxx|7 -
 sd/source/filter/eppt/pptx-animations.cxx |5 -
 sd/source/filter/eppt/pptx-epptooxml.cxx  |   18 +--
 sw/source/filter/ww8/docxattributeoutput.cxx  |  118 +++---
 sw/source/filter/ww8/docxexport.cxx   |   52 +--
 sw/source/filter/ww8/docxsdrexport.cxx|8 -
 sw/source/filter/ww8/docxtablestyleexport.cxx |   29 +++---
 14 files changed, 186 insertions(+), 207 deletions(-)

New commits:
commit 687b6395d4d1810eef911adb3ac4defd7cd863c0
Author: Mike Kaganski 
AuthorDate: Mon Jul 6 00:15:20 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Jul 6 00:25:25 2020 +0200

Don't explicitly convert OUString to OString

See commit 57afeb8d9e35933630568a02fc48a00f5582b261

Change-Id: Idb41fb2e3b90bd0eb1d7ebd588c13fd50b9536fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98173
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 17a12acde6e7..b3aec333967e 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -633,11 +633,11 @@ writeCoreProperties( XmlFilterBase& rSelf, const 
Reference< XDocumentProperties
 "docProps/core.xml",
 "application/vnd.openxmlformats-package.core-properties+xml" );
 pCoreProps->startElementNS( XML_cp, XML_coreProperties,
-FSNS(XML_xmlns, XML_cp),   
rSelf.getNamespaceURL(OOX_NS(packageMetaCorePr)).toUtf8(),
-FSNS(XML_xmlns, XML_dc),   
rSelf.getNamespaceURL(OOX_NS(dc)).toUtf8(),
-FSNS(XML_xmlns, XML_dcterms),  
rSelf.getNamespaceURL(OOX_NS(dcTerms)).toUtf8(),
-FSNS(XML_xmlns, XML_dcmitype), 
rSelf.getNamespaceURL(OOX_NS(dcmiType)).toUtf8(),
-FSNS(XML_xmlns, XML_xsi),  
rSelf.getNamespaceURL(OOX_NS(xsi)).toUtf8());
+FSNS(XML_xmlns, XML_cp),   
rSelf.getNamespaceURL(OOX_NS(packageMetaCorePr)),
+FSNS(XML_xmlns, XML_dc),   rSelf.getNamespaceURL(OOX_NS(dc)),
+FSNS(XML_xmlns, XML_dcterms),  rSelf.getNamespaceURL(OOX_NS(dcTerms)),
+FSNS(XML_xmlns, XML_dcmitype), rSelf.getNamespaceURL(OOX_NS(dcmiType)),
+FSNS(XML_xmlns, XML_xsi),  rSelf.getNamespaceURL(OOX_NS(xsi)));
 
 #ifdef OOXTODO
 writeElement( pCoreProps, FSNS( XML_cp, XML_category ), "category" 
);
@@ -675,8 +675,8 @@ writeAppProperties( XmlFilterBase& rSelf, const Reference< 
XDocumentProperties >
 "docProps/app.xml",
 
"application/vnd.openxmlformats-officedocument.extended-properties+xml" );
 pAppProps->startElement( XML_Properties,
-XML_xmlns,   
rSelf.getNamespaceURL(OOX_NS(officeExtPr)).toUtf8(),
-FSNS(XML_xmlns, XML_vt), 
rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)).toUtf8());
+XML_xmlns,   
rSelf.getNamespaceURL(OOX_NS(officeExtPr)),
+FSNS(XML_xmlns, XML_vt), 
rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)));
 
 writeElement( pAppProps, XML_Template,  
xProperties->getTemplateName() );
 #ifdef OOXTODO
@@ -787,8 +787,8 @@ writeCustomProperties( XmlFilterBase& rSelf, const 
Reference< XDocumentPropertie
 "docProps/custom.xml",
 
"application/vnd.openxmlformats-officedocument.custom-properties+xml" );
 pAppProps->startElement( XML_Properties,
-XML_xmlns,   
rSelf.getNamespaceURL(OOX_NS(officeCustomPr)).toUtf8(),
-FSNS(XML_xmlns, XML_vt), 
rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)).toUtf8());
+XML_xmlns,   
rSelf.getNamespaceURL(OOX_NS(officeCustomPr)),
+FSNS(XML_xmlns, XML_vt), 
rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)));
 
 size_t nIndex = 0;
 for (const auto& rProp : aprop)
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index e1ff4e7f763c..5f8ea80f8c9b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -689,7 +689,7 @@ void ChartExport::WriteChartObj( const Reference< XShape >& 
xShape, sal_Int32 nI
 
 pFS->startElementNS( mnXmlNamespace, XML_cNvPr,
   XML_id, OString::number(nID),
-  XML_name,   sName.toUtf8());
+  XML_name,   sName);
 
 OUString sURL;
 if ( GetProperty( xShapeProps, "URL" ) )
@@ -701,8 +701,7 @@ void ChartExport::WriteChartObj( const Reference< XShape >& 
xShape, sal_Int32 nI
 mpURLTran

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |   48 +++---
 1 file changed, 35 insertions(+), 13 deletions(-)

New commits:
commit 1c501215611741dde9e5517cd1856c92d19285c1
Author: Tomaž Vajngerl 
AuthorDate: Thu Jul 2 10:12:47 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jul 5 23:17:29 2020 +0200

pdf: convert static functions to functs in anonymous namespace

Change-Id: Ia89cab0add22f0d5ea6ac978606191c112402d96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97726
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index a4d6f640eb52..4e1ea4b4c9f7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -115,13 +115,23 @@ static bool g_bDebugDisableCompression = 
getenv("VCL_DEBUG_DISABLE_PDFCOMPRESSIO
 #define MAX_SIGNATURE_CONTENT_LENGTH 5
 #endif
 
-const sal_Int32 nLog10Divisor = 3;
-const double fDivisor = 1000.0;
+namespace
+{
+
+constexpr sal_Int32 nLog10Divisor = 3;
+constexpr double fDivisor = 1000.0;
+
+constexpr double pixelToPoint(double px)
+{
+return px / fDivisor;
+}
 
-static double pixelToPoint( double px ) { return px/fDivisor; }
-static sal_Int32 pointToPixel( double pt ) { return sal_Int32(pt*fDivisor); }
+constexpr sal_Int32 pointToPixel(double pt)
+{
+return sal_Int32(pt * fDivisor);
+}
 
-static void appendHex( sal_Int8 nInt, OStringBuffer& rBuffer )
+void appendHex(sal_Int8 nInt, OStringBuffer& rBuffer)
 {
 static const char pHexDigits[] = { '0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 
'F' };
@@ -129,7 +139,7 @@ static void appendHex( sal_Int8 nInt, OStringBuffer& 
rBuffer )
 rBuffer.append( pHexDigits[ nInt & 15 ] );
 }
 
-static void appendName( const OUString& rStr, OStringBuffer& rBuffer )
+void appendName( const OUString& rStr, OStringBuffer& rBuffer )
 {
 // FIXME i59651 add a check for max length of 127 chars? Per PDF spec 1.4, 
appendix C.1
 // I guess than when reading the #xx sequence it will count for a single 
character.
@@ -159,7 +169,7 @@ static void appendName( const OUString& rStr, 
OStringBuffer& rBuffer )
 }
 }
 
-static void appendName( const char* pStr, OStringBuffer& rBuffer )
+void appendName( const char* pStr, OStringBuffer& rBuffer )
 {
 // FIXME i59651 see above
 while( pStr && *pStr )
@@ -181,7 +191,7 @@ static void appendName( const char* pStr, OStringBuffer& 
rBuffer )
 }
 
 //used only to emit encoded passwords
-static void appendLiteralString( const char* pStr, sal_Int32 nLength, 
OStringBuffer& rBuffer )
+void appendLiteralString( const char* pStr, sal_Int32 nLength, OStringBuffer& 
rBuffer )
 {
 while( nLength )
 {
@@ -240,7 +250,7 @@ static void appendLiteralString( const char* pStr, 
sal_Int32 nLength, OStringBuf
  * Further limitation: it is advisable to use standard ASCII characters for
  * OOo bookmarks.
 */
-static void appendDestinationName( const OUString& rString, OStringBuffer& 
rBuffer )
+void appendDestinationName( const OUString& rString, OStringBuffer& rBuffer )
 {
 const sal_Unicode* pStr = rString.getStr();
 sal_Int32 nLen = rString.getLength();
@@ -264,6 +274,8 @@ static void appendDestinationName( const OUString& rString, 
OStringBuffer& rBuff
 }
 }
 
+} // end anonymous namespace
+
 namespace vcl
 {
 const sal_uInt8 PDFWriterImpl::s_nPadString[32] =
@@ -272,8 +284,11 @@ const sal_uInt8 PDFWriterImpl::s_nPadString[32] =
 0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80, 0x2F, 0x0C, 0xA9, 0xFE, 
0x64, 0x53, 0x69, 0x7A
 };
 
+namespace
+{
+
 template < class GEOMETRY >
-static GEOMETRY lcl_convert( const MapMode& _rSource, const MapMode& _rDest, 
OutputDevice* _pPixelConversion, const GEOMETRY& _rObject )
+GEOMETRY lcl_convert( const MapMode& _rSource, const MapMode& _rDest, 
OutputDevice* _pPixelConversion, const GEOMETRY& _rObject )
 {
 GEOMETRY aPoint;
 if ( MapUnit::MapPixel == _rSource.GetMapUnit() )
@@ -287,6 +302,8 @@ static GEOMETRY lcl_convert( const MapMode& _rSource, const 
MapMode& _rDest, Out
 return aPoint;
 }
 
+} // end anonymous namespace
+
 void PDFWriter::AppendUnicodeTextString(const OUString& rString, 
OStringBuffer& rBuffer)
 {
 rBuffer.append( "FEFF" );
@@ -453,7 +470,10 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 
i_nWidgetIndex, const PDFWr
 m_aWidgets[i_nWidgetIndex].m_aName = aPartialName;
 }
 
-static void appendFixedInt( sal_Int32 nValue, OStringBuffer& rBuffer )
+namespace
+{
+
+void appendFixedInt( sal_Int32 nValue, OStringBuffer& rBuffer )
 {
 if( nValue < 0 )
 {
@@ -479,7 +499,7 @@ static void appendFixedInt( sal_Int32 nValue, 
OStringBuffer& rBuffer )
 }
 
 // appends a double. PDF does not accept exponential format, only fixed point
-static void appendDouble( double fValue, OStringBuffer& rBuffer, sal_Int32 
nPrecision = 5 )
+void appendDouble( double fValue,

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

[Tomaž Vajngerl (via logerrit)]

 include/vcl/BitmapFilter.hxx |   28 
 vcl/qa/cppunit/BitmapFilterTest.cxx  |   63 +++
 vcl/source/bitmap/BitmapFilterStackBlur.cxx  |   49 -
 vcl/source/bitmap/BitmapScaleSuperFilter.cxx |   24 --
 4 files changed, 130 insertions(+), 34 deletions(-)

New commits:
commit 8166f340511f49c91deba161f27d9ded11a14e14
Author: Tomaž Vajngerl 
AuthorDate: Wed Jul 1 15:57:15 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Jul 5 23:17:16 2020 +0200

add generateStripRanges and use that in StackBlur and ScaleSuper

generateStripRanges divides a range into equally long stripes that
is useful for defining scanlines for a thread. This is used in
the BitmapFilterStackBlur and BitmapScaleSuperFilter as they are
running using a thread pool.

Change-Id: Ifb9f70dea3b0233e6aa30ccf20187a2ff58fd5a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97725
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/BitmapFilter.hxx b/include/vcl/BitmapFilter.hxx
index 19599d06316f..0521ded42357 100644
--- a/include/vcl/BitmapFilter.hxx
+++ b/include/vcl/BitmapFilter.hxx
@@ -12,8 +12,36 @@
 #define INCLUDED_VCL_BITMAPFILTER_HXX
 
 #include 
+#include 
+
 class Animation;
 
+namespace vcl::bitmap
+{
+// Generates strip ranges and run the input function with the start and
+// end as parameters. The additional parameter bLast denotes if the
+// iteration is teh last one.
+//
+// Example:
+// first = 0, last = 100, STRIP_SIZE = 32
+// this will generate:
+// [0, 31, false], [32, 63, false], [64, 95, false], [96, 100, true]
+template 
+void generateStripRanges(
+long nFirst, long nLast,
+std::function 
aFunction)
+{
+long nStart = nFirst;
+for (; nStart < nLast - STRIP_SIZE; nStart += STRIP_SIZE)
+{
+long nEnd = nStart + STRIP_SIZE - 1;
+aFunction(nStart, nEnd, false);
+}
+aFunction(nStart, nLast, true);
+}
+
+} // end vcl::bitmap
+
 class VCL_DLLPUBLIC BitmapFilter
 {
 public:
diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx 
b/vcl/qa/cppunit/BitmapFilterTest.cxx
index dddfaf571dd4..a519da24ed9b 100644
--- a/vcl/qa/cppunit/BitmapFilterTest.cxx
+++ b/vcl/qa/cppunit/BitmapFilterTest.cxx
@@ -38,11 +38,13 @@ public:
 void testBlurCorrectness();
 void testBasicMorphology();
 void testPerformance();
+void testGenerateStripRanges();
 
 CPPUNIT_TEST_SUITE(BitmapFilterTest);
 CPPUNIT_TEST(testBlurCorrectness);
 CPPUNIT_TEST(testBasicMorphology);
 CPPUNIT_TEST(testPerformance);
+CPPUNIT_TEST(testGenerateStripRanges);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -209,6 +211,67 @@ void BitmapFilterTest::testPerformance()
 }
 }
 
+void BitmapFilterTest::testGenerateStripRanges()
+{
+{
+constexpr long nFirstIndex = 0;
+constexpr long nLastIndex = 100;
+constexpr long nStripSize = 32;
+
+std::vector> aRanges;
+
+vcl::bitmap::generateStripRanges(
+nFirstIndex, nLastIndex, [&](long const nStart, long const nEnd, 
bool const bLast) {
+aRanges.emplace_back(nStart, nEnd, bLast);
+});
+
+CPPUNIT_ASSERT_EQUAL(size_t(4), aRanges.size());
+
+CPPUNIT_ASSERT_EQUAL(0L, std::get<0>(aRanges[0]));
+CPPUNIT_ASSERT_EQUAL(31L, std::get<1>(aRanges[0]));
+CPPUNIT_ASSERT_EQUAL(false, std::get<2>(aRanges[0]));
+
+CPPUNIT_ASSERT_EQUAL(32L, std::get<0>(aRanges[1]));
+CPPUNIT_ASSERT_EQUAL(63L, std::get<1>(aRanges[1]));
+CPPUNIT_ASSERT_EQUAL(false, std::get<2>(aRanges[1]));
+
+CPPUNIT_ASSERT_EQUAL(64L, std::get<0>(aRanges[2]));
+CPPUNIT_ASSERT_EQUAL(95L, std::get<1>(aRanges[2]));
+CPPUNIT_ASSERT_EQUAL(false, std::get<2>(aRanges[2]));
+
+CPPUNIT_ASSERT_EQUAL(96L, std::get<0>(aRanges[3]));
+CPPUNIT_ASSERT_EQUAL(100L, std::get<1>(aRanges[3]));
+CPPUNIT_ASSERT_EQUAL(true, std::get<2>(aRanges[3]));
+}
+
+{
+constexpr long nFirstIndex = 0;
+constexpr long nLastIndex = 95;
+constexpr long nStripSize = 32;
+
+std::vector> aRanges;
+
+vcl::bitmap::generateStripRanges(
+nFirstIndex, nLastIndex, [&](long const nStart, long const nEnd, 
bool const bLast) {
+aRanges.emplace_back(nStart, nEnd, bLast);
+});
+
+CPPUNIT_ASSERT_EQUAL(size_t(3), aRanges.size());
+
+CPPUNIT_ASSERT_EQUAL(0L, std::get<0>(aRanges[0]));
+CPPUNIT_ASSERT_EQUAL(31L, std::get<1>(aRanges[0]));
+CPPUNIT_ASSERT_EQUAL(false, std::get<2>(aRanges[0]));
+
+CPPUNIT_ASSERT_EQUAL(32L, std::get<0>(aRanges[1]));
+CPPUNIT_ASSERT_EQUAL(63L, std::get<1>(aRanges[1]));
+CPPUNIT_ASSERT_EQUAL(false, std::get<2>(aRanges[1]));
+
+CPPUNIT_ASSERT_EQUAL(64L, std::get<0>(aRanges[2]));
+CPPUNIT_ASSERT_EQUAL(95L, std::get<1>(aRanges[2]));
+CPPUNIT_ASSERT_EQU

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - editeng/source sw/qa

[László Németh (via logerrit)]

 editeng/source/misc/svxacorr.cxx |   39 +++
 sw/qa/extras/uiwriter/data/tdf133524_ro.fodt |   14 +++
 sw/qa/extras/uiwriter/uiwriter.cxx   |   54 ---
 3 files changed, 85 insertions(+), 22 deletions(-)

New commits:
commit 81584e76961d1180bb95bfe2e8f226177a26b28c
Author: László Németh 
AuthorDate: Sat Jul 4 16:37:33 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jul 5 22:52:51 2020 +0200

tdf#133524 AutoCorrect: fix Romanian nested quotations

typing " inside primary quotation marks: use
the correct order of the double angle quotes:

„... «quote» ...”

Add also Aragonese, Asturian and Catalan to the
"<<" and ">>" replacement.

See commit 57f07b1d7378d218648667c5b1315cc8ad905875
(tdf#133524 AutoCorrect: support double angle quotes).

Change-Id: I2e80cc45768eefa3eb62b446ca822ee6c46f7242
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97970
Tested-by: Jenkins
Reviewed-by: László Németh 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98140
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f991370c6b99..217143f42845 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -318,8 +318,10 @@ static constexpr sal_Unicode cLeftSingleAngleQuote = 
0x2039;
 static constexpr sal_Unicode cRightSingleAngleQuote = 0x203A;
 // stop characters for searching preceding quotes
 // (the first character is also the opening quote we are looking for)
-const sal_Unicode aStopDoubleAngleQuoteStart[] = { 0x201E, 0x201D, 0 }; // 
preceding ,,
+const sal_Unicode aStopDoubleAngleQuoteStart[] = { 0x201E, 0x201D, 0x201C, 0 
}; // preceding ,,
 const sal_Unicode aStopDoubleAngleQuoteEnd[] = { cRightDoubleAngleQuote, 
cLeftDoubleAngleQuote, 0x201D, 0x201E, 0 }; // preceding >>
+// preceding << for Romanian, handle also alternative primary closing 
quotation mark U+201C
+const sal_Unicode aStopDoubleAngleQuoteEndRo[] = { cLeftDoubleAngleQuote, 
cRightDoubleAngleQuote, 0x201D, 0x201E, 0x201C, 0 };
 const sal_Unicode aStopSingleQuoteEnd[] = { 0x201A, 0x2018, 0x201C, 0x201E, 0 
};
 const sal_Unicode aStopSingleQuoteEndRuUa[] = { 0x201E, 0x201C, 
cRightDoubleAngleQuote, cLeftDoubleAngleQuote, 0 };
 
@@ -1212,7 +1214,12 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, 
sal_Int32 nInsPos,
 if ( eType == ACQuotes::DoubleAngleQuote )
 {
 bool bSwiss = eLang == LANGUAGE_FRENCH_SWISS;
-cRet = ( '<' == cInsChar || ('\"' == cInsChar && !bSttQuote) )
+// pressing " inside a quotation -> use second level angle quotes
+bool bLeftQuote = '\"' == cInsChar &&
+// start position and Romanian OR
+// not start position and Hungarian
+bSttQuote == (eLang != LANGUAGE_HUNGARIAN);
+cRet = ( '<' == cInsChar || bLeftQuote )
 ? ( bSwiss ? cLeftSingleAngleQuote : cLeftDoubleAngleQuote )
 : ( bSwiss ? cRightSingleAngleQuote : cRightDoubleAngleQuote );
 }
@@ -1348,13 +1355,23 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& 
rDoc, const OUString& rTxt,
 {
 eType = ACQuotes::CapitalizeIAm;
 }
-// tdf#133524 support << and >> in Hungarian and Romanian
-else if ( !bSingle && nInsPos && eLang.anyOf( 
LANGUAGE_HUNGARIAN, LANGUAGE_ROMANIAN ) &&
-lcl_HasPrecedingChar( rTxt, nInsPos,
+// tdf#133524 support >>Hungarian<< and <> 
secondary level quotations
+else if ( !bSingle && nInsPos &&
+( ( eLang == LANGUAGE_HUNGARIAN &&
+lcl_HasPrecedingChar( rTxt, nInsPos,
 bSttQuote ? aStopDoubleAngleQuoteStart[0] : 
aStopDoubleAngleQuoteEnd[0],
-bSttQuote ? aStopDoubleAngleQuoteStart + 1 : 
aStopDoubleAngleQuoteEnd + 1 ) )
+bSttQuote ? aStopDoubleAngleQuoteStart + 1 : 
aStopDoubleAngleQuoteEnd + 1 ) ) ||
+  ( eLang.anyOf(
+LANGUAGE_ROMANIAN,
+LANGUAGE_ROMANIAN_MOLDOVA ) &&
+lcl_HasPrecedingChar( rTxt, nInsPos,
+bSttQuote ? aStopDoubleAngleQuoteStart[0] : 
aStopDoubleAngleQuoteEndRo[0],
+bSttQuote ? aStopDoubleAngleQuoteStart + 1 : 
aStopDoubleAngleQuoteEndRo + 1 ) ) ) )
 {
-eType = ACQuotes::DoubleAngleQuote;
+LocaleDataWrapper& rLcl = GetLocaleDataWrapper( eLang 
);
+// only if the opening double quotation mark is the 
default one
+if ( rLcl.getDoubleQuotationMarkS

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

[Jan-Marek Glogowski (via logerrit)]

 bin/gla11y |   66 ++---
 1 file changed, 46 insertions(+), 20 deletions(-)

New commits:
commit b945946135cb302c1805fdf6502e02dbdf52b813
Author: Jan-Marek Glogowski 
AuthorDate: Sun Jul 5 03:08:01 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Sun Jul 5 22:50:39 2020 +0200

gla11y: add check, buffer output and # comment

- add visible check to labelled-by
- buffer output, so it's consistent in parallel builds
- remove per-line file reference and just add a general header
  referencing the used suppress and false-positive files
- allow common commenting in suppression and false-positive
  files by starting a line with a #

Change-Id: Iefac711deb9ea620728ab5b0aeac73cfff40a7b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/61051
Tested-by: Jenkins
Reviewed-by: Samuel Thibault 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/bin/gla11y b/bin/gla11y
index b1d98c7c0fb8..d29ee4ac62cc 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -275,6 +275,9 @@ fatalexists = 0
 enables = [ ]
 dofatals = [ ]
 
+# buffers all printed output, so it isn't split in parallel builds
+output_buffer = ""
+
 #
 # XML browsing and printing functions
 #
@@ -468,7 +471,7 @@ def err(filename, tree, elm, msgtype, msg, error = True):
 """
 Emit a warning or error for an element
 """
-global errors, errexists, warnings, warnexists, fatals, fatalexists
+global errors, errexists, warnings, warnexists, fatals, fatalexists, 
output_buffer
 
 # Let user tune whether a warning or error
 fatal = is_enabled(elm, msgtype, dofatals, error)
@@ -503,7 +506,7 @@ def err(filename, tree, elm, msgtype, msg, error = True):
 "FATAL " if fatal else "",
 "ERROR" if error else "WARNING",
 elm_name(elm), msg)
-print(msg)
+output_buffer += msg + "\n"
 if outfile is not None:
 print(msg, file=outfile)
 
@@ -796,7 +799,7 @@ def is_orphan_widget(filename, tree, root, obj, orphan, 
orphan_root, doprint = F
 
 # no label for a button, warn
 if doprint:
-warn(filename, tree, obj, "button-no-label", "does not have its 
own label");
+warn(filename, tree, obj, "button-no-label", "does not have its 
own label")
 if not is_enabled(obj, "button-no-label", enables, True):
 # Warnings disabled
 return False
@@ -842,7 +845,6 @@ def is_orphan_widget(filename, tree, root, obj, orphan, 
orphan_root, doprint = F
 if len(children) >= 1:
 return False
 
-
 # Really no label, perhaps emit a warning
 if not is_enabled(obj, "no-labelled-by", enables, True):
 # Warnings disabled for this class of widgets
@@ -987,6 +989,11 @@ def check_a11y_relation(filename, tree):
 
 visible = is_visible(obj)
 
+# warning message type "syntax" used:
+#
+# multiple-*  => 2+ XML tags of the inspected element itself
+# duplicate-* => 2+ XML tags of other elements referencing this element
+
 # Should have only one label
 if len(labelled_by) >= 1:
 if oid in mnemonic_for_elm:
@@ -994,6 +1001,13 @@ def check_a11y_relation(filename, tree):
  "has both a mnemonic " + 
elm_name_line(mnemonic_for_elm[oid][0]) + "and labelled-by relation")
 if len(labelled_by) > 1:
 warn(filename, tree, obj, "multiple-labelled-by", "has 
multiple labelled-by relations")
+
+if oid in labelled_by_elm:
+if len(labelled_by_elm[oid]) == 1:
+paired = labelled_by_elm[oid][0]
+if paired != None and visible != is_visible(paired):
+warn(filename, tree, obj, "visibility-conflict", 
"visibility conflicts with paired " + elm_name_line(paired))
+
 if oid in label_for_elm:
 if len(label_for_elm[oid]) > 1:
 warn(filename, tree, obj, "duplicate-label-for", "is 
referenced by multiple label-for " + elms_names_lines(label_for_elm[oid]))
@@ -1001,6 +1015,7 @@ def check_a11y_relation(filename, tree):
 paired = label_for_elm[oid][0]
 if visible != is_visible(paired):
 warn(filename, tree, obj, "visibility-conflict", 
"visibility conflicts with paired " + elm_name_line(paired))
+
 if oid in mnemonic_for_elm:
 if len(mnemonic_for_elm[oid]) > 1:
 warn(filename, tree, obj, "duplicate-mnemonic", "is referenced 
by multiple mnemonic_widget " + elms_names_lines(mnemonic_for_elm[oid]))
@@ -1168,7 +1183,7 @@ def widgets_opt(widgets_list, arg):
 def main():
 global pflag, gen_suppr, gen_supprfile, suppressions, suppr_prefix, 
false_positives, dofatals, enables, dofatals, warn_orphan_labels
 global widgets_toplevel, widgets_ignored, widgets_suffixignored, 
widgets_needlabel, widgets_buttons, widgets_labels
-global outfile
+global 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - editeng/source sw/qa

[László Németh (via logerrit)]

 editeng/source/misc/svxacorr.cxx  |   30 +-
 sw/qa/extras/uiwriter/data/tdf123786.fodt |   14 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   27 +++
 3 files changed, 62 insertions(+), 9 deletions(-)

New commits:
commit f9943909d26530eea6351c88745fa5bc2e1df946
Author: László Németh 
AuthorDate: Thu Jun 25 10:54:41 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Sun Jul 5 22:51:20 2020 +0200

tdf#123786 AutoCorrect: fix apostrophe in Russian

and Ukrainian at "Single quotes" replacement
outside of second level quotations.

For example:

„quote' -> „quote“

but now

apostrophe' -> apostrophe’

instead of the bad

apostrophe' -> apostrophe“

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

Change-Id: Iad69b7f88ab9677f25ee0f806d035e16cdebe29b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97096
Tested-by: Jenkins
Reviewed-by: László Németh 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98139
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 983660bab918..f991370c6b99 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -321,6 +321,7 @@ static constexpr sal_Unicode cRightSingleAngleQuote = 
0x203A;
 const sal_Unicode aStopDoubleAngleQuoteStart[] = { 0x201E, 0x201D, 0 }; // 
preceding ,,
 const sal_Unicode aStopDoubleAngleQuoteEnd[] = { cRightDoubleAngleQuote, 
cLeftDoubleAngleQuote, 0x201D, 0x201E, 0 }; // preceding >>
 const sal_Unicode aStopSingleQuoteEnd[] = { 0x201A, 0x2018, 0x201C, 0x201E, 0 
};
+const sal_Unicode aStopSingleQuoteEndRuUa[] = { 0x201E, 0x201C, 
cRightDoubleAngleQuote, cLeftDoubleAngleQuote, 0 };
 
 SvxAutoCorrect::SvxAutoCorrect( const OUString& rShareAutocorrFile,
 const OUString& rUserAutocorrFile )
@@ -1355,19 +1356,30 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& 
rDoc, const OUString& rTxt,
 {
 eType = ACQuotes::DoubleAngleQuote;
 }
-// tdf#128860 use apostrophe outside of second level 
quotation in Czech, German, Icelandic,
-// Slovak and Slovenian instead of the – in this case, bad 
– closing quotation mark U+2018.
 else if ( bSingle && nInsPos && !bSttQuote &&
-( primary(eLang) == primary(LANGUAGE_GERMAN) || 
eLang.anyOf (
- LANGUAGE_CZECH,
- LANGUAGE_ICELANDIC,
- LANGUAGE_SLOVAK,
- LANGUAGE_SLOVENIAN ) ) &&
-!lcl_HasPrecedingChar( rTxt, nInsPos, 
aStopSingleQuoteEnd[0],  aStopSingleQuoteEnd + 1 ) )
+// tdf#128860 use apostrophe outside of second level 
quotation in Czech, German, Icelandic,
+// Slovak and Slovenian instead of the – in this case, 
bad – closing quotation mark U+2018.
+// tdf#123786 the same for Russian and Ukrainian
+( ( eLang.anyOf (
+ LANGUAGE_CZECH,
+ LANGUAGE_GERMAN,
+ LANGUAGE_GERMAN_SWISS,
+ LANGUAGE_GERMAN_AUSTRIAN,
+ LANGUAGE_GERMAN_LUXEMBOURG,
+ LANGUAGE_GERMAN_LIECHTENSTEIN,
+ LANGUAGE_ICELANDIC,
+ LANGUAGE_SLOVAK,
+ LANGUAGE_SLOVENIAN ) &&
+!lcl_HasPrecedingChar( rTxt, nInsPos, 
aStopSingleQuoteEnd[0],  aStopSingleQuoteEnd + 1 ) ) ||
+  ( eLang.anyOf (
+ LANGUAGE_RUSSIAN,
+ LANGUAGE_UKRAINIAN ) &&
+!lcl_HasPrecedingChar( rTxt, nInsPos, 
aStopSingleQuoteEndRuUa[0],  aStopSingleQuoteEndRuUa + 1 ) ) ) )
 {
 LocaleDataWrapper& rLcl = GetLocaleDataWrapper( eLang 
);
 CharClass& rCC = GetCharClass( eLang );
-if ( rLcl.getQuotationMarkStart() == 
OUStringChar(aStopSingleQuoteEnd[0]) &&
+if ( ( rLcl.getQuotationMarkStart() == 
OUStringChar(aStopSingleQuoteEnd[0]) ||
+ rLcl.getQuotationMarkStart() == 
OUStringChar(aStopSingleQuoteEndRuUa[0]) ) &&
  // use apostrophe only after letters, not after 
digits or punctuation
  rCC.isLetter(rTxt, nInsPos-1) )
 {
diff --git a/sw/qa/extras/uiwriter/data/tdf123786.fodt 
b/sw/qa/extras/uiwriter/data/tdf123786.fodt
new file mode 100644
index 0

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

[Mike Kaganski (via logerrit)]

 include/sax/fshelper.hxx |   13 +
 oox/source/export/shapes.cxx |   24 
 2 files changed, 25 insertions(+), 12 deletions(-)

New commits:
commit 57afeb8d9e35933630568a02fc48a00f5582b261
Author: Mike Kaganski 
AuthorDate: Sun Jul 5 17:20:49 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sun Jul 5 22:14:12 2020 +0200

Allow use OUString as attribute value in FastSerializerHelper::*Element

Change-Id: Id34d08787d0188d5c7847dcb75958a511a1fef27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98143
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index b38689a5927f..235181bf9846 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -62,6 +63,12 @@ public:
 pushAttributeValue(attribute, value);
 startElement(elementTokenId, std::forward(args)...);
 }
+template
+void startElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
OUString& value, Args&&... args)
+{
+// The temporary created by toUtf8() must stay alive until 
startElement() ends using it
+startElement(elementTokenId, attribute, value.toUtf8(), 
std::forward(args)...);
+}
 void startElement(sal_Int32 elementTokenId);
 
 /// Start an element. After the first two arguments there can be a number 
of (attribute, value) pairs.
@@ -85,6 +92,12 @@ public:
 pushAttributeValue(attribute, value);
 singleElement(elementTokenId, std::forward(args)...);
 }
+template
+void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute, const 
OUString& value, Args&&... args)
+{
+// The temporary created by toUtf8() must stay alive until 
singleElement() ends using it
+singleElement(elementTokenId, attribute, value.toUtf8(), 
std::forward(args)...);
+}
 void singleElement(sal_Int32 elementTokenId);
 
 /// Create a single element. After the first two arguments there can be a 
number of (attribute, value) pairs.
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 3ea0ae57ba6b..eb5eedff1d89 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -414,7 +414,7 @@ ShapeExport& ShapeExport::WritePolyPolygonShape( const 
Reference< XShape >& xSha
 pFS->startElementNS(mnXmlNamespace, XML_nvSpPr);
 pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
   XML_id, OString::number(GetNewShapeID(xShape)),
-  XML_name, GetShapeName(xShape).toUtf8());
+  XML_name, GetShapeName(xShape));
 }
 pFS->singleElementNS(mnXmlNamespace, XML_cNvSpPr);
 if (GetDocumentType() != DOCUMENT_DOCX)
@@ -475,7 +475,7 @@ ShapeExport& ShapeExport::WriteGroupShape(const 
uno::Reference&
 pFS->startElementNS(mnXmlNamespace, XML_nvGrpSpPr);
 pFS->singleElementNS(mnXmlNamespace, XML_cNvPr,
 XML_id, OString::number(GetNewShapeID(xShape)),
-XML_name, GetShapeName(xShape).toUtf8());
+XML_name, GetShapeName(xShape));
 pFS->singleElementNS(mnXmlNamespace, XML_cNvGrpSpPr);
 WriteNonVisualProperties(xShape );
 pFS->endElementNS(mnXmlNamespace, XML_nvGrpSpPr);
@@ -801,7 +801,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 pFS->startElementNS( mnXmlNamespace, XML_nvSpPr );
 pFS->startElementNS( mnXmlNamespace, XML_cNvPr,
 XML_id, OString::number(GetNewShapeID(xShape)),
-XML_name, GetShapeName(xShape).toUtf8(),
+XML_name, GetShapeName(xShape),
 XML_hidden, isVisible ? nullptr : "1" );
 
 if( GETA( URL ) )
@@ -1049,7 +1049,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( const 
Reference< XShape >& xShape )
 pFS->startElementNS(mnXmlNamespace, XML_nvSpPr);
 pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
 XML_id, OString::number(GetNewShapeID(xShape)),
-XML_name, GetShapeName(xShape).toUtf8());
+XML_name, GetShapeName(xShape));
 pFS->singleElementNS( mnXmlNamespace, XML_cNvSpPr );
 WriteNonVisualProperties( xShape );
 pFS->endElementNS( mnXmlNamespace, XML_nvSpPr );
@@ -1193,7 +1193,7 @@ void ShapeExport::WriteGraphicObjectShapePart( const 
Reference< XShape >& xShape
 
 pFS->startElementNS( mnXmlNamespace, XML_cNvPr,
   XML_id, OString::number(GetNewShapeID(xShape)),
-  XML_name,   GetShapeName(xShape).toUtf8(),
+  XML_name,   GetShapeName(xShape),
   XML_descr,  bHaveDesc ? sDescr.toUtf8().getStr() : 
nullptr );
 
 // OOXTODO: //cNvPr children: XML_extLst, XML_hlinkHover
@@ -1337,7 +133

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

[Mike Kaganski (via logerrit)]

 include/sax/fshelper.hxx |   32 
 1 file changed, 4 insertions(+), 28 deletions(-)

New commits:
commit 01c58c7d6da0a5671460ba4c0e23a2a04d2eb87e
Author: Mike Kaganski 
AuthorDate: Sat Jul 4 13:07:19 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sun Jul 5 22:00:56 2020 +0200

Simplify FastSerializerHelper::*ElementNS to just call corresponding 
*Element

Change-Id: Idd7ab4961fe5e4871ea5b64e7d837f98743eb301
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97954
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 7c1f9a2ea1af..b38689a5927f 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -66,21 +66,9 @@ public:
 
 /// Start an element. After the first two arguments there can be a number 
of (attribute, value) pairs.
 template
-void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const char* value, Args &&... args)
+void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
Args &&... args)
 {
-if (value)
-pushAttributeValue(attribute, value);
-startElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
-}
-template
-void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const OString& value, Args &&... args)
-{
-pushAttributeValue(attribute, value);
-startElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
-}
-void startElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId)
-{
-startElement(FSNS(namespaceTokenId, elementTokenId));
+startElement(FSNS(namespaceTokenId, elementTokenId), 
std::forward(args)...);
 }
 
 /// Create a single element. After the first argument there can be a 
number of (attribute, value) pairs.
@@ -101,21 +89,9 @@ public:
 
 /// Create a single element. After the first two arguments there can be a 
number of (attribute, value) pairs.
 template
-void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const char* value, Args &&... args)
-{
-if (value)
-pushAttributeValue(attribute, value);
-singleElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
-}
-template
-void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
sal_Int32 attribute, const OString& value, Args &&... args)
-{
-pushAttributeValue(attribute, value);
-singleElementNS(namespaceTokenId, elementTokenId, 
std::forward(args)...);
-}
-void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId)
+void singleElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId, 
Args &&... args)
 {
-singleElement(FSNS(namespaceTokenId, elementTokenId));
+singleElement(FSNS(namespaceTokenId, elementTokenId), 
std::forward(args)...);
 }
 
 void endElement(sal_Int32 elementTokenId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[gokaysatir (via logerrit)]

 loleaflet/admin/admin.html |1 
 loleaflet/admin/adminAnalytics.html|2 +
 loleaflet/admin/admintemplate.html |4 +--
 loleaflet/admin/src/AdminSocketOverview.js |   33 ++---
 4 files changed, 26 insertions(+), 14 deletions(-)

New commits:
commit 3b6ac9179cd506085e11ff958ff0955c3edaaff6
Author: gokaysatir 
AuthorDate: Sun Jul 5 14:37:40 2020 +0300
Commit: Andras Timar 
CommitDate: Sun Jul 5 21:45:56 2020 +0200

loleaflet: Admin panel does not have kill session button anymore.

Change-Id: I4cfa87dd2bc835281b0738628e88d824f0bcc4e9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98136
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index 9f5fc6886..82f3c0c41 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -54,6 +54,7 @@
   
 
   
+
 document.write(l10nstrings.strPid)
 document.write(l10nstrings.strDocument)
 document.write(l10nstrings.strNumberOfViews)
diff --git a/loleaflet/admin/adminAnalytics.html 
b/loleaflet/admin/adminAnalytics.html
index b03c38777..a3a8e5a2e 100644
--- a/loleaflet/admin/adminAnalytics.html
+++ b/loleaflet/admin/adminAnalytics.html
@@ -43,6 +43,8 @@
   document.getElementById('a-analytics-mobile').classList.add('is-active');
   document.getElementById('a-analytics-tablet').classList.add('is-active');
 
+  window.location.href += '#memview';
+
   // Switching tabs is done by css rules. We will set "is-active" classes here.
   document.getElementById('button-memview').onclick = function() {
 document.getElementById('button-memview').parentNode.className = 
'is-active';
diff --git a/loleaflet/admin/admintemplate.html 
b/loleaflet/admin/admintemplate.html
index 9d6225b87..d87c78204 100644
--- a/loleaflet/admin/admintemplate.html
+++ b/loleaflet/admin/admintemplate.html
@@ -55,7 +55,7 @@
 
 
 document.write(l10nstrings.strOverview)
-document.write(l10nstrings.strAnalytics)
+document.write(l10nstrings.strAnalytics)
 document.write(l10nstrings.strHistory)
 document.write(l10nstrings.strLog)
 document.write(l10nstrings.strSettings)
@@ -71,7 +71,7 @@
 
 ←
 document.write(l10nstrings.strOverview)
-document.write(l10nstrings.strAnalytics)
+document.write(l10nstrings.strAnalytics)
 document.write(l10nstrings.strHistory)
 document.write(l10nstrings.strLog)
 
diff --git a/loleaflet/admin/src/AdminSocketOverview.js 
b/loleaflet/admin/src/AdminSocketOverview.js
index 6f4f6c667..653045d04 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -2,9 +2,25 @@
 /*
Socket to be intialized on opening the overview page in Admin console
 */
-/* global _ vex $ Util AdminSocketBase Admin */
-
-function appendDocRow(document, $rowContainer, $userContainer, sPid, sName, 
sViews, sMem, sDocTime, sDocIdle, modified) {
+/* global DlgYesNo _ vex $ Util AdminSocketBase Admin */
+
+function appendDocRow(document, $rowContainer, $userContainer, sPid, sName, 
sViews, sMem, sDocTime, sDocIdle, modified, socket) {
+   var $sessionCloseCell = $(document.createElement('td')).text('✖'); // 
This cell will open "Do you want to kill this session?" dialog.
+   $rowContainer.append($sessionCloseCell);
+   $sessionCloseCell.addClass('has-text-centered');
+   $sessionCloseCell.css('cursor', 'pointer');
+   $sessionCloseCell.click(function() {
+   var dialog = (new DlgYesNo())
+   .title(_('Confirmation'))
+   .text(_('Are you sure you want to terminate this session?'))
+   .yesButtonText(_('OK'))
+   .noButtonText(_('Cancel'))
+   .type('warning')
+   .yesFunction(function() {
+   socket.send('kill ' + sPid);
+   });
+   dialog.open();
+   });
 
var $pid = $(document.createElement('td')).text(sPid);
$pid.append($userContainer);
@@ -116,13 +132,6 @@ var AdminSocketOverview = AdminSocketBase.extend({
}
});
});
-
-   $('.view-opt-button').on('click', function() {
-   $('#docview-btn').toggleClass('selected-view-opt');
-   $('#userview-btn').toggleClass('selected-view-opt');
-   $('#docview').toggle();
-   $('#userview').toggle();
-   });
},
 
onSocketMessage: function(e) {
@@ -215,7 +224,7 

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

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridcell.cxx |   10 --
 svx/source/inc/gridcell.hxx|   10 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 9202793ed81c5568f6789504335446b97e8087da
Author: Caolán McNamara 
AuthorDate: Thu Jul 2 16:57:16 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jul 5 21:35:55 2020 +0200

loosen requirement that createField return something derived from SpinField

Change-Id: I2f15717d2e96f21c3fcbbcfd9eda6544daf2a0a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 2a4213ffcede..098ae2e3356b 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1944,7 +1944,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const 
Reference< XPropertySe
 rPaintFormatter.SetFormat( sFormatString, aAppLanguage );
 }
 
-VclPtr DbNumericField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/  )
+VclPtr DbNumericField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/  )
 {
 WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 return VclPtr::Create( _pParent, _nFieldStyle );
@@ -2072,14 +2072,12 @@ void DbCurrencyField::implAdjustGenericFieldSetting( 
const Reference< XPropertyS
 static_cast< LongCurrencyField* >( m_pPainter.get() )->SetStrictFormat( 
bStrict );
 }
 
-
-VclPtr DbCurrencyField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/  )
+VclPtr DbCurrencyField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/  )
 {
 WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 return VclPtr::Create( _pParent, _nFieldStyle );
 }
 
-
 double DbCurrencyField::GetCurrency(const Reference< css::sdb::XColumn >& 
_rxField, const Reference< XNumberFormatter >& xFormatter) const
 {
 double fValue = GetValue(_rxField, xFormatter);
@@ -2179,7 +2177,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn )
 doPropertyListening( FM_PROP_DATE_SHOW_CENTURY );
 }
 
-VclPtr DbDateField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& _rxModel  )
+VclPtr DbDateField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& _rxModel  )
 {
 WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 // check if there is a DropDown property set to TRUE
@@ -2306,7 +2304,7 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn )
 doPropertyListening( FM_PROP_STRICTFORMAT );
 }
 
-VclPtr DbTimeField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
+VclPtr DbTimeField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
 {
 WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 return VclPtr::Create( _pParent, _nFieldStyle );
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 2491152cbf0d..f63f2466b720 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -545,7 +545,7 @@ public:
 virtual ::svt::CellControllerRefCreateController() const override;
 
 protected:
-virtual VclPtr createField(
+virtual VclPtr createField(
 vcl::Window* _pParent,
 bool bSpinButton,
 const css::uno::Reference< 
css::beans::XPropertySet >& _rxModel
@@ -566,7 +566,7 @@ protected:
 virtual voidupdateFromModel( css::uno::Reference< 
css::beans::XPropertySet > _rxModel ) override;
 
 // DbSpinField
-virtual VclPtr createField(
+virtual VclPtr createField(
 vcl::Window* _pParent,
 bool bSpinButton,
 const css::uno::Reference< 
css::beans::XPropertySet >& _rxModel
@@ -590,7 +590,7 @@ protected:
 virtual voidupdateFromModel( css::uno::Reference< 
css::beans::XPropertySet > _rxModel ) override;
 
 // DbSpinField
-virtual VclPtr createField(
+virtual VclPtr createField(
 vcl::Window* _pParent,
 bool bSpinButton,
 const css::uno::Reference< 
css::beans::XPropertySet >& _rxModel
@@ -618,7 +618,7 @@ protected:
 virtual voidupdateFromModel( css::uno::Reference< 
css::beans::XPropertySet > _rxModel ) override;
 
 // DbSpinField
-virtual VclPtr createField(
+virtual VclPtr createField(
 vcl::Window* _pParent,
 bool bSpinButton,
 const css::uno::Reference< 
css::beans::XPropertySet >& _rxModel
@@ -642,7 

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/css/loleaflet.css  |2 +-
 loleaflet/src/control/Control.PresentationBar.js |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 349f7362b5bf3149906f5f6a355a260df1054dbc
Author: Pranam Lashkari 
AuthorDate: Thu Jul 2 17:59:11 2020 +0530
Commit: Andras Timar 
CommitDate: Sun Jul 5 21:09:07 2020 +0200

leaflet: removed slide controls from draw

Change-Id: I5916d829b257729363125643cf3ba548f7e4e9db
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97759
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 99944f8842e73a4207c230f895ac02ecba23cfd0)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97797

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index de1d246e1..03b13cd69 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -135,7 +135,7 @@ body {
 }
 
 #presentation-controls-wrapper.drawing {
-   bottom: 40px; /* Hide the presentation toolbar (insert slide etc.) for 
doctype = drawing */
+   bottom: 33px; /* Hide the presentation toolbar (insert slide etc.) for 
doctype = drawing */
 }
 
 #presentation-controls-wrapper.readonly {
diff --git a/loleaflet/src/control/Control.PresentationBar.js 
b/loleaflet/src/control/Control.PresentationBar.js
index eeb3cfac8..dd10369b0 100644
--- a/loleaflet/src/control/Control.PresentationBar.js
+++ b/loleaflet/src/control/Control.PresentationBar.js
@@ -10,6 +10,9 @@ L.Control.PresentationBar = L.Control.extend({
},
 
onAdd: function (map) {
+   if (this._map.getDocType() === 'drawing') {
+   return;
+   }
this.map = map;
this.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/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |   21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit d69350013c0960560a45a14a055081d2930fdf78
Author: Pranam Lashkari 
AuthorDate: Thu Jul 2 16:00:14 2020 +0530
Commit: Andras Timar 
CommitDate: Sun Jul 5 21:08:36 2020 +0200

leaflet: Removed impress download options from drawing doc

Change-Id: Iaddc3f8330733ec89af0cb0ec6ed14d1f51999ff
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97740
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 32185682de346c9a729a2ef2efb0d66713a6a84d)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97799

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 63278bf62..3eea9a713 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -257,9 +257,11 @@ L.Control.Menubar = L.Control.extend({
{name: _('See revision history'), id: 
'rev-history', type: 'action'},
{name: !window.ThisIsAMobileApp ? _('Download 
as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 
'downloadas-pdf', type: 'action'},
-   {name: _('ODF presentation (.odp)'), 
id: 'downloadas-odp', type: 'action'},
-   {name: _('PowerPoint 2003 Presentation 
(.ppt)'), id: 'downloadas-ppt', type: 'action'},
-   {name: _('PowerPoint Presentation 
(.pptx)'), id: 'downloadas-pptx', type: 'action'}]},
+   {name: _('ODF presentation (.odp)'), 
id: 'downloadas-odp', type: 'action', drawing: false},
+   {name: _('PowerPoint 2003 Presentation 
(.ppt)'), id: 'downloadas-ppt', type: 'action', drawing: false},
+   {name: _('PowerPoint Presentation 
(.pptx)'), id: 'downloadas-pptx', type: 'action', drawing: false},
+   {name: _('ODF Drawing (.odg)'), id: 
'downloadas-odg', type: 'action'}
+   ]},
{type: 'separator'},
{name: _('Close document'), id: 
'closedocument', type: 'action'}
]},
@@ -538,9 +540,10 @@ L.Control.Menubar = L.Control.extend({
]},
{name: !window.ThisIsAMobileApp ? _('Download as') : 
_('Export as'), id:'downloadas', type: 'menu', menu: [
{name: _('PDF Document (.pdf)'), id: 
'downloadas-pdf', type: 'action'},
-   {name: _('ODF presentation (.odp)'), id: 
'downloadas-odp', type: 'action'},
-   {name: _('PowerPoint 2003 Presentation 
(.ppt)'), id: 'downloadas-ppt', type: 'action'},
-   {name: _('PowerPoint Presentation (.pptx)'), 
id: 'downloadas-pptx', type: 'action'},
+   {name: _('ODF presentation (.odp)'), id: 
'downloadas-odp', type: 'action', drawing: false},
+   {name: _('PowerPoint 2003 Presentation 
(.ppt)'), id: 'downloadas-ppt', type: 'action', drawing: false},
+   {name: _('PowerPoint Presentation (.pptx)'), 
id: 'downloadas-pptx', type: 'action', drawing: false},
+   {name: _('ODF Drawing (.odg)'), id: 
'downloadas-odg', type: 'action'}
]},
{name: _UNO('.uno:EditMenu', 'presentation'), id: 
'editmenu', type: 'menu', menu: [
{uno: '.uno:Undo'},
@@ -1384,6 +1387,12 @@ L.Control.Menubar = L.Control.extend({
if (menuItem.id === 'changesmenu' && 
this._map['wopi'].HideChangeTrackingControls)
return false;
 
+   if (menuItem.drawing === false && this._map.getDocType() === 
'drawing')
+   return false;
+
+   if (menuItem.id === 'downloadas-odg' && 
!this._map['wopi'].BaseFileName.endsWith('.odg'))
+   return false;
+
// Keep track of all 'downloadas-' options and register them as
// export formats with docLayer which can then be publicly 
accessed unlike
// this Menubar control for which there doesn't seem to be any 
easy way
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - 6 commits - configure.ac drawinglayer/source vcl/source wizards/com writerfilter/source

[Jean-Sebastien BEVILACQUA (via logerrit)]

 configure.ac   |2 +-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |4 ++--
 vcl/source/control/edit.cxx|3 +--
 wizards/com/sun/star/wizards/db/SQLQueryComposer.java  |3 ++-
 writerfilter/source/rtftok/rtfdispatchsymbol.cxx   |1 +
 writerfilter/source/rtftok/rtfdispatchvalue.cxx|5 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 ++
 8 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit ba352b96595e9b31d57a5fb2829eccca433f28f7
Author: Jean-Sebastien BEVILACQUA 
AuthorDate: Tue Mar 24 15:46:37 2020 +0100
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Tue Mar 24 15:46:37 2020 +0100

bump product versionto 6.2.8.2.M1

Change-Id: If38028f94b37570f7cc5fae69b5ea2c7e5a0ccd8

diff --git a/configure.ac b/configure.ac
index 694ea2d23398..1278e25b65d7 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.2.8.2.M0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M1],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
commit a197747b1411c833165ff396aeae819541a67b50
Author: Andrés Maldonado 
AuthorDate: Thu Dec 26 22:46:36 2019 +0100
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Tue Mar 24 15:31:14 2020 +0100

tdf#125901: apply color modifiers when drawing hatch

With this fix, the shadow of a shape with a Hatching fill is no longer
the same color as the hatching (in full screen mode)

Change-Id: I979866e748b5caf2ccafc8a6084ffdb46bc8122c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/73964
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 9c64e8a2948c379c537ee0882afa57882facb26e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85864
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 6ac21b0985b0..2b65ac277a07 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1630,7 +1630,7 @@ namespace drawinglayer
 aTransform,
 false,
 eHatch,
-Color(rFillHatchAttribute.getColor()),
+
Color(maBColorModifierStack.getModifiedColor(rFillHatchAttribute.getColor())),
 SvtGraphicFill::GradientType::Linear,
 Color(),
 Color(),
@@ -1651,7 +1651,7 @@ namespace drawinglayer
 
 mpOutputDevice->DrawHatch(aToolsPolyPolygon,
 Hatch(aHatchStyle,
-Color(rFillHatchAttribute.getColor()),
+
Color(maBColorModifierStack.getModifiedColor(rFillHatchAttribute.getColor())),
 basegfx::fround(rFillHatchAttribute.getDistance()),
 basegfx::fround(rFillHatchAttribute.getAngle() / 
F_PI1800)));
 
commit b2f419740375bc13cd6e869ddf0d9cbd9065c49c
Author: Andrés Maldonado 
AuthorDate: Thu Apr 18 15:24:50 2019 +0200
Commit: Jean-Sebastien BEVILACQUA 
CommitDate: Tue Mar 24 15:28:04 2020 +0100

tdf#124824 FILEOPEN: Error rendering page break between two tables in a RTF

This patch is adapted from an old unpublished Linagora patch by 
mdero...@linagora.com

Change-Id: I49bd9a9797ef42cd110259bd0dd4d4747300da71

diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx 
b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index 2603ebe22952..8443cc1a3415 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -100,6 +100,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword 
nKeyword)
 {
 if (m_aStates.top().eDestination == Destination::FOOTNOTESEPARATOR)
 break; // just ignore it - only thing we read in here is 
CHFTNSEP
+m_bNeedTableBreak = false;
 checkFirstRun();
 bool bNeedPap = m_bNeedPap;
 checkNeedPap();
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx 
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 72fd4802a601..a433fa9e85d6 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -845,6 +845,11 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword 
nKeyword, int nParam)
 break;
 case RTF_CELLX:
 {
+if (m_bNeedTableBreak && !m_bFirstRun)
+dispatchSymbo

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 0c4336e83fe86addd86814eebc33e7f5b8ddc1ce
Author: Johnny_M 
AuthorDate: Sun Jul 5 20:42:03 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 20:42:03 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 6e391bd9be1d344565b84dc42df5b76197aa5207
  - tdf#132643 Translate German section IDs

Change-Id: I6d62bf5afebc4f1789676c58620849cef56f66dd
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97755
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 193415db6bd7..6e391bd9be1d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 193415db6bd7d5f7ca9c828e354efc9bac1919ac
+Subproject commit 6e391bd9be1d344565b84dc42df5b76197aa5207
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0302.xhp |2 +-
 source/text/sbasic/shared/03020200.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e391bd9be1d344565b84dc42df5b76197aa5207
Author: Johnny_M 
AuthorDate: Thu Jul 2 13:27:02 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 20:42:03 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I6d62bf5afebc4f1789676c58620849cef56f66dd
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97755
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/0302.xhp 
b/source/text/sbasic/shared/0302.xhp
index a049e523c..aadbcb509 100644
--- a/source/text/sbasic/shared/0302.xhp
+++ b/source/text/sbasic/shared/0302.xhp
@@ -36,7 +36,7 @@
 
 You can use 
these functions to support the creation of "relative" files, so that you can 
save and reload certain records by specifying their record number. File I/O 
functions can also help you manage your files by providing you with information 
such as file size, current path settings, or the creation date of a file or a 
directory.
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/03020200.xhp 
b/source/text/sbasic/shared/03020200.xhp
index e2a230376..2ae72fee0 100644
--- a/source/text/sbasic/shared/03020200.xhp
+++ b/source/text/sbasic/shared/03020200.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 File 
Input/Output Functions
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 external/postgresql/UnpackedTarball_postgresql.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5fe12dd54ab09e3321c01f57d6af127b2fbdcf5f
Author: Tor Lillqvist 
AuthorDate: Sun Jul 5 10:23:44 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Jul 5 20:34:50 2020 +0200

Use correct location for the config.{guess,sub} in the postgresql tarball

Change-Id: Iccec53f67ab6c9e7920354f6a26c81300c1bee48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98097
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/postgresql/UnpackedTarball_postgresql.mk 
b/external/postgresql/UnpackedTarball_postgresql.mk
index a53bbbffdb9b..90b363c2dccf 100644
--- a/external/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,postgresql))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL),,postgresql))
 
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,postgresql,config))
+
 $(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
@@ -26,6 +28,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
 ))
 endif
 
-$(eval $(call gb_UnpackedTarball_update_autoconf_configs,postgresql))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 3cd512bd6851287ac742304a9f2be5a61fe535c6
Author: Johnny_M 
AuthorDate: Sun Jul 5 20:32:36 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 20:32:36 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 193415db6bd7d5f7ca9c828e354efc9bac1919ac
  - tdf#132643 Translate German section IDs

Change-Id: I2a9caef0d9e87224cd512e3c8bbe9a19296edc2e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97852
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 770a9dbb7c42..193415db6bd7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 770a9dbb7c4224cb379d327ca02300abe5083001
+Subproject commit 193415db6bd7d5f7ca9c828e354efc9bac1919ac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/01170100.xhp|2 +-
 source/text/sbasic/shared/01170101.xhp|2 +-
 source/text/shared/00/0105.xhp|2 +-
 source/text/shared/01/gallery.xhp |2 +-
 source/text/shared/02/01170100.xhp|2 +-
 source/text/shared/02/01170101.xhp|2 +-
 source/text/shared/02/01170200.xhp|2 +-
 source/text/shared/02/01170201.xhp|2 +-
 source/text/shared/explorer/database/0504.xhp |2 +-
 source/text/shared/explorer/database/05040100.xhp |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 193415db6bd7d5f7ca9c828e354efc9bac1919ac
Author: Johnny_M 
AuthorDate: Fri Jul 3 13:46:08 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 20:32:36 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I2a9caef0d9e87224cd512e3c8bbe9a19296edc2e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97852
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/01170100.xhp 
b/source/text/sbasic/shared/01170100.xhp
index 6e1547268..8a532491c 100644
--- a/source/text/sbasic/shared/01170100.xhp
+++ b/source/text/sbasic/shared/01170100.xhp
@@ -98,7 +98,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/01170101.xhp 
b/source/text/sbasic/shared/01170101.xhp
index 80fb865c5..eda7765b4 100644
--- a/source/text/sbasic/shared/01170101.xhp
+++ b/source/text/sbasic/shared/01170101.xhp
@@ -29,7 +29,7 @@
 
 
 
-
+
 General
 Define the 
properties for the selected control or dialog. The available properties depend 
on the type of control selected. The following properties therefore are not 
available for every type of control.
 
diff --git a/source/text/shared/00/0105.xhp 
b/source/text/shared/00/0105.xhp
index 941b81873..e4fc5004c 100644
--- a/source/text/shared/00/0105.xhp
+++ b/source/text/shared/00/0105.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 GeneralUFI: 
this is a tab page of the Gallery. Deleted everything else
diff --git a/source/text/shared/01/gallery.xhp 
b/source/text/shared/01/gallery.xhp
index ceae4e0b4..2a47133b1 100644
--- a/source/text/shared/01/gallery.xhp
+++ b/source/text/shared/01/gallery.xhp
@@ -69,7 +69,7 @@
 
 Properties
 The 
Properties of (Theme) dialog contains the following 
tabs:
-
+
 
 Files
 
diff --git a/source/text/shared/02/01170100.xhp 
b/source/text/shared/02/01170100.xhp
index 1c12b1521..501f7e9be 100644
--- a/source/text/shared/02/01170100.xhp
+++ b/source/text/shared/02/01170100.xhp
@@ -103,7 +103,7 @@
 
 As with list 
boxes or combo boxes, you can open or close the list with a mouse click at the 
arrow on the right end of the field. However, the input here can be entered 
either in the opened list or in the top text field. An exception is the 
properties that expect a list representation, for example, the property "List 
Entries", which can be set for the control fields List Box and 
Combo Box. Here, you can only edit the entries when the field is 
opened.
 
-
+
 
 
 
diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index a3270b20e..650605f77 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -25,7 +25,7 @@
   
 
 
-
+
 GeneralUFI: had to remove all 
internal links to this file because all the targets vanished and no time to 
reinsert them all
   This 
General tab enables you to define the general properties of a form 
control. These properties differ, depending on the control type. Not all of the 
following properties are available for every control.
 
diff --git a/source/text/shared/02/01170200.xhp 
b/source/text/shared/02/01170200.xhp
index 9ae5fbbd1..641e959cf 100644
--- a/source/text/shared/02/01170200.xhp
+++ b/source/text/shared/02/01170200.xhp
@@ -42,7 +42,7 @@
 
   
   
-  
+  
   
   
   
diff --git a/source/text/shared/02/01170201.xhp 
b/source/text/shared/02/01170201.xhp
index d37e218e5..b7e44faee 100644
--- a/source/text/shared/02/01170201.xhp
+++ b/source/text/shared/02/01170201.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 submitting forms
 get method for form transmissions
 post method for form transmissions
diff --git a/source/text/shared/explorer/database/0504.xhp 
b/source/text/shared/explorer/database/0504.xhp
index 4c8385e0c..751edc395 100644
--- a/source/text/shared/explorer/database/0504.xhp
+++ b/source/text/shared/explorer/database/0504.xhp
@@ -33,7 +33,7 @@
 
 
 General
-
+
 
 
 
diff --git a/source/text/shared/explorer/database/05040100.xhp 
b/source/text/shared/explorer/database/05040100.xhp
index 6ba298ba2..9c45e34f1 100644
--- a/source/text/shared/explorer/database/05040100.xhp
+++ b/source/text/shared/explorer/database/05040100.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 General
 When you 
create a database table as an administrator, you can use this tab to determine 
user access, and to edit the data or the table 

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

[Tor Lillqvist (via logerrit)]

 external/openssl/ExternalProject_openssl.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d0ed2c49d2ed75307d4d6bcb1a841a02f13edc6d
Author: Tor Lillqvist 
AuthorDate: Sun Jul 5 17:46:54 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Sun Jul 5 20:18:09 2020 +0200

Remove leftover thing for macOS on x86

Change-Id: I353e854c3deb7d1df3767e2295aef68e9491f0e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98144
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index ea2b6a405e7f..6645cab4bc4a 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -45,7 +45,6 @@ OPENSSL_PLATFORM := \
   $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\
 ,\
   $(if $(filter MACOSX,$(OS)),\
-$(if $(filter INTEL,$(CPUNAME)),darwin-i386-cc)\
 $(if $(filter X86_64,$(CPUNAME)),darwin64-x86_64-cc)\
 $(if $(filter ARM64,$(CPUNAME)),darwin64-arm64-cc)\
   )\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Error in building LibreOffice

[Rene Engelhard]

Hi,


Am 05.07.20 um 18:32 schrieb Tor Lillqvist:
>
>
>
> This link: https://github.com/dotnet/runtime/issues/15416
>
> says that I have to add myself to the list of permissions
> of C:\ProgramData\Microsoft\Crypto\RSA\MachineKeys folder with
> Full Control.
>
>
> Why do you think a five year old message about a problem when building
> the .NET runtime has anything to do with building LibreOffice in 2020?
>
Because he read stuff (e.g. LOs own wiki):

https://wiki.documentfoundation.org/Development/BuildingOnWindows/de#Windows_permission_issues:

--- quote ---


  Windows permission issues

If you receive the following error :

ALINK : error AL1078: Error signing assembly -- Access is denied.

Then right click and select "properties" of the folder
"C:\ProgramData\Microsoft\Crypto\RSA\MachineKeys" and under the
"security" tab modify the permissions of the user and allow "Full control".

See this for more
information 
https://odetocode.com/blogs/scott/archive/2020/01/12/solving-access-denied-in-crypto-machine-keys.aspx

--- quote ---


Regards,


Rene

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

Re: Error in building LibreOffice

[anshu khare]

The link says about solving the error


ALINK: error AL1078: Error signing assembly -- Access is denied.

That's why I thought that it might be useful..

Please tell me how to solve this problem

On Sun, 5 Jul, 2020, 10:02 PM Tor Lillqvist,  wrote:

>
>>
>> This link: https://github.com/dotnet/runtime/issues/15416
>>
>> says that I have to add myself to the list of permissions of
>> C:\ProgramData\Microsoft\Crypto\RSA\MachineKeys folder with Full Control.
>>
>
> Why do you think a five year old message about a problem when building the
> .NET runtime has anything to do with building LibreOffice in 2020?
>
> --tml
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Error in building LibreOffice

[Tor Lillqvist]

>
>
>
> This link: https://github.com/dotnet/runtime/issues/15416
>
> says that I have to add myself to the list of permissions of
> C:\ProgramData\Microsoft\Crypto\RSA\MachineKeys folder with Full Control.
>

Why do you think a five year old message about a problem when building the
.NET runtime has anything to do with building LibreOffice in 2020?

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

Error in building LibreOffice

[anshu khare]

Hi

When I run

 /opt/lo/bin/make gb_COLOR=1

it gives the following error

ALINK: error AL1078: Error signing assembly -- Access is denied.
make[1]: *** [C:/sources/libo-core/solenv/gbuild/CliAssembly.mk:82:
C:/build/workdir/CliAssemblyTarget/cli_basetypes.done] Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:282: build] Error 2

This link: https://github.com/dotnet/runtime/issues/15416

says that I have to add myself to the list of permissions of
C:\ProgramData\Microsoft\Crypto\RSA\MachineKeys folder with Full Control.

When I go this path I find that MachineKeys is a system file and editing it
can cause harm to my pc.

Is it the correct solution or there is something else that needs to be
focussed on?

If it is the correct solution, then which permissions do I have to edit the
attached picture?



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

Re: Error in building

[anshu khare]

I just saw it on the link given by you..
It somehow didn't appear on the mail..
Thanks Julien :)

On Sun, 5 Jul, 2020, 8:08 PM Mike Kaganski, 
wrote:

> On 05.07.2020 17:30, anshu khare wrote:
> > Could you please tell me the exact command?
>
> The command was already mentioned by Julien
> (
> http://document-foundation-mail-archive.969070.n3.nabble.com/Error-in-building-tp4282620p4282665.html
> ).
>
> Specifically, you wrote this:
>
> > On running make clean, the output is :
> >
> >
> > rm -fr C:/build/test-install
> > make: rm: No such file or directory
> > make: *** [Makefile:177: clean-host] Error 127
>
> ... after which you wrote:
>
> > I tried to build it.. But it's giving the same error
>
> > To be specific the error when i run
> >
> >  /opt/lo/bin/make gb_COLOR=1
> >
> > is
> >
> >
> > C:/sources/libo-core/sal/osl/all/debugbase.cxx: fatal error C1853:
> > 'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'
> > precompiled header file is from a different version of t
> > he compiler, or the precompiled header is C++ and you are using it from C
> > (or vice versa)
>
> The problem seemed to be using `make clean` literally, not turning
> `make` into `/opt/lo/bin/make` to clean. Since that call failed to find
> `rm`, it naturally hadn't removed nothing, and you re-tried to build in
> the unchanged working tree.
>
> --
> Best regards,
> Mike Kaganski
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: cypress_test/data cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/data/mobile/calc/hamburger_menu_sheet.ods|binary
 cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js |  264 
++
 2 files changed, 264 insertions(+)

New commits:
commit 05e77fd0da0338882d6f805843ccb56b4379a22e
Author: Tamás Zolnai 
AuthorDate: Sun Jul 5 15:50:25 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Sun Jul 5 16:53:38 2020 +0200

cypress: add tests for sheet operations (calc, mobile)

Change-Id: I01b4806eac3ee713b8d3754e075df55d917e07ce
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98142
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/data/mobile/calc/hamburger_menu_sheet.ods 
b/cypress_test/data/mobile/calc/hamburger_menu_sheet.ods
new file mode 100644
index 0..6883a88d9
Binary files /dev/null and 
b/cypress_test/data/mobile/calc/hamburger_menu_sheet.ods differ
diff --git a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js 
b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
index 154f651d3..2f25a8072 100644
--- a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
@@ -374,6 +374,270 @@ describe('Trigger hamburger menu options.', function() {
.should('not.be.visible');
});
 
+   it('Sheet: insert row before.', function() {
+   before('hamburger_menu_sheet.ods');
+
+   calcHelper.clickOnFirstCell();
+
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'Sheet')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Insert Rows')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Rows Above')
+   .click();
+
+   calcMobileHelper.selectAllMobile(false);
+
+   cy.get('#copy-paste-container table tr')
+   .should('have.length', 3);
+
+   cy.get('#copy-paste-container table tr td:nth-of-type(1)')
+   .should(function(cells) {
+   expect(cells).to.have.lengthOf(3);
+   expect(cells[0]).to.have.text('');
+   expect(cells[1]).to.have.text('1');
+   expect(cells[2]).to.have.text('3');
+   });
+   });
+
+   it('Sheet: insert row after.', function() {
+   before('hamburger_menu_sheet.ods');
+
+   calcHelper.clickOnFirstCell();
+
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'Sheet')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Insert Rows')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Rows Below')
+   .click();
+
+   calcMobileHelper.selectAllMobile(false);
+
+   cy.get('#copy-paste-container table tr')
+   .should('have.length', 3);
+
+   cy.get('#copy-paste-container table tr td:nth-of-type(1)')
+   .should(function(cells) {
+   expect(cells).to.have.lengthOf(3);
+   expect(cells[0]).to.have.text('1');
+   expect(cells[1]).to.have.text('');
+   expect(cells[2]).to.have.text('3');
+   });
+   });
+
+   it('Sheet: insert column before.', function() {
+   before('hamburger_menu_sheet.ods');
+
+   calcHelper.clickOnFirstCell();
+
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'Sheet')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Insert Columns')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Columns Before')
+   .click();
+
+   calcMobileHelper.selectAllMobile(false);
+
+   cy.get('#copy-paste-container table tr')
+   .should('have.length', 2);
+
+   cy.get('#copy-paste-container table tr:nth-of-type(1) td')
+   .should(function(cells) {
+   expect(cells).to.have.lengthOf(3);
+   expect(cells[0]).to.have.text('');
+   expect(cells[1]).to.have.text('1');
+   expect(cells[2]).to.have.text('2');
+   });
+   });
+
+   it('Sheet: insert column after.', function() {
+   before('hamburger_menu_sheet.ods');
+
+   calcHelper.clickOnFirstCell();
+
+   mobileHelper.openHamburgerMenu();
+
+ 

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

[Caolán McNamara (via logerrit)]

 svx/source/fmcomp/gridcell.cxx |   26 +-
 svx/source/inc/gridcell.hxx|   10 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit d60bc5d0827247797811d766aafb7d26a502152f
Author: Caolán McNamara 
AuthorDate: Fri Jul 3 19:48:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jul 5 16:45:21 2020 +0200

clarify this arg is to determine if its a spinbutton or entry variant

Change-Id: If102441312bf0c6d27462535268e79242bcde48c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97894
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 4a2a452b3ecb..2a4213ffcede 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1851,20 +1851,19 @@ DbSpinField::DbSpinField( DbGridColumn& _rColumn, 
sal_Int16 _nStandardAlign )
 {
 }
 
-
 void DbSpinField::Init( vcl::Window& _rParent, const Reference< XRowSet >& 
_rxCursor )
 {
 m_rColumn.SetAlignmentFromModel( m_nStandardAlign );
 
 Reference< XPropertySet > xModel( m_rColumn.getModel() );
 
-// determine the WinBits for the field
-WinBits nFieldStyle = 0;
+// determine if we need a spinbutton version
+bool bSpinButton(false);
 if ( ::comphelper::getBOOL( xModel->getPropertyValue( FM_PROP_SPIN ) ) )
-nFieldStyle = WB_REPEAT | WB_SPIN;
+bSpinButton = true;
 // create the fields
-m_pWindow = createField( &_rParent, nFieldStyle, xModel );
-m_pPainter = createField( &_rParent, nFieldStyle, xModel );
+m_pWindow = createField( &_rParent, bSpinButton, xModel );
+m_pPainter = createField( &_rParent, bSpinButton, xModel );
 
 // adjust all other settings which depend on the property values
 implAdjustGenericFieldSetting( xModel );
@@ -1873,7 +1872,6 @@ void DbSpinField::Init( vcl::Window& _rParent, const 
Reference< XRowSet >& _rxCu
 DbCellControl::Init( _rParent, _rxCursor );
 }
 
-
 CellControllerRef DbSpinField::CreateController() const
 {
 return new SpinCellController( static_cast< SpinField* >( m_pWindow.get() 
) );
@@ -1946,8 +1944,9 @@ void DbNumericField::implAdjustGenericFieldSetting( const 
Reference< XPropertySe
 rPaintFormatter.SetFormat( sFormatString, aAppLanguage );
 }
 
-VclPtr DbNumericField::createField( vcl::Window* _pParent, WinBits 
_nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/  )
+VclPtr DbNumericField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/  )
 {
+WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 return VclPtr::Create( _pParent, _nFieldStyle );
 }
 
@@ -2074,8 +2073,9 @@ void DbCurrencyField::implAdjustGenericFieldSetting( 
const Reference< XPropertyS
 }
 
 
-VclPtr DbCurrencyField::createField( vcl::Window* _pParent, WinBits 
_nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/  )
+VclPtr DbCurrencyField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/  )
 {
+WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 return VclPtr::Create( _pParent, _nFieldStyle );
 }
 
@@ -2179,8 +2179,9 @@ DbDateField::DbDateField( DbGridColumn& _rColumn )
 doPropertyListening( FM_PROP_DATE_SHOW_CENTURY );
 }
 
-VclPtr DbDateField::createField( vcl::Window* _pParent, WinBits 
_nFieldStyle, const Reference< XPropertySet >& _rxModel  )
+VclPtr DbDateField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& _rxModel  )
 {
+WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 // check if there is a DropDown property set to TRUE
 bool bDropDown =!hasProperty( FM_PROP_DROPDOWN, _rxModel )
 ||  getBOOL( _rxModel->getPropertyValue( 
FM_PROP_DROPDOWN ) );
@@ -2305,13 +2306,12 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn )
 doPropertyListening( FM_PROP_STRICTFORMAT );
 }
 
-
-VclPtr DbTimeField::createField( vcl::Window* _pParent, WinBits 
_nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ )
+VclPtr DbTimeField::createField( vcl::Window* _pParent, bool 
bSpinButton, const Reference< XPropertySet >& /*_rxModel*/ )
 {
+WinBits _nFieldStyle = bSpinButton ? (WB_REPEAT | WB_SPIN) : 0;
 return VclPtr::Create( _pParent, _nFieldStyle );
 }
 
-
 void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet 
>& _rxModel )
 {
 DBG_ASSERT( m_pWindow, "DbTimeField::implAdjustGenericFieldSetting: not to 
be called without window!" );
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 2e43144fcb1d..2491152cbf0d 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -547,7 +547,7 @@ public:
 protected:
 virtual VclPtr createField(
 vcl::Window* _pParent,
-WinBits _nFieldStyle,
+ 

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

[Caolán McNamara (via logerrit)]

 include/vcl/weldutils.hxx|   17 +
 vcl/source/app/weldutils.cxx |   53 +++
 2 files changed, 70 insertions(+)

New commits:
commit 697f635fb8316d2c325ccdf9040cd0e371cdd6e5
Author: Caolán McNamara 
AuthorDate: Fri Jul 3 09:57:44 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jul 5 16:44:58 2020 +0200

add a DoubleNumericEntry

Change-Id: I866f078531779cbffb22035848dc88e0039c5ba0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index 757303fdcabf..84e647835863 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -202,6 +202,23 @@ private:
 virtual void UpdateCurrentValue(double dCurrentValue) override;
 };
 
+class VCL_DLLPUBLIC DoubleNumericEntry final : public EntryFormatter
+{
+public:
+DoubleNumericEntry(weld::Entry& rEntry);
+DoubleNumericEntry(weld::FormattedSpinButton& rSpinButton);
+
+virtual ~DoubleNumericEntry() override;
+
+private:
+virtual bool CheckText(const OUString& sText) const override;
+
+virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat) override;
+void ResetConformanceTester();
+
+std::unique_ptr m_pNumberValidator;
+};
+
 // get the row the iterator is on
 VCL_DLLPUBLIC size_t GetAbsPos(const weld::TreeView& rTreeView, const 
weld::TreeIter& rIter);
 
diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx
index f560923e5609..329d15827b70 100644
--- a/vcl/source/app/weldutils.cxx
+++ b/vcl/source/app/weldutils.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -234,6 +236,57 @@ IMPL_LINK_NOARG(EntryFormatter, FocusOutHdl, 
weld::Widget&, void)
 m_aFocusOutHdl.Call(m_rEntry);
 }
 
+DoubleNumericEntry::DoubleNumericEntry(weld::Entry& rEntry)
+: EntryFormatter(rEntry)
+{
+ResetConformanceTester();
+}
+
+DoubleNumericEntry::DoubleNumericEntry(weld::FormattedSpinButton& rSpinButton)
+: EntryFormatter(rSpinButton)
+{
+ResetConformanceTester();
+}
+
+DoubleNumericEntry::~DoubleNumericEntry() = default;
+
+void DoubleNumericEntry::FormatChanged(FORMAT_CHANGE_TYPE nWhat)
+{
+ResetConformanceTester();
+EntryFormatter::FormatChanged(nWhat);
+}
+
+bool DoubleNumericEntry::CheckText(const OUString& sText) const
+{
+// We'd like to implement this using the NumberFormatter::IsNumberFormat, 
but unfortunately, this doesn't
+// recognize fragments of numbers (like, for instance "1e", which happens 
during entering e.g. "1e10")
+// Thus, the roundabout way via a regular expression
+return m_pNumberValidator->isValidNumericFragment(sText);
+}
+
+void DoubleNumericEntry::ResetConformanceTester()
+{
+// the thousands and the decimal separator are language dependent
+const SvNumberformat* pFormatEntry = 
GetOrCreateFormatter()->GetEntry(m_nFormatKey);
+
+sal_Unicode cSeparatorThousand = ',';
+sal_Unicode cSeparatorDecimal = '.';
+if (pFormatEntry)
+{
+LocaleDataWrapper 
aLocaleInfo(LanguageTag(pFormatEntry->GetLanguage()));
+
+OUString sSeparator = aLocaleInfo.getNumThousandSep();
+if (!sSeparator.isEmpty())
+cSeparatorThousand = sSeparator[0];
+
+sSeparator = aLocaleInfo.getNumDecimalSep();
+if (!sSeparator.isEmpty())
+cSeparatorDecimal = sSeparator[0];
+}
+
+m_pNumberValidator.reset(
+new validation::NumberValidator(cSeparatorThousand, 
cSeparatorDecimal));
+}
 }
 
 /* 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: include/vcl svx/source toolkit/source vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/fmtfield.hxx   |2 
 svx/source/fmcomp/gridcell.cxx |   39 +++
 toolkit/source/awt/vclxwindows.cxx |  189 ++---
 vcl/inc/salvtables.hxx |2 
 vcl/source/app/salvtables.cxx  |   40 +++
 vcl/source/control/fmtfield.cxx|   81 +++
 vcl/source/uitest/uiobject.cxx |2 
 vcl/source/window/builder.cxx  |   12 +-
 8 files changed, 181 insertions(+), 186 deletions(-)

New commits:
commit ef371319fa5f6b076d6d2edc8f252bbb94fd77f0
Author: Caolán McNamara 
AuthorDate: Fri Jul 3 17:20:50 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jul 5 16:44:27 2020 +0200

return a reference instead of a pointer

Change-Id: Ib8b9133991a9c36e737171ae6dfb6a87cc91e1ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97888
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/fmtfield.hxx b/include/vcl/fmtfield.hxx
index 1d92a1b957b4..c1b8adc73c80 100644
--- a/include/vcl/fmtfield.hxx
+++ b/include/vcl/fmtfield.hxx
@@ -47,7 +47,7 @@ public:
 
 virtual FactoryFunction GetUITestFactory() const override;
 
-Formatter* GetFormatter();
+Formatter& GetFormatter();
 void SetFormatter(Formatter* pFormatter);
 
 protected:
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index f3c5cb22c106..4a2a452b3ecb 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1905,16 +1905,16 @@ void DbNumericField::implAdjustGenericFieldSetting( 
const Reference< XPropertySe
 sal_Int16   nScale  = getINT16( _rxModel->getPropertyValue( 
FM_PROP_DECIMAL_ACCURACY ) );
 boolbThousand   = getBOOL( _rxModel->getPropertyValue( 
FM_PROP_SHOWTHOUSANDSEP ) );
 
-Formatter* pEditFormatter = 
static_cast(m_pWindow.get())->GetFormatter();
-pEditFormatter->SetMinValue(nMin);
-pEditFormatter->SetMaxValue(nMax);
-pEditFormatter->SetSpinSize(nStep);
-pEditFormatter->SetStrictFormat(bStrict);
+Formatter& rEditFormatter = 
static_cast(m_pWindow.get())->GetFormatter();
+rEditFormatter.SetMinValue(nMin);
+rEditFormatter.SetMaxValue(nMax);
+rEditFormatter.SetSpinSize(nStep);
+rEditFormatter.SetStrictFormat(bStrict);
 
-Formatter* pPaintFormatter = 
static_cast(m_pPainter.get())->GetFormatter();
-pPaintFormatter->SetMinValue(nMin);
-pPaintFormatter->SetMaxValue(nMax);
-pPaintFormatter->SetStrictFormat(bStrict);
+Formatter& rPaintFormatter = 
static_cast(m_pPainter.get())->GetFormatter();
+rPaintFormatter.SetMinValue(nMin);
+rPaintFormatter.SetMaxValue(nMax);
+rPaintFormatter.SetStrictFormat(bStrict);
 
 // give a formatter to the field and the painter;
 // test first if I can get from the service behind a connection
@@ -1932,21 +1932,20 @@ void DbNumericField::implAdjustGenericFieldSetting( 
const Reference< XPropertySe
 }
 if ( nullptr == pFormatterUsed )
 {   // the cursor didn't lead to success -> standard
-pFormatterUsed = pEditFormatter->StandardFormatter();
+pFormatterUsed = rEditFormatter.StandardFormatter();
 DBG_ASSERT( pFormatterUsed != nullptr, 
"DbNumericField::implAdjustGenericFieldSetting: no standard formatter given by 
the numeric field !" );
 }
-pEditFormatter->SetFormatter( pFormatterUsed );
-pPaintFormatter->SetFormatter( pFormatterUsed );
+rEditFormatter.SetFormatter( pFormatterUsed );
+rPaintFormatter.SetFormatter( pFormatterUsed );
 
 // and then generate a format which has the desired length after the 
decimal point, etc.
 LanguageType aAppLanguage = 
Application::GetSettings().GetUILanguageTag().getLanguageType();
 OUString sFormatString = pFormatterUsed->GenerateFormat(0, aAppLanguage, 
bThousand, false, nScale);
 
-pEditFormatter->SetFormat( sFormatString, aAppLanguage );
-pPaintFormatter->SetFormat( sFormatString, aAppLanguage );
+rEditFormatter.SetFormat( sFormatString, aAppLanguage );
+rPaintFormatter.SetFormat( sFormatString, aAppLanguage );
 }
 
-
 VclPtr DbNumericField::createField( vcl::Window* _pParent, WinBits 
_nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/  )
 {
 return VclPtr::Create( _pParent, _nFieldStyle );
@@ -1966,7 +1965,7 @@ namespace
 double fValue = _rControl.GetValue( _rxField, _rxFormatter );
 if ( !_rxField->wasNull() )
 {
-_rField.GetFormatter()->SetValue( fValue );
+_rField.GetFormatter().SetValue( fValue );
 sValue = _rField.GetText();
 }
 }
@@ -1996,8 +1995,8 @@ void DbNumericField::updateFromModel( Reference< 
XPropertySet > _rxModel )
 double dValue = 0;
 if ( _rxModel->getPropertyValue( FM_PROP_VALUE ) >>= dValue )
 {
-Formatter* pFormatter = 
static_cast(m_pWindow.get())->GetFormatter();
-pFormatter->SetValue(dValue);
+Form

[Libreoffice-commits] core.git: chart2/source extensions/source framework/source include/vcl vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/res_Trendline.cxx|   22 +
 chart2/source/controller/dialogs/tp_AxisPositions.cxx |   27 +-
 chart2/source/controller/dialogs/tp_Scale.cxx |   76 --
 extensions/source/propctrlr/usercontrol.cxx   |   47 ++-
 extensions/source/propctrlr/usercontrol.hxx   |4 
 framework/source/uielement/spinfieldtoolbarcontroller.cxx |   62 +
 include/vcl/fmtfield.hxx  |1 
 include/vcl/formatter.hxx |   12 
 include/vcl/weld.hxx  |   46 +--
 include/vcl/weldutils.hxx |   23 +
 vcl/source/app/salvtables.cxx |   76 --
 vcl/source/app/weldutils.cxx  |   76 +-
 vcl/source/control/fmtfield.cxx   |   17 -
 vcl/unx/gtk3/gtk3gtkinst.cxx  |  173 --
 14 files changed, 332 insertions(+), 330 deletions(-)

New commits:
commit 95cfa85395f983df3ba044192b29ce0bbc5e6085
Author: Caolán McNamara 
AuthorDate: Fri Jul 3 12:08:02 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jul 5 16:44:09 2020 +0200

adjust FormattedSpinButton to be driven by an EntryFormatter

so we can have the same backend driving the FormattedSpinButtons as a
FormattedEntry

Change-Id: I07a472315a04787eb5fcf992cde8f758af742156
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97860
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 0eaea7b4e163..11514a19a84a 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 namespace chart
@@ -31,8 +32,9 @@ namespace chart
 
 static void lcl_setValue(weld::FormattedSpinButton& rFmtField, double fValue )
 {
-rFmtField.set_value(fValue);
-//TODOrFmtField.SetDefaultValue( fValue );
+Formatter& rFieldFormatter = rFmtField.GetFormatter();
+rFieldFormatter.SetValue(fValue);
+rFieldFormatter.SetDefaultValue( fValue );
 }
 
 TrendlineResources::TrendlineResources(weld::Builder& rBuilder, const 
SfxItemSet& rInAttrs)
@@ -66,6 +68,16 @@ TrendlineResources::TrendlineResources(weld::Builder& 
rBuilder, const SfxItemSet
 {
 FillValueSets();
 
+Formatter& rForwardFormatter = 
m_xFmtFld_ExtrapolateForward->GetFormatter();
+rForwardFormatter.ClearMinValue();
+rForwardFormatter.ClearMaxValue();
+Formatter& rBackwardFormatter = 
m_xFmtFld_ExtrapolateBackward->GetFormatter();
+rBackwardFormatter.ClearMinValue();
+rBackwardFormatter.ClearMaxValue();
+Formatter& rInterceptFormatter = m_xFmtFld_InterceptValue->GetFormatter();
+rInterceptFormatter.ClearMinValue();
+rInterceptFormatter.ClearMaxValue();
+
 Link aLink = LINK(this, TrendlineResources, 
SelectTrendLine);
 m_xRB_Linear->connect_toggled( aLink );
 m_xRB_Logarithmic->connect_toggled( aLink );
@@ -369,9 +381,9 @@ IMPL_LINK_NOARG(TrendlineResources, ChangeFormattedValue, 
weld::FormattedSpinBut
 void TrendlineResources::SetNumFormatter( SvNumberFormatter* pFormatter )
 {
 m_pNumFormatter = pFormatter;
-m_xFmtFld_ExtrapolateForward->set_formatter( m_pNumFormatter );
-m_xFmtFld_ExtrapolateBackward->set_formatter( m_pNumFormatter );
-m_xFmtFld_InterceptValue->set_formatter( m_pNumFormatter );
+m_xFmtFld_ExtrapolateForward->GetFormatter().SetFormatter(m_pNumFormatter);
+
m_xFmtFld_ExtrapolateBackward->GetFormatter().SetFormatter(m_pNumFormatter);
+m_xFmtFld_InterceptValue->GetFormatter().SetFormatter(m_pNumFormatter);
 }
 
 void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx 
b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 89b8c3899881..f94f09b98690 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -59,10 +60,12 @@ AxisPositionsTabPage::AxisPositionsTabPage(weld::Container* 
pPage, weld::DialogC
 m_xLB_CrossesAt->connect_changed(LINK(this, AxisPositionsTabPage, 
CrossesAtSelectHdl));
 m_xLB_PlaceLabels->connect_changed(LINK(this, AxisPositionsTabPage, 
PlaceLabelsSelectHdl));
 
-const double nMin = static_cast(SAL_MIN_INT64);
-const double nMax = static_cast(SAL_MAX_INT64);
-m_xED_CrossesAt->set_range(nMin, nMax);
-m_xED_LabelDistance->set_range(nMin, nMax);
+Formatter& rCrossFormatter = m_xED_CrossesAt->GetFormatter();
+rCrossFormatter.ClearMinValue();
+rCrossFormatter.ClearMaxValue();
+Formatter& rDistanceFormatter = m_xED_Crosses

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svtools include/vcl svtools/source svx/source vcl/inc vcl/source vcl/unx

[Caolán McNamara (via logerrit)]

 include/svtools/ctrlbox.hxx|3 ++-
 include/vcl/toolkit/combobox.hxx   |1 +
 include/vcl/weld.hxx   |2 +-
 svtools/source/control/ctrlbox.cxx |   26 +-
 svx/source/tbxctrls/tbcontrl.cxx   |   16 ++--
 vcl/inc/salvtables.hxx |4 ++--
 vcl/source/app/salvtables.cxx  |   18 --
 vcl/source/control/combobox.cxx|5 +
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   36 +---
 9 files changed, 75 insertions(+), 36 deletions(-)

New commits:
commit a5f95804c1a730fb393c33b49e6fbe0f5a5e9eac
Author: Caolán McNamara 
AuthorDate: Sat Jul 4 18:00:52 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Jul 5 16:42:39 2020 +0200

tdf#134479 allow disable font preview to work on existing font comboboxes

not just newly created one.

you can only restore back to a text-only view, not a text+(icon/whatever) 
view

Change-Id: Ic3becd7a942ee6b1dbabb57eebf1e25d1b626fdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97991
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 301a9c13047f..1c3185915b7d 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -353,7 +353,8 @@ public:
 
 voidFill( const FontList* pList );
 
-voidEnableWYSIWYG();
+voidEnableWYSIWYG(bool bEnable);
+boolIsWYSIWYGEnabled() const { return mbWYSIWYG; }
 
 void connect_changed(const Link& rLink) { 
m_xComboBox->connect_changed(rLink); }
 void connect_focus_in(const Link& rLink) { 
m_xComboBox->connect_focus_in(rLink); }
diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx
index a3c4e1cee5b3..611bce590add 100644
--- a/include/vcl/toolkit/combobox.hxx
+++ b/include/vcl/toolkit/combobox.hxx
@@ -102,6 +102,7 @@ public:
 
 voidSetUserItemSize( const Size& rSz );
 voidEnableUserDraw( bool bUserDraw );
+boolIsUserDrawEnabled() const;
 
 voidDrawEntry( const UserDrawEvent& rEvt );
 voidSetBorderStyle( WindowBorderStyle nBorderStyle );
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index cad56785acb2..cae26c1ffccf 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -732,7 +732,7 @@ public:
 }
 void connect_custom_render(const Link& rLink) { 
m_aRenderHdl = rLink; }
 // call set_custom_renderer after setting custom callbacks
-virtual void set_custom_renderer() = 0;
+virtual void set_custom_renderer(bool bOn) = 0;
 // create a virtual device compatible with the device passed in 
render_args wrt alpha
 virtual VclPtr create_render_virtual_device() const = 0;
 // set a sub menu for a entry, only works with custom rendering
diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index e60494a51097..555d35a94aa0 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -466,14 +466,16 @@ void FontNameBox::Fill( const FontList* pList )
 set_active_or_entry_text(aOldText);
 }
 
-void FontNameBox::EnableWYSIWYG()
+void FontNameBox::EnableWYSIWYG(bool bEnable)
 {
-if (mbWYSIWYG || comphelper::LibreOfficeKit::isActive())
+if (comphelper::LibreOfficeKit::isActive())
 return;
-mbWYSIWYG = true;
+if (mbWYSIWYG == bEnable)
+return;
+mbWYSIWYG = bEnable;
 
 static bool bGlobalsInited;
-if (!bGlobalsInited)
+if (mbWYSIWYG && !bGlobalsInited)
 {
 gUserItemSz = Size(m_xComboBox->get_approximate_digit_width() * 52, 
m_xComboBox->get_text_height());
 gUserItemSz.setHeight(gUserItemSz.Height() * 16);
@@ -485,11 +487,17 @@ void FontNameBox::EnableWYSIWYG()
 bGlobalsInited = true;
 }
 
-m_xComboBox->connect_custom_get_size(LINK(this, FontNameBox, 
CustomGetSizeHdl));
-m_xComboBox->connect_custom_render(LINK(this, FontNameBox, 
CustomRenderHdl));
-m_xComboBox->set_custom_renderer();
-
-mbWYSIWYG = true;
+if (mbWYSIWYG)
+{
+m_xComboBox->connect_custom_get_size(LINK(this, FontNameBox, 
CustomGetSizeHdl));
+m_xComboBox->connect_custom_render(LINK(this, FontNameBox, 
CustomRenderHdl));
+}
+else
+{
+m_xComboBox->connect_custom_get_size(Link());
+m_xComboBox->connect_custom_render(Link());
+}
+m_xComboBox->set_custom_renderer(mbWYSIWYG);
 }
 
 IMPL_STATIC_LINK_NOARG(FontNameBox, CustomGetSizeHdl, OutputDevice&, Size)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 732ad7d9f835..d64e033d6823 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -856,7 +856,7 @@ 
SvxStyleBox_Base::SvxStyleBox_Base(std::unique_ptr xWidget,
 
 m_xWidget->connect_custom_get_size(LINK(this, SvxStyleBox_Base, 
Cu

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |  125 ++
 loleaflet/src/layer/tile/TileLayer.js |   14 ++-
 2 files changed, 135 insertions(+), 4 deletions(-)

New commits:
commit e0eca220541fcd8d9ab236e6a274f00e256cc2e7
Author: Dennis Francis 
AuthorDate: Thu May 28 06:41:23 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:39:53 2020 +0200

Replay print-twips messages for a couple of reasons...

If L.CalcTileLayer.options.printTwipsMsgsEnabled is set, we will not get
some messages (with coordinates) from core when zoom changes because
print-twips coordinates are zoom-invariant. So we need to remember the
last version of each of them and replay, when zoom is changed.  We also
need to replay the messages, when sheet-geometry changes. This is
because it is possible for the updated print-twips messages to arrive
before the sheet-geometry update message arrives.

Change-Id: Icd77ad77c7642aae24e68fb0b7f229c7ec62484a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98114
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index db08b2019..f37caa6c5 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -238,7 +238,60 @@ L.CalcTileLayer = L.TileLayer.extend({
}
},
 
+   _saveMessageForReplay: function (textMsg, viewId) {
+   // If this.options.printTwipsMsgsEnabled is set, we will not 
get some messages (with coordinates)
+   // from core when zoom changes because print-twips coordinates 
are zoom-invariant. So we need to
+   // remember the last version of them and replay, when zoom is 
changed.
+   // We also need to replay the messages, when sheet-geometry 
changes. This is because it is possible for
+   // the updated print-twips messages to arrive before the 
sheet-geometry update message arrives.
+   if (!this.options.printTwipsMsgsEnabled) {
+   return;
+   }
+
+   if (!this._printTwipsMessagesForReplay) {
+   var ownViewTypes = [
+   'cellcursor',
+   'referencemarks',
+   'cellselectionarea',
+   'textselection',
+   ];
+
+   var otherViewTypes = [
+   'cellviewcursor',
+   'textviewselection',
+   ];
+
+   this._printTwipsMessagesForReplay = new 
L.MessageStore(ownViewTypes, otherViewTypes);
+   }
+
+   var colonIndex = textMsg.indexOf(':');
+   if (colonIndex === -1) {
+   return;
+   }
+
+   var msgType = textMsg.substring(0, colonIndex);
+   this._printTwipsMessagesForReplay.save(msgType, textMsg, 
viewId);
+   },
+
+   _clearMsgReplayStore: function () {
+   if (!this.options.printTwipsMsgsEnabled || 
!this._printTwipsMessagesForReplay) {
+   return;
+   }
+
+   this._printTwipsMessagesForReplay.clear();
+   },
+
+   // See _saveMessageForReplay.
+   _replayPrintTwipsMsgs: function () {
+   if (!this.options.printTwipsMsgsEnabled || 
!this._printTwipsMessagesForReplay) {
+   return;
+   }
+
+   
this._printTwipsMessagesForReplay.forEach(this._onMessage.bind(this));
+   },
+
_onMessage: function (textMsg, img) {
+   this._saveMessageForReplay(textMsg);
if (textMsg.startsWith('comment:')) {
var obj = 
JSON.parse(textMsg.substring('comment:'.length + 1));
obj.comment.tab = parseInt(obj.comment.tab);
@@ -377,6 +430,7 @@ L.CalcTileLayer = L.TileLayer.extend({
_onSetPartMsg: function (textMsg) {
var part = parseInt(textMsg.match(/\d+/g)[0]);
if (!this.isHiddenPart(part)) {
+   this._clearMsgReplayStore();
this.refreshViewData(undefined, false /* 
compatDataSrcOnly */, true /* sheetGeometryChanged */);
}
},
@@ -387,6 +441,7 @@ L.CalcTileLayer = L.TileLayer.extend({

this.sheetGeometry.setTileGeometryData(this._tileWidthTwips, 
this._tileHeightTwips,
this._tileSize, this._tilePixelScale);
}
+   this._replayPrintTwipsMsgs();
this.refreshViewData();
this._map._socket.sendMessage('commandvalues 
command=.uno:ViewAnnotationsPosition');
},
@@ -621,6 +676,8 @@ L.CalcTileLayer = L.Tile

Re: Error in building

[Mike Kaganski]

On 05.07.2020 17:30, anshu khare wrote:
> Could you please tell me the exact command?

The command was already mentioned by Julien
(http://document-foundation-mail-archive.969070.n3.nabble.com/Error-in-building-tp4282620p4282665.html).

Specifically, you wrote this:

> On running make clean, the output is :
> 
> 
> rm -fr C:/build/test-install
> make: rm: No such file or directory
> make: *** [Makefile:177: clean-host] Error 127

... after which you wrote:

> I tried to build it.. But it's giving the same error

> To be specific the error when i run
> 
>  /opt/lo/bin/make gb_COLOR=1
> 
> is
> 
> 
> C:/sources/libo-core/sal/osl/all/debugbase.cxx: fatal error C1853:
> 'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'
> precompiled header file is from a different version of t
> he compiler, or the precompiled header is C++ and you are using it from C
> (or vice versa)

The problem seemed to be using `make clean` literally, not turning
`make` into `/opt/lo/bin/make` to clean. Since that call failed to find
`rm`, it naturally hadn't removed nothing, and you re-tried to build in
the unchanged working tree.

-- 
Best regards,
Mike Kaganski


pEpkey.asc
Description: application/pgp-keys
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 33850593011b96ba2ed485811c6ff920b906d1dd
Author: Dennis Francis 
AuthorDate: Wed May 27 20:26:30 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:37:25 2020 +0200

Avoid position recomputations if no change in zoom

Change-Id: I25bab150c9e8f13a52f67c8f908f0d27206e6993
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98113
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 16b1005e0..db08b2019 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -1003,6 +1003,17 @@ L.SheetDimension = L.Class.extend({
updatePositions = true;
}
 
+   // Avoid position re-computations if no change in Zoom/dpiScale.
+   if (this._tileSizeTwips === tileSizeTwips &&
+   this._tileSizeCSSPixels === tileSizeCSSPixels &&
+   this._dpiScale === dpiScale) {
+   return;
+   }
+
+   this._tileSizeTwips = tileSizeTwips;
+   this._tileSizeCSSPixels = tileSizeCSSPixels;
+   this._dpiScale = dpiScale;
+
this._twipsPerCSSPixel = tileSizeTwips / tileSizeCSSPixels;
this._devPixelsPerCssPixel = dpiScale;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 051803327a20fd176de29fb294f35860eaccf51a
Author: Dennis Francis 
AuthorDate: Wed May 27 20:19:14 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:36:25 2020 +0200

Handle print-twips 'comment' msg correctly

Change-Id: I36687aab705eef0e3dab3af7d39de7ac390129c0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98112
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index b067c9dcc..16b1005e0 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -243,7 +243,8 @@ L.CalcTileLayer = L.TileLayer.extend({
var obj = 
JSON.parse(textMsg.substring('comment:'.length + 1));
obj.comment.tab = parseInt(obj.comment.tab);
if (obj.comment.action === 'Add') {
-   obj.comment.cellPos = 
L.LOUtil.stringToBounds(obj.comment.cellPos);
+   var cellPos = 
L.LOUtil.stringToBounds(obj.comment.cellPos);
+   obj.comment.cellPos = 
this._convertToTileTwipsSheetArea(cellPos);
obj.comment.cellPos = 
L.latLngBounds(this._twipsToLatLng(obj.comment.cellPos.getBottomLeft()),

this._twipsToLatLng(obj.comment.cellPos.getTopRight()));
if (!this._annotations[obj.comment.tab]) {
@@ -261,7 +262,8 @@ L.CalcTileLayer = L.TileLayer.extend({
}
} else if (obj.comment.action === 'Modify') {
var modified = 
this._annotations[obj.comment.tab][obj.comment.id];
-   obj.comment.cellPos = 
L.LOUtil.stringToBounds(obj.comment.cellPos);
+   cellPos = 
L.LOUtil.stringToBounds(obj.comment.cellPos);
+   obj.comment.cellPos = 
this._convertToTileTwipsSheetArea(cellPos);
obj.comment.cellPos = 
L.latLngBounds(this._twipsToLatLng(obj.comment.cellPos.getBottomLeft()),

this._twipsToLatLng(obj.comment.cellPos.getTopRight()));
if (modified) {
@@ -751,7 +753,6 @@ L.SheetGeometry = L.Class.extend({
 
setTileGeometryData: function (tileWidthTwips, tileHeightTwips, 
tileSizeCSSPixels,
dpiScale, updatePositions) {
-
this._columns.setTileGeometryData(tileWidthTwips, 
tileSizeCSSPixels, dpiScale, updatePositions);
this._rows.setTileGeometryData(tileHeightTwips, 
tileSizeCSSPixels, dpiScale, updatePositions);
},
@@ -997,6 +998,7 @@ L.SheetDimension = L.Class.extend({
},
 
setTileGeometryData: function (tileSizeTwips, tileSizeCSSPixels, 
dpiScale, updatePositions) {
+
if (updatePositions === undefined) {
updatePositions = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 31b30936865b672f3015763fb8f6d3705a10a8b3
Author: Dennis Francis 
AuthorDate: Wed May 27 17:30:39 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:35:16 2020 +0200

Handle print-twips 'textviewselection' msg correctly

Change-Id: I94a40b5a53a33a6658a8c8e4cd1cdbbd5ae4f460
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98111
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index f34ca10a9..f2268776c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1711,10 +1711,11 @@ L.TileLayer = L.GridLayer.extend({
for (var i = 0; i < strTwips.length; i += 4) {
var topLeftTwips = new 
L.Point(parseInt(strTwips[i]), parseInt(strTwips[i + 1]));
var offset = new L.Point(parseInt(strTwips[i + 
2]), parseInt(strTwips[i + 3]));
-   var topRightTwips = topLeftTwips.add(new 
L.Point(offset.x, 0));
-   var bottomLeftTwips = topLeftTwips.add(new 
L.Point(0, offset.y));
var bottomRightTwips = topLeftTwips.add(offset);
-   rectangles.push([bottomLeftTwips, 
bottomRightTwips, topLeftTwips, topRightTwips]);
+   var boundsTwips = 
this._convertToTileTwipsSheetArea(
+   new L.Bounds(topLeftTwips, 
bottomRightTwips));
+   rectangles.push([boundsTwips.getBottomLeft(), 
boundsTwips.getBottomRight(),
+   boundsTwips.getTopLeft(), 
boundsTwips.getTopRight()]);
}
 
this._viewSelections[viewId].part = viewPart;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 210b5ecde95ac1d7716016bfdee9c1077e276105
Author: Dennis Francis 
AuthorDate: Wed May 27 16:22:39 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:34:22 2020 +0200

Handle print-twips 'textselection' msg correctly

Change-Id: I6da579fe74827ad6cf127a58300b0ffd9c50b248
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98110
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6c4ede99e..f34ca10a9 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1669,10 +1669,11 @@ L.TileLayer = L.GridLayer.extend({
for (var i = 0; i < strTwips.length; i += 4) {
var topLeftTwips = new 
L.Point(parseInt(strTwips[i]), parseInt(strTwips[i + 1]));
var offset = new L.Point(parseInt(strTwips[i + 
2]), parseInt(strTwips[i + 3]));
-   var topRightTwips = topLeftTwips.add(new 
L.Point(offset.x, 0));
-   var bottomLeftTwips = topLeftTwips.add(new 
L.Point(0, offset.y));
var bottomRightTwips = topLeftTwips.add(offset);
-   rectangles.push([bottomLeftTwips, 
bottomRightTwips, topLeftTwips, topRightTwips]);
+   var boundsTwips = 
this._convertToTileTwipsSheetArea(
+   new L.Bounds(topLeftTwips, 
bottomRightTwips));
+   rectangles.push([boundsTwips.getBottomLeft(), 
boundsTwips.getBottomRight(),
+   boundsTwips.getTopLeft(), 
boundsTwips.getTopRight()]);
}
 
var polygons = 
L.PolyUtil.rectanglesToPolygons(rectangles, this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 72fd12904e5228b4db670ac02d56966e9509e74e
Author: Dennis Francis 
AuthorDate: Wed May 27 12:48:50 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:33:07 2020 +0200

Handle print-twips 'cellselectionarea' msg correctly

Change-Id: Ib8a13f66a4ffd3d63eeff8951960ebf176733a18
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98109
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index fd92bb468..6c4ede99e 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1858,10 +1858,12 @@ L.TileLayer = L.GridLayer.extend({
var topLeftTwips = new L.Point(parseInt(strTwips[0]), 
parseInt(strTwips[1]));
var offset = new L.Point(parseInt(strTwips[2]), 
parseInt(strTwips[3]));
var bottomRightTwips = topLeftTwips.add(offset);
+   var boundsTwips = this._convertToTileTwipsSheetArea(
+   new L.Bounds(topLeftTwips, 
bottomRightTwips));
var oldSelection = this._cellSelectionArea;
this._cellSelectionArea = new L.LatLngBounds(
-   
this._twipsToLatLng(topLeftTwips, this._map.getZoom()),
-   
this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
+   
this._twipsToLatLng(boundsTwips.getTopLeft(), this._map.getZoom()),
+   
this._twipsToLatLng(boundsTwips.getBottomRight(), this._map.getZoom()));
 
this._updateScrollOnCellSelection(oldSelection, 
this._cellSelectionArea);
} else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Error in building

[Ilmari Lauhakangas]

Julien already did five hours ago, but here it is again:
/opt/lo/bin/make clean

Please look at Julien's message in any case.

Ilmari

anshu khare kirjoitti 5.7.2020 klo 17.30:

Could you please tell me the exact command?

On Sun, 5 Jul, 2020, 6:37 PM Ilmari Lauhakangas, 
> wrote:


Yes, it was already discussed, but they used the wrong make for make
clean. It was my mistake not to give the exact command.

Ilmari

Arnaud Versini kirjoitti 5.7.2020 klo 15.05:
 > Hello,
 >
 > Dix you update Visual Studio recently?
 >
 > After each MSVC update you need to make clean to rebuild pre
compiled
 > headers.
 >
 > Le dim. 5 juil. 2020 à 11:17, anshu khare mailto:anshukhar...@gmail.com>
 > >>
a écrit :
 >
 >     To be specific the error when i run
 >
 >       /opt/lo/bin/make gb_COLOR=1
 >
 >     is
 >
 >
 >     C:/sources/libo-core/sal/osl/all/debugbase.cxx: fatal error
C1853:
 >   
  'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'

 >     precompiled header file is from a different version of t
 >     he compiler, or the precompiled header is C++ and you are
using it
 >     from C (or vice
 >   
  versa)C:/sources/libo-core/sal/osl/all/loadmodulerelative.cxx: fatal

 >     error C1853: 'C:/build/workdir/Precompil
 >     edHeader/nodebug/precompiled_sal.hxx.pch' precompiled header
file is
 >     from a different version of the compiler, or the precompiled
header
 >     is C++ and you are using it from C (or vice versa)C:/so
 >     urces/libo-core/sal/osl/all/filepath.cxx: fatal error C1853:
 >   
  'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'

 >     precompiled header file is from a different version of the com
 >     piler, or the precompiled header is C++ and you are using it
from C
 >     (or vice versa)
 >
 >
 >     C:/sources/libo-core/sal/osl/all/compat.cxx: fatal error C1853:
 >   
  'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'

 >     precompiled header file is from a different version of the
 >     compiler, or the precompiled header is C++ and you are using
it from
 >     C (or vice versa)
 >     make[1]: ***
[C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
 >     C:/build/workdir/CxxObject/sal/osl/all/loadmodulerelative.o]
Error 2
 >     make[1]: *** Waiting for unfinished jobs
 >     make[1]: ***
[C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
 >     C:/build/workdir/CxxObject/sal/osl/all/compat.o] Error 2
 >     make[1]: ***
[C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
 >     C:/build/workdir/CxxObject/sal/osl/all/debugbase.o] Error 2
 >     make[1]: ***
[C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
 >     C:/build/workdir/CxxObject/sal/osl/all/filepath.o] Error 2
 >     make: *** [Makefile:282: build] Error 2
 >
 >
 >
 >     On Sun, Jul 5, 2020 at 1:36 PM Ilmari Lauhakangas
 >     mailto:ilmari.lauhakan...@libreoffice.org>
 >     >> wrote:
 >
 >         So were the instdir and workdir removed anyway? You can
run make
 >         now and
 >         it builds happily?
 >
 >         Ilmari
 >
 >         anshu khare kirjoitti 5.7.2020 klo 8.58:
 >          > On running make clean, the output is :
 >          >
 >          >
 >          > rm -fr C:/build/test-install
 >          > make: rm: No such file or directory
 >          > make: *** [Makefile:177: clean-host] Error 127
 >          >
 >          >
 >          >
 >          >
 >          > On Sun, Jul 5, 2020 at 12:54 AM Ilmari Lauhakangas
 >          > mailto:ilmari.lauhakan...@libreoffice.org>
 >         >
 >          > 
 >                   >
 >          >     --enable-pch makes it use precompiled headers. The
error
 >         messages are
 >          >     quite clear.
 >          >
 >          >     Now you have to run
 >          >
 >          >     make clean
 >          >
 >          >     and then build again.
 >          >
 >          >     Ilmari
 >          >
 >          >     anshu khare kirjoitti 4.7.2020 klo 22.20:
 >          >      > I ran autogen.sh as shown below :
 >          >      >
 >          

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 034a17b4ec41b2380b0d34c342fb2ae038833d49
Author: Dennis Francis 
AuthorDate: Sun May 24 22:58:36 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:32:25 2020 +0200

Handle print-twips 'cellviewcursor' msg correctly

Change-Id: I744a24aa54768f12ea8801f6ceabdd4c79fa483a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98108
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 949e8354b..fd92bb468 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1365,9 +1365,11 @@ L.TileLayer = L.GridLayer.extend({
var topLeftTwips = new L.Point(parseInt(strTwips[0]), 
parseInt(strTwips[1]));
var offset = new L.Point(parseInt(strTwips[2]), 
parseInt(strTwips[3]));
var bottomRightTwips = topLeftTwips.add(offset);
+   var boundsTwips = this._convertToTileTwipsSheetArea(
+   new L.Bounds(topLeftTwips, bottomRightTwips));
this._cellViewCursors[viewId].bounds = new 
L.LatLngBounds(
-   this._twipsToLatLng(topLeftTwips, 
this._map.getZoom()),
-   this._twipsToLatLng(bottomRightTwips, 
this._map.getZoom()));
+   this._twipsToLatLng(boundsTwips.getTopLeft(), 
this._map.getZoom()),
+   
this._twipsToLatLng(boundsTwips.getBottomRight(), this._map.getZoom()));
}
 
this._cellViewCursors[viewId].part = parseInt(obj.part);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e2409e27cad531043719d382542ad143917995db
Author: Dennis Francis 
AuthorDate: Sun May 24 20:34:25 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:31:38 2020 +0200

Handle print-twips referencemarks msg correctly

Change-Id: I53f283e267a5fd84cf3232cc346921b67d3487bc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98107
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index e0ac093c6..949e8354b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1755,10 +1755,10 @@ L.TileLayer = L.GridLayer.extend({
for (var i = 0; i < strTwips.length; i += 4) {
var topLeftTwips = new 
L.Point(parseInt(strTwips[i]), parseInt(strTwips[i + 1]));
var offset = new 
L.Point(parseInt(strTwips[i + 2]), parseInt(strTwips[i + 3]));
-   var topRightTwips = 
topLeftTwips.add(new L.Point(offset.x, 0));
-   var bottomLeftTwips = 
topLeftTwips.add(new L.Point(0, offset.y));
-   var bottomRightTwips = 
topLeftTwips.add(offset);
-   rectangles.push([bottomLeftTwips, 
bottomRightTwips, topLeftTwips, topRightTwips]);
+   var boundsTwips = 
this._convertToTileTwipsSheetArea(
+   new L.Bounds(topLeftTwips, 
topLeftTwips.add(offset)));
+   
rectangles.push([boundsTwips.getBottomLeft(), boundsTwips.getBottomRight(),
+   boundsTwips.getTopLeft(), 
boundsTwips.getTopRight()]);
}
 
var polygons = 
L.PolyUtil.rectanglesToPolygons(rectangles, this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |4 +++-
 loleaflet/src/layer/tile/TileLayer.js |   16 +---
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit e2c8e486fe208af1f84c9f8f75f7b111c81c8a5d
Author: Dennis Francis 
AuthorDate: Sun May 24 18:26:05 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:30:54 2020 +0200

Handle print-twips 'cellcursor' msg from correctly

This is conditioned on the flag printTwipsMsgsEnabled.

Change-Id: I61a9165a9f81ce7473c3fa6579947f34552dbdaf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98106
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 478ea87e8..b067c9dcc 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -6,7 +6,9 @@
 /* global */
 L.CalcTileLayer = L.TileLayer.extend({
options: {
-   sheetGeometryDataEnabled: false
+   // TODO: sync these automatically from SAL_LOK_OPTIONS
+   sheetGeometryDataEnabled: false,
+   printTwipsMsgsEnabled: false
},
 
STD_EXTRA_WIDTH: 113, /* 2mm extra for optimal width,
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 0fe28e7ea..e0ac093c6 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1145,10 +1145,11 @@ L.TileLayer = L.GridLayer.extend({
var topLeftTwips = new L.Point(parseInt(strTwips[0]), 
parseInt(strTwips[1]));
var offset = new L.Point(parseInt(strTwips[2]), 
parseInt(strTwips[3]));
var bottomRightTwips = topLeftTwips.add(offset);
-   this._cellCursorTwips = new L.Bounds(topLeftTwips, 
bottomRightTwips);
+   this._cellCursorTwips = 
this._convertToTileTwipsSheetArea(
+   new 
L.Bounds(topLeftTwips, bottomRightTwips));
this._cellCursor = new L.LatLngBounds(
-   
this._twipsToLatLng(topLeftTwips, this._map.getZoom()),
-   
this._twipsToLatLng(bottomRightTwips, this._map.getZoom()));
+   
this._twipsToLatLng(this._cellCursorTwips.getTopLeft(), this._map.getZoom()),
+   
this._twipsToLatLng(this._cellCursorTwips.getBottomRight(), 
this._map.getZoom()));
this._cellCursorXY = new L.Point(parseInt(strTwips[4]), 
parseInt(strTwips[5]));
}
 
@@ -3380,6 +3381,15 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   // convert the area in print-twips to tile-twips by computing the 
involved cell-range.
+   _convertToTileTwipsSheetArea: function (rectangle) {
+   if (!(rectangle instanceof L.Bounds) || 
!this.options.printTwipsMsgsEnabled) {
+   return rectangle;
+   }
+
+   return 
this.sheetGeometry.getTileTwipsSheetAreaFromPrint(rectangle);
+   },
+
_debugGetTimeArray: function() {
return {count: 0, ms: 0, best: Number.MAX_SAFE_INTEGER, worst: 
0, date: 0};
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Error in building

[anshu khare]

Could you please tell me the exact command?

On Sun, 5 Jul, 2020, 6:37 PM Ilmari Lauhakangas, <
ilmari.lauhakan...@libreoffice.org> wrote:

> Yes, it was already discussed, but they used the wrong make for make
> clean. It was my mistake not to give the exact command.
>
> Ilmari
>
> Arnaud Versini kirjoitti 5.7.2020 klo 15.05:
> > Hello,
> >
> > Dix you update Visual Studio recently?
> >
> > After each MSVC update you need to make clean to rebuild pre compiled
> > headers.
> >
> > Le dim. 5 juil. 2020 à 11:17, anshu khare  > > a écrit :
> >
> > To be specific the error when i run
> >
> >   /opt/lo/bin/make gb_COLOR=1
> >
> > is
> >
> >
> > C:/sources/libo-core/sal/osl/all/debugbase.cxx: fatal error C1853:
> > 'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'
> > precompiled header file is from a different version of t
> > he compiler, or the precompiled header is C++ and you are using it
> > from C (or vice
> > versa)C:/sources/libo-core/sal/osl/all/loadmodulerelative.cxx: fatal
> > error C1853: 'C:/build/workdir/Precompil
> > edHeader/nodebug/precompiled_sal.hxx.pch' precompiled header file is
> > from a different version of the compiler, or the precompiled header
> > is C++ and you are using it from C (or vice versa)C:/so
> > urces/libo-core/sal/osl/all/filepath.cxx: fatal error C1853:
> > 'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'
> > precompiled header file is from a different version of the com
> > piler, or the precompiled header is C++ and you are using it from C
> > (or vice versa)
> >
> >
> > C:/sources/libo-core/sal/osl/all/compat.cxx: fatal error C1853:
> > 'C:/build/workdir/PrecompiledHeader/nodebug/precompiled_sal.hxx.pch'
> > precompiled header file is from a different version of the
> > compiler, or the precompiled header is C++ and you are using it from
> > C (or vice versa)
> > make[1]: *** [C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
> > C:/build/workdir/CxxObject/sal/osl/all/loadmodulerelative.o] Error 2
> > make[1]: *** Waiting for unfinished jobs
> > make[1]: *** [C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
> > C:/build/workdir/CxxObject/sal/osl/all/compat.o] Error 2
> > make[1]: *** [C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
> > C:/build/workdir/CxxObject/sal/osl/all/debugbase.o] Error 2
> > make[1]: *** [C:/sources/libo-core/solenv/gbuild/LinkTarget.mk:301:
> > C:/build/workdir/CxxObject/sal/osl/all/filepath.o] Error 2
> > make: *** [Makefile:282: build] Error 2
> >
> >
> >
> > On Sun, Jul 5, 2020 at 1:36 PM Ilmari Lauhakangas
> >  > > wrote:
> >
> > So were the instdir and workdir removed anyway? You can run make
> > now and
> > it builds happily?
> >
> > Ilmari
> >
> > anshu khare kirjoitti 5.7.2020 klo 8.58:
> >  > On running make clean, the output is :
> >  >
> >  >
> >  > rm -fr C:/build/test-install
> >  > make: rm: No such file or directory
> >  > make: *** [Makefile:177: clean-host] Error 127
> >  >
> >  >
> >  >
> >  >
> >  > On Sun, Jul 5, 2020 at 12:54 AM Ilmari Lauhakangas
> >  >  > 
> >  >  > >> wrote:
> >  >
> >  > --enable-pch makes it use precompiled headers. The error
> > messages are
> >  > quite clear.
> >  >
> >  > Now you have to run
> >  >
> >  > make clean
> >  >
> >  > and then build again.
> >  >
> >  > Ilmari
> >  >
> >  > anshu khare kirjoitti 4.7.2020 klo 22.20:
> >  >  > I ran autogen.sh as shown below :
> >  >  >
> >  >  >   /cygdrive/c/sources/libo-core/autogen.sh
> >  >  >
>   --with-external-tar=/cygdrive/c/sources/lo-externalsrc
> >  >  > --with-junit=/cygdrive/c/sources/junit-4.10.jar
> >  >  >
>  --with-ant-home=/cygdrive/c/sources/apache-ant-1.9.5
> >  >  >--enable-pch --disable-ccache
> >  >  >--enable-64-bit
> >  >  >   --disable-skia
> >  >  >
> >--with-jdk-home=/cygdrive/c/ProgramFiles/Java/jdk-13.0.2
> >  >  >
> >  >  > It gave the following output :
> >  >  >
> >  >  > Host Configuration unchanged - avoiding scp2 stamp
> update
> >  >  > Language Configuration unchanged - avoiding scp2 stamp
> > update
> >  >  >
> >  >
> >
>  **

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

[Dennis Francis (via logerrit)]

 loleaflet/src/geometry/Bounds.js  |8 +
 loleaflet/src/layer/tile/CalcTileLayer.js |  125 --
 2 files changed, 125 insertions(+), 8 deletions(-)

New commits:
commit f716d610c1f98af0c187061528d67a97d2b59c14
Author: Dennis Francis 
AuthorDate: Sun May 24 18:08:52 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:29:34 2020 +0200

Allow conversion of print-twips coordinates to tile-twips...

in L.SheetGeometry/L.SheetDimension classes.

Change-Id: If212e6ef2bebfeae32635f58a3025fbdf42e6ef2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98105
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/geometry/Bounds.js b/loleaflet/src/geometry/Bounds.js
index b1b73ec1d..212089d86 100644
--- a/loleaflet/src/geometry/Bounds.js
+++ b/loleaflet/src/geometry/Bounds.js
@@ -44,6 +44,14 @@ L.Bounds.prototype = {
return new L.Point(this.max.x, this.min.y);
},
 
+   getTopLeft: function () { // -> Point
+   return new L.Point(this.min.x, this.min.y);
+   },
+
+   getBottomRight: function () { // -> Point
+   return new L.Point(this.max.x, this.max.y);
+   },
+
getSize: function () {
return this.max.subtract(this.min);
},
diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index dd648be91..478ea87e8 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -847,6 +847,26 @@ L.SheetGeometry = L.Class.extend({
return this._rows.getGroupsDataInView();
},
 
+   // accepts a rectangle in print twips coordinates and returns the 
equivalent rectangle
+   // in tile-twips aligned to the cells.
+   getTileTwipsSheetAreaFromPrint: function (rectangle) { // (L.Bounds) -> 
L.Bounds
+   if (!(rectangle instanceof L.Bounds)) {
+   console.error('Bad argument type, expected L.Bounds');
+   return rectangle;
+   }
+
+   var topLeft = rectangle.getTopLeft();
+   var bottomRight = rectangle.getBottomRight();
+
+   var horizBounds = 
this._columns.getTileTwipsRangeFromPrint(topLeft.x, bottomRight.x);
+   var vertBounds = 
this._rows.getTileTwipsRangeFromPrint(topLeft.y, bottomRight.y);
+
+   topLeft = new L.Point(horizBounds.startpos, 
vertBounds.startpos);
+   bottomRight = new L.Point(horizBounds.endpos, 
vertBounds.endpos);
+
+   return new L.Bounds(topLeft, bottomRight);
+   },
+
_testValidity: function (sheetGeomJSON, checkCompleteness) {
 
if (!sheetGeomJSON.hasOwnProperty('commandName')) {
@@ -998,6 +1018,7 @@ L.SheetDimension = L.Class.extend({
_updatePositions: function() {
 
var posDevPx = 0; // position in device pixels.
+   var posPrintTwips = 0;
var dimensionObj = this;
this._visibleSizes.addCustomDataForEachSpan(function (
index,
@@ -1010,12 +1031,14 @@ L.SheetDimension = L.Class.extend({
var posCssPx = posDevPx / 
dimensionObj._devPixelsPerCssPixel;
// position in device-pixel aligned twips.
var posTileTwips = Math.floor(posCssPx * 
dimensionObj._twipsPerCSSPixel);
+   posPrintTwips += (size * spanLength);
 
var customData = {
sizedev: sizeDevPxOne,
posdevpx: posDevPx,
poscsspx: posCssPx,
-   postiletwips: posTileTwips
+   postiletwips: posTileTwips,
+   posprinttwips: posPrintTwips
};
 
return customData;
@@ -1034,15 +1057,48 @@ L.SheetDimension = L.Class.extend({
 
// returns element pos/size in css pixels by default.
_getElementDataFromSpanByIndex: function (index, span, useDevicePixels) 
{
+   return this._getElementDataAnyFromSpanByIndex(index, span,
+   useDevicePixels ? 'devpixels' : 'csspixels');
+   },
+
+   // returns element pos/size in the requested unit.
+   _getElementDataAnyFromSpanByIndex: function (index, span, unitName) {
+
if (span === undefined || index < span.start || span.end < 
index) {
return undefined;
}
 
+   if (unitName !== 'csspixels' && unitName !== 'devpixels' &&
+   unitName !== 'tiletwips' && unitName !== 
'printtwips') {
+   console.error('unsupported unitName: ' + unitName);
+   return undefined;
+   }

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

[Dennis Francis (via logerrit)]

 loleaflet/css/spreadsheet.css |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 320550f5820fb2f2158978145be3644f46044fb0
Author: Dennis Francis 
AuthorDate: Fri May 22 23:41:52 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:29:12 2020 +0200

row(col) header's canvas height(width) should not auto-adjust...

with the height(width) of the parent container, because if it does, the
header-canvas scales its contents to adjust to the new height(width) and
of course goes out of sync with the tiles.

This bug is visible when we do synchronous update of headers and if one
or both of the headers change size due to increase/decrease of
table-outline levels.

Change-Id: Ib65fd27f3598c7d58323d37c80ce2a147e594911
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98104
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 1934933b5..a24792192 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -135,7 +135,6 @@
 .spreadsheet-header-columns {
display: inline-block;
white-space: nowrap;
-   width: 100%;
height: 100%;
border-spacing: 0px !important;
position: relative;
@@ -178,7 +177,6 @@
 
 .spreadsheet-header-rows {
width: 100%;
-   height: 100%;
border-spacing: 0px !important;
position: relative;
margin: 0px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9909f20a05ec6130e0d8f3f586d6ce517ea86857
Author: Dennis Francis 
AuthorDate: Fri May 22 22:52:12 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:28:11 2020 +0200

fix a logical error regarding useDevicePixels flag

Change-Id: I4a930544a8f09d4d97c5e8257f0a353b4fccefac
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98103
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 24bcba0ab..dd648be91 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -1039,7 +1039,7 @@ L.SheetDimension = L.Class.extend({
}
 
var numSizes = span.end - index + 1;
-   var pixelScale = useDevicePixels ? this._devPixelsPerCssPixel : 
1;
+   var pixelScale = useDevicePixels ? 1 : 
this._devPixelsPerCssPixel;
return {
startpos: (span.data.posdevpx - span.data.sizedev * 
numSizes) / pixelScale,
size: span.data.sizedev / pixelScale
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7b8df1fd0e568cb34e24c81cf88c758b8e3b0e2a
Author: Dennis Francis 
AuthorDate: Thu May 21 23:43:17 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:27:26 2020 +0200

Avoid double parse/load of the first sheet geometry message

Change-Id: I381c63608dd4858b7f4e6e22d3f1d010cd2308e0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98102
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 1f9b8d966..24bcba0ab 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -613,8 +613,10 @@ L.CalcTileLayer = L.TileLayer.extend({
this._tileWidthTwips, this._tileHeightTwips,
this._tileSize, this._tilePixelScale);
}
+   else {
+   this.sheetGeometry.update(jsonMsgObj);
+   }
 
-   this.sheetGeometry.update(jsonMsgObj);

this.sheetGeometry.setViewArea(this._pixelsToTwips(this._map._getTopLeftPoint()),
this._pixelsToTwips(this._map.getSize()));
this._updateHeadersGridLines(undefined, true /* updateCols */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 2d8f0d5a6fe09e84e1f6eb9a35bf135620feef6f
Author: Dennis Francis 
AuthorDate: Thu May 21 23:30:04 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:26:46 2020 +0200

Supress multiple .uno:SheetGeometryData requests...

at document load till we get a response, by using flag.

Change-Id: I6296d6e18a122ee3cb714f26c019f9080c7febc7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98101
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 35a887817..1f9b8d966 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -530,8 +530,10 @@ L.CalcTileLayer = L.TileLayer.extend({
return;
}
 
-   this.sheetGeometry.setViewArea(pos, size);
-   this._updateHeadersGridLines(undefined, updateCols, updateRows);
+   if (this.sheetGeometry) {
+   this.sheetGeometry.setViewArea(pos, size);
+   this._updateHeadersGridLines(undefined, updateCols, 
updateRows);
+   }
},
 
// This send .uno:ViewRowColumnHeaders command to core with the new 
view coordinates (tile-twips).
@@ -545,6 +547,13 @@ L.CalcTileLayer = L.TileLayer.extend({
 
// sends the .uno:SheetGeometryData command optionally with arguments.
requestSheetGeometryData: function (flags) {
+   if (!this.sheetGeometry) {
+   // Supress multiple requests at document load, till we 
get a response.
+   if (this._sheetGeomFirstWait === true) {
+   return;
+   }
+   this._sheetGeomFirstWait = true;
+   }
var unoCmd = '.uno:SheetGeometryData';
var haveArgs = (typeof flags == 'object' &&
(flags.columns === true || flags.rows === true || 
flags.all === true));
@@ -599,6 +608,7 @@ L.CalcTileLayer = L.TileLayer.extend({
 
_handleSheetGeometryDataMsg: function (jsonMsgObj) {
if (!this.sheetGeometry) {
+   this._sheetGeomFirstWait = false;
this.sheetGeometry = new L.SheetGeometry(jsonMsgObj,
this._tileWidthTwips, this._tileHeightTwips,
this._tileSize, this._tilePixelScale);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/core/Socket.js |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a695506c732f222972616ea4cc9837065d58974e
Author: Dennis Francis 
AuthorDate: Thu May 21 21:41:38 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:26:06 2020 +0200

loleaflet: avoid double logging of messages

Change-Id: Ib19e3f26ec0fe5bb66364a488f764bdcf88acf83
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98100
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 35c7ceb15..b4f918da7 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -772,8 +772,6 @@ L.Socket = L.Class.extend({
this._map.fire(mobileEvent);
}
else if (!textMsg.startsWith('tile:') && 
!textMsg.startsWith('renderfont:') && !textMsg.startsWith('windowpaint:')) {
-   // log the tile msg separately as we need the tile 
coordinates
-   this._logSocket('INCOMING', textMsg);
 
if (imgBytes !== undefined) {
try {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |   16 
 1 file changed, 12 insertions(+), 4 deletions(-)

New commits:
commit fbae86ca65f8de53e3f1333fb452e3a1270e895f
Author: Dennis Francis 
AuthorDate: Thu May 21 16:09:39 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:25:34 2020 +0200

handle 'invalidatesheetgeometry' message

and use it to fetch the changed sheet geometry data and update the view.

Change-Id: I5a72012ce08f23e456cd64388e22385872f665a5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98099
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 3e6453e26..35a887817 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -279,6 +279,14 @@ L.CalcTileLayer = L.TileLayer.extend({
this.refreshViewData({x: 
this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint().y,
offset: {x: undefined, y: undefined}}, true /* 
compatDataSrcOnly */);
this._map._socket.sendMessage('commandvalues 
command=.uno:ViewAnnotationsPosition');
+   } else if (this.options.sheetGeometryDataEnabled &&
+   textMsg.startsWith('invalidatesheetgeometry:')) 
{
+   var params = 
textMsg.substring('invalidatesheetgeometry:'.length).trim().split(' ');
+   var flags = {};
+   params.forEach(function (param) {
+   flags[param] = true;
+   });
+   this.requestSheetGeometryData(flags);
} else {
L.TileLayer.prototype._onMessage.call(this, textMsg, 
img);
}
@@ -539,16 +547,16 @@ L.CalcTileLayer = L.TileLayer.extend({
requestSheetGeometryData: function (flags) {
var unoCmd = '.uno:SheetGeometryData';
var haveArgs = (typeof flags == 'object' &&
-   (flags.columns === true || flags.rows === true) &&
-   (flags.columns !== flags.rows));
+   (flags.columns === true || flags.rows === true || 
flags.all === true));
var payload = 'commandvalues command=' + unoCmd;
 
if (haveArgs) {
var argList = [];
-   if (flags.columns === true) {
+   var both = (flags.all === true);
+   if (both || flags.columns === true) {
argList.push('columns=1');
}
-   if (flags.rows === true) {
+   if (both || flags.rows === true) {
argList.push('rows=1');
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 7b78a2e66470969f7daba9846b55b30eda311c0c
Author: Dennis Francis 
AuthorDate: Thu May 21 12:29:52 2020 +0530
Commit: Dennis Francis 
CommitDate: Sun Jul 5 16:24:27 2020 +0200

Ignore the "invalidateheader:" msgs when...

sheet-geometry data source is enabled, because these messages are not
just for sheet geometry changes.

Change-Id: I8b2cca968a189607e46a4f9512c60e4b29f124bc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98098
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Dennis Francis 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index ff75e6b99..3e6453e26 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -269,15 +269,15 @@ L.CalcTileLayer = L.TileLayer.extend({
}
} else if (textMsg.startsWith('invalidateheader: column')) {
this.refreshViewData({x: 
this._map._getTopLeftPoint().x, y: 0,
-   offset: {x: undefined, y: 0}});
+   offset: {x: undefined, y: 0}}, true /* 
compatDataSrcOnly */);
this._map._socket.sendMessage('commandvalues 
command=.uno:ViewAnnotationsPosition');
} else if (textMsg.startsWith('invalidateheader: row')) {
this.refreshViewData({x: 0, y: 
this._map._getTopLeftPoint().y,
-   offset: {x: 0, y: undefined}});
+   offset: {x: 0, y: undefined}}, true /* 
compatDataSrcOnly */);
this._map._socket.sendMessage('commandvalues 
command=.uno:ViewAnnotationsPosition');
} else if (textMsg.startsWith('invalidateheader: all')) {
this.refreshViewData({x: 
this._map._getTopLeftPoint().x, y: this._map._getTopLeftPoint().y,
-   offset: {x: undefined, y: undefined}});
+   offset: {x: undefined, y: undefined}}, true /* 
compatDataSrcOnly */);
this._map._socket.sendMessage('commandvalues 
command=.uno:ViewAnnotationsPosition');
} else {
L.TileLayer.prototype._onMessage.call(this, textMsg, 
img);
@@ -365,7 +365,7 @@ L.CalcTileLayer = L.TileLayer.extend({
_onSetPartMsg: function (textMsg) {
var part = parseInt(textMsg.match(/\d+/g)[0]);
if (!this.isHiddenPart(part)) {
-   this.refreshViewData(undefined, true /* 
sheetGeometryChanged */);
+   this.refreshViewData(undefined, false /* 
compatDataSrcOnly */, true /* sheetGeometryChanged */);
}
},
 
@@ -467,8 +467,11 @@ L.CalcTileLayer = L.TileLayer.extend({
// zooming, cursor moving out of view-area etc.).  Depending on the
// active sheet geometry data-source, it may ask core to send current
// view area's data or the global data on geometry changes.
-   refreshViewData: function (coordinatesData, sheetGeometryChanged) {
+   refreshViewData: function (coordinatesData, compatDataSrcOnly, 
sheetGeometryChanged) {
 
+   if (this.options.sheetGeometryDataEnabled && compatDataSrcOnly) 
{
+   return;
+   }
// There are places that call this function with no arguments 
to indicate that the
// command arguments should be the current map area coordinates.
if (typeof coordinatesData != 'object') {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 9b7bfb6f32737f6b076959ae5577718b5dcd82b8
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:28:43 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:28:43 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3d0d927f0c4337a27ffcc94caba4ee6818fbdd8e
  - tdf#132643 Translate German section IDs

Change-Id: Ib49d9ddad0fd04c00bc6fc33572c627354409f60
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97848
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 86cef767faa4..3d0d927f0c43 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 86cef767faa48cafb031eab201a8cec16ce7102b
+Subproject commit 3d0d927f0c4337a27ffcc94caba4ee6818fbdd8e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 7b6549811a929e004266a6ead26b69d499c73e0c
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:29:31 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:29:31 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 770a9dbb7c4224cb379d327ca02300abe5083001
  - tdf#132643 Translate German section IDs

Change-Id: I9caadfaaea1e96ebf583379b0ed31f29ea11d860
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97850
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 3d0d927f0c43..770a9dbb7c42 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3d0d927f0c4337a27ffcc94caba4ee6818fbdd8e
+Subproject commit 770a9dbb7c4224cb379d327ca02300abe5083001
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0303.xhp |2 +-
 source/text/sbasic/shared/03030300.xhp |2 +-
 source/text/sbasic/shared/0312.xhp |2 +-
 source/text/sbasic/shared/03120400.xhp |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 770a9dbb7c4224cb379d327ca02300abe5083001
Author: Johnny_M 
AuthorDate: Fri Jul 3 13:37:40 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:29:31 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I9caadfaaea1e96ebf583379b0ed31f29ea11d860
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97850
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/0303.xhp 
b/source/text/sbasic/shared/0303.xhp
index 4436903d1..8d1a6ac3c 100644
--- a/source/text/sbasic/shared/0303.xhp
+++ b/source/text/sbasic/shared/0303.xhp
@@ -39,6 +39,6 @@
   You can combine 
date and time values into a single floating-decimal number. Dates are converted 
to integers, and times to decimal values. %PRODUCTNAME Basic also supports the variable type 
Date, which can contain a time specification consisting of both a date and 
time.
   
   
-  
+  
  
 
diff --git a/source/text/sbasic/shared/03030300.xhp 
b/source/text/sbasic/shared/03030300.xhp
index 6c79c4ea2..4f64396e1 100644
--- a/source/text/sbasic/shared/03030300.xhp
+++ b/source/text/sbasic/shared/03030300.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   System Date 
and Time
   The 
following functions and statements set or return the system date and 
time.
   
diff --git a/source/text/sbasic/shared/0312.xhp 
b/source/text/sbasic/shared/0312.xhp
index aa398323b..8709a9a24 100644
--- a/source/text/sbasic/shared/0312.xhp
+++ b/source/text/sbasic/shared/0312.xhp
@@ -40,6 +40,6 @@
   
   
   
-  
+  
  
 
diff --git a/source/text/sbasic/shared/03120400.xhp 
b/source/text/sbasic/shared/03120400.xhp
index 3250f7718..b3012ca68 100644
--- a/source/text/sbasic/shared/03120400.xhp
+++ b/source/text/sbasic/shared/03120400.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Editing 
String Length
   The 
following functions determine string lengths and compare strings.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 8e65c80dcf59bc4ab0b5317d3776e660b068e07b
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:27:54 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:27:54 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 86cef767faa48cafb031eab201a8cec16ce7102b
  - tdf#132643 Translate German section IDs

Change-Id: I5697e0717deea95fb32d462c1781cc9f404d6f1a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97847
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index cb2fb05325ca..86cef767faa4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cb2fb05325ca1a669e66c1b6ea0180707ebe84ba
+Subproject commit 86cef767faa48cafb031eab201a8cec16ce7102b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0300.xhp |2 +-
 source/text/sbasic/shared/0301.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3d0d927f0c4337a27ffcc94caba4ee6818fbdd8e
Author: Johnny_M 
AuthorDate: Fri Jul 3 13:27:24 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:28:43 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: Ib49d9ddad0fd04c00bc6fc33572c627354409f60
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97848
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/0300.xhp 
b/source/text/sbasic/shared/0300.xhp
index d6a7c0439..5a8645ed1 100644
--- a/source/text/sbasic/shared/0300.xhp
+++ b/source/text/sbasic/shared/0300.xhp
@@ -34,7 +34,7 @@
 This section 
describes the Runtime Functions of %PRODUCTNAME 
Basic.
 
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/0301.xhp 
b/source/text/sbasic/shared/0301.xhp
index 90032922e..c8ee14cc9 100644
--- a/source/text/sbasic/shared/0301.xhp
+++ b/source/text/sbasic/shared/0301.xhp
@@ -30,7 +30,7 @@
 
 
 
-  
+  
   Screen I/O 
Functions
   This section 
describes the Runtime Functions used to call dialogs for the input and output 
of user entries.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sdatabase/0200.xhp |2 +-
 source/text/shared/02/1401.xhp |4 ++--
 source/text/shared/main0214.xhp|4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit cb2fb05325ca1a669e66c1b6ea0180707ebe84ba
Author: Johnny_M 
AuthorDate: Fri Jul 3 13:19:51 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:27:04 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I46ffa2c6b1cf63241c35c9f2f35fdde250deac23
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97846
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sdatabase/0200.xhp 
b/source/text/sdatabase/0200.xhp
index 2a6c9903a..e3fa83b2e 100644
--- a/source/text/sdatabase/0200.xhp
+++ b/source/text/sdatabase/0200.xhp
@@ -24,7 +24,7 @@
 
 
 
-
+
 queries;overview (Base)
 tables in databases; printing queries (Base)
 printing; queries (Base)
diff --git a/source/text/shared/02/1401.xhp 
b/source/text/shared/02/1401.xhp
index 70d0871c6..826e223ac 100644
--- a/source/text/shared/02/1401.xhp
+++ b/source/text/shared/02/1401.xhp
@@ -28,14 +28,14 @@
   
 
 
-
+
 
 Run 
Query
 Runs the SQL query and displays the query 
result. The Run Query function does not save the 
query.
 
 The Run 
Query function allows you to check the query. When you save the query, 
it is stored in the Query tab page.
 Choose View - 
Preview to run the query from the menu bar of a query design 
window.UFI: see dba-features "Querydesign: Close preview has 
moved"
-
+
 
   
 
diff --git a/source/text/shared/main0214.xhp b/source/text/shared/main0214.xhp
index 1f6f2b92f..0b916e98e 100644
--- a/source/text/shared/main0214.xhp
+++ b/source/text/shared/main0214.xhp
@@ -35,8 +35,8 @@
 When creating or editing an SQL query, use the icons in the Query 
Design Bar to control the display of data.
 
 Depending on 
whether you have created the query or view in the Design or 
SQL tab page, the following icons appear:
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0103.xhp |2 +-
 source/text/sbasic/shared/01030300.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86cef767faa48cafb031eab201a8cec16ce7102b
Author: Johnny_M 
AuthorDate: Fri Jul 3 13:23:31 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:27:54 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I5697e0717deea95fb32d462c1781cc9f404d6f1a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97847
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/0103.xhp 
b/source/text/sbasic/shared/0103.xhp
index c0b00fbbc..341f3b77e 100644
--- a/source/text/sbasic/shared/0103.xhp
+++ b/source/text/sbasic/shared/0103.xhp
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/01030300.xhp 
b/source/text/sbasic/shared/01030300.xhp
index 71eabb848..0345d9250 100644
--- a/source/text/sbasic/shared/01030300.xhp
+++ b/source/text/sbasic/shared/01030300.xhp
@@ -29,7 +29,7 @@
 
 
 
-
+
 debugging Basic programs
 variables; observing values
 watching variables
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit bc180432694dfe73deb7a720215bfddb420f5a9a
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:27:04 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:27:04 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to cb2fb05325ca1a669e66c1b6ea0180707ebe84ba
  - tdf#132643 Translate German section IDs

Change-Id: I46ffa2c6b1cf63241c35c9f2f35fdde250deac23
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97846
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index dd01432283b4..cb2fb05325ca 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd01432283b4ed8259fac3ee8c097ae27b9ec79a
+Subproject commit cb2fb05325ca1a669e66c1b6ea0180707ebe84ba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/01170100.xhp |2 +-
 source/text/sbasic/shared/01170103.xhp |2 +-
 source/text/shared/01/0614.xhp |2 +-
 source/text/shared/01/06140500.xhp |2 +-
 source/text/shared/02/01170100.xhp |2 +-
 source/text/shared/02/01170103.xhp |2 +-
 source/text/shared/02/01170200.xhp |2 +-
 source/text/shared/02/01170202.xhp |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit dd01432283b4ed8259fac3ee8c097ae27b9ec79a
Author: Johnny_M 
AuthorDate: Thu Jul 2 13:24:03 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:26:05 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I348ed6e6dff01d198f2b33ea559792eb9f775851
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97754
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/01170100.xhp 
b/source/text/sbasic/shared/01170100.xhp
index 05153753d..6e1547268 100644
--- a/source/text/sbasic/shared/01170100.xhp
+++ b/source/text/sbasic/shared/01170100.xhp
@@ -99,6 +99,6 @@
 
 
 
-
+
 
 
diff --git a/source/text/sbasic/shared/01170103.xhp 
b/source/text/sbasic/shared/01170103.xhp
index f08026f8b..fd3d25ae8 100644
--- a/source/text/sbasic/shared/01170103.xhp
+++ b/source/text/sbasic/shared/01170103.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 Events
 Define event 
assignments for the selected control or dialog. The available events depend on 
the type of control selected.
 
diff --git a/source/text/shared/01/0614.xhp 
b/source/text/shared/01/0614.xhp
index ed9db7ca0..793e72b5b 100644
--- a/source/text/shared/01/0614.xhp
+++ b/source/text/shared/01/0614.xhp
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/06140500.xhp 
b/source/text/shared/01/06140500.xhp
index 2cc0a6ccc..30a9e90d9 100644
--- a/source/text/shared/01/06140500.xhp
+++ b/source/text/shared/01/06140500.xhp
@@ -24,7 +24,7 @@
   
 
 
-
+
   customizing; events
 events; customizing
   
diff --git a/source/text/shared/02/01170100.xhp 
b/source/text/shared/02/01170100.xhp
index ed0ae4dbb..1c12b1521 100644
--- a/source/text/shared/02/01170100.xhp
+++ b/source/text/shared/02/01170100.xhp
@@ -105,7 +105,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/02/01170103.xhp 
b/source/text/shared/02/01170103.xhp
index 3a2083681..69e9607fa 100644
--- a/source/text/shared/02/01170103.xhp
+++ b/source/text/shared/02/01170103.xhp
@@ -25,7 +25,7 @@
   
 
 
-
+
 
 controls; events
 events; controls
diff --git a/source/text/shared/02/01170200.xhp 
b/source/text/shared/02/01170200.xhp
index eb0a74fbc..9ae5fbbd1 100644
--- a/source/text/shared/02/01170200.xhp
+++ b/source/text/shared/02/01170200.xhp
@@ -44,7 +44,7 @@
   
   
   
-  
+  
   
  
 
diff --git a/source/text/shared/02/01170202.xhp 
b/source/text/shared/02/01170202.xhp
index 998a2c523..65dfee343 100644
--- a/source/text/shared/02/01170202.xhp
+++ b/source/text/shared/02/01170202.xhp
@@ -27,7 +27,7 @@
   


-  
+  
 forms; events
  events;in forms
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit bb6da5ac57172bccca27a163f391c3eee03f38ef
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:26:05 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:26:05 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to dd01432283b4ed8259fac3ee8c097ae27b9ec79a
  - tdf#132643 Translate German section IDs

Change-Id: I348ed6e6dff01d198f2b33ea559792eb9f775851
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97754
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 420a701bbbe7..dd01432283b4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 420a701bbbe76d95792e167cc4cee169abd09b58
+Subproject commit dd01432283b4ed8259fac3ee8c097ae27b9ec79a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 183dcecedd3ab9d58a657d7fff705e2d8b7894d3
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:24:56 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:24:56 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 420a701bbbe76d95792e167cc4cee169abd09b58
  - tdf#132643 Translate German section IDs

Change-Id: I7230dee984de1ce119b37b0c6ed9e683f1a00e8f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97753
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 0d09266b1a53..420a701bbbe7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0d09266b1a530022f8191774212800bb811096c6
+Subproject commit 420a701bbbe76d95792e167cc4cee169abd09b58
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/2000.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 420a701bbbe76d95792e167cc4cee169abd09b58
Author: Johnny_M 
AuthorDate: Thu Jul 2 13:18:47 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:24:56 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I7230dee984de1ce119b37b0c6ed9e683f1a00e8f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97753
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/02/2000.xhp 
b/source/text/sbasic/shared/02/2000.xhp
index 0f6286edc..d3a28dafe 100644
--- a/source/text/sbasic/shared/02/2000.xhp
+++ b/source/text/sbasic/shared/02/2000.xhp
@@ -29,7 +29,7 @@
 
 
 
-
+
 controls; in dialog editor
 push button control in dialog editor
 icon control
@@ -67,7 +67,7 @@
 
 Insert 
Controls
 Opens the Toolbox 
bar.
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 119eb09fbd53a7e407ea2450d51e9563d4b3f3f2
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:24:09 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:24:09 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0d09266b1a530022f8191774212800bb811096c6
  - tdf#132643 Translate German section IDs

Change-Id: I9bdb94359d3bb9b0b140cc704b138ec0d1347832
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97752
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 2239aea3af81..0d09266b1a53 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2239aea3af8134f2d7799784bce5fe91499fc4fc
+Subproject commit 0d09266b1a530022f8191774212800bb811096c6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1107.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0d09266b1a530022f8191774212800bb811096c6
Author: Johnny_M 
AuthorDate: Thu Jul 2 13:13:40 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:24:09 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I9bdb94359d3bb9b0b140cc704b138ec0d1347832
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97752
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/02/1107.xhp 
b/source/text/sbasic/shared/02/1107.xhp
index ffee38d3b..8382317d2 100644
--- a/source/text/sbasic/shared/02/1107.xhp
+++ b/source/text/sbasic/shared/02/1107.xhp
@@ -29,13 +29,13 @@
 
 
 
-
+
 
 Breakpoint
 Inserts a breakpoint in the program 
line.
 
 The breakpoint 
is inserted at the cursor position. Use a breakpoint to interrupt a program 
just before an error occurs. You can then troubleshoot the program by running 
it in Single 
Step mode until the error occurs. You can also use the Watch icon to 
check the content of the relevant variables.
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index 82a76e668..fc34e35c9 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -50,8 +50,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1105.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2239aea3af8134f2d7799784bce5fe91499fc4fc
Author: Johnny_M 
AuthorDate: Thu Jul 2 13:08:06 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:23:19 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I74d819195dbe0f8ddb38c780e45672d17e13d0d4
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97751
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/02/1105.xhp 
b/source/text/sbasic/shared/02/1105.xhp
index 80d38ae25..57a75a94e 100644
--- a/source/text/sbasic/shared/02/1105.xhp
+++ b/source/text/sbasic/shared/02/1105.xhp
@@ -30,13 +30,13 @@
 
 
 
-
+
 
 Single 
Step
 Runs the macro and stops it after the next 
command.
 
 You can use 
this command in conjunction with the Watch command to 
troubleshoot errors.
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index f881a3cc9..82a76e668 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -46,8 +46,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 4c00ff8f2298d35f698621776d86ad2e9db59378
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:23:19 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:23:19 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2239aea3af8134f2d7799784bce5fe91499fc4fc
  - tdf#132643 Translate German section IDs

Change-Id: I74d819195dbe0f8ddb38c780e45672d17e13d0d4
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97751
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 0dd5d7c2a95c..2239aea3af81 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0dd5d7c2a95c0639585311173a1456ff9c10edfe
+Subproject commit 2239aea3af8134f2d7799784bce5fe91499fc4fc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 2b112cdd653e9f69ac54743e036b326807eeeaa0
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:22:10 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:22:10 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0dd5d7c2a95c0639585311173a1456ff9c10edfe
  - tdf#132643 Translate German section IDs

Change-Id: I315e0631ac9fc089c7a837530ac20a931b19852b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97750
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 22b4159695d5..0dd5d7c2a95c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 22b4159695d519d3509ca2f1ce2fe5e88978c027
+Subproject commit 0dd5d7c2a95c0639585311173a1456ff9c10edfe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1104.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0dd5d7c2a95c0639585311173a1456ff9c10edfe
Author: Johnny_M 
AuthorDate: Thu Jul 2 13:03:58 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:22:10 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I315e0631ac9fc089c7a837530ac20a931b19852b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97750
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/02/1104.xhp 
b/source/text/sbasic/shared/02/1104.xhp
index 52c2522d6..a8a7aa415 100644
--- a/source/text/sbasic/shared/02/1104.xhp
+++ b/source/text/sbasic/shared/02/1104.xhp
@@ -29,7 +29,7 @@
 
 
 
-
+
 macros; stopping
 program stops
 stopping macros
@@ -39,7 +39,7 @@
 Stops running the current macro.
  You can also press 
Shift+Ctrl+Q.
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index 74da6e8a0..f881a3cc9 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -42,8 +42,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/00/0005.xhp |2 +-
 source/text/shared/01/02180100.xhp |2 +-
 source/text/shared/guide/hyperlink_rel_abs.xhp |2 +-
 source/text/shared/optionen/01010200.xhp   |6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 22b4159695d519d3509ca2f1ce2fe5e88978c027
Author: Johnny_M 
AuthorDate: Thu Jul 2 13:01:05 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:21:11 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I4f616f8e5ab5be3887cc4109952aadd4fde7a471
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97749
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/00/0005.xhp 
b/source/text/shared/00/0005.xhp
index 22bc7dd13..6bcfd87ab 100644
--- a/source/text/shared/00/0005.xhp
+++ b/source/text/shared/00/0005.xhp
@@ -261,7 +261,7 @@
Rich Text 
Format (RTF) is a file format developed for the exchange of text files. A 
special feature is that the formatting is converted into directly readable text 
information. Unfortunately, in comparison to other file formats, this creates 
relatively large files.

   
-  
+  

Saving Relatively and Absolutely
In various 
dialogs (for example, Tools - AutoText) you can select whether you 
want to save files relatively or absolutely.
diff --git a/source/text/shared/01/02180100.xhp 
b/source/text/shared/01/02180100.xhp
index cfa2e1621..2d833132b 100644
--- a/source/text/shared/01/02180100.xhp
+++ b/source/text/shared/01/02180100.xhp
@@ -46,7 +46,7 @@
 Lists the application that last saved the 
source file. %PRODUCTNAME applications have the server name 
soffice.
 
 File
-Path to the source file. Relative 
paths must be expressed by full URI, for example, with 
file://.
+Path to the source file. Relative 
paths must be expressed by full URI, for example, with 
file://.
 
 Category
   Lists the section or object that the link 
refers to in the source file. If you want, you can enter a new section or 
object here.
diff --git a/source/text/shared/guide/hyperlink_rel_abs.xhp 
b/source/text/shared/guide/hyperlink_rel_abs.xhp
index 0813113c5..32503d609 100644
--- a/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -39,7 +39,7 @@
 When you 
include hyperlinks, two factors must be taken into account: whether they are 
set as relative or absolute on saving, and whether or not the file is 
present.
 
 
-Choose 
%PRODUCTNAME - 
PreferencesTools - 
Options - Load/Save - General and specify in the Save 
URLs relative to field if $[officename] creates relative or absolute hyperlinks. Relative linking is only 
possible when the document you are working on and the link destination are on 
the same drive.
+Choose 
%PRODUCTNAME - 
PreferencesTools - 
Options - Load/Save - General and specify in the Save 
URLs relative to field if $[officename] creates relative or absolute hyperlinks. Relative linking is only 
possible when the document you are working on and the link destination are on 
the same drive.
 
 
 You should 
create the same directory structure on your hard disk as that which exists in 
the web space hosted by your Internet provider. Call the root directory for the 
homepage on your hard disk "homepage", for example. The start file is then 
"index.html", the full path being "C:\homepage\index.html" (assuming Windows 
operating system). The URL on your Internet provider's server might then be as 
follows: "http://www.myprovider.com/mypage/index.html";. With relative 
addressing, you indicate the link relative to the location of the output 
document. For example, if you placed all the graphics for your homepage in a 
subfolder called "C:\homepage\images", you would need to give the following 
path to access the graphic "picture.gif": "images\picture.gif". This is the 
relative path, starting from the location of the file "index.html". On the 
provider's server, you would place the picture in the folder "mypage/images". 
When you 
 transfer the document "index.html" to the provider's server through the 
File - Save As dialog, and if you have marked the option 
Copy local images to Internet under %PRODUCTNAME - 
PreferencesTools - 
Options - Load/Save - HTML 
Compatibility, $[officename] will automatically copy the graphic to the 
correct directory on the server.
diff --git a/source/text/shared/optionen/01010200.xhp 
b/source/text/shared/optionen/01010200.xhp
index 17682de75..22fcbc0d7 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -94,7 +94,7 @@
 Automatically save the document too
   Specifies that %PRODUCTNAME saves all open documents when saving 
auto recovery information. Uses the same time interval as AutoRecovery 
does.
 Save URLs relative to file system
-  This option 
allows you to select the default for relative addressing of URLs in the file 
system and on the 

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 2fb85d80d9883bb0c7867545bc858f8eec6b6c8c
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:21:11 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:21:11 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 22b4159695d519d3509ca2f1ce2fe5e88978c027
  - tdf#132643 Translate German section IDs

Change-Id: I4f616f8e5ab5be3887cc4109952aadd4fde7a471
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97749
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index da883c5454b4..22b4159695d5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit da883c5454b41e985c73b2c6a8b8b85e4322fb67
+Subproject commit 22b4159695d519d3509ca2f1ce2fe5e88978c027
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/optionen/01010200.xhp |2 +-
 source/text/shared/optionen/0102.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da883c5454b41e985c73b2c6a8b8b85e4322fb67
Author: Johnny_M 
AuthorDate: Thu Jul 2 12:55:17 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:20:17 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I7dfbe147fa191f051265b96616c43727b0c44b4f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97748
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/optionen/01010200.xhp 
b/source/text/shared/optionen/01010200.xhp
index e88dfad69..17682de75 100644
--- a/source/text/shared/optionen/01010200.xhp
+++ b/source/text/shared/optionen/01010200.xhp
@@ -25,7 +25,7 @@

 
 
-
+
 
 saving; options
 defaults;of saving
diff --git a/source/text/shared/optionen/0102.xhp 
b/source/text/shared/optionen/0102.xhp
index cb66bbf8b..f73315b3a 100644
--- a/source/text/shared/optionen/0102.xhp
+++ b/source/text/shared/optionen/0102.xhp
@@ -38,7 +38,7 @@
   
   
 
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit b510536991b8fdfa52b60f07c744e30dcfae14c1
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:20:17 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:20:17 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to da883c5454b41e985c73b2c6a8b8b85e4322fb67
  - tdf#132643 Translate German section IDs

Change-Id: I7dfbe147fa191f051265b96616c43727b0c44b4f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97748
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index d0b8c9029801..da883c5454b4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d0b8c9029801f0a51b2ce72d7b8fdc67fc6f570f
+Subproject commit da883c5454b41e985c73b2c6a8b8b85e4322fb67
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit bf27ded877eafc490cdb9de269f0a9e3b973d153
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:19:35 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:19:35 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to d0b8c9029801f0a51b2ce72d7b8fdc67fc6f570f
  - tdf#132643 Translate German section IDs

Change-Id: I2e0f576ce1a7741eea231607d4f335e8ff08af2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97747
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index fc51a0560e6a..d0b8c9029801 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fc51a0560e6a26202f47f6144b8c5e65cb8694ad
+Subproject commit d0b8c9029801f0a51b2ce72d7b8fdc67fc6f570f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sdraw/main0101.xhp |2 +-
 source/text/shared/01/0106.xhp |2 --
 source/text/shared/main0201.xhp|2 +-
 source/text/smath/main0101.xhp |2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit d0b8c9029801f0a51b2ce72d7b8fdc67fc6f570f
Author: Johnny_M 
AuthorDate: Thu Jul 2 12:51:08 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:19:35 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I2e0f576ce1a7741eea231607d4f335e8ff08af2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97747
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sdraw/main0101.xhp b/source/text/sdraw/main0101.xhp
index e63af462e..9fbb9951f 100644
--- a/source/text/sdraw/main0101.xhp
+++ b/source/text/sdraw/main0101.xhp
@@ -39,7 +39,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/0106.xhp 
b/source/text/shared/01/0106.xhp
index 42bfd5832..4497a57cf 100644
--- a/source/text/shared/01/0106.xhp
+++ b/source/text/shared/01/0106.xhp
@@ -29,12 +29,10 @@
 
 
 
-Can this be removed?
 
 Save
   Saves the current document.
 
-
 
   
 
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index 48da54f9e..2e43c77d1 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -33,7 +33,7 @@
 Open File
 
 
-
+
 
 Save 
As
 
diff --git a/source/text/smath/main0101.xhp b/source/text/smath/main0101.xhp
index fca81312d..44637af01 100644
--- a/source/text/smath/main0101.xhp
+++ b/source/text/smath/main0101.xhp
@@ -39,7 +39,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 94e149ecba28a8077e97d9cc9fd6ca5e2dd1fb85
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:14:38 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:14:38 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to fc51a0560e6a26202f47f6144b8c5e65cb8694ad
  - tdf#132643 Translate German section IDs

Change-Id: Ie95d3bdc17ddcc83afa4c05035011a1982f4f9d5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97853
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 81aab1b7d5cf..fc51a0560e6a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 81aab1b7d5cfad482f80bf975521f86a68116708
+Subproject commit fc51a0560e6a26202f47f6144b8c5e65cb8694ad
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit a651b5d3890d6af29892444616f81695267de2fe
Author: Johnny_M 
AuthorDate: Sun Jul 5 15:13:55 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Sun Jul 5 15:13:55 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 81aab1b7d5cfad482f80bf975521f86a68116708
  - tdf#132643 Translate German section IDs

Change-Id: I21f33dc6af5b8798f12c17c90aaefddd612141bd
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97854
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 23fa7d66f1e1..81aab1b7d5cf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 23fa7d66f1e1a2aa2f237d7e93b0412c90de1d33
+Subproject commit 81aab1b7d5cfad482f80bf975521f86a68116708
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0308.xhp |2 +-
 source/text/sbasic/shared/03080400.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fc51a0560e6a26202f47f6144b8c5e65cb8694ad
Author: Johnny_M 
AuthorDate: Fri Jul 3 13:51:02 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:14:38 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: Ie95d3bdc17ddcc83afa4c05035011a1982f4f9d5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97853
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/0308.xhp 
b/source/text/sbasic/shared/0308.xhp
index 5be4c6704..dcadb6f25 100644
--- a/source/text/sbasic/shared/0308.xhp
+++ b/source/text/sbasic/shared/0308.xhp
@@ -39,7 +39,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/source/text/sbasic/shared/03080400.xhp 
b/source/text/sbasic/shared/03080400.xhp
index 3a8aef25b..b1c3eb18a 100644
--- a/source/text/sbasic/shared/03080400.xhp
+++ b/source/text/sbasic/shared/03080400.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Square 
Root Calculation
   Use this 
function to calculate square roots.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0102.xhp |2 +-
 source/text/sbasic/shared/01020300.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 81aab1b7d5cfad482f80bf975521f86a68116708
Author: Johnny_M 
AuthorDate: Fri Jul 3 13:55:33 2020 +0200
Commit: Olivier Hallot 
CommitDate: Sun Jul 5 15:13:55 2020 +0200

tdf#132643 Translate German section IDs

Change-Id: I21f33dc6af5b8798f12c17c90aaefddd612141bd
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97854
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/shared/0102.xhp 
b/source/text/sbasic/shared/0102.xhp
index 6fe488ae8..ccec8f509 100644
--- a/source/text/sbasic/shared/0102.xhp
+++ b/source/text/sbasic/shared/0102.xhp
@@ -38,7 +38,7 @@
   
   
   
-  
+  
   
  
 
diff --git a/source/text/sbasic/shared/01020300.xhp 
b/source/text/sbasic/shared/01020300.xhp
index 6780cbda9..067746a1d 100644
--- a/source/text/sbasic/shared/01020300.xhp
+++ b/source/text/sbasic/shared/01020300.xhp
@@ -38,7 +38,7 @@
   functions;return value type
   return value type of functions
 
-
+
 Using 
Procedures, Functions and Properties
 The following describes the 
basic use of procedures, functions and properties in %PRODUCTNAME 
Basic.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits